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

fixes related to EIP-4399/EIP-3675 

- fix `RANDOM` opcode export
- fix `difficulty` return value in VMState
This commit is contained in:
jangko 2022-02-05 16:15:50 +07:00
parent 6869eafce6
commit d3fbe1d94d
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nimbus/vm/interpreter.nim
View File

@ -12,7 +12,7 @@
import import
./interpreter/opcode_values as vmo ./interpreter/opcode_values as vmo
export export
vmo.Op vmo.Op, vmo.Random
# see vm_message # see vm_message

4
nimbus/vm/state.nim
View File

@ -308,6 +308,10 @@ method blockNumber*(vmState: BaseVMState): BlockNumber {.base, gcsafe.} =
vmState.parent.blockNumber + 1 vmState.parent.blockNumber + 1
method difficulty*(vmState: BaseVMState): UInt256 {.base, gcsafe.} = method difficulty*(vmState: BaseVMState): UInt256 {.base, gcsafe.} =
if vmState.fork >= FkPostMerge:
# EIP-4399/EIP-3675
0.u256
else:
vmState.chainDB.config.calcDifficulty(vmState.timestamp, vmState.parent) vmState.chainDB.config.calcDifficulty(vmState.timestamp, vmState.parent)
method baseFee*(vmState: BaseVMState): UInt256 {.base, gcsafe.} = method baseFee*(vmState: BaseVMState): UInt256 {.base, gcsafe.} =

4
nimbus/vm2/state.nim
View File

@ -295,6 +295,10 @@ method blockNumber*(vmState: BaseVMState): BlockNumber {.base, gcsafe.} =
vmState.parent.blockNumber + 1 vmState.parent.blockNumber + 1
method difficulty*(vmState: BaseVMState): UInt256 {.base, gcsafe.} = method difficulty*(vmState: BaseVMState): UInt256 {.base, gcsafe.} =
if vmState.fork >= FkPostMerge:
# EIP-4399/EIP-3675
0.u256
else:
vmState.chainDB.config.calcDifficulty(vmState.timestamp, vmState.parent) vmState.chainDB.config.calcDifficulty(vmState.timestamp, vmState.parent)
method baseFee*(vmState: BaseVMState): UInt256 {.base, gcsafe.} = method baseFee*(vmState: BaseVMState): UInt256 {.base, gcsafe.} =

1
nimbus/vm_internals.nim
View File

@ -133,6 +133,7 @@ else:
eGmt.refundGas, eGmt.refundGas,
eGmt.returnGas, eGmt.returnGas,
fVmo.Op, fVmo.Op,
fVmo.Random,
gVmg.isCreate, gVmg.isCreate,
hStk.Stack, hStk.Stack,
hStk.`$`, hStk.`$`,