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

devnet-5: fix Consolidation and Withdrawal request predeploy address (#2956) 

* devnet-5: fix Consolidation and Withdrawal request predeploy address

[Update EIP-7251: Set MAX_CONSOLIDATIONS=2](https://github.com/ethereum/EIPs/pull/9127)
will override
[Update EIP-7251: fix CONSOLIDATION_REQUEST_PREDEPLOY_ADDRES](https://github.com/ethereum/EIPs/pull/9118)
therefore we only need the later.

* Fix test vectors
This commit is contained in:
andri lim 2024-12-19 17:39:18 +07:00 committed by GitHub
parent 48aa410f8a
commit 55fd25758a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nimbus/constants.nim
View File

@ -108,6 +108,6 @@ const
initAddress(3) initAddress(3)
HISTORY_STORAGE_ADDRESS* = address"0x0aae40965e6800cd9b1f4b05ff21581047e3f91e" HISTORY_STORAGE_ADDRESS* = address"0x0aae40965e6800cd9b1f4b05ff21581047e3f91e"
WITHDRAWAL_QUEUE_ADDRESS* = address"0x09Fc772D0857550724b07B850a4323f39112aAaA" WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS* = address"0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA"
CONSOLIDATION_QUEUE_ADDRESS* = address"0x01aBEa29659e5e97C95107F20bb753cD3e09bBBb" CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS* = address"0x00431F263cE400f4455c2dCf564e53007Ca4bbBb"
# End # End

4
nimbus/core/executor/process_transaction.nim
View File

@ -199,7 +199,7 @@ proc processDequeueWithdrawalRequests*(vmState: BaseVMState): seq[byte] =
sender : SYSTEM_ADDRESS, sender : SYSTEM_ADDRESS,
gasLimit : DEFAULT_GAS_LIMIT.GasInt, gasLimit : DEFAULT_GAS_LIMIT.GasInt,
gasPrice : 0.GasInt, gasPrice : 0.GasInt,
to : WITHDRAWAL_QUEUE_ADDRESS, to : WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS,
# It's a systemCall, no need for other knicks knacks # It's a systemCall, no need for other knicks knacks
sysCall : true, sysCall : true,
@ -223,7 +223,7 @@ proc processDequeueConsolidationRequests*(vmState: BaseVMState): seq[byte] =
sender : SYSTEM_ADDRESS, sender : SYSTEM_ADDRESS,
gasLimit : DEFAULT_GAS_LIMIT.GasInt, gasLimit : DEFAULT_GAS_LIMIT.GasInt,
gasPrice : 0.GasInt, gasPrice : 0.GasInt,
to : CONSOLIDATION_QUEUE_ADDRESS, to : CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS,
# It's a systemCall, no need for other knicks knacks # It's a systemCall, no need for other knicks knacks
sysCall : true, sysCall : true,

2
tools/t8n/testdata/00-525/exp1.json vendored
View File

@ -1,6 +1,6 @@
{ {
"result": { "result": {
"stateRoot": "0x08fd46faf1bc68f8f3b6c78710d91b825cb22375aa8a3db99ddd9084cbbbfd75", "stateRoot": "0xeb95cffa29db5479fb7135cb16c6c21d9d2e213d850bc12d2b47304085f16eef",
"txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",

2
tools/t8n/testdata/00-525/exp2.json vendored
View File

@ -1,6 +1,6 @@
{ {
"result": { "result": {
"stateRoot": "0xdbeeef4c53f45167aea35bccfa9329f4a9b59fa7b115dc2f6462eea7316c2600", "stateRoot": "0x1b9f157c7ef478901a0fce1a7837a850ea8a0aad6686e6e7b176a425209910a6",
"txRoot": "0xe67cc7032923c32bc107773c80dbe2afc754eeed4203ccee50605b9fe15a5bb5", "txRoot": "0xe67cc7032923c32bc107773c80dbe2afc754eeed4203ccee50605b9fe15a5bb5",
"receiptsRoot": "0xead5884f735e5e8e703878f0c89b54919d06c2cee8e373d632e730d42b380e0c", "receiptsRoot": "0xead5884f735e5e8e703878f0c89b54919d06c2cee8e373d632e730d42b380e0c",
"logsHash": "0x6fb31d3ef4580565e54b679a3bb580d1a4c345faab2cfc7868304e0e5da23f4c", "logsHash": "0x6fb31d3ef4580565e54b679a3bb580d1a4c345faab2cfc7868304e0e5da23f4c",

2
tools/t8n/testdata/00-525/exp3.json vendored
View File

@ -1,6 +1,6 @@
{ {
"result": { "result": {
"stateRoot": "0xdbeeef4c53f45167aea35bccfa9329f4a9b59fa7b115dc2f6462eea7316c2600", "stateRoot": "0x1b9f157c7ef478901a0fce1a7837a850ea8a0aad6686e6e7b176a425209910a6",
"txRoot": "0xe67cc7032923c32bc107773c80dbe2afc754eeed4203ccee50605b9fe15a5bb5", "txRoot": "0xe67cc7032923c32bc107773c80dbe2afc754eeed4203ccee50605b9fe15a5bb5",
"receiptsRoot": "0xead5884f735e5e8e703878f0c89b54919d06c2cee8e373d632e730d42b380e0c", "receiptsRoot": "0xead5884f735e5e8e703878f0c89b54919d06c2cee8e373d632e730d42b380e0c",
"logsHash": "0x6fb31d3ef4580565e54b679a3bb580d1a4c345faab2cfc7868304e0e5da23f4c", "logsHash": "0x6fb31d3ef4580565e54b679a3bb580d1a4c345faab2cfc7868304e0e5da23f4c",