fix(evm): sstore istanbul gas (#308)

Author: starwarfan

src/compiler/evm_frontend/evm_imported.cpp

@@ -1142,7 +1142,12 @@ void evmSetSStore(zen::runtime::EVMInstance *Instance,
     return;
   }
   const evmc_message *Msg = Instance->getCurrentMessage();
-  evmc_revision Rev = Instance->getRevision();
+  const evmc_revision Rev = Instance->getRevision();
+  if (Rev >= EVMC_ISTANBUL &&
+      Instance->getGas() <= zen::evm::SSTORE_REQUIRED_ISTANBUL) {
+    zen::runtime::EVMInstance::triggerInstanceExceptionOnJIT(
+        Instance, zen::common::ErrorCode::GasLimitExceeded);
+  }
   const auto Key = intx::be::store<evmc::bytes32>(Index);
   const auto Val = intx::be::store<evmc::bytes32>(Value);
 
@@ -1157,10 +1162,6 @@ void evmSetSStore(zen::runtime::EVMInstance *Instance,
   const auto [GasCostWarm, GasReFund] = zen::evm::SSTORE_COSTS[Rev][Status];
 
   const auto GasCost = GasCostCold + GasCostWarm;
-  if ((uint64_t)GasCost > Instance->getGas()) {
-    zen::runtime::EVMInstance::triggerInstanceExceptionOnJIT(
-        Instance, zen::common::ErrorCode::GasLimitExceeded);
-  }
   Instance->chargeGas(GasCost);
   Instance->addGasRefund(GasReFund);
 }

src/evm/gas_storage_cost.h

@@ -18,6 +18,9 @@ constexpr auto WORD_COPY_COST = 3;
 // Applied from EVMC_TANGERINE_WHISTLE through EVMC_ISTANBUL versions
 constexpr auto DELEGATECALL_EXTRA_GAS_TW_TO_ISTANBUL = 600;
 
+// OOG if gas is less than or equal 2300 (since Istanbul fork)
+constexpr auto SSTORE_REQUIRED_ISTANBUL = 2300;
+
 struct StorageStoreCost {
   int16_t GasCost;
   int16_t GasReFund;

src/evm/opcode_handlers.cpp

@@ -786,11 +786,16 @@ void SStoreHandler::doExecute() {
   EVM_FRAME_CHECK(Frame);
   EVM_SET_EXCEPTION_UNLESS(!Frame->isStaticMode(), EVMC_STATIC_MODE_VIOLATION);
 
+  const auto Rev = currentRevision();
+  if (Rev >= EVMC_ISTANBUL && Frame->Msg.gas <= SSTORE_REQUIRED_ISTANBUL) {
+    getContext()->setStatus(EVMC_OUT_OF_GAS);
+    return;
+  }
+
   EVM_STACK_CHECK(Frame, 2);
   const auto Key = intx::be::store<evmc::bytes32>(Frame->pop());
   const auto Value = intx::be::store<evmc::bytes32>(Frame->pop());
 
-  const auto Rev = currentRevision();
   const auto GasCostCold =
       (Rev >= EVMC_BERLIN && Frame->Host->access_storage(
                                  Frame->Msg.recipient, Key) == EVMC_ACCESS_COLD)
@@ -803,12 +808,10 @@ void SStoreHandler::doExecute() {
   const auto [GasCostWarm, GasReFund] = SSTORE_COSTS[Rev][Status];
 
   const auto GasCost = GasCostCold + GasCostWarm;
-  if (Frame->Msg.gas < GasCost) {
-    Frame->Host->set_storage(Frame->Msg.recipient, Key, PrevValue);
-    Context->setStatus(EVMC_OUT_OF_GAS);
+  if (!chargeGas(Frame, GasCost)) {
+    getContext()->setStatus(EVMC_OUT_OF_GAS);
     return;
   }
-  Frame->Msg.gas -= GasCost;
 
   // Track refund at Instance level (consolidate all gas refund tracking there)
   Context->getInstance()->addGasRefund(GasReFund);

tests/evmone_unittests/EVMOneInterpreterUnitTestsRunList.txt

@@ -87,6 +87,7 @@ multi_vm/evm.eip2929_extcodehash_oog/external_vm
 multi_vm/evm.eip2929_sload_cold/external_vm
 multi_vm/evm.eip2929_sload_two_slots/external_vm
 multi_vm/evm.eip2929_sload_warm/external_vm
+multi_vm/evm.eip2929_sstore_modify_cold/external_vm
 multi_vm/evm.eip2929_delegatecall_cold/external_vm
 multi_vm/evm.basefee_nominal_case/external_vm
 multi_vm/evm.push0/external_vm
@@ -124,6 +125,7 @@ multi_vm/evm.sstore_out_of_block_gas/external_vm
 multi_vm/evm.sstore_cost/external_vm
 multi_vm/evm.sstore_cost_legacy/external_vm
 multi_vm/evm.sstore_cost_net_gas_metering/external_vm
+multi_vm/evm.sstore_below_stipend/external_vm
 multi_vm/evm.evmone_loaded_program_relocation/external_vm
 multi_vm/evm.jumpdest_with_high_offset/external_vm
 multi_vm/evm.grow_memory_with_mload/external_vm

tests/evmone_unittests/EVMOneMultipassUnitTestsRunList.txt

@@ -129,6 +129,7 @@ multi_vm/evm.sstore_out_of_block_gas/external_vm
 multi_vm/evm.sstore_cost/external_vm
 multi_vm/evm.sstore_cost_legacy/external_vm
 multi_vm/evm.sstore_cost_net_gas_metering/external_vm
+multi_vm/evm.sstore_below_stipend/external_vm
 multi_vm/evm.evmone_loaded_program_relocation/external_vm
 multi_vm/evm.jumpdest_with_high_offset/external_vm
 multi_vm/evm.grow_memory_with_mload/external_vm