From b105d6d9f8e08ab32edee2ddc63c61224b6f9948 Mon Sep 17 00:00:00 2001 From: Chris Maree Date: Mon, 6 Jan 2025 12:05:08 +0100 Subject: [PATCH 1/7] add new storage layout Signed-off-by: Chris Maree --- storage-layouts/AlephZero_SpokePool.json | 8 +++++++- storage-layouts/PolygonZkEVM_SpokePool.json | 8 +++++++- storage-layouts/Redstone_SpokePool.json | 8 +++++++- storage-layouts/Scroll_SpokePool.json | 8 +++++++- storage-layouts/WorldChain_SpokePool.json | 8 +++++++- storage-layouts/Zora_SpokePool.json | 8 +++++++- 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/storage-layouts/AlephZero_SpokePool.json b/storage-layouts/AlephZero_SpokePool.json index 24a66a64d..382132dd3 100644 --- a/storage-layouts/AlephZero_SpokePool.json +++ b/storage-layouts/AlephZero_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/AlephZero_SpokePool.sol:AlephZero_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/AlephZero_SpokePool.sol:AlephZero_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/AlephZero_SpokePool.sol:AlephZero_SpokePool", "label": "l2GatewayRouter", diff --git a/storage-layouts/PolygonZkEVM_SpokePool.json b/storage-layouts/PolygonZkEVM_SpokePool.json index 776ed36d0..7e1fc8127 100644 --- a/storage-layouts/PolygonZkEVM_SpokePool.json +++ b/storage-layouts/PolygonZkEVM_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", "label": "l2PolygonZkEVMBridge", diff --git a/storage-layouts/Redstone_SpokePool.json b/storage-layouts/Redstone_SpokePool.json index 61e0704c0..92b0654e8 100644 --- a/storage-layouts/Redstone_SpokePool.json +++ b/storage-layouts/Redstone_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", "label": "l1Gas", diff --git a/storage-layouts/Scroll_SpokePool.json b/storage-layouts/Scroll_SpokePool.json index adec6db47..81782717b 100644 --- a/storage-layouts/Scroll_SpokePool.json +++ b/storage-layouts/Scroll_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", "label": "l2GatewayRouter", diff --git a/storage-layouts/WorldChain_SpokePool.json b/storage-layouts/WorldChain_SpokePool.json index 2bc68b54c..e46bb47d2 100644 --- a/storage-layouts/WorldChain_SpokePool.json +++ b/storage-layouts/WorldChain_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", "label": "l1Gas", diff --git a/storage-layouts/Zora_SpokePool.json b/storage-layouts/Zora_SpokePool.json index 6a6b9ae6d..ca513b7cc 100644 --- a/storage-layouts/Zora_SpokePool.json +++ b/storage-layouts/Zora_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", "label": "l1Gas", From 4b980471b83a9ec40290f3dc4447deffb5f98f36 Mon Sep 17 00:00:00 2001 From: Chris Maree Date: Mon, 6 Jan 2025 12:06:08 +0100 Subject: [PATCH 2/7] Discard changes to storage-layouts/PolygonZkEVM_SpokePool.json --- storage-layouts/PolygonZkEVM_SpokePool.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/storage-layouts/PolygonZkEVM_SpokePool.json b/storage-layouts/PolygonZkEVM_SpokePool.json index 7e1fc8127..776ed36d0 100644 --- a/storage-layouts/PolygonZkEVM_SpokePool.json +++ b/storage-layouts/PolygonZkEVM_SpokePool.json @@ -144,17 +144,11 @@ "offset": 0, "slot": "2162" }, - { - "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", - "label": "relayerRefund", - "offset": 0, - "slot": "2163" - }, { "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", "label": "__gap", "offset": 0, - "slot": "2164" + "slot": "2163" }, { "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", From 2e904303b4ff1c94cccd1080da2f69a76d95ba24 Mon Sep 17 00:00:00 2001 From: Chris Maree Date: Mon, 6 Jan 2025 12:06:12 +0100 Subject: [PATCH 3/7] Discard changes to storage-layouts/Redstone_SpokePool.json --- storage-layouts/Redstone_SpokePool.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/storage-layouts/Redstone_SpokePool.json b/storage-layouts/Redstone_SpokePool.json index 92b0654e8..61e0704c0 100644 --- a/storage-layouts/Redstone_SpokePool.json +++ b/storage-layouts/Redstone_SpokePool.json @@ -144,17 +144,11 @@ "offset": 0, "slot": "2162" }, - { - "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", - "label": "relayerRefund", - "offset": 0, - "slot": "2163" - }, { "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", "label": "__gap", "offset": 0, - "slot": "2164" + "slot": "2163" }, { "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", From 78a204ce5df43d73c8a10d2def1be5e6ea0aff00 Mon Sep 17 00:00:00 2001 From: Chris Maree Date: Mon, 6 Jan 2025 12:06:15 +0100 Subject: [PATCH 4/7] Discard changes to storage-layouts/Scroll_SpokePool.json --- storage-layouts/Scroll_SpokePool.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/storage-layouts/Scroll_SpokePool.json b/storage-layouts/Scroll_SpokePool.json index 81782717b..adec6db47 100644 --- a/storage-layouts/Scroll_SpokePool.json +++ b/storage-layouts/Scroll_SpokePool.json @@ -144,17 +144,11 @@ "offset": 0, "slot": "2162" }, - { - "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", - "label": "relayerRefund", - "offset": 0, - "slot": "2163" - }, { "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", "label": "__gap", "offset": 0, - "slot": "2164" + "slot": "2163" }, { "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", From 178ed6d45b72a60cf85cfae5dbf5b009c3d90a46 Mon Sep 17 00:00:00 2001 From: Chris Maree Date: Mon, 6 Jan 2025 12:06:21 +0100 Subject: [PATCH 5/7] Discard changes to storage-layouts/Zora_SpokePool.json --- storage-layouts/Zora_SpokePool.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/storage-layouts/Zora_SpokePool.json b/storage-layouts/Zora_SpokePool.json index ca513b7cc..6a6b9ae6d 100644 --- a/storage-layouts/Zora_SpokePool.json +++ b/storage-layouts/Zora_SpokePool.json @@ -144,17 +144,11 @@ "offset": 0, "slot": "2162" }, - { - "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", - "label": "relayerRefund", - "offset": 0, - "slot": "2163" - }, { "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", "label": "__gap", "offset": 0, - "slot": "2164" + "slot": "2163" }, { "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", From 6101b9e8479cff40b19e91d9af26328ab0fde3fd Mon Sep 17 00:00:00 2001 From: Chris Maree Date: Mon, 6 Jan 2025 12:06:25 +0100 Subject: [PATCH 6/7] Discard changes to storage-layouts/WorldChain_SpokePool.json --- storage-layouts/WorldChain_SpokePool.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/storage-layouts/WorldChain_SpokePool.json b/storage-layouts/WorldChain_SpokePool.json index e46bb47d2..2bc68b54c 100644 --- a/storage-layouts/WorldChain_SpokePool.json +++ b/storage-layouts/WorldChain_SpokePool.json @@ -144,17 +144,11 @@ "offset": 0, "slot": "2162" }, - { - "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", - "label": "relayerRefund", - "offset": 0, - "slot": "2163" - }, { "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", "label": "__gap", "offset": 0, - "slot": "2164" + "slot": "2163" }, { "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", From 2c5f36bad36e0648d56c1054e6aff1816f182f65 Mon Sep 17 00:00:00 2001 From: Chris Maree Date: Mon, 6 Jan 2025 12:07:11 +0100 Subject: [PATCH 7/7] add new storage layout Signed-off-by: Chris Maree --- storage-layouts/PolygonZkEVM_SpokePool.json | 8 +++++++- storage-layouts/Redstone_SpokePool.json | 8 +++++++- storage-layouts/Scroll_SpokePool.json | 8 +++++++- storage-layouts/WorldChain_SpokePool.json | 8 +++++++- storage-layouts/Zora_SpokePool.json | 8 +++++++- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/storage-layouts/PolygonZkEVM_SpokePool.json b/storage-layouts/PolygonZkEVM_SpokePool.json index 776ed36d0..7e1fc8127 100644 --- a/storage-layouts/PolygonZkEVM_SpokePool.json +++ b/storage-layouts/PolygonZkEVM_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/PolygonZkEVM_SpokePool.sol:PolygonZkEVM_SpokePool", "label": "l2PolygonZkEVMBridge", diff --git a/storage-layouts/Redstone_SpokePool.json b/storage-layouts/Redstone_SpokePool.json index 61e0704c0..92b0654e8 100644 --- a/storage-layouts/Redstone_SpokePool.json +++ b/storage-layouts/Redstone_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/Redstone_SpokePool.sol:Redstone_SpokePool", "label": "l1Gas", diff --git a/storage-layouts/Scroll_SpokePool.json b/storage-layouts/Scroll_SpokePool.json index adec6db47..81782717b 100644 --- a/storage-layouts/Scroll_SpokePool.json +++ b/storage-layouts/Scroll_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/Scroll_SpokePool.sol:Scroll_SpokePool", "label": "l2GatewayRouter", diff --git a/storage-layouts/WorldChain_SpokePool.json b/storage-layouts/WorldChain_SpokePool.json index 2bc68b54c..e46bb47d2 100644 --- a/storage-layouts/WorldChain_SpokePool.json +++ b/storage-layouts/WorldChain_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/WorldChain_SpokePool.sol:WorldChain_SpokePool", "label": "l1Gas", diff --git a/storage-layouts/Zora_SpokePool.json b/storage-layouts/Zora_SpokePool.json index 6a6b9ae6d..ca513b7cc 100644 --- a/storage-layouts/Zora_SpokePool.json +++ b/storage-layouts/Zora_SpokePool.json @@ -146,10 +146,16 @@ }, { "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", - "label": "__gap", + "label": "relayerRefund", "offset": 0, "slot": "2163" }, + { + "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", + "label": "__gap", + "offset": 0, + "slot": "2164" + }, { "contract": "contracts/Zora_SpokePool.sol:Zora_SpokePool", "label": "l1Gas",