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

fix EIP-3860 bugs

Browse Source
This commit is contained in:
jangko 2023-01-10 11:25:23 +07:00
parent cdf40b2d37
commit 735d780424
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nimbus/core/validate.nim
View File

@ -259,7 +259,7 @@ proc validateTransaction*(
debug "invalid tx: Eip1559 Tx type detected before London"
return false
if fork >= FkShanghai and tx.contractCreation and tx.payload.len >= EIP3860_MAX_INITCODE_SIZE:
if fork >= FkShanghai and tx.contractCreation and tx.payload.len > EIP3860_MAX_INITCODE_SIZE:
debug "invalid tx: initcode size exceeds maximum"
return false

4
nimbus/errors.nim
View File

@ -68,3 +68,7 @@ type
VmStateError* = object of VMError
## VM state error relay
InitcodeError* = object of EVMError
## Error to signal inicode size > EIP3860_MAX_INITCODE_SIZE

12
nimbus/evm/interpreter/op_handlers/oph_create.nim
View File

@ -94,7 +94,8 @@ const
# EIP-3860
if k.cpt.fork >= FkShanghai and memLen > EIP3860_MAX_INITCODE_SIZE:
trace "Initcode size exceeds maximum", initcodeSize = memLen
return
raise newException(InitcodeError,
&"CREATE: have {memLen}, max {EIP3860_MAX_INITCODE_SIZE}")
let gasParams = GasParams(
kind: Create,
@ -171,8 +172,9 @@ const
# EIP-3860
if k.cpt.fork >= FkShanghai and memLen > EIP3860_MAX_INITCODE_SIZE:
trace "Initcode size exceeds maximum", initcodeSize = memLen
return
raise newException(InitcodeError,
&"CREATE2: have {memLen}, max {EIP3860_MAX_INITCODE_SIZE}")
let gasParams = GasParams(
kind: Create,
cr_currentMemSize: k.cpt.memory.len,
@ -183,7 +185,7 @@ const
gasCost = gasCost + k.cpt.gasCosts[Create2].m_handler(0, 0, memLen)
k.cpt.gasMeter.consumeGas(
gasCost, reason = &"CREATE: GasCreate + {memLen} * memory expansion")
gasCost, reason = &"CREATE2: GasCreate + {memLen} * memory expansion")
k.cpt.memory.extend(memPos, memLen)
k.cpt.returnData.setLen(0)
@ -206,7 +208,7 @@ const
var createMsgGas = k.cpt.gasMeter.gasRemaining
if k.cpt.fork >= FkTangerine:
createMsgGas -= createMsgGas div 64
k.cpt.gasMeter.consumeGas(createMsgGas, reason = "CREATE")
k.cpt.gasMeter.consumeGas(createMsgGas, reason = "CREATE2")
when evmc_enabled:
let

2
nimbus/transaction.nim
View File

@ -123,7 +123,7 @@ proc validate*(tx: Transaction, fork: EVMFork) =
if tx.intrinsicGas(fork) > tx.gasLimit:
raise newException(ValidationError, "Insufficient gas")
if fork >= FkShanghai and tx.contractCreation and tx.payload.len >= EIP3860_MAX_INITCODE_SIZE:
if fork >= FkShanghai and tx.contractCreation and tx.payload.len > EIP3860_MAX_INITCODE_SIZE:
raise newException(ValidationError, "Initcode size exceeds max")
# check signature validity