From 7772510b9d3f2940d36c2710dc15d14ef17dc84d Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Wed, 11 Dec 2024 16:48:35 +1000 Subject: [PATCH 1/4] update withdrawal request address Signed-off-by: Sally MacFarlane --- .../ethereum/mainnet/requests/RequestContractAddresses.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestContractAddresses.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestContractAddresses.java index d16d1bddbc0..ef76961ba2b 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestContractAddresses.java +++ b/ethereum/core/src/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 = From 9ef2ec64ba80e8477b943cf3d9f3390952cde087 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Wed, 11 Dec 2024 16:48:56 +1000 Subject: [PATCH 2/4] rename file to match convention Signed-off-by: Sally MacFarlane --- .../{prague-withdrawal.json => prague-withdrawal-request.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/{prague-withdrawal.json => prague-withdrawal-request.json} (100%) diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json similarity index 100% rename from ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal.json rename to ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json From ed4668b6ce910d8c082801d24fe1d62f01772d11 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Wed, 11 Dec 2024 17:17:45 +1000 Subject: [PATCH 3/4] allow comments Signed-off-by: Sally MacFarlane --- .../hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json | 2 ++ .../besu/ethereum/referencetests/ReferenceTestWorldState.java | 1 + 2 files changed, 3 insertions(+) diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json index 35f9843231d..ffaa52e266f 100644 --- a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json +++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json @@ -52,6 +52,7 @@ } }, "0x09fc772d0857550724b07b850a4323f39112aaaa": { + "comment": "This is the runtime bytecode for the Withdrawal Request Smart Contract. The address is not the real value, this test is independent of the real address.", "nonce": "0x01", "balance": "0x00", "code": "0x3373fffffffffffffffffffffffffffffffffffffffe1460c7573615156028575f545f5260205ff35b36603814156101f05760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f057600182026001905f5b5f821115608057810190830284830290049160010191906065565b9093900434106101f057600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160db575060105b5f5b81811461017f5780604c02838201600302600401805490600101805490600101549160601b83528260140152807fffffffffffffffffffffffffffffffff0000000000000000000000000000000016826034015260401c906044018160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160dd565b9101809214610191579060025561019c565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101c957505f5b6001546002828201116101de5750505f6101e4565b01600290035b5f555f600155604c025ff35b5f5ffd", @@ -82,6 +83,7 @@ "storage": {} }, "0x0000000000000000000000000000000000001000": { + "comment": "This is a proxy contract that calls 09fc772d0857550724b07b850a4323f39112aaaa ie Withdrawal Request", "nonce": "0x01", "balance": "0xad78ebc5ac62000000", "code": "0x60386000600037600060006038600060017309fc772d0857550724b07b850a4323f39112aaaa620f4240f150", diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java index 8549a2dd150..36b4f8e9376 100644 --- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java +++ b/ethereum/referencetests/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; From 5b40e2cc6da8dfb2463bd15fca6fe90e8d6eb53d Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Wed, 11 Dec 2024 17:29:17 +1000 Subject: [PATCH 4/4] updated withdrawal request contract address Signed-off-by: Sally MacFarlane --- .../t8n/prague-withdrawal-request.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json index ffaa52e266f..91588037fd2 100644 --- a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json +++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json @@ -51,8 +51,8 @@ "0x40": "0x985e929f70af28d0bdd1a90a808f977f597c7c778c489e98d3bd8910d31ac0f7" } }, - "0x09fc772d0857550724b07b850a4323f39112aaaa": { - "comment": "This is the runtime bytecode for the Withdrawal Request Smart Contract. The address is not the real value, this test is independent of the real address.", + "0x0c15f14308530b7cdb8460094bbb9cc28b9aaaaa": { + "comment": "This is the runtime bytecode for the Withdrawal Request Smart Contract.", "nonce": "0x01", "balance": "0x00", "code": "0x3373fffffffffffffffffffffffffffffffffffffffe1460c7573615156028575f545f5260205ff35b36603814156101f05760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f057600182026001905f5b5f821115608057810190830284830290049160010191906065565b9093900434106101f057600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160db575060105b5f5b81811461017f5780604c02838201600302600401805490600101805490600101549160601b83528260140152807fffffffffffffffffffffffffffffffff0000000000000000000000000000000016826034015260401c906044018160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160dd565b9101809214610191579060025561019c565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101c957505f5b6001546002828201116101de5750505f6101e4565b01600290035b5f555f600155604c025ff35b5f5ffd", @@ -83,10 +83,10 @@ "storage": {} }, "0x0000000000000000000000000000000000001000": { - "comment": "This is a proxy contract that calls 09fc772d0857550724b07b850a4323f39112aaaa ie Withdrawal Request", + "comment": "This is a proxy contract that calls 0c15f14308530b7cdb8460094bbb9cc28b9aaaaa ie Withdrawal Request", "nonce": "0x01", "balance": "0xad78ebc5ac62000000", - "code": "0x60386000600037600060006038600060017309fc772d0857550724b07b850a4323f39112aaaa620f4240f150", + "code": "0x6038600060003760006000603860006001730c15f14308530b7cdb8460094bbb9cc28b9aaaaa620f4240f150", "storage": {} } }, @@ -133,7 +133,7 @@ "stdout": { "alloc": { "0x0000000000000000000000000000000000001000": { - "code": "0x60386000600037600060006038600060017309fc772d0857550724b07b850a4323f39112aaaa620f4240f150", + "code": "0x6038600060003760006000603860006001730c15f14308530b7cdb8460094bbb9cc28b9aaaaa620f4240f150", "balance": "0xad78ebc5ac61ffffff", "nonce": "0x1" }, @@ -188,7 +188,7 @@ "balance": "0x0", "nonce": "0x1" }, - "0x09fc772d0857550724b07b850a4323f39112aaaa": { + "0x0c15f14308530b7cdb8460094bbb9cc28b9aaaaa": { "code": "0x3373fffffffffffffffffffffffffffffffffffffffe1460c7573615156028575f545f5260205ff35b36603814156101f05760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f057600182026001905f5b5f821115608057810190830284830290049160010191906065565b9093900434106101f057600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160db575060105b5f5b81811461017f5780604c02838201600302600401805490600101805490600101549160601b83528260140152807fffffffffffffffffffffffffffffffff0000000000000000000000000000000016826034015260401c906044018160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160dd565b9101809214610191579060025561019c565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101c957505f5b6001546002828201116101de5750505f6101e4565b01600290035b5f555f600155604c025ff35b5f5ffd", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000004": "0x0000000000000000000000000000000000000000000000000000000000001000", @@ -218,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,