Charge for hashing init code in CREATE2 implementation.

ethereum · Oct 4, 2018 · da1cf1f · da1cf1f
1 parent 0add2b3
commit da1cf1f
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 0 deletions.
diff --git a/libaleth-interpreter/VMCalls.cpp b/libaleth-interpreter/VMCalls.cpp
@@ -116,7 +116,11 @@ void VM::caseCreate()
 
     u256 salt;
     if (m_OP == Instruction::CREATE2)
+    {
         salt = m_SP[3];
+        // charge for hashing initCode = GSHA3WORD * ceil(len(init_code) / 32)
+        m_runGas += toInt63((u512{initSize} + 31) / 32 * uint64_t{VMSchedule::sha3WordGas});
+    }
 
     updateMem(memNeed(initOff, initSize));
     updateIOGas();

diff --git a/libevm/LegacyVMCalls.cpp b/libevm/LegacyVMCalls.cpp
@@ -127,7 +127,11 @@ void LegacyVM::caseCreate()
 
     u256 salt;
     if (m_OP == Instruction::CREATE2)
+    {
         salt = m_SP[3];
+        // charge for hashing initCode = GSHA3WORD * ceil(len(init_code) / 32)
+        m_runGas += toInt63((u512{initSize} +31) / 32 * m_schedule->sha3WordGas);
+    }
 
     updateMem(memNeed(initOff, initSize));
     updateIOGas();

diff --git a/test/unittests/libevm/VMTest.cpp b/test/unittests/libevm/VMTest.cpp
@@ -144,6 +144,40 @@ class Create2TestFixture: public TestOutputHelperFixture
         BOOST_REQUIRE_EQUAL(state.getNonce(expectedAddress), 1);
     }
 
+    void testCreate2costIncludesInitCodeHashing()
+    {
+        ExtVM extVm(state, envInfo, *se, address, address, address, value, gasPrice, ref(inputData),
+            ref(code), sha3(code), depth, isCreate, staticCall);
+
+        uint64_t gasBefore = 0;
+        uint64_t gasAfter = 0;
+        auto onOp = [&gasBefore, &gasAfter](uint64_t /*steps*/, uint64_t /* PC */,
+                        Instruction _instr, bigint /* newMemSize */, bigint /* gasCost */,
+                        bigint _gas, VMFace const*, ExtVMFace const*) {
+            if (_instr == Instruction::CREATE2)
+            {
+                // before CREATE2 instruction
+                gasBefore = static_cast<uint64_t>(_gas);
+            }
+            else if (gasBefore != 0 && gasAfter == 0)
+            {
+                // first instruction of the init code
+                gasAfter = static_cast<uint64_t>(_gas);
+            }
+        };
+
+        vm->exec(gas, extVm, onOp);
+
+        // create cost
+        uint64_t expectedGasAfter = gasBefore - 32000;
+        // hashing cost, assuming no memory expansion needed
+        expectedGasAfter -=
+            static_cast<uint64_t>(std::ceil(static_cast<double>(inputData.size()) / 32)) * 6;
+        // EIP-150 adjustion of subcall gas
+        expectedGasAfter -= expectedGasAfter / 64;
+        BOOST_REQUIRE_EQUAL(gasAfter, expectedGasAfter);
+    }
+
 
     BlockHeader blockHeader{initBlockHeader()};
     LastBlockHashes lastBlockHashes;
@@ -494,6 +528,11 @@ BOOST_AUTO_TEST_CASE(LegacyVMCreate2collisionWithNonEmptyStorageEmptyInitCode)
     testCreate2collisionWithNonEmptyStorageEmptyInitCode();
 }
 
+BOOST_AUTO_TEST_CASE(LegacyVMCreate2costIncludesInitCodeHashing)
+{
+    testCreate2costIncludesInitCodeHashing();
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_FIXTURE_TEST_SUITE(LegacyVMExtcodehashSuite, LegacyVMExtcodehashTestFixture)