Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tersec merged 2 commits into from
Dec 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8253054
devnet-5: fix Consolidation and Withdrawal request predeploy address
jangko Dec 19, 2024
dc32aa3
Fix test vectors
jangko Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nimbus/constants.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,6 @@ const
initAddress(3)

HISTORY_STORAGE_ADDRESS* = address"0x0aae40965e6800cd9b1f4b05ff21581047e3f91e"
WITHDRAWAL_QUEUE_ADDRESS* = address"0x09Fc772D0857550724b07B850a4323f39112aAaA"
CONSOLIDATION_QUEUE_ADDRESS* = address"0x01aBEa29659e5e97C95107F20bb753cD3e09bBBb"
WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS* = address"0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA"
CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS* = address"0x00431F263cE400f4455c2dCf564e53007Ca4bbBb"
# End
4 changes: 2 additions & 2 deletions nimbus/core/executor/process_transaction.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ proc processDequeueWithdrawalRequests*(vmState: BaseVMState): seq[byte] =
sender : SYSTEM_ADDRESS,
gasLimit : DEFAULT_GAS_LIMIT.GasInt,
gasPrice : 0.GasInt,
to : WITHDRAWAL_QUEUE_ADDRESS,
to : WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS,

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

# It's a systemCall, no need for other knicks knacks
sysCall : true,
Expand Down
2 changes: 1 addition & 1 deletion tools/t8n/testdata/00-525/exp1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"result": {
"stateRoot": "0x08fd46faf1bc68f8f3b6c78710d91b825cb22375aa8a3db99ddd9084cbbbfd75",
"stateRoot": "0xeb95cffa29db5479fb7135cb16c6c21d9d2e213d850bc12d2b47304085f16eef",
"txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
Expand Down
2 changes: 1 addition & 1 deletion tools/t8n/testdata/00-525/exp2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"result": {
"stateRoot": "0xdbeeef4c53f45167aea35bccfa9329f4a9b59fa7b115dc2f6462eea7316c2600",
"stateRoot": "0x1b9f157c7ef478901a0fce1a7837a850ea8a0aad6686e6e7b176a425209910a6",
"txRoot": "0xe67cc7032923c32bc107773c80dbe2afc754eeed4203ccee50605b9fe15a5bb5",
"receiptsRoot": "0xead5884f735e5e8e703878f0c89b54919d06c2cee8e373d632e730d42b380e0c",
"logsHash": "0x6fb31d3ef4580565e54b679a3bb580d1a4c345faab2cfc7868304e0e5da23f4c",
Expand Down
2 changes: 1 addition & 1 deletion tools/t8n/testdata/00-525/exp3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"result": {
"stateRoot": "0xdbeeef4c53f45167aea35bccfa9329f4a9b59fa7b115dc2f6462eea7316c2600",
"stateRoot": "0x1b9f157c7ef478901a0fce1a7837a850ea8a0aad6686e6e7b176a425209910a6",
"txRoot": "0xe67cc7032923c32bc107773c80dbe2afc754eeed4203ccee50605b9fe15a5bb5",
"receiptsRoot": "0xead5884f735e5e8e703878f0c89b54919d06c2cee8e373d632e730d42b380e0c",
"logsHash": "0x6fb31d3ef4580565e54b679a3bb580d1a4c345faab2cfc7868304e0e5da23f4c",
Expand Down