status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

EIP-3529: Remove the SELFDESTRUCT refund. 

- remove it from both nim-evm and nim-evm2
This commit is contained in:
jangko 2021-06-28 20:03:50 +07:00
parent e08c9ef2d9
commit 8982e6c649
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nimbus/vm/state_transactions.nim
View File

@ -8,7 +8,7 @@
import import
options, sets, options, sets,
eth/common, chronicles, ../db/accounts_cache, eth/common, chronicles, ../db/accounts_cache,
../transaction, ../transaction, ../forks,
./computation, ./interpreter, ./state, ./types ./computation, ./interpreter, ./state, ./types
proc execComputation*(c: Computation) = proc execComputation*(c: Computation) =
@ -19,7 +19,9 @@ proc execComputation*(c: Computation) =
c.execCallOrCreate() c.execCallOrCreate()
if c.isSuccess: if c.isSuccess:
c.refundSelfDestruct() if c.fork < FkLondon:
# EIP-3529: Reduction in refunds
c.refundSelfDestruct()
shallowCopy(c.vmState.selfDestructs, c.selfDestructs) shallowCopy(c.vmState.selfDestructs, c.selfDestructs)
shallowCopy(c.vmState.logEntries, c.logEntries) shallowCopy(c.vmState.logEntries, c.logEntries)
c.vmState.touchedAccounts.incl c.touchedAccounts c.vmState.touchedAccounts.incl c.touchedAccounts

4
nimbus/vm2/state_transactions.nim
View File

@ -89,7 +89,9 @@ proc execComputation*(c: Computation) =
c.execCallOrCreate() c.execCallOrCreate()
if c.isSuccess: if c.isSuccess:
c.refundSelfDestruct() if c.fork < FkLondon:
# EIP-3529: Reduction in refunds
c.refundSelfDestruct()
shallowCopy(c.vmState.selfDestructs, c.selfDestructs) shallowCopy(c.vmState.selfDestructs, c.selfDestructs)
shallowCopy(c.vmState.logEntries, c.logEntries) shallowCopy(c.vmState.logEntries, c.logEntries)
c.vmState.touchedAccounts.incl c.touchedAccounts c.vmState.touchedAccounts.incl c.touchedAccounts