From 8253054475216d91eff86dd944d296d84bd30c7e Mon Sep 17 00:00:00 2001 From: jangko Date: Thu, 19 Dec 2024 14:30:54 +0700 Subject: [PATCH] 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. --- nimbus/constants.nim | 4 ++-- nimbus/core/executor/process_transaction.nim | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nimbus/constants.nim b/nimbus/constants.nim index 5bafba67b1..f16000cfa8 100644 --- a/nimbus/constants.nim +++ b/nimbus/constants.nim @@ -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 diff --git a/nimbus/core/executor/process_transaction.nim b/nimbus/core/executor/process_transaction.nim index 5cd0fc3528..8422bb3fd6 100644 --- a/nimbus/core/executor/process_transaction.nim +++ b/nimbus/core/executor/process_transaction.nim @@ -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, @@ -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,