Sync with upstream repo

contracts/AtomicWethDepositor.sol

@@ -49,6 +49,7 @@ contract AtomicWethDepositor {
     OvmL1Bridge public immutable modeL1Bridge = OvmL1Bridge(0x735aDBbE72226BD52e818E7181953f42E3b0FF21);
     OvmL1Bridge public immutable bobaL1Bridge = OvmL1Bridge(0xdc1664458d2f0B6090bEa60A8793A4E66c2F1c00);
     OvmL1Bridge public immutable baseL1Bridge = OvmL1Bridge(0x3154Cf16ccdb4C6d922629664174b904d80F2C35);
+    OvmL1Bridge public immutable cherL1Bridge = OvmL1Bridge(0xeb9bf100225c214Efc3E7C651ebbaDcF85177607);
     OvmL1Bridge public immutable inkL1Bridge = OvmL1Bridge(0x88FF1e5b602916615391F55854588EFcBB7663f0);
     OvmL1Bridge public immutable liskL1Bridge = OvmL1Bridge(0x2658723Bf70c7667De6B25F99fcce13A16D25d08);
     OvmL1Bridge public immutable redstoneL1Bridge = OvmL1Bridge(0xc473ca7E02af24c129c2eEf51F2aDf0411c1Df69);
@@ -80,6 +81,8 @@ contract AtomicWethDepositor {
             inkL1Bridge.depositETHTo{ value: amount }(to, l2Gas, "");
         } else if (chainId == 1135) {
             liskL1Bridge.depositETHTo{ value: amount }(to, l2Gas, "");
+        } else if (chainId == 1868) {
+            cherL1Bridge.depositETHTo{ value: amount }(to, l2Gas, "");
         } else if (chainId == 81457) {
             blastL1Bridge.depositETHTo{ value: amount }(to, l2Gas, "");
         } else if (chainId == 690) {

deployments/mainnet/solcInputs/c704b7dd9dde90da1811337714ae187e.json

@@ -0,0 +1,21 @@
+{
+  "language": "Solidity",
+  "sources": {
+    "contracts/AtomicWethDepositor.sol": {
+      "content": "// SPDX-License-Identifier: GPL-3.0-only\npragma solidity ^0.8.0;\n\ninterface Weth {\n    function withdraw(uint256 _wad) external;\n\n    function transferFrom(address _from, address _to, uint256 _wad) external;\n}\n\ninterface OvmL1Bridge {\n    function depositETHTo(address _to, uint32 _l2Gas, bytes calldata _data) external payable;\n}\n\ninterface PolygonL1Bridge {\n    function depositEtherFor(address _to) external payable;\n}\n\ninterface ZkSyncL1Bridge {\n    function requestL2Transaction(\n        address _contractL2,\n        uint256 _l2Value,\n        bytes calldata _calldata,\n        uint256 _l2GasLimit,\n        uint256 _l2GasPerPubdataByteLimit,\n        bytes[] calldata _factoryDeps,\n        address _refundRecipient\n    ) external payable;\n\n    function l2TransactionBaseCost(\n        uint256 _gasPrice,\n        uint256 _l2GasLimit,\n        uint256 _l2GasPerPubdataByteLimit\n    ) external pure returns (uint256);\n}\n\ninterface LineaL1MessageService {\n    function sendMessage(address _to, uint256 _fee, bytes calldata _calldata) external payable;\n}\n\n/**\n * @notice Contract deployed on Ethereum helps relay bots atomically unwrap and bridge WETH over the canonical chain\n * bridges for Optimism, Base, Boba, ZkSync, Linea, and Polygon. Needed as these chains only support bridging of ETH,\n * not WETH.\n */\n\ncontract AtomicWethDepositor {\n    Weth public immutable weth = Weth(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2);\n    OvmL1Bridge public immutable optimismL1Bridge = OvmL1Bridge(0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1);\n    OvmL1Bridge public immutable modeL1Bridge = OvmL1Bridge(0x735aDBbE72226BD52e818E7181953f42E3b0FF21);\n    OvmL1Bridge public immutable bobaL1Bridge = OvmL1Bridge(0xdc1664458d2f0B6090bEa60A8793A4E66c2F1c00);\n    OvmL1Bridge public immutable baseL1Bridge = OvmL1Bridge(0x3154Cf16ccdb4C6d922629664174b904d80F2C35);\n    OvmL1Bridge public immutable cherL1Bridge = OvmL1Bridge(0xeb9bf100225c214Efc3E7C651ebbaDcF85177607);\n    OvmL1Bridge public immutable inkL1Bridge = OvmL1Bridge(0x88FF1e5b602916615391F55854588EFcBB7663f0);\n    OvmL1Bridge public immutable liskL1Bridge = OvmL1Bridge(0x2658723Bf70c7667De6B25F99fcce13A16D25d08);\n    OvmL1Bridge public immutable redstoneL1Bridge = OvmL1Bridge(0xc473ca7E02af24c129c2eEf51F2aDf0411c1Df69);\n    OvmL1Bridge public immutable blastL1Bridge = OvmL1Bridge(0x697402166Fbf2F22E970df8a6486Ef171dbfc524);\n    OvmL1Bridge public immutable worldChainL1Bridge = OvmL1Bridge(0x470458C91978D2d929704489Ad730DC3E3001113);\n    OvmL1Bridge public immutable zoraL1Bridge = OvmL1Bridge(0x3e2Ea9B92B7E48A52296fD261dc26fd995284631);\n    PolygonL1Bridge public immutable polygonL1Bridge = PolygonL1Bridge(0xA0c68C638235ee32657e8f720a23ceC1bFc77C77);\n    ZkSyncL1Bridge public immutable zkSyncL1Bridge = ZkSyncL1Bridge(0x32400084C286CF3E17e7B677ea9583e60a000324);\n    LineaL1MessageService public immutable lineaL1MessageService =\n        LineaL1MessageService(0xd19d4B5d358258f05D7B411E21A1460D11B0876F);\n\n    event ZkSyncEthDepositInitiated(address indexed from, address indexed to, uint256 amount);\n    event LineaEthDepositInitiated(address indexed from, address indexed to, uint256 amount);\n    event OvmEthDepositInitiated(uint256 indexed chainId, address indexed from, address indexed to, uint256 amount);\n\n    function bridgeWethToOvm(address to, uint256 amount, uint32 l2Gas, uint256 chainId) public {\n        weth.transferFrom(msg.sender, address(this), amount);\n        weth.withdraw(amount);\n\n        if (chainId == 10) {\n            optimismL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 8453) {\n            baseL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 34443) {\n            modeL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 480) {\n            worldChainL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 57073) {\n            inkL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 1135) {\n            liskL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 1868) {\n            cherL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 81457) {\n            blastL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 690) {\n            redstoneL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 7777777) {\n            zoraL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else if (chainId == 288) {\n            bobaL1Bridge.depositETHTo{ value: amount }(to, l2Gas, \"\");\n        } else {\n            revert(\"Invalid OVM chainId\");\n        }\n\n        emit OvmEthDepositInitiated(chainId, msg.sender, to, amount);\n    }\n\n    function bridgeWethToPolygon(address to, uint256 amount) public {\n        weth.transferFrom(msg.sender, address(this), amount);\n        weth.withdraw(amount);\n        polygonL1Bridge.depositEtherFor{ value: amount }(to);\n    }\n\n    function bridgeWethToLinea(address to, uint256 amount) public payable {\n        weth.transferFrom(msg.sender, address(this), amount);\n        weth.withdraw(amount);\n        lineaL1MessageService.sendMessage{ value: amount + msg.value }(to, msg.value, \"\");\n        // Emit an event that we can easily track in the Linea-related adapters/finalizers\n        emit LineaEthDepositInitiated(msg.sender, to, amount);\n    }\n\n    function bridgeWethToZkSync(\n        address to,\n        uint256 amount,\n        uint256 l2GasLimit,\n        uint256 l2GasPerPubdataByteLimit,\n        address refundRecipient\n    ) public {\n        // The ZkSync Mailbox contract checks that the msg.value of the transaction is enough to cover the transaction base\n        // cost. The transaction base cost can be queried from the Mailbox by passing in an L1 \"executed\" gas price,\n        // which is the priority fee plus base fee. This is the same as calling tx.gasprice on-chain as the Mailbox\n        // contract does here:\n        // https://github.com/matter-labs/era-contracts/blob/3a4506522aaef81485d8abb96f5a6394bd2ba69e/ethereum/contracts/zksync/facets/Mailbox.sol#L287\n        uint256 l2TransactionBaseCost = zkSyncL1Bridge.l2TransactionBaseCost(\n            tx.gasprice,\n            l2GasLimit,\n            l2GasPerPubdataByteLimit\n        );\n        uint256 valueToSubmitXChainMessage = l2TransactionBaseCost + amount;\n        weth.transferFrom(msg.sender, address(this), valueToSubmitXChainMessage);\n        weth.withdraw(valueToSubmitXChainMessage);\n        zkSyncL1Bridge.requestL2Transaction{ value: valueToSubmitXChainMessage }(\n            to,\n            amount,\n            \"\",\n            l2GasLimit,\n            l2GasPerPubdataByteLimit,\n            new bytes[](0),\n            refundRecipient\n        );\n\n        // Emit an event that we can easily track in the ZkSyncAdapter because otherwise there is no easy event to\n        // track ETH deposit initiations.\n        emit ZkSyncEthDepositInitiated(msg.sender, to, amount);\n    }\n\n    fallback() external payable {}\n\n    // Included to remove a compilation warning.\n    // NOTE: this should not affect behavior.\n    receive() external payable {}\n}\n"
+    }
+  },
+  "settings": {
+    "optimizer": {
+      "enabled": true,
+      "runs": 1000000
+    },
+    "viaIR": true,
+    "outputSelection": {
+      "*": {
+        "*": ["abi", "evm.bytecode", "evm.deployedBytecode", "evm.methodIdentifiers", "metadata"],
+        "": ["ast"]
+      }
+    }
+  }
+}

package.json

@@ -10,9 +10,9 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@across-protocol/constants": "^3.1.27",
-    "@across-protocol/contracts": "^3.0.20",
-    "@across-protocol/sdk": "^3.4.9",
+    "@across-protocol/constants": "^3.1.30",
+    "@across-protocol/contracts": "^3.0.25",
+    "@across-protocol/sdk": "^3.4.12",
     "@arbitrum/sdk": "^4.0.2",
     "@consensys/linea-sdk": "^0.2.1",
     "@defi-wonderland/smock": "^2.3.5",

src/clients/BalanceAllocator.ts

@@ -153,7 +153,7 @@ export class BalanceAllocator {
     this.balances = {};
   }
 
-  // This method is primarily here to be overriden for testing purposes.
+  // This method is primarily here to be overridden for testing purposes.
   protected async _queryBalance(chainId: number, token: string, holder: string): Promise<BigNumber> {
     return getNativeTokenAddressForChain(chainId).toLowerCase() === token.toLowerCase()
       ? await this.providers[chainId].getBalance(holder)

src/clients/ProfitClient.ts

@@ -616,10 +616,11 @@ export class ProfitClient {
     const testSymbols = {
       [CHAIN_IDs.ALEPH_ZERO]: "USDT", // USDC is not yet supported on AlephZero, so revert to USDT. @todo: Update.
       [CHAIN_IDs.BLAST]: "USDB",
+      [CHAIN_IDs.INK]: "WETH", // USDC deferred on Ink.
       [CHAIN_IDs.LISK]: "USDT", // USDC is not yet supported on Lisk, so revert to USDT. @todo: Update.
       [CHAIN_IDs.REDSTONE]: "WETH", // Redstone only supports WETH.
+      [CHAIN_IDs.SONEIUM]: "WETH", // USDC deferred on Soneium.
       [CHAIN_IDs.WORLD_CHAIN]: "WETH", // USDC deferred on World Chain.
-      [CHAIN_IDs.INK]: "WETH", // USDC deferred on Ink.
       [CHAIN_IDs.LENS_SEPOLIA]: "WETH", // No USD token on Lens Sepolia
     };
     const prodRelayer = process.env.RELAYER_FILL_SIMULATION_ADDRESS ?? PROD_RELAYER;

src/clients/TokenClient.ts

@@ -71,7 +71,7 @@ export class TokenClient {
     return this.getBalance(deposit.destinationChainId, deposit.outputToken).gte(deposit.outputAmount);
   }
 
-  // If the relayer tries to execute a relay but does not have enough tokens to fully fill it it will capture the
+  // If the relayer tries to execute a relay but does not have enough tokens to fully fill it will capture the
   // shortfall by calling this method. This will track the information for logging purposes and use in other clients.
   captureTokenShortfall(chainId: number, token: string, depositId: number, unfilledAmount: BigNumber): void {
     // Shortfall is the previous shortfall + the current unfilledAmount from this deposit.