status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-12 13:24:21 +00:00
Code Issues Projects Releases Wiki Activity

fix contract call in gst and executor.nim

Browse Source
This commit is contained in:
andri lim 2019-02-19 17:02:59 +07:00 committed by zah
parent 8b3b1f4c57
commit 5ba44083f0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nimbus/p2p/executor.nim
View File

@ -27,7 +27,7 @@ proc contractCall(t: Transaction, vmState: BaseVMState, sender: EthAddress, fork
if execComputation(computation): if execComputation(computation):
let let
gasRemaining = computation.gasMeter.gasRemaining.u256 gasRemaining = computation.gasMeter.gasRemaining.u256
gasRefunded = computation.gasMeter.gasRefunded.u256 gasRefunded = computation.getGasRefund().u256
gasUsed = t.gasLimit.u256 - gasRemaining gasUsed = t.gasLimit.u256 - gasRemaining
gasRefund = min(gasRefunded, gasUsed div 2) gasRefund = min(gasRefunded, gasUsed div 2)
gasRefundAmount = (gasRefund + gasRemaining) * t.gasPrice.u256 gasRefundAmount = (gasRefund + gasRemaining) * t.gasPrice.u256

2
tests/test_generalstate_json.nim
View File

@ -73,7 +73,7 @@ proc testFixtureIndexes(prevStateRoot: Hash256, header: BlockHeader, pre: JsonNo
if execComputation(computation): if execComputation(computation):
let let
gasRemaining = computation.gasMeter.gasRemaining.u256 gasRemaining = computation.gasMeter.gasRemaining.u256
gasRefunded = computation.gasMeter.gasRefunded.u256 gasRefunded = computation.getGasRefund().u256
gasUsed = transaction.gasLimit.u256 - gasRemaining gasUsed = transaction.gasLimit.u256 - gasRemaining
gasRefund = min(gasRefunded, gasUsed div 2) gasRefund = min(gasRefunded, gasUsed div 2)
gasRefundAmount = (gasRefund + gasRemaining) * transaction.gasPrice.u256 gasRefundAmount = (gasRefund + gasRemaining) * transaction.gasPrice.u256