feat: update function and event naming for backwards compatibility

contracts/SpokePoolVerifier.sol

@@ -21,7 +21,7 @@ contract SpokePoolVerifier {
     error InvalidSpokePool();
 
     /**
-     * @notice Passthrough function to `depositV3()` on the SpokePool contract.
+     * @notice Passthrough function to `deposit()` on the SpokePool contract.
      * @dev Protects the caller from losing their ETH (or other native token) by reverting if the SpokePool address
      * they intended to call does not exist on this chain. Because this contract can be deployed at the same address
      * everywhere callers should be protected even if the transaction is submitted to an unintended network.
@@ -58,7 +58,7 @@ contract SpokePoolVerifier {
         if (msg.value != inputAmount) revert InvalidMsgValue();
         if (!address(spokePool).isContract()) revert InvalidSpokePool();
         // Set msg.sender as the depositor so that msg.sender can speed up the deposit.
-        spokePool.depositV3{ value: msg.value }(
+        spokePool.deposit{ value: msg.value }(
             msg.sender.toBytes32(),
             recipient,
             inputToken,

contracts/SwapAndBridge.sol

@@ -183,7 +183,7 @@ abstract contract SwapAndBridgeBase is Lockable, MultiCaller {
         DepositData calldata depositData
     ) internal {
         _acrossInputToken.safeIncreaseAllowance(address(spokePool), _acrossInputAmount);
-        spokePool.depositV3(
+        spokePool.deposit(
             depositData.depositor.toBytes32(),
             depositData.recipient.toBytes32(),
             address(_acrossInputToken).toBytes32(), // input token

contracts/erc7683/ERC7683OrderDepositorExternal.sol

@@ -75,15 +75,15 @@ contract ERC7683OrderDepositorExternal is ERC7683OrderDepositor, Ownable, MultiC
                 message
             );
         } else {
-            SPOKE_POOL.unsafeDepositV3(
-                depositor,
-                recipient,
-                inputToken,
-                outputToken,
+            SPOKE_POOL.unsafeDeposit(
+                depositor.toBytes32(),
+                recipient.toBytes32(),
+                inputToken.toBytes32(),
+                outputToken.toBytes32(),
                 inputAmount,
                 outputAmount,
                 destinationChainId,
-                exclusiveRelayer,
+                exclusiveRelayer.toBytes32(),
                 depositNonce,
                 quoteTimestamp,
                 fillDeadline,

contracts/interfaces/SpokePoolInterface.sol

@@ -52,7 +52,7 @@ interface SpokePoolInterface {
 
     function emergencyDeleteRootBundle(uint256 rootBundleId) external;
 
-    function deposit(
+    function depositDeprecated_5947912356(
         address recipient,
         address originToken,
         uint256 amount,

contracts/interfaces/V3SpokePoolInterface.sol

@@ -62,6 +62,23 @@ interface V3SpokePoolInterface {
         bytes message;
     }
 
+    // Same as V3RelayData but using addresses instead of bytes32 & depositId is uint32.
+    // Will be deprecated in favor of V3RelayData in the future.
+    struct V3RelayDataLegacy {
+        address depositor;
+        address recipient;
+        address exclusiveRelayer;
+        address inputToken;
+        address outputToken;
+        uint256 inputAmount;
+        uint256 outputAmount;
+        uint256 originChainId;
+        uint32 depositId;
+        uint32 fillDeadline;
+        uint32 exclusivityDeadline;
+        bytes message;
+    }
+
     // Contains parameters passed in by someone who wants to execute a slow relay leaf.
     struct V3SlowFill {
         V3RelayData relayData;
@@ -82,7 +99,7 @@ interface V3SpokePoolInterface {
         uint256 repaymentChainId;
     }
 
-    // Packs together parameters emitted in FilledV3Relay because there are too many emitted otherwise.
+    // Packs together parameters emitted in FilledRelay because there are too many emitted otherwise.
     // Similar to V3RelayExecutionParams, these parameters are not used to uniquely identify the deposit being
     // filled so they don't have to be unpacked by all clients.
     struct V3RelayExecutionEventInfo {
@@ -113,7 +130,7 @@ interface V3SpokePoolInterface {
      *              EVENTS                *
      **************************************/
 
-    event V3FundsDeposited(
+    event FundsDeposited(
         bytes32 inputToken,
         bytes32 outputToken,
         uint256 inputAmount,
@@ -129,7 +146,7 @@ interface V3SpokePoolInterface {
         bytes message
     );
 
-    event RequestedSpeedUpV3Deposit(
+    event RequestedSpeedUpDeposit(
         uint256 updatedOutputAmount,
         uint256 indexed depositId,
         bytes32 indexed depositor,
@@ -138,7 +155,7 @@ interface V3SpokePoolInterface {
         bytes depositorSignature
     );
 
-    event FilledV3Relay(
+    event FilledRelay(
         bytes32 inputToken,
         bytes32 outputToken,
         uint256 inputAmount,
@@ -156,7 +173,7 @@ interface V3SpokePoolInterface {
         V3RelayExecutionEventInfo relayExecutionInfo
     );
 
-    event RequestedV3SlowFill(
+    event RequestedSlowFill(
         bytes32 inputToken,
         bytes32 outputToken,
         uint256 inputAmount,
@@ -182,7 +199,7 @@ interface V3SpokePoolInterface {
      *              FUNCTIONS             *
      **************************************/
 
-    function depositV3(
+    function deposit(
         bytes32 depositor,
         bytes32 recipient,
         bytes32 inputToken,
@@ -212,7 +229,7 @@ interface V3SpokePoolInterface {
         bytes calldata message
     ) external payable;
 
-    function depositV3Now(
+    function depositNow(
         bytes32 depositor,
         bytes32 recipient,
         bytes32 inputToken,
@@ -226,7 +243,37 @@ interface V3SpokePoolInterface {
         bytes calldata message
     ) external payable;
 
-    function speedUpV3Deposit(
+    function depositV3Now(
+        address depositor,
+        address recipient,
+        address inputToken,
+        address outputToken,
+        uint256 inputAmount,
+        uint256 outputAmount,
+        uint256 destinationChainId,
+        address exclusiveRelayer,
+        uint32 fillDeadlineOffset,
+        uint32 exclusivityDeadline,
+        bytes calldata message
+    ) external payable;
+
+    function unsafeDeposit(
+        bytes32 depositor,
+        bytes32 recipient,
+        bytes32 inputToken,
+        bytes32 outputToken,
+        uint256 inputAmount,
+        uint256 outputAmount,
+        uint256 destinationChainId,
+        bytes32 exclusiveRelayer,
+        uint256 depositNonce,
+        uint32 quoteTimestamp,
+        uint32 fillDeadline,
+        uint32 exclusivityParameter,
+        bytes calldata message
+    ) external payable;
+
+    function speedUpDeposit(
         bytes32 depositor,
         uint256 depositId,
         uint256 updatedOutputAmount,
@@ -235,13 +282,24 @@ interface V3SpokePoolInterface {
         bytes calldata depositorSignature
     ) external;
 
-    function fillV3Relay(
+    function speedUpV3Deposit(
+        address depositor,
+        uint256 depositId,
+        uint256 updatedOutputAmount,
+        address updatedRecipient,
+        bytes calldata updatedMessage,
+        bytes calldata depositorSignature
+    ) external;
+
+    function fillRelay(
         V3RelayData calldata relayData,
         uint256 repaymentChainId,
         bytes32 repaymentAddress
     ) external;
 
-    function fillV3RelayWithUpdatedDeposit(
+    function fillV3Relay(V3RelayDataLegacy calldata relayData, uint256 repaymentChainId) external;
+
+    function fillRelayWithUpdatedDeposit(
         V3RelayData calldata relayData,
         uint256 repaymentChainId,
         bytes32 repaymentAddress,
@@ -251,9 +309,9 @@ interface V3SpokePoolInterface {
         bytes calldata depositorSignature
     ) external;
 
-    function requestV3SlowFill(V3RelayData calldata relayData) external;
+    function requestSlowFill(V3RelayData calldata relayData) external;
 
-    function executeV3SlowRelayLeaf(
+    function executeSlowRelayLeaf(
         V3SlowFill calldata slowFillLeaf,
         uint32 rootBundleId,
         bytes32[] calldata proof
@@ -284,4 +342,67 @@ interface V3SpokePoolInterface {
     error LowLevelCallFailed(bytes data);
     error InsufficientSpokePoolBalanceToExecuteLeaf();
     error NoRelayerRefundToClaim();
+
+    /**************************************
+     *             LEGACY EVENTS          *
+     **************************************/
+
+    // Note: these events are unused, but included in the ABI for ease of migration.
+    event V3FundsDeposited(
+        address inputToken,
+        address outputToken,
+        uint256 inputAmount,
+        uint256 outputAmount,
+        uint256 indexed destinationChainId,
+        uint32 indexed depositId,
+        uint32 quoteTimestamp,
+        uint32 fillDeadline,
+        uint32 exclusivityDeadline,
+        address indexed depositor,
+        address recipient,
+        address exclusiveRelayer,
+        bytes message
+    );
+
+    event RequestedSpeedUpV3Deposit(
+        uint256 updatedOutputAmount,
+        uint32 indexed depositId,
+        address indexed depositor,
+        address updatedRecipient,
+        bytes updatedMessage,
+        bytes depositorSignature
+    );
+
+    event FilledV3Relay(
+        address inputToken,
+        address outputToken,
+        uint256 inputAmount,
+        uint256 outputAmount,
+        uint256 repaymentChainId,
+        uint256 indexed originChainId,
+        uint32 indexed depositId,
+        uint32 fillDeadline,
+        uint32 exclusivityDeadline,
+        address exclusiveRelayer,
+        address indexed relayer,
+        address depositor,
+        address recipient,
+        bytes message,
+        V3RelayExecutionEventInfo relayExecutionInfo
+    );
+
+    event RequestedV3SlowFill(
+        address inputToken,
+        address outputToken,
+        uint256 inputAmount,
+        uint256 outputAmount,
+        uint256 indexed originChainId,
+        uint32 indexed depositId,
+        uint32 fillDeadline,
+        uint32 exclusivityDeadline,
+        address exclusiveRelayer,
+        address depositor,
+        address recipient,
+        bytes message
+    );
 }

contracts/permit2-order/Permit2Depositor.sol

@@ -59,7 +59,7 @@ contract Permit2Depositor {
         uint256 amountToDeposit = order.input.amount + order.fillerCollateral.amount;
 
         IERC20(order.input.token).safeIncreaseAllowance(address(SPOKE_POOL), amountToDeposit);
-        SPOKE_POOL.depositV3(
+        SPOKE_POOL.deposit(
             order.info.offerer.toBytes32(),
             // Note: Permit2OrderLib checks that order only has a single output.
             order.outputs[0].recipient.toBytes32(),

contracts/test/MockSpokePool.sol

@@ -85,7 +85,7 @@ contract MockSpokePool is SpokePool, MockV2SpokePoolInterface, OwnableUpgradeabl
         _verifyDepositorSignature(depositor, expectedTypedDataV4Hash, depositorSignature);
     }
 
-    function verifyUpdateV3DepositMessage(
+    function verifyUpdateV3DepositMessageBytes32(
         bytes32 depositor,
         uint256 depositId,
         uint256 originChainId,
@@ -103,7 +103,7 @@ contract MockSpokePool is SpokePool, MockV2SpokePoolInterface, OwnableUpgradeabl
                 updatedRecipient,
                 updatedMessage,
                 depositorSignature,
-                UPDATE_V3_DEPOSIT_DETAILS_HASH
+                UPDATE_BYTES32_DEPOSIT_DETAILS_HASH
             );
     }
 
@@ -125,7 +125,7 @@ contract MockSpokePool is SpokePool, MockV2SpokePoolInterface, OwnableUpgradeabl
                 updatedRecipient.toBytes32(),
                 updatedMessage,
                 depositorSignature,
-                UPDATE_V3_DEPOSIT_ADDRESS_OVERLOAD_DETAILS_HASH
+                UPDATE_ADDRESS_DEPOSIT_DETAILS_HASH
             );
     }
 

foundry.toml

@@ -23,11 +23,11 @@ remappings = [
     "hardhat/=node_modules/hardhat/",
 ]
 via_ir = true
-optimizer_runs = 1_000_000
-solc_version = "0.8.25"
+optimizer_runs = 800
+solc_version = "0.8.23"
 revert_strings = "strip"
 
-solc = "0.8.25"
+solc = "0.8.23"
 evm_version = "shanghai"
 
 [rpc_endpoints]

hardhat.config.ts

@@ -47,7 +47,7 @@ const mnemonic = getMnemonic();
 const LARGE_CONTRACT_COMPILER_SETTINGS = {
   version: solcVersion,
   settings: {
-    optimizer: { enabled: true, runs: 1000 },
+    optimizer: { enabled: true, runs: 800 },
     viaIR: true,
     debug: { revertStrings: isTest ? "debug" : "strip" },
   },
@@ -68,7 +68,7 @@ const config: HardhatUserConfig = {
     overrides: {
       "contracts/HubPool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
       "contracts/Linea_SpokePool.sol": {
-        ...DEFAULT_CONTRACT_COMPILER_SETTINGS,
+        ...LARGE_CONTRACT_COMPILER_SETTINGS,
         // NOTE: Linea only supports 0.8.19.
         // See https://docs.linea.build/build-on-linea/ethereum-differences#evm-opcodes
         version: "0.8.19",