feat: Add relayer repayment address

contracts/SpokePool.sol

@@ -134,7 +134,7 @@ abstract contract SpokePool is
     uint256 public constant EMPTY_REPAYMENT_CHAIN_ID = 0;
     // Default address used to signify that no relayer should be credited with a refund, for example
     // when executing a slow fill.
-    address public constant EMPTY_RELAYER = address(0);
+    bytes32 public constant EMPTY_RELAYER = bytes32(0);
     // This is the magic value that signals to the off-chain validator
     // that this deposit can never expire. A deposit with this fill deadline should always be eligible for a
     // slow fill, meaning that its output token and input token must be "equivalent". Therefore, this value is only
@@ -830,12 +830,11 @@ abstract contract SpokePool is
      * @param repaymentChainId Chain of SpokePool where relayer wants to be refunded after the challenge window has
      * passed. Will receive inputAmount of the equivalent token to inputToken on the repayment chain.
      */
-    function fillV3Relay(V3RelayData calldata relayData, uint256 repaymentChainId)
-        public
-        override
-        nonReentrant
-        unpausedFills
-    {
+    function fillV3Relay(
+        V3RelayData calldata relayData,
+        uint256 repaymentChainId,
+        bytes32 repaymentAddress
+    ) public override nonReentrant unpausedFills {
         // Exclusivity deadline is inclusive and is the latest timestamp that the exclusive relayer has sole right
         // to fill the relay.
         if (
@@ -855,7 +854,7 @@ abstract contract SpokePool is
             repaymentChainId: repaymentChainId
         });
 
-        _fillRelayV3(relayExecution, msg.sender, false);
+        _fillRelayV3(relayExecution, repaymentAddress, false);
     }
 
     /**
@@ -878,6 +877,7 @@ abstract contract SpokePool is
     function fillV3RelayWithUpdatedDeposit(
         V3RelayData calldata relayData,
         uint256 repaymentChainId,
+        bytes32 repaymentAddress,
         uint256 updatedOutputAmount,
         address updatedRecipient,
         bytes calldata updatedMessage,
@@ -908,7 +908,7 @@ abstract contract SpokePool is
             depositorSignature
         );
 
-        _fillRelayV3(relayExecution, msg.sender, false);
+        _fillRelayV3(relayExecution, repaymentAddress, false);
     }
 
     /**
@@ -1311,7 +1311,7 @@ abstract contract SpokePool is
     // exclusiveRelayer if passed exclusivityDeadline or if slow fill.
     function _fillRelayV3(
         V3RelayExecutionParams memory relayExecution,
-        address relayer,
+        bytes32 relayer,
         bool isSlowFill
     ) internal {
         V3RelayData memory relayData = relayExecution.relay;

contracts/interfaces/V3SpokePoolInterface.sol

@@ -23,9 +23,9 @@ interface V3SpokePoolInterface {
         // to know when to send excess funds from the SpokePool to the HubPool because they can no longer be used
         // for a slow fill execution.
         SlowFill
-        // Slow fills are requested via requestSlowFill and executed by executeSlowRelayLeaf after a bundle containing
-        // the slow fill is validated.
     }
+    // Slow fills are requested via requestSlowFill and executed by executeSlowRelayLeaf after a bundle containing
+    // the slow fill is validated.
 
     /**************************************
      *              STRUCTS               *
@@ -132,7 +132,7 @@ interface V3SpokePoolInterface {
         uint32 fillDeadline,
         uint32 exclusivityDeadline,
         address exclusiveRelayer,
-        address indexed relayer,
+        bytes32 indexed relayer,
         address depositor,
         address recipient,
         bytes message,
@@ -196,11 +196,16 @@ interface V3SpokePoolInterface {
         bytes calldata depositorSignature
     ) external;
 
-    function fillV3Relay(V3RelayData calldata relayData, uint256 repaymentChainId) external;
+    function fillV3Relay(
+        V3RelayData calldata relayData,
+        uint256 repaymentChainId,
+        bytes32 repaymentAddress
+    ) external;
 
     function fillV3RelayWithUpdatedDeposit(
         V3RelayData calldata relayData,
         uint256 repaymentChainId,
+        bytes32 repaymentAddress,
         uint256 updatedOutputAmount,
         address updatedRecipient,
         bytes calldata updatedMessage,

contracts/test/MockSpokePool.sol

@@ -105,7 +105,7 @@ contract MockSpokePool is SpokePool, MockV2SpokePoolInterface, OwnableUpgradeabl
 
     function fillRelayV3Internal(
         V3RelayExecutionParams memory relayExecution,
-        address relayer,
+        bytes32 relayer,
         bool isSlowFill
     ) external {
         _fillRelayV3(relayExecution, relayer, isSlowFill);

hardhat.config.ts

@@ -43,7 +43,7 @@ const LARGE_CONTRACT_COMPILER_SETTINGS = {
   settings: {
     optimizer: { enabled: true, runs: 1000 },
     viaIR: true,
-    debug: { revertStrings: isTest ? "default" : "strip" },
+    debug: { revertStrings: isTest ? "debug" : "strip" },
   },
 };
 const DEFAULT_CONTRACT_COMPILER_SETTINGS = {
@@ -52,7 +52,7 @@ const DEFAULT_CONTRACT_COMPILER_SETTINGS = {
     optimizer: { enabled: true, runs: 1000000 },
     viaIR: true,
     // Only strip revert strings if not testing or in ci.
-    debug: { revertStrings: isTest ? "default" : "strip" },
+    debug: { revertStrings: isTest ? "debug" : "strip" },
   },
 };
 

programs/svm-spoke/src/instructions/fill.rs

@@ -97,6 +97,7 @@ pub fn fill_v3_relay(
     relay_hash: [u8; 32], // include in props, while not using it, to enable us to access it from the #Instruction Attribute within the accounts. This enables us to pass in the relay_hash PDA.
     relay_data: V3RelayData,
     repayment_chain_id: u64,
+    repayment_address: Pubkey,
 ) -> Result<()> {
     let state = &mut ctx.accounts.state;
     // TODO: Try again to pull this into a helper function. for some reason I was not able to due to passing context around of state.
@@ -165,7 +166,7 @@ pub fn fill_v3_relay(
         fill_deadline: relay_data.fill_deadline,
         exclusivity_deadline: relay_data.exclusivity_deadline,
         exclusive_relayer: relay_data.exclusive_relayer,
-        relayer: *ctx.accounts.signer.key,
+        relayer: repayment_address,
         depositor: relay_data.depositor,
         recipient: relay_data.recipient,
         message: relay_data.message,

programs/svm-spoke/src/instructions/slow_fill.rs

@@ -260,7 +260,7 @@ pub fn execute_v3_slow_relay_leaf(
         fill_deadline: relay_data.fill_deadline,
         exclusivity_deadline: relay_data.exclusivity_deadline,
         exclusive_relayer: relay_data.exclusive_relayer,
-        relayer: *ctx.accounts.signer.key,
+        relayer: Pubkey::default(), // There is no repayment address for slow
         depositor: relay_data.depositor,
         recipient: relay_data.recipient,
         message: relay_data.message,

programs/svm-spoke/src/lib.rs

@@ -131,8 +131,15 @@ pub mod svm_spoke {
         relay_hash: [u8; 32],
         relay_data: V3RelayData,
         repayment_chain_id: u64,
+        repayment_address: Pubkey,
     ) -> Result<()> {
-        instructions::fill_v3_relay(ctx, relay_hash, relay_data, repayment_chain_id)
+        instructions::fill_v3_relay(
+            ctx,
+            relay_hash,
+            relay_data,
+            repayment_chain_id,
+            repayment_address,
+        )
     }
 
     pub fn close_fill_pda(

scripts/svm/simpleFill.ts

@@ -118,7 +118,7 @@ async function fillV3Relay(): Promise<void> {
     }))
   );
 
-  const tx = await (program.methods.fillV3Relay(Array.from(relayHashUint8Array), relayData, chainId) as any)
+  const tx = await (program.methods.fillV3Relay(Array.from(relayHashUint8Array), relayData, chainId, signer) as any)
     .accounts({
       state: statePda,
       signer: signer,