improve: Restore TokensBridged and ExecutedRelayerRefundLeaf event si…

…gnatures (#27) Co-authored-by: nicholaspai <[email protected]>
across-protocol · Feb 9, 2024 · 00b66f8 · 00b66f8
1 parent 446aae6
commit 00b66f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/contracts/SpokePool.sol b/contracts/SpokePool.sol
@@ -231,13 +231,15 @@ abstract contract SpokePool is
         uint32 indexed rootBundleId,
         uint32 indexed leafId,
         address l2TokenAddress,
-        address[] refundAddresses
+        address[] refundAddresses,
+        address caller
     );
     event TokensBridged(
         uint256 amountToReturn,
         uint256 indexed chainId,
         uint32 indexed leafId,
-        address indexed l2TokenAddress
+        address indexed l2TokenAddress,
+        address caller
     );
     event EmergencyDeleteRootBundle(uint256 indexed rootBundleId);
     event PausedDeposits(bool isPaused);
@@ -1297,7 +1299,8 @@ abstract contract SpokePool is
             rootBundleId,
             relayerRefundLeaf.leafId,
             relayerRefundLeaf.l2TokenAddress,
-            relayerRefundLeaf.refundAddresses
+            relayerRefundLeaf.refundAddresses,
+            msg.sender
         );
     }
 
@@ -1468,7 +1471,7 @@ abstract contract SpokePool is
         if (amountToReturn > 0) {
             _bridgeTokensToHubPool(amountToReturn, l2TokenAddress);
 
-            emit TokensBridged(amountToReturn, _chainId, leafId, l2TokenAddress);
+            emit TokensBridged(amountToReturn, _chainId, leafId, l2TokenAddress, msg.sender);
         }
     }
 

diff --git a/test/SpokePool.ExecuteRootBundle.ts b/test/SpokePool.ExecuteRootBundle.ts
@@ -304,7 +304,7 @@ describe("SpokePool Root Bundle Execution", function () {
             .distributeRelayerRefunds(destinationChainId, toBN(1), [], 0, destErc20.address, [])
         )
           .to.emit(spokePool, "TokensBridged")
-          .withArgs(toBN(1), destinationChainId, 0, destErc20.address);
+          .withArgs(toBN(1), destinationChainId, 0, destErc20.address, dataWorker.address);
       });
     });
     describe("amountToReturn = 0", function () {