Merge pull request #5728 from ethereum/eip-2200-interpreter

Implement EIP-2200: Structured Definitions for Net Gas Metering in aleth-interpreter

Author: gumb0

CHANGELOG.md

@@ -20,7 +20,7 @@
 - Added: [#5701](https://github.com/ethereum/aleth/issues/5701) Outputs ENR text representation in admin.nodeInfo RPC.
 - Added: [#5705](https://github.com/ethereum/aleth/pull/5705) Istanbul support: EIP 1108 Reduce alt_bn128 precompile gas costs.
 - Added: [#5707](https://github.com/ethereum/aleth/pull/5707) Aleth waits for 2 seconds after sending disconnect to peer before closing socket.
-- Added: [#5709](https://github.com/ethereum/aleth/pull/5709) Istanbul support: EIP-2200 Structured Definitions for Net Gas Metering.
+- Added: [#5709](https://github.com/ethereum/aleth/pull/5709) [#5728](https://github.com/ethereum/aleth/pull/5728) Istanbul support: EIP-2200 Structured Definitions for Net Gas Metering.
 - Added: [#5751](https://github.com/ethereum/aleth/pull/5751) Istanbul support: EIP-152 Add BLAKE2 compression function `F` precompile.
 - Added: [#5758](https://github.com/ethereum/aleth/pull/5758) Istanbul support: activation in Ropsten config.
 - Changed: [#5532](https://github.com/ethereum/aleth/pull/5532) The leveldb is upgraded to 1.22. This is breaking change on Windows and the old databases are not compatible.

libaleth-interpreter/VM.cpp

@@ -1369,6 +1369,9 @@ void VM::interpretCases()
             if (m_message->flags & EVMC_STATIC)
                 throwDisallowedStateChange();
 
+            if (m_rev >= EVMC_ISTANBUL && m_io_gas <= VMSchedule::callStipend)
+                throwOutOfGas();
+
             evmc_uint256be const key = toEvmC(m_SP[0]);
             evmc_uint256be const value = toEvmC(m_SP[1]);
             auto const status =
@@ -1385,8 +1388,9 @@ void VM::interpretCases()
                 break;
             case EVMC_STORAGE_UNCHANGED:
             case EVMC_STORAGE_MODIFIED_AGAIN:
-                m_runGas = m_rev == EVMC_CONSTANTINOPLE ? VMSchedule::sstoreUnchangedGas :
-                                                          VMSchedule::sstoreResetGas;
+                m_runGas = (m_rev == EVMC_CONSTANTINOPLE || m_rev >= EVMC_ISTANBUL) ?
+                               (*m_metrics)[OP_SLOAD].gas_cost :
+                               VMSchedule::sstoreResetGas;
                 break;
             }
 

libaleth-interpreter/VM.h

@@ -29,10 +29,8 @@ struct VMSchedule
     static constexpr int64_t stepGas6 = 20;
     static constexpr int64_t sha3Gas = 30;
     static constexpr int64_t sha3WordGas = 6;
-    static constexpr int64_t sloadGas = 50;
     static constexpr int64_t sstoreSetGas = 20000;
     static constexpr int64_t sstoreResetGas = 5000;
-    static constexpr int64_t sstoreUnchangedGas = 200;
     static constexpr int64_t jumpdestGas = 1;
     static constexpr int64_t logGas = 375;
     static constexpr int64_t logDataGas = 8;

libevm/ExtVMFace.cpp

@@ -42,7 +42,7 @@ evmc_storage_status EvmCHost::set_storage(
     EVMSchedule const& schedule = m_extVM.evmSchedule();
     auto status = EVMC_STORAGE_MODIFIED;
     u256 const originalValue = m_extVM.originalStorageValue(index);
-    if (originalValue == currentValue || !schedule.eip1283Mode)
+    if (originalValue == currentValue || !schedule.sstoreNetGasMetering())
     {
         if (currentValue == 0)
             status = EVMC_STORAGE_ADDED;

test/unittests/libevm/VMTest.cpp

@@ -999,6 +999,16 @@ BOOST_AUTO_TEST_CASE(AlethInterpreterSstorePetersburg)
     testPetersburg();
 }
 
+BOOST_AUTO_TEST_CASE(AlethInterpreterSstoreIstanbul)
+{
+    testIstanbul();
+}
+
+BOOST_AUTO_TEST_CASE(AlethInterpreterSstoreBelowStipend)
+{
+    testSstoreBelowStipend();
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_FIXTURE_TEST_SUITE(AlethInterpreterChainIDSuite, AlethInterpreterChainIDTestFixture)