@across-protocol/contracts 3.0.20 → 3.0.21

package/contracts/Cher_SpokePool.sol

@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+import "@eth-optimism/contracts/libraries/constants/Lib_PredeployAddresses.sol";
+
+import "./Ovm_SpokePool.sol";
+import "./external/interfaces/CCTPInterfaces.sol";
+import { IOpUSDCBridgeAdapter } from "./external/interfaces/IOpUSDCBridgeAdapter.sol";
+
+/**
+ * @notice Cher SpokePool.
+ * @custom:security-contact bugs@across.to
+ */
+contract Cher_SpokePool is Ovm_SpokePool {
+    using SafeERC20 for IERC20;
+
+    // Address of the custom L2 USDC bridge.
+    address private constant USDC_BRIDGE = 0x8be79275FCfD08A931087ECf70Ba8a99aee3AC59;
+
+    /// @custom:oz-upgrades-unsafe-allow constructor
+    constructor(
+        address _wrappedNativeTokenAddress,
+        uint32 _depositQuoteTimeBuffer,
+        uint32 _fillDeadlineBuffer,
+        IERC20 _l2Usdc,
+        ITokenMessenger _cctpTokenMessenger
+    )
+        Ovm_SpokePool(
+            _wrappedNativeTokenAddress,
+            _depositQuoteTimeBuffer,
+            _fillDeadlineBuffer,
+            _l2Usdc,
+            _cctpTokenMessenger
+        )
+    {} // solhint-disable-line no-empty-blocks
+
+    /**
+     * @notice Construct the OVM Cher SpokePool.
+     * @param _initialDepositId Starting deposit ID. Set to 0 unless this is a re-deployment in order to mitigate
+     * relay hash collisions.
+     * @param _crossDomainAdmin Cross domain admin to set. Can be changed by admin.
+     * @param _withdrawalRecipient Address which receives token withdrawals. Can be changed by admin. For Spoke Pools on L2, this will
+     */
+    function initialize(
+        uint32 _initialDepositId,
+        address _crossDomainAdmin,
+        address _withdrawalRecipient
+    ) public initializer {
+        __OvmSpokePool_init(_initialDepositId, _crossDomainAdmin, _withdrawalRecipient, Lib_PredeployAddresses.OVM_ETH);
+    }
+
+    /**
+     * @notice Cher-specific logic to bridge tokens back to the hub pool contract on L1.
+     * @param amountToReturn Amount of the token to bridge back.
+     * @param l2TokenAddress Address of the l2 Token to bridge back. This token will either be bridged back to the token defined in the mapping `remoteL1Tokens`,
+     * or via the canonical mapping defined in the bridge contract retrieved from `tokenBridges`.
+     * @dev This implementation deviates slightly from `_bridgeTokensToHubPool` in the `Ovm_SpokePool` contract since
+     * this chain uses Circle's bridged (upgradable to native) USDC standard, which uses a custom interface.
+     */
+    function _bridgeTokensToHubPool(uint256 amountToReturn, address l2TokenAddress) internal virtual override {
+        // Handle custom USDC bridge which doesn't conform to the standard bridge interface. In the future, CCTP may be used to bridge USDC to mainnet, in which
+        // case bridging logic is handled by the Ovm_SpokePool code. In the meantime, if CCTP is not enabled, then use the USDC bridge. Once CCTP is activated on
+        // Cher, this block of code will be unused.
+        if (l2TokenAddress == address(usdcToken) && !_isCCTPEnabled()) {
+            usdcToken.safeIncreaseAllowance(USDC_BRIDGE, amountToReturn);
+            IOpUSDCBridgeAdapter(USDC_BRIDGE).sendMessage(
+                withdrawalRecipient, // _to. Withdraw, over the bridge, to the l1 hub pool contract.
+                amountToReturn, // _amount.
+                l1Gas // _minGasLimit. Same value used in other OpStack bridges.
+            );
+        } else super._bridgeTokensToHubPool(amountToReturn, l2TokenAddress);
+    }
+}

package/dist/deploy/consts.js

@@ -86,6 +86,11 @@ exports.OP_STACK_ADDRESS_MAP = {
             L1StandardBridge: "0x88ff1e5b602916615391f55854588efcbb7663f0",
             L1OpUSDCBridgeAdapter: common_1.ZERO_ADDRESS,
         },
+        [utils_1.CHAIN_IDs.CHER]: {
+            L1CrossDomainMessenger: "0x9cf951e3f74b644e621b36ca9cea147a78d4c39f",
+            L1StandardBridge: "0xeb9bf100225c214efc3e7c651ebbadcf85177607",
+            L1OpUSDCBridgeAdapter: "0xC67A8c5f22b40274Ca7C4A56Db89569Ee2AD3FAb",
+        },
         [utils_1.CHAIN_IDs.LISK]: {
             L1CrossDomainMessenger: "0x31B72D76FB666844C41EdF08dF0254875Dbb7edB",
             L1StandardBridge: "0x2658723Bf70c7667De6B25F99fcce13A16D25d08",

package/dist/deployments/deployments.json

@@ -29,7 +29,8 @@
         "Zora_Adapter": { "address": "0x024f2fc31cbdd8de17194b1892c834f98ef5169b", "blockNumber": 20512287 },
         "WorldChain_Adapter": { "address": "0xA8399e221a583A57F54Abb5bA22f31b5D6C09f32", "blockNumber": 20963234 },
         "AlephZero_Adapter": { "address": "0x6F4083304C2cA99B077ACE06a5DcF670615915Af", "blockNumber": 21131132 },
-        "Ink_Adapter": { "address": "0x7e90a40c7519b041a7df6498fbf5662e8cfc61d2", "blockNumber": 21438590 }
+        "Ink_Adapter": { "address": "0x7e90a40c7519b041a7df6498fbf5662e8cfc61d2", "blockNumber": 21438590 },
+        "Cher_Adapter": { "address": "0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2", "blockNumber": 21597341 }
     },
     "10": {
         "SpokePool": { "address": "0x6f26Bf09B1C792e3228e5467807a900A503c0281", "blockNumber": 93903076 },
@@ -168,5 +169,14 @@
         "SpokePool": { "address": "0xeF684C38F94F48775959ECf2012D7E864ffb9dd4", "blockNumber": 1139240 },
         "SpokePoolVerifier": { "address": "0xB4A8d45647445EA9FC3E1058096142390683dBC2", "blockNumber": 1152853 },
         "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 1145284 }
+    },
+    "1810017368444177321": {
+        "SvmSpoke": { "address": "YVMQN27RnCNt23NRxzJPumXRd8iovEfKtzkqyMc5vDt", "blockNumber": 0 },
+        "MessageTransmitter": { "address": "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd", "blockNumber": 0 },
+        "TokenMessengerMinter": { "address": "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3", "blockNumber": 0 }
+    },
+    "1868": {
+        "SpokePool": { "address": "0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96", "blockNumber": 1709997 },
+        "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 1711482 }
     }
 }

package/dist/hardhat.config.js

@@ -102,6 +102,7 @@ const config = {
             "contracts/Optimism_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
             "contracts/WorldChain_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
             "contracts/Ink_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
+            "contracts/Cher_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
         },
     },
     zksolc: {
@@ -326,6 +327,13 @@ const config = {
             accounts: { mnemonic },
             companionNetworks: { l1: "mainnet" },
         },
+        cher: {
+            chainId: constants_1.CHAIN_IDs.CHER,
+            url: (0, common_1.getNodeUrl)("cher", true, constants_1.CHAIN_IDs.CHER),
+            saveDeployments: true,
+            accounts: { mnemonic },
+            companionNetworks: { l1: "mainnet" },
+        },
     },
     gasReporter: { enabled: process.env.REPORT_GAS !== undefined, currency: "USD" },
     etherscan: {
@@ -356,6 +364,7 @@ const config = {
             worldchain: "blockscout",
             alephzero: "blockscout",
             ink: "blockscout",
+            cher: "blockscout",
         },
         customChains: [
             {
@@ -390,6 +399,14 @@ const config = {
                     browserURL: "https://explorer.inkonchain.com",
                 },
             },
+            {
+                network: "cher",
+                chainId: constants_1.CHAIN_IDs.CHER,
+                urls: {
+                    apiURL: "https://blockscout.com/api",
+                    browserURL: "https://blockscout.com",
+                },
+            },
             {
                 network: "linea",
                 chainId: constants_1.CHAIN_IDs.LINEA,

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./typechain";
 export * from "./src/DeploymentUtils";
 export * from "./utils";
+export * from "./src/svm";

package/dist/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./typechain"), exports);
 __exportStar(require("./src/DeploymentUtils"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./src/svm"), exports);

package/dist/scripts/svm/bridgeLiabilityToHubPool.js

@@ -56,16 +56,14 @@ const svm_1 = require("../../src/svm");
 const constants_1 = require("@across-protocol/constants");
 const common_1 = require("@uma/common");
 const ethers_1 = require("ethers");
+const svm_2 = require("../../src/svm");
 const typechain_1 = require("../../typechain");
 const helpers_1 = require("./utils/helpers");
 // Set up Solana provider.
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
 // Get Solana programs and IDLs.
-const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
-const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
-const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
-const tokenMessengerMinterIdl = require("../../target/idl/token_messenger_minter.json");
+const svmSpokeProgram = (0, svm_2.getSpokePoolProgram)(provider);
 // CCTP domains.
 const ethereumDomain = 0; // Ethereum
 const solanaDomain = 5; // Solana
@@ -171,11 +169,11 @@ async function bridgeLiabilityToHubPool() {
     console.log("✅ Bridge liability to hub pool completed successfully.");
 }
 async function bridgeTokensToHubPool(amount, signer, statePda, inputToken) {
-    const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
+    const messageTransmitterProgram = (0, svm_2.getMessageTransmitterProgram)(provider);
     const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
     // Derive the transferLiability PDA
     const [transferLiability] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("transfer_liability"), inputToken.toBuffer()], svmSpokeProgram.programId);
-    const tokenMessengerMinterProgram = new anchor_1.Program(tokenMessengerMinterIdl, provider);
+    const tokenMessengerMinterProgram = (0, svm_2.getTokenMessengerMinterProgram)(provider);
     const [tokenMessengerMinterSenderAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("sender_authority")], tokenMessengerMinterProgram.programId);
     const [messageTransmitter] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
     const [tokenMessenger] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_messenger")], tokenMessengerMinterProgram.programId);

package/dist/scripts/svm/closeRelayerPdas.js

@@ -37,8 +37,7 @@ const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 // Parse arguments
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))

package/dist/scripts/svm/enableRoute.js

@@ -29,15 +29,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
+const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 console.log("SVM-Spoke Program ID:", programId.toString());
 // Parse arguments

package/dist/scripts/svm/executeRebalanceToHubPool.js

@@ -72,10 +72,8 @@ const svm_1 = require("../../src/svm");
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
 // Get Solana programs.
-const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
-const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
-const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
-const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
+const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
+const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
 const [messageTransmitterState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
 const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter_authority"), svmSpokeProgram.programId.toBuffer()], messageTransmitterProgram.programId);
 const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);

package/dist/scripts/svm/executeRebalanceToSpokePool.js

@@ -32,29 +32,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 const common_1 = require("@uma/common");
 // eslint-disable-next-line camelcase
-const constants_1 = require("../../utils/constants");
+const constants_1 = require("@across-protocol/constants");
+const ethers_1 = require("ethers");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const svm_1 = require("../../src/svm");
-const ethers_1 = require("ethers");
-// eslint-disable-next-line camelcase
 const typechain_1 = require("../../typechain");
-const poolRebalanceTree_1 = require("./utils/poolRebalanceTree");
 const helpers_2 = require("./utils/helpers");
+const poolRebalanceTree_1 = require("./utils/poolRebalanceTree");
 // Set up Solana provider.
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
 // Get Solana programs.
-const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
-const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
-const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
-const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
-const tokenMessengerMinterIdl = require("../../target/idl/token_messenger_minter.json");
-const tokenMessengerMinterProgram = new anchor_1.Program(tokenMessengerMinterIdl, provider);
+const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
+const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
+const tokenMessengerMinterProgram = (0, svm_1.getTokenMessengerMinterProgram)(provider);
 // Set up Ethereum provider and signer.
 const isDevnet = (0, svm_1.isSolanaDevnet)(provider);
 const nodeURL = isDevnet ? (0, common_1.getNodeUrl)("sepolia", true) : (0, common_1.getNodeUrl)("mainnet", true);

package/dist/scripts/svm/fakeFillWithRandomDistribution.js

@@ -30,8 +30,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // Note that this should be run only on devnet as this is fake fill and all filled tokens are sent to random recipients.
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const svm_1 = require("../../src/svm");
@@ -39,8 +39,7 @@ const svm_1 = require("../../src/svm");
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
 const signer = anchor.AnchorProvider.env().wallet.payer;
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 // Parse arguments
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))

package/dist/scripts/svm/initialize.js

@@ -36,8 +36,7 @@ const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 // Parse arguments
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))

package/dist/scripts/svm/queryDeposits.js

@@ -36,8 +36,7 @@ const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 console.log("SVM-Spoke Program ID:", programId.toString());
 // Parse arguments

package/dist/scripts/svm/queryFills.js

@@ -36,8 +36,7 @@ const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 // Parse arguments
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).option("seed", {

package/dist/scripts/svm/queryRoute.js

@@ -29,15 +29,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
+const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 console.log("SVM-Spoke Program ID:", programId.toString());
 // Parse arguments

package/dist/scripts/svm/queryState.js

@@ -32,11 +32,11 @@ const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
+const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 console.log("SVM-Spoke Program ID:", programId.toString());
 // Parse arguments

package/dist/scripts/svm/remoteHubPoolPauseDeposits.js

@@ -64,11 +64,9 @@ async function remoteHubPoolPauseDeposit() {
     // CCTP domains.
     const remoteDomain = 0; // Ethereum
     // Get Solana programs and accounts.
-    const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
-    const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
+    const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
     const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], svmSpokeProgram.programId);
-    const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
-    const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
+    const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
     const [messageTransmitterState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
     const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter_authority"), svmSpokeProgram.programId.toBuffer()], messageTransmitterProgram.programId);
     const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);

package/dist/scripts/svm/remoteHubPoolSetDepositRoute.js

@@ -71,8 +71,7 @@ async function remoteHubPoolSetDepositRoute() {
     // CCTP domains.
     const remoteDomain = 0; // Ethereum
     // Get Solana programs and accounts.
-    const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
-    const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
+    const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
     const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], svmSpokeProgram.programId);
     const [routePda] = web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from("route"),
@@ -81,8 +80,7 @@ async function remoteHubPoolSetDepositRoute() {
         new anchor_1.BN(destinationChainId).toArrayLike(Buffer, "le", 8),
     ], svmSpokeProgram.programId);
     const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(originToken, statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
-    const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
-    const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
+    const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
     const [messageTransmitterState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
     const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter_authority"), svmSpokeProgram.programId.toBuffer()], messageTransmitterProgram.programId);
     const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);

package/dist/scripts/svm/remotePauseDeposits.js

@@ -71,11 +71,9 @@ async function remotePauseDeposits() {
     const remoteDomain = 0; // Ethereum
     const localDomain = 5; // Solana
     // Get Solana programs and accounts.
-    const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
-    const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
+    const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
     const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], svmSpokeProgram.programId);
-    const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
-    const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
+    const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
     const [messageTransmitterState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
     const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter_authority"), svmSpokeProgram.programId.toBuffer()], messageTransmitterProgram.programId);
     const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);

package/dist/scripts/svm/simpleDeposit.js

@@ -29,15 +29,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
+const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 console.log("SVM-Spoke Program ID:", programId.toString());
 // Parse arguments

package/dist/scripts/svm/simpleFakeRelayerRepayment.js

@@ -29,17 +29,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
-const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
 const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 // Parse arguments
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))

package/dist/scripts/svm/simpleFill.js

@@ -30,16 +30,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
-const idl = require("../../target/idl/svm_spoke.json");
-const program = new anchor_1.Program(idl, provider);
+const program = (0, svm_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 // Parse arguments
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))

package/dist/src/DeploymentUtils.d.ts

@@ -1,4 +1,4 @@
-export declare function getDeployedAddress(contractName: string, networkId: number, throwOnError?: boolean): string | undefined;
+export declare function getDeployedAddress(contractName: string, networkId: number | string, throwOnError?: boolean): string | undefined;
 export declare function getDeployedBlockNumber(contractName: string, networkId: number): number;
 export declare function getContractInfoFromAddress(contractAddress: string): {
     chainId: Number;

package/dist/src/svm/assets/idl/index.d.ts

@@ -0,0 +1,6 @@
+declare const MessageTransmitterIdl: any;
+declare const MulticallHandlerIdl: any;
+declare const SvmSpokeIdl: any;
+declare const TestIdl: any;
+declare const TokenMessengerMinterIdl: any;
+export { MessageTransmitterIdl, MulticallHandlerIdl, SvmSpokeIdl, TestIdl, TokenMessengerMinterIdl };

package/dist/src/svm/assets/idl/index.js

@@ -0,0 +1,15 @@
+"use strict";
+// This file has been autogenerated. Do not edit manually.
+// Generated by a script.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenMessengerMinterIdl = exports.TestIdl = exports.SvmSpokeIdl = exports.MulticallHandlerIdl = exports.MessageTransmitterIdl = void 0;
+const MessageTransmitterIdl = require("./message_transmitter.json");
+exports.MessageTransmitterIdl = MessageTransmitterIdl;
+const MulticallHandlerIdl = require("./multicall_handler.json");
+exports.MulticallHandlerIdl = MulticallHandlerIdl;
+const SvmSpokeIdl = require("./svm_spoke.json");
+exports.SvmSpokeIdl = SvmSpokeIdl;
+const TestIdl = require("./test.json");
+exports.TestIdl = TestIdl;
+const TokenMessengerMinterIdl = require("./token_messenger_minter.json");
+exports.TokenMessengerMinterIdl = TokenMessengerMinterIdl;

package/dist/src/svm/assets/index.d.ts

@@ -0,0 +1,6 @@
+export * from "./idl";
+export { MessageTransmitter as MessageTransmitterAnchor } from "./message_transmitter";
+export { MulticallHandler as MulticallHandlerAnchor } from "./multicall_handler";
+export { SvmSpoke as SvmSpokeAnchor } from "./svm_spoke";
+export { Test as TestAnchor } from "./test";
+export { TokenMessengerMinter as TokenMessengerMinterAnchor } from "./token_messenger_minter";

package/dist/src/svm/assets/index.js

@@ -0,0 +1,19 @@
+"use strict";
+// This file has been autogenerated. Do not edit manually.
+// Generated by a script.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./idl"), exports);