Skip to content

Commit 754d27f

Browse files
authored
improve(SpokePool): Delete chainId in ExecutedV3RelayerRefundRoot event (#424)
chainId is not useful because it is known based on the SpokePool being queried. Also, the marginal value of indexing the leafId on top of the rootBundleId is pretty minimal, so instead index l2TokenAddress and fillsRefundedRoot. Authored by Nick & cherry-picked by me.
1 parent c28135a commit 754d27f

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

contracts/SpokePool.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,6 @@ abstract contract SpokePool is
13521352

13531353
emit ExecutedV3RelayerRefundRoot(
13541354
relayerRefundLeaf.amountToReturn,
1355-
relayerRefundLeaf.chainId,
13561355
relayerRefundLeaf.refundAmounts,
13571356
rootBundleId,
13581357
relayerRefundLeaf.leafId,

contracts/interfaces/V3SpokePoolInterface.sol

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,12 @@ interface V3SpokePoolInterface {
178178

179179
event ExecutedV3RelayerRefundRoot(
180180
uint256 amountToReturn,
181-
uint256 indexed chainId,
182181
uint256[] refundAmounts,
183182
uint32 indexed rootBundleId,
184-
uint32 indexed leafId,
185-
address l2TokenAddress,
183+
uint32 leafId,
184+
address indexed l2TokenAddress,
186185
address[] refundAddresses,
187-
bytes32 fillsRefundedRoot,
186+
bytes32 indexed fillsRefundedRoot,
188187
string fillsRefundedHash
189188
);
190189

test/SpokePool.ExecuteRootBundle.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ describe("SpokePool Root Bundle Execution", function () {
261261
.to.emit(spokePool, "ExecutedV3RelayerRefundRoot")
262262
.withArgs(
263263
leaves[0].amountToReturn,
264-
leaves[0].chainId,
265264
leaves[0].refundAmounts,
266265
0, // rootBundleId
267266
leaves[0].leafId,

0 commit comments

Comments
 (0)