Move "gas below stipend" check to the beginning of SSTORE instruction

ethereum · Sep 3, 2019 · d00a436 · d00a436
1 parent e1c073b
commit d00a436
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/libevm/LegacyVM.cpp b/libevm/LegacyVM.cpp
@@ -97,6 +97,9 @@ void LegacyVM::adjustStack(unsigned _removed, unsigned _added)
 
 void LegacyVM::updateSSGas()
 {
+    if (m_schedule->sstoreThrowsIfGasBelowCallStipend() && m_io_gas <= m_schedule->callStipend)
+        throwOutOfGas();
+
     u256 const currentValue = m_ext->store(m_SP[0]);
     u256 const newValue = m_SP[1];
 
@@ -1677,10 +1680,6 @@ void LegacyVM::interpretCases()
             updateSSGas();
             updateIOGas();
 
-            if (m_schedule->sstoreThrowsIfGasBelowCallStipend() &&
-                m_io_gas <= m_schedule->callStipend)
-                throwOutOfGas();
-
             m_ext->setStore(m_SP[0], m_SP[1]);
         }
         NEXT