status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-04 00:05:22 +00:00
Code Issues Projects Releases Wiki Activity

simplify 'gasUsed' and 'refundGas'

Browse Source
This commit is contained in:
andri lim 2020-01-30 22:54:29 +07:00 committed by zah
parent d9991b1e8b
commit 270854a5aa
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nimbus/p2p/executor.nim
View File

@ -13,21 +13,22 @@ proc processTransaction*(tx: Transaction, sender: EthAddress, vmState: BaseVMSta
trace "Sender", sender trace "Sender", sender
trace "txHash", rlpHash = tx.rlpHash trace "txHash", rlpHash = tx.rlpHash
var gasUsed = 0.GasInt
if validateTransaction(vmState, tx, sender, fork): if validateTransaction(vmState, tx, sender, fork):
gasUsed = tx.gasLimit
var c = setupComputation(vmState, tx, sender, fork) var c = setupComputation(vmState, tx, sender, fork)
vmState.mutateStateDB: vmState.mutateStateDB:
db.subBalance(sender, tx.gasLimit.u256 * tx.gasPrice.u256) db.subBalance(sender, tx.gasLimit.u256 * tx.gasPrice.u256)
execComputation(c) execComputation(c)
if not c.shouldBurnGas:
gasUsed = c.refundGas(tx, sender)
vmState.cumulativeGasUsed += gasUsed result = tx.gasLimit
if not c.shouldBurnGas:
c.refundGas(tx, sender)
result -= c.gasMeter.gasRemaining
vmState.cumulativeGasUsed += result
vmState.mutateStateDB: vmState.mutateStateDB:
# miner fee # miner fee
let txFee = gasUsed.u256 * tx.gasPrice.u256 let txFee = result.u256 * tx.gasPrice.u256
db.addBalance(vmState.blockHeader.coinbase, txFee) db.addBalance(vmState.blockHeader.coinbase, txFee)
for deletedAccount in vmState.suicides: for deletedAccount in vmState.suicides:
@ -42,7 +43,6 @@ proc processTransaction*(tx: Transaction, sender: EthAddress, vmState: BaseVMSta
db.deleteAccount(account) db.deleteAccount(account)
vmState.accountDb.updateOriginalRoot() vmState.accountDb.updateOriginalRoot()
result = gasUsed
type type
# TODO: these types need to be removed # TODO: these types need to be removed

14
nimbus/vm_state_transactions.nim
View File

@ -84,17 +84,11 @@ proc execComputation*(c: Computation) =
c.vmstate.status = c.isSuccess c.vmstate.status = c.isSuccess
proc refundGas*(c: Computation, tx: Transaction, sender: EthAddress): GasInt = proc refundGas*(c: Computation, tx: Transaction, sender: EthAddress) =
let let maxRefund = (tx.gasLimit - c.gasMeter.gasRemaining) div 2
gasRemaining = c.gasMeter.gasRemaining c.gasMeter.returnGas min(c.getGasRefund(), maxRefund)
gasRefunded = c.getGasRefund()
gasUsed = tx.gasLimit - gasRemaining
gasRefund = min(gasRefunded, gasUsed div 2)
c.vmState.mutateStateDB: c.vmState.mutateStateDB:
db.addBalance(sender, (gasRemaining + gasRefund).u256 * tx.gasPrice.u256) db.addBalance(sender, c.gasMeter.gasRemaining.u256 * tx.gasPrice.u256)
result = gasUsed - gasRefund
#[ #[
method executeTransaction(vmState: BaseVMState, transaction: Transaction): (Computation, BlockHeader) {.base.}= method executeTransaction(vmState: BaseVMState, transaction: Transaction): (Computation, BlockHeader) {.base.}=