Fix delegate calls to precompiles and gas calculation in case of error

gumb0 · gumb0 · commit d90d3f5e4678 · 2019-12-23T17:09:05.000+01:00
diff --git a/libethereum/Executive.cpp b/libethereum/Executive.cpp
@@ -189,12 +189,12 @@ bool Executive::call(CallParameters const& _p, u256 const& _gasPrice, Address co
 
         try
         {
-            m_gas = _p.gas;
-
+            auto gas = _p.gas;
             auto const& schedule = m_sealEngine.evmSchedule(m_envInfo.number());
             bool const isCreate = false;
-            m_output = precompilesVM->exec(m_gas, _p.receiveAddress, _p.senderAddress,
+            m_output = precompilesVM->exec(gas, _p.codeAddress, _p.senderAddress,
                 _p.apparentValue, _p.data, m_depth, isCreate, _p.staticCall, schedule);
+            m_gas = gas;
         }
         catch (OutOfGas const&)
         {

Original file line number	Diff line number	Diff line change
`@@ -189,12 +189,12 @@ bool Executive::call(CallParameters const& _p, u256 const& _gasPrice, Address co`
`189`	`189`
`190`	`190`	`try`
`191`	`191`	`{`
`192`		`- m_gas = _p.gas;`
`193`		`-`
	`192`	`+ auto gas = _p.gas;`
`194`	`193`	`auto const& schedule = m_sealEngine.evmSchedule(m_envInfo.number());`
`195`	`194`	`bool const isCreate = false;`
`196`		`- m_output = precompilesVM->exec(m_gas, _p.receiveAddress, _p.senderAddress,`
	`195`	`+ m_output = precompilesVM->exec(gas, _p.codeAddress, _p.senderAddress,`
`197`	`196`	`_p.apparentValue, _p.data, m_depth, isCreate, _p.staticCall, schedule);`
	`197`	`+ m_gas = gas;`
`198`	`198`	`}`
`199`	`199`	`catch (OutOfGas const&)`
`200`	`200`	`{`