update withdrawal request address (#8016)

* rename file to match convention * allow comments * updated withdrawal request contract address Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>
hyperledger · Dec 11, 2024 · 7e58f58 · 7e58f58
1 parent c62cd21
commit 7e58f58
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/...rc/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestContractAddresses.java b/...rc/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestContractAddresses.java
@@ -23,7 +23,7 @@ public class RequestContractAddresses {
   private final Address consolidationRequestContractAddress;
 
   public static final Address DEFAULT_WITHDRAWAL_REQUEST_CONTRACT_ADDRESS =
-      Address.fromHexString("0x09FC772D0857550724B07B850A4323F39112AAAA");
+      Address.fromHexString("0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA");
   public static final Address DEFAULT_CONSOLIDATION_REQUEST_CONTRACT_ADDRESS =
       Address.fromHexString("0x01ABEA29659E5E97C95107F20BB753CD3E09BBBB");
   public static final Address DEFAULT_DEPOSIT_CONTRACT_ADDRESS =

diff --git a/...r/besu/evmtool/t8n/prague-withdrawal.json → ...vmtool/t8n/prague-withdrawal-request.json b/...r/besu/evmtool/t8n/prague-withdrawal.json → ...vmtool/t8n/prague-withdrawal-request.json
@@ -51,7 +51,8 @@
           "0x40": "0x985e929f70af28d0bdd1a90a808f977f597c7c778c489e98d3bd8910d31ac0f7"
         }
       },
-      "0x09fc772d0857550724b07b850a4323f39112aaaa": {
+      "0x0c15f14308530b7cdb8460094bbb9cc28b9aaaaa": {
+        "comment": "This is the runtime bytecode for the Withdrawal Request Smart Contract.",
         "nonce": "0x01",
         "balance": "0x00",
         "code": "0x3373fffffffffffffffffffffffffffffffffffffffe1460c7573615156028575f545f5260205ff35b36603814156101f05760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f057600182026001905f5b5f821115608057810190830284830290049160010191906065565b9093900434106101f057600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160db575060105b5f5b81811461017f5780604c02838201600302600401805490600101805490600101549160601b83528260140152807fffffffffffffffffffffffffffffffff0000000000000000000000000000000016826034015260401c906044018160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160dd565b9101809214610191579060025561019c565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101c957505f5b6001546002828201116101de5750505f6101e4565b01600290035b5f555f600155604c025ff35b5f5ffd",
@@ -82,9 +83,10 @@
         "storage": {}
       },
       "0x0000000000000000000000000000000000001000": {
+        "comment": "This is a proxy contract that calls 0c15f14308530b7cdb8460094bbb9cc28b9aaaaa ie Withdrawal Request",
         "nonce": "0x01",
         "balance": "0xad78ebc5ac62000000",
-        "code": "0x60386000600037600060006038600060017309fc772d0857550724b07b850a4323f39112aaaa620f4240f150",
+        "code": "0x6038600060003760006000603860006001730c15f14308530b7cdb8460094bbb9cc28b9aaaaa620f4240f150",
         "storage": {}
       }
     },
@@ -131,7 +133,7 @@
   "stdout": {
     "alloc": {
       "0x0000000000000000000000000000000000001000": {
-        "code": "0x60386000600037600060006038600060017309fc772d0857550724b07b850a4323f39112aaaa620f4240f150",
+        "code": "0x6038600060003760006000603860006001730c15f14308530b7cdb8460094bbb9cc28b9aaaaa620f4240f150",
         "balance": "0xad78ebc5ac61ffffff",
         "nonce": "0x1"
       },
@@ -186,7 +188,7 @@
         "balance": "0x0",
         "nonce": "0x1"
       },
-      "0x09fc772d0857550724b07b850a4323f39112aaaa": {
+      "0x0c15f14308530b7cdb8460094bbb9cc28b9aaaaa": {
         "code": "0x3373fffffffffffffffffffffffffffffffffffffffe1460c7573615156028575f545f5260205ff35b36603814156101f05760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f057600182026001905f5b5f821115608057810190830284830290049160010191906065565b9093900434106101f057600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160db575060105b5f5b81811461017f5780604c02838201600302600401805490600101805490600101549160601b83528260140152807fffffffffffffffffffffffffffffffff0000000000000000000000000000000016826034015260401c906044018160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160dd565b9101809214610191579060025561019c565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101c957505f5b6001546002828201116101de5750505f6101e4565b01600290035b5f555f600155604c025ff35b5f5ffd",
         "storage": {
           "0x0000000000000000000000000000000000000000000000000000000000000004": "0x0000000000000000000000000000000000000000000000000000000000001000",
@@ -216,20 +218,20 @@
         "0x00000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000",
         "0x"
       ],
-      "stateRoot": "0x23d988164325beeeea1044c9f104ff4fe108038369f26a3327198ce40f827430",
+      "stateRoot": "0x85f165ac5a1420cd8931904750ffa7d8e271a53590776045731a7a31bd28fb35",
       "txRoot": "0x0d36638e52999b7beafa00eb94f7ca23139774cd14229c011d0edc1fc66125c9",
-      "receiptsRoot": "0x3d22e243cbebced1fafba149bce09285797af6c66ce901ff3ab1caf073fca791",
-      "logsHash": "0xf69b003be75aaafefa35aa30e6367f732dd9b31a6c97196febc285ee9289bb60",
-      "logsBloom": "0x00000000000000000000000008000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receiptsRoot": "0x74c42177b19a4db67c4bf4eb40d7e0a31102f8e918db6b60276994d95834b8f9",
+      "logsHash": "0xac344ad50aad544ec284bf76ac9b939f93e00f8fe16097a151df14bde2065f83",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000",
       "receipts": [
         {
           "root": "0x",
           "status": "0x1",
           "cumulativeGasUsed": "0x1e6e3",
-          "logsBloom": "0x00000000000000000000000008000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000",
           "logs": [
             {
-              "address": "0x09fc772d0857550724b07b850a4323f39112aaaa",
+              "address": "0x0c15f14308530b7cdb8460094bbb9cc28b9aaaaa",
               "topics": [],
               "data": "0x00000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000",
               "blockNumber": 1,

diff --git a/...s/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java b/...s/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java
@@ -35,6 +35,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public interface ReferenceTestWorldState extends MutableWorldState {
 
+  @JsonIgnoreProperties(ignoreUnknown = true)
   class AccountMock {
     private final long nonce;
     private final Wei balance;