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

fix nonce overflow related to CREATE/CREATE2 

if the caller nonce == u64.high, the contract creation cannot
go on.
This commit is contained in:
jangko 2022-02-10 15:02:39 +07:00
parent fcad04d9ff
commit b4283aeb1f
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nimbus/vm/computation.nim
View File

@ -311,7 +311,11 @@ proc afterExecCall(c: Computation) =
proc beforeExecCreate(c: Computation): bool = proc beforeExecCreate(c: Computation): bool =
c.vmState.mutateStateDB: c.vmState.mutateStateDB:
db.incNonce(c.msg.sender) let nonce = db.getNonce(c.msg.sender)
if nonce+1 < nonce:
c.setError(&"Nonce overflow when sender={c.msg.sender.toHex} wants to create contract", false)
return true
db.setNonce(c.msg.sender, nonce+1)
# We add this to the access list _before_ taking a snapshot. # We add this to the access list _before_ taking a snapshot.
# Even if the creation fails, the access-list change should not be rolled back # Even if the creation fails, the access-list change should not be rolled back
@ -322,7 +326,7 @@ proc beforeExecCreate(c: Computation): bool =
c.snapshot() c.snapshot()
if c.vmState.readOnlyStateDb().hasCodeOrNonce(c.msg.contractAddress): if c.vmState.readOnlyStateDb().hasCodeOrNonce(c.msg.contractAddress):
c.setError("Address collision when creating contract address={c.msg.contractAddress.toHex}", true) c.setError(&"Address collision when creating contract address={c.msg.contractAddress.toHex}", true)
c.rollback() c.rollback()
return true return true

6
nimbus/vm2/interpreter_dispatch.nim
View File

@ -131,7 +131,11 @@ proc afterExecCall(c: Computation) =
proc beforeExecCreate(c: Computation): bool = proc beforeExecCreate(c: Computation): bool =
c.vmState.mutateStateDB: c.vmState.mutateStateDB:
db.incNonce(c.msg.sender) let nonce = db.getNonce(c.msg.sender)
if nonce+1 < nonce:
c.setError(&"Nonce overflow when sender={c.msg.sender.toHex} wants to create contract", false)
return true
db.setNonce(c.msg.sender, nonce+1)
# We add this to the access list _before_ taking a snapshot. # We add this to the access list _before_ taking a snapshot.
# Even if the creation fails, the access-list change should not be rolled # Even if the creation fails, the access-list change should not be rolled