@across-protocol/contracts 3.0.18 → 3.0.19

package/contracts/Ink_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 Ink Spoke pool.
+ * @custom:security-contact bugs@across.to
+ */
+contract Ink_SpokePool is Ovm_SpokePool {
+    using SafeERC20 for IERC20;
+
+    // Address of the custom L2 USDC bridge.
+    address private constant USDC_BRIDGE = address(0);
+
+    /// @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 World Chain 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 Ink-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 World Chain has a USDC bridge which uses
+     * a custom interface. This is because the USDC token on World Chain is meant to be upgraded to a native, CCTP supported version in the future.
+     */
+    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
+        // WorldChain, 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

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CIRCLE_DOMAIN_IDs = exports.POLYGON_CHAIN_IDS = exports.L2_ADDRESS_MAP = exports.OP_STACK_ADDRESS_MAP = exports.L1_ADDRESS_MAP = exports.AZERO_GAS_PRICE = exports.ARBITRUM_MAX_SUBMISSION_COST = exports.FILL_DEADLINE_BUFFER = exports.QUOTE_TIME_BUFFER = exports.AZERO = exports.WAZERO = exports.WMATIC = exports.WETH = exports.USDCe = exports.USDC = exports.ZERO_ADDRESS = void 0;
-var common_1 = require("@uma/common");
-Object.defineProperty(exports, "ZERO_ADDRESS", { enumerable: true, get: function () { return common_1.ZERO_ADDRESS; } });
+const common_1 = require("@uma/common");
 const utils_1 = require("../utils");
+var common_2 = require("@uma/common");
+Object.defineProperty(exports, "ZERO_ADDRESS", { enumerable: true, get: function () { return common_2.ZERO_ADDRESS; } });
 exports.USDC = utils_1.TOKEN_SYMBOLS_MAP.USDC.addresses;
 exports.USDCe = utils_1.TOKEN_SYMBOLS_MAP["USDC.e"].addresses;
 exports.WETH = utils_1.TOKEN_SYMBOLS_MAP.WETH.addresses;
@@ -74,6 +75,11 @@ exports.OP_STACK_ADDRESS_MAP = {
             L1CrossDomainMessenger: "0x5D4472f31Bd9385709ec61305AFc749F0fA8e9d0",
             L1StandardBridge: "0x697402166Fbf2F22E970df8a6486Ef171dbfc524",
         },
+        [utils_1.CHAIN_IDs.INK]: {
+            L1CrossDomainMessenger: "0x69d3cf86b2bf1a9e99875b7e2d9b6a84426c171f",
+            L1StandardBridge: "0x88ff1e5b602916615391f55854588efcbb7663f0",
+            L1OpUSDCBridgeAdapter: common_1.ZERO_ADDRESS,
+        },
         [utils_1.CHAIN_IDs.LISK]: {
             L1CrossDomainMessenger: "0x31B72D76FB666844C41EdF08dF0254875Dbb7edB",
             L1StandardBridge: "0x2658723Bf70c7667De6B25F99fcce13A16D25d08",

package/dist/deployments/deployments.json

@@ -28,7 +28,8 @@
         "Redstone_Adapter": { "address": "0x188F8C95B7cfB7993B53a4F643efa687916f73fA", "blockNumber": 20432774 },
         "Zora_Adapter": { "address": "0x024f2fc31cbdd8de17194b1892c834f98ef5169b", "blockNumber": 20512287 },
         "WorldChain_Adapter": { "address": "0xA8399e221a583A57F54Abb5bA22f31b5D6C09f32", "blockNumber": 20963234 },
-        "AlephZero_Adapter": { "address": "0x6F4083304C2cA99B077ACE06a5DcF670615915Af", "blockNumber": 21131132 }
+        "AlephZero_Adapter": { "address": "0x6F4083304C2cA99B077ACE06a5DcF670615915Af", "blockNumber": 21131132 },
+        "Ink_Adapter": { "address": "0x7e90a40c7519b041a7df6498fbf5662e8cfc61d2", "blockNumber": 21438590 }
     },
     "10": {
         "SpokePool": { "address": "0x6f26Bf09B1C792e3228e5467807a900A503c0281", "blockNumber": 93903076 },
@@ -157,5 +158,10 @@
     "41455": {
         "SpokePool": { "address": "0x13fDac9F9b4777705db45291bbFF3c972c6d1d97", "blockNumber": 4240318 },
         "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 4112529 }
+    },
+    "57073": {
+        "SpokePool": { "address": "0xeF684C38F94F48775959ECf2012D7E864ffb9dd4", "blockNumber": 1139240 },
+        "SpokePoolVerifier": { "address": "0xB4A8d45647445EA9FC3E1058096142390683dBC2", "blockNumber": 1152853 },
+        "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 1145284 }
     }
 }

package/dist/hardhat.config.js

@@ -101,6 +101,7 @@ const config = {
             "contracts/Base_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
             "contracts/Optimism_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
             "contracts/WorldChain_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
+            "contracts/Ink_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
         },
     },
     zksolc: {
@@ -203,6 +204,13 @@ const config = {
             accounts: { mnemonic },
             companionNetworks: { l1: "sepolia" },
         },
+        ink: {
+            chainId: constants_1.CHAIN_IDs.INK,
+            url: "https://rpc-gel.inkonchain.com",
+            saveDeployments: true,
+            accounts: { mnemonic },
+            companionNetworks: { l1: "mainnet" },
+        },
         linea: {
             chainId: constants_1.CHAIN_IDs.LINEA,
             url: `https://linea-mainnet.infura.io/v3/${process.env.INFURA_API_KEY}`,
@@ -337,6 +345,7 @@ const config = {
             zora: "routescan",
             worldchain: "blockscout",
             alephzero: "blockscout",
+            ink: "blockscout",
         },
         customChains: [
             {
@@ -363,6 +372,14 @@ const config = {
                     browserURL: "https://sepolia.basescan.org",
                 },
             },
+            {
+                network: "ink",
+                chainId: constants_1.CHAIN_IDs.INK,
+                urls: {
+                    apiURL: "https://explorer.inkonchain.com/api",
+                    browserURL: "https://explorer.inkonchain.com",
+                },
+            },
             {
                 network: "linea",
                 chainId: constants_1.CHAIN_IDs.LINEA,

package/dist/scripts/svm/addressToPublicKey.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).option("address", {
@@ -13,7 +13,7 @@ const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).option("
 }).argv;
 async function logPublicKey() {
     const address = (await argv).address;
-    const publicKey = (0, SvmUtils_1.evmAddressToPublicKey)(address);
+    const publicKey = (0, svm_1.evmAddressToPublicKey)(address);
     console.log("Ethereum Address:", address);
     console.log("Associated Public Key:", publicKey.toString());
 }

package/dist/scripts/svm/bridgeLiabilityToHubPool.d.ts

@@ -6,14 +6,11 @@
  * updates the Hub Pool’s USDC balance.
  *
  * Required Environment Variables:
- * - TESTNET: (Optional) Set to "true" to use Sepolia; defaults to mainnet.
  * - MNEMONIC: Wallet mnemonic to sign the Ethereum transaction.
  * - HUB_POOL_ADDRESS: Ethereum address of the Hub Pool.
- * - NODE_URL_1: Ethereum RPC URL for mainnet (ignored if TESTNET=true).
- * - NODE_URL_11155111: Ethereum RPC URL for Sepolia (ignored if TESTNET=false).
+ * - NODE_URL_${CHAIN_ID}: Ethereum RPC URL (must point to the Mainnet or Sepolia depending on Solana cluster).
  *
  * Example Usage:
- * TESTNET=true \
  * NODE_URL_11155111=$NODE_URL_11155111 \
  * MNEMONIC=$MNEMONIC \
  * HUB_POOL_ADDRESS=$HUB_POOL_ADDRESS \

package/dist/scripts/svm/bridgeLiabilityToHubPool.js

@@ -7,14 +7,11 @@
  * updates the Hub Pool’s USDC balance.
  *
  * Required Environment Variables:
- * - TESTNET: (Optional) Set to "true" to use Sepolia; defaults to mainnet.
  * - MNEMONIC: Wallet mnemonic to sign the Ethereum transaction.
  * - HUB_POOL_ADDRESS: Ethereum address of the Hub Pool.
- * - NODE_URL_1: Ethereum RPC URL for mainnet (ignored if TESTNET=true).
- * - NODE_URL_11155111: Ethereum RPC URL for Sepolia (ignored if TESTNET=false).
+ * - NODE_URL_${CHAIN_ID}: Ethereum RPC URL (must point to the Mainnet or Sepolia depending on Solana cluster).
  *
  * Example Usage:
- * TESTNET=true \
  * NODE_URL_11155111=$NODE_URL_11155111 \
  * MNEMONIC=$MNEMONIC \
  * HUB_POOL_ADDRESS=$HUB_POOL_ADDRESS \
@@ -74,7 +71,8 @@ const tokenMessengerMinterIdl = require("../../target/idl/token_messenger_minter
 const ethereumDomain = 0; // Ethereum
 const solanaDomain = 5; // Solana
 // Set up Ethereum provider and signer.
-const nodeURL = process.env.TESTNET === "true" ? (0, common_1.getNodeUrl)("sepolia", true) : (0, common_1.getNodeUrl)("mainnet", true);
+const isDevnet = (0, helpers_1.isSolanaDevnet)(provider);
+const nodeURL = isDevnet ? (0, common_1.getNodeUrl)("sepolia", true) : (0, common_1.getNodeUrl)("mainnet", true);
 const ethersProvider = new ethers_1.ethers.providers.JsonRpcProvider(nodeURL);
 const ethersSigner = ethers_1.ethers.Wallet.fromMnemonic((0, helpers_1.requireEnv)("MNEMONIC")).connect(ethersProvider);
 // Get the HubPool contract instance.
@@ -126,15 +124,7 @@ const messageTransmitterAbi = [
 ];
 async function bridgeLiabilityToHubPool() {
     const seed = constants_1.SOLANA_SPOKE_STATE_SEED; // Seed is always 0 for the state account PDA in public networks.
-    // Resolve Solana cluster, EVM chain ID, Iris API URL and USDC addresses.
-    let isDevnet;
-    const solanaRpcEndpoint = provider.connection.rpcEndpoint;
-    if (solanaRpcEndpoint.includes("devnet"))
-        isDevnet = true;
-    else if (solanaRpcEndpoint.includes("mainnet"))
-        isDevnet = false;
-    else
-        throw new Error(`Unsupported solanaCluster endpoint: ${solanaRpcEndpoint}`);
+    // Resolve Solana USDC addresses.
     const svmUsdc = isDevnet ? constants_1.SOLANA_USDC_DEVNET : constants_1.SOLANA_USDC_MAINNET;
     const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], svmSpokeProgram.programId);
     const irisApiUrl = isDevnet ? constants_1.CIRCLE_IRIS_API_URL_DEVNET : constants_1.CIRCLE_IRIS_API_URL_MAINNET;
@@ -148,7 +138,7 @@ async function bridgeLiabilityToHubPool() {
     const usdcBalanceBefore = await usdc.balanceOf(hubPoolAddress);
     console.log("Receiving liability from Solana Spoke Pool to Ethereum Hub Pool...");
     console.table([
-        { Property: "isTestnet", Value: process.env.TESTNET === "true" },
+        { Property: "isTestnet", Value: isDevnet },
         { Property: "hubPoolAddress", Value: hubPoolAddress },
         { Property: "svmSpokeProgramProgramId", Value: svmSpokeProgram.programId.toString() },
         { Property: "providerPublicKey", Value: provider.wallet.publicKey.toString() },

package/dist/scripts/svm/closeRelayerPdas.js

@@ -33,7 +33,7 @@ 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 SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
@@ -54,7 +54,7 @@ async function closeExpiredRelays() {
         { Property: "programId", Value: programId.toString() },
     ]);
     try {
-        const events = await (0, SvmUtils_1.readProgramEvents)(provider.connection, program);
+        const events = await (0, svm_1.readProgramEvents)(provider.connection, program);
         const fillEvents = events.filter((event) => event.name === "filledV3Relay" && new web3_js_1.PublicKey(event.data.relayer).equals(relayer));
         console.log(`Number of fill events found: ${fillEvents.length}`);
         if (fillEvents.length === 0) {
@@ -95,7 +95,7 @@ async function closeFillPda(eventData, seed) {
     // Fetch the state to get the chainId
     const state = await program.account.state.fetch(statePda);
     const chainId = new anchor_1.BN(state.chainId);
-    const relayHashUint8Array = (0, SvmUtils_1.calculateRelayEventHashUint8Array)(relayEventData, chainId);
+    const relayHashUint8Array = (0, svm_1.calculateRelayEventHashUint8Array)(relayEventData, chainId);
     const [fillStatusPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], programId);
     try {
         // Check if the fillStatusPda account exists

package/dist/scripts/svm/executeRebalanceToHubPool.d.ts

@@ -6,18 +6,15 @@
  * liabilities for bridging back to the Hub Pool.
  *
  * Required Environment Variables:
- * - TESTNET: (Optional) Set to "true" to use Sepolia; defaults to mainnet.
  * - MNEMONIC: Wallet mnemonic to sign the Ethereum transaction.
  * - HUB_POOL_ADDRESS: Ethereum address of the Hub Pool.
- * - NODE_URL_1: Ethereum RPC URL for mainnet (ignored if TESTNET=true).
- * - NODE_URL_11155111: Ethereum RPC URL for Sepolia (ignored if TESTNET=false).
+ * - NODE_URL_${CHAIN_ID}: Ethereum RPC URL (must point to the Mainnet or Sepolia depending on Solana cluster).
  *
  * Required Arguments:
  * - `--netSendAmount`: The unscaled amount of USDC to rebalance (e.g., for USDC with 6 decimals, 1 = 0.000001 USDC).
  * - `--resumeRemoteTx`: (Optional) Hash of a previously submitted remote transaction to resume.
  *
  * Example Usage:
- * TESTNET=true \
  * NODE_URL_11155111=$NODE_URL_11155111 \
  * MNEMONIC=$MNEMONIC \
  * HUB_POOL_ADDRESS=$HUB_POOL_ADDRESS \

package/dist/scripts/svm/executeRebalanceToHubPool.js

@@ -7,18 +7,15 @@
  * liabilities for bridging back to the Hub Pool.
  *
  * Required Environment Variables:
- * - TESTNET: (Optional) Set to "true" to use Sepolia; defaults to mainnet.
  * - MNEMONIC: Wallet mnemonic to sign the Ethereum transaction.
  * - HUB_POOL_ADDRESS: Ethereum address of the Hub Pool.
- * - NODE_URL_1: Ethereum RPC URL for mainnet (ignored if TESTNET=true).
- * - NODE_URL_11155111: Ethereum RPC URL for Sepolia (ignored if TESTNET=false).
+ * - NODE_URL_${CHAIN_ID}: Ethereum RPC URL (must point to the Mainnet or Sepolia depending on Solana cluster).
  *
  * Required Arguments:
  * - `--netSendAmount`: The unscaled amount of USDC to rebalance (e.g., for USDC with 6 decimals, 1 = 0.000001 USDC).
  * - `--resumeRemoteTx`: (Optional) Hash of a previously submitted remote transaction to resume.
  *
  * Example Usage:
- * TESTNET=true \
  * NODE_URL_11155111=$NODE_URL_11155111 \
  * MNEMONIC=$MNEMONIC \
  * HUB_POOL_ADDRESS=$HUB_POOL_ADDRESS \
@@ -72,7 +69,7 @@ const constants_2 = require("./utils/constants");
 const helpers_2 = require("./utils/helpers");
 const common_1 = require("@uma/common");
 const cctpHelpers_1 = require("../../test/svm/cctpHelpers");
-const utils_1 = require("../../test/svm/utils");
+const svm_1 = require("../../src/svm");
 // Set up Solana provider.
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
@@ -86,7 +83,8 @@ const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("
 const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);
 const [eventAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("__event_authority")], svmSpokeProgram.programId);
 // Set up Ethereum provider and signer.
-const nodeURL = process.env.TESTNET === "true" ? (0, common_1.getNodeUrl)("sepolia", true) : (0, common_1.getNodeUrl)("mainnet", true);
+const isDevnet = (0, helpers_2.isSolanaDevnet)(provider);
+const nodeURL = isDevnet ? (0, common_1.getNodeUrl)("sepolia", true) : (0, common_1.getNodeUrl)("mainnet", true);
 const ethersProvider = new ethers_1.ethers.providers.JsonRpcProvider(nodeURL);
 const ethersSigner = ethers_1.ethers.Wallet.fromMnemonic((0, helpers_2.requireEnv)("MNEMONIC")).connect(ethersProvider);
 // Get the HubPool contract instance.
@@ -105,14 +103,6 @@ async function executeRebalanceToHubPool() {
     const netSendAmount = ethers_1.BigNumber.from(resolvedArgv.netSendAmount);
     const resumeRemoteTx = resolvedArgv.resumeRemoteTx;
     // Resolve Solana cluster, EVM chain ID, Iris API URL and USDC addresses.
-    let isDevnet;
-    const solanaRpcEndpoint = provider.connection.rpcEndpoint;
-    if (solanaRpcEndpoint.includes("devnet"))
-        isDevnet = true;
-    else if (solanaRpcEndpoint.includes("mainnet"))
-        isDevnet = false;
-    else
-        throw new Error(`Unsupported solanaCluster endpoint: ${solanaRpcEndpoint}`);
     const solanaCluster = isDevnet ? "devnet" : "mainnet";
     const solanaChainId = (0, helpers_2.getSolanaChainId)(solanaCluster);
     const irisApiUrl = isDevnet ? constants_2.CIRCLE_IRIS_API_URL_DEVNET : constants_2.CIRCLE_IRIS_API_URL_MAINNET;
@@ -127,7 +117,7 @@ async function executeRebalanceToHubPool() {
     const [rootBundlePda] = getRootBundlePda(state.rootBundleId, seed);
     console.log("Executing rebalance to hub pool...");
     console.table([
-        { Property: "isTestnet", Value: process.env.TESTNET === "true" },
+        { Property: "isTestnet", Value: isDevnet },
         { Property: "originChainId", Value: evmChainId.toString() },
         { Property: "targetChainId", Value: solanaChainId.toString() },
         { Property: "hubPoolAddress", Value: hubPool.address },
@@ -324,7 +314,7 @@ async function executeRelayerRefundLeaf(signer, program, statePda, rootBundle, r
     if (!lookupTableAccount) {
         throw new Error("AddressLookupTableAccount not fetched");
     }
-    await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, signer.publicKey, rootBundleId, leaf, proofAsNumbers);
+    await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, signer.publicKey, rootBundleId, leaf, proofAsNumbers);
     console.log(`loaded execute relayer refund leaf params ${instructionParams}. \nExecuting relayer refund leaf...`);
     const executeInstruction = await program.methods
         .executeRelayerRefundLeaf()

package/dist/scripts/svm/executeRebalanceToSpokePool.js

@@ -1,7 +1,7 @@
 "use strict";
 // This script executes root bundle on HubPool that rebalances tokens to Solana Spoke Pool. Required environment:
-// - ETHERS_PROVIDER_URL: Ethereum RPC provider URL.
-// - ETHERS_MNEMONIC: Mnemonic of the wallet that will sign the sending transaction on Ethereum
+// - NODE_URL_${CHAIN_ID}: Ethereum RPC URL (must point to the Mainnet or Sepolia depending on Solana cluster).
+// - MNEMONIC: Mnemonic of the wallet that will sign the sending transaction on Ethereum
 // - HUB_POOL_ADDRESS: Hub Pool address
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -34,17 +34,19 @@ 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 common_1 = require("@uma/common");
 // eslint-disable-next-line camelcase
 const constants_1 = require("../../utils/constants");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
-const SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 const ethers_1 = require("ethers");
 // eslint-disable-next-line camelcase
 const typechain_1 = require("../../typechain");
 const constants_2 = require("./utils/constants");
 const poolRebalanceTree_1 = require("./utils/poolRebalanceTree");
 const cctpHelpers_1 = require("../../test/svm/cctpHelpers");
+const helpers_2 = require("./utils/helpers");
 // Set up Solana provider.
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
@@ -55,20 +57,13 @@ 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);
-// Set up Ethereum provider.
-if (!process.env.ETHERS_PROVIDER_URL) {
-    throw new Error("Environment variable ETHERS_PROVIDER_URL is not set");
-}
-const ethersProvider = new ethers_1.ethers.providers.JsonRpcProvider(process.env.ETHERS_PROVIDER_URL);
-if (!process.env.ETHERS_MNEMONIC) {
-    throw new Error("Environment variable ETHERS_MNEMONIC is not set");
-}
-const ethersSigner = ethers_1.ethers.Wallet.fromMnemonic(process.env.ETHERS_MNEMONIC).connect(ethersProvider);
+// Set up Ethereum provider and signer.
+const isDevnet = (0, helpers_2.isSolanaDevnet)(provider);
+const nodeURL = isDevnet ? (0, common_1.getNodeUrl)("sepolia", true) : (0, common_1.getNodeUrl)("mainnet", true);
+const ethersProvider = new ethers_1.ethers.providers.JsonRpcProvider(nodeURL);
+const ethersSigner = ethers_1.ethers.Wallet.fromMnemonic((0, helpers_2.requireEnv)("MNEMONIC")).connect(ethersProvider);
 // Get the HubPool contract instance.
-if (!process.env.HUB_POOL_ADDRESS) {
-    throw new Error("Environment variable HUB_POOL_ADDRESS is not set");
-}
-const hubPoolAddress = ethers_1.ethers.utils.getAddress(process.env.HUB_POOL_ADDRESS);
+const hubPoolAddress = ethers_1.ethers.utils.getAddress((0, helpers_2.requireEnv)("HUB_POOL_ADDRESS"));
 const hubPool = typechain_1.HubPool__factory.connect(hubPoolAddress, ethersProvider);
 // CCTP domains.
 const remoteDomain = 0; // Ethereum
@@ -90,17 +85,9 @@ async function executeRebalanceToSpokePool() {
     const seed = new anchor_1.BN(0); // Seed is always 0 for the state account PDA in public networks.
     const netSendAmount = resolvedArgv.netSendAmount ? ethers_1.BigNumber.from(resolvedArgv.netSendAmount) : ethers_1.BigNumber.from(0);
     const resumeRemoteTx = resolvedArgv.resumeRemoteTx;
-    // Resolve Solana cluster, EVM chain ID, Iris API URL and USDC addresses.
-    let isDevnet;
-    const solanaRpcEndpoint = provider.connection.rpcEndpoint;
-    if (solanaRpcEndpoint.includes("devnet"))
-        isDevnet = true;
-    else if (solanaRpcEndpoint.includes("mainnet"))
-        isDevnet = false;
-    else
-        throw new Error(`Unsupported solanaCluster endpoint: ${solanaRpcEndpoint}`);
+    // Resolve chain IDs, Iris API URL and USDC addresses.
     const solanaCluster = isDevnet ? "devnet" : "mainnet";
-    const solanaChainId = ethers_1.BigNumber.from(BigInt(ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.toUtf8Bytes(`solana-${solanaCluster}`))) & BigInt("0xFFFFFFFFFFFFFFFF"));
+    const solanaChainId = (0, helpers_2.getSolanaChainId)(solanaCluster);
     const irisApiUrl = isDevnet ? constants_2.CIRCLE_IRIS_API_URL_DEVNET : constants_2.CIRCLE_IRIS_API_URL_MAINNET;
     const supportedEvmChainId = isDevnet ? constants_1.CHAIN_IDs.SEPOLIA : constants_1.CHAIN_IDs.MAINNET; // Sepolia is bridged to devnet, Ethereum to mainnet in CCTP.
     const evmChainId = (await ethersProvider.getNetwork()).chainId;
@@ -136,7 +123,7 @@ async function executeRebalanceToSpokePool() {
     const [remoteTokenMessengerKey] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("remote_token_messenger"), Buffer.from(remoteDomain.toString())], tokenMessengerMinterProgram.programId);
     const [tokenMinterAccount] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_minter")], tokenMessengerMinterProgram.programId);
     const [localToken] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("local_token"), solanaTokenKey.toBuffer()], tokenMessengerMinterProgram.programId);
-    const [tokenPair] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_pair"), Buffer.from(remoteDomain.toString()), (0, SvmUtils_1.evmAddressToPublicKey)(l1TokenAddress).toBuffer()], tokenMessengerMinterProgram.programId);
+    const [tokenPair] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_pair"), Buffer.from(remoteDomain.toString()), (0, svm_1.evmAddressToPublicKey)(l1TokenAddress).toBuffer()], tokenMessengerMinterProgram.programId);
     const [custodyTokenAccount] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("custody"), solanaTokenKey.toBuffer()], tokenMessengerMinterProgram.programId);
     const [tokenMessengerEventAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("__event_authority")], tokenMessengerMinterProgram.programId);
     // Fetch attestation from CCTP attestation service.

package/dist/scripts/svm/fakeFillWithRandomDistribution.js

@@ -34,8 +34,7 @@ const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
-const SvmUtils_1 = require("../../src/SvmUtils");
-const utils_1 = require("../../test/svm/utils");
+const svm_1 = require("../../src/svm");
 // Set up the provider and signer.
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
@@ -98,9 +97,9 @@ async function fillV3RelayToRandom() {
         transferInstructions.push(transferInstruction);
     }
     // Encode handler message for the token distribution.
-    const multicallHandlerCoder = new SvmUtils_1.MulticallHandlerCoder(transferInstructions);
+    const multicallHandlerCoder = new svm_1.MulticallHandlerCoder(transferInstructions);
     const handlerMessage = multicallHandlerCoder.encode();
-    const message = new SvmUtils_1.AcrossPlusMessageCoder({
+    const message = new svm_1.AcrossPlusMessageCoder({
         handler,
         readOnlyLen: multicallHandlerCoder.readOnlyLen,
         valueAmount: new anchor_1.BN(0),
@@ -128,7 +127,7 @@ async function fillV3RelayToRandom() {
     // Fetch the state from the on-chain program to get chainId
     const state = await program.account.state.fetch(statePda);
     const chainId = new anchor_1.BN(state.chainId);
-    const relayHashUint8Array = (0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId);
+    const relayHashUint8Array = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
     const relayHash = Array.from(relayHashUint8Array);
     // Define the fill status account PDA
     const [fillStatusPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], programId);
@@ -155,7 +154,7 @@ async function fillV3RelayToRandom() {
     // Prepare fill instruction as we will need to use Address Lookup Table (ALT).
     const fillV3RelayValues = [relayHash, relayData, repaymentChain, repaymentAddress];
     if (bufferParams) {
-        await (0, utils_1.loadFillV3RelayParams)(program, signer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
+        await (0, svm_1.loadFillV3RelayParams)(program, signer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
     }
     const fillV3RelayParams = bufferParams ? [fillV3RelayValues[0], null, null, null] : fillV3RelayValues;
     const [instructionParams] = bufferParams
@@ -184,7 +183,7 @@ async function fillV3RelayToRandom() {
         .remainingAccounts(remainingAccounts)
         .instruction();
     // Fill using the ALT.
-    const { txSignature } = await (0, SvmUtils_1.sendTransactionWithLookupTable)(provider.connection, [approveInstruction, fillInstruction], signer);
+    const { txSignature } = await (0, svm_1.sendTransactionWithLookupTable)(provider.connection, [approveInstruction, fillInstruction], signer);
     console.log("Transaction signature:", txSignature);
 }
 // Run the fillV3RelayToRandom function

package/dist/scripts/svm/initialize.js

@@ -32,7 +32,7 @@ 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 SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
@@ -64,7 +64,7 @@ async function initialize() {
     const initialNumberOfDeposits = new anchor_1.BN(resolvedArgv.initNumbDeposits);
     const chainId = new anchor_1.BN(resolvedArgv.chainId);
     const remoteDomain = resolvedArgv.remoteDomain;
-    const crossDomainAdmin = (0, SvmUtils_1.evmAddressToPublicKey)(resolvedArgv.crossDomainAdmin); // Use the function to cast the value
+    const crossDomainAdmin = (0, svm_1.evmAddressToPublicKey)(resolvedArgv.crossDomainAdmin); // Use the function to cast the value
     const depositQuoteTimeBuffer = resolvedArgv.depositQuoteTimeBuffer;
     const fillDeadlineBuffer = resolvedArgv.fillDeadlineBuffer;
     // Define the state account PDA

package/dist/scripts/svm/proposeRebalanceToSpokePool.js

@@ -1,9 +1,11 @@
 "use strict";
 // This script proposes root bundle on HubPool that would rebalance tokens to Solana Spoke Pool once executed.
 // Required environment:
-// - ETHERS_PROVIDER_URL: Ethereum RPC provider URL.
-// - ETHERS_MNEMONIC: Mnemonic of the wallet that will sign the sending transaction on Ethereum
+// - TESTNET: (Optional) Set to "true" to use Sepolia; defaults to mainnet.
+// - MNEMONIC: Wallet mnemonic to sign the Ethereum transaction.
 // - HUB_POOL_ADDRESS: Hub Pool address
+// - NODE_URL_1: Ethereum RPC URL for mainnet (ignored if TESTNET=true).
+// - NODE_URL_11155111: Ethereum RPC URL for Sepolia (ignored if TESTNET=false).
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -13,23 +15,17 @@ const constants_1 = require("../../utils/constants");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const ethers_1 = require("ethers");
+const common_1 = require("@uma/common");
 // eslint-disable-next-line camelcase
 const typechain_1 = require("../../typechain");
 const poolRebalanceTree_1 = require("./utils/poolRebalanceTree");
+const helpers_2 = require("./utils/helpers");
 // Set up Ethereum provider.
-if (!process.env.ETHERS_PROVIDER_URL) {
-    throw new Error("Environment variable ETHERS_PROVIDER_URL is not set");
-}
-const ethersProvider = new ethers_1.ethers.providers.JsonRpcProvider(process.env.ETHERS_PROVIDER_URL);
-if (!process.env.ETHERS_MNEMONIC) {
-    throw new Error("Environment variable ETHERS_MNEMONIC is not set");
-}
-const ethersSigner = ethers_1.ethers.Wallet.fromMnemonic(process.env.ETHERS_MNEMONIC).connect(ethersProvider);
+const nodeURL = process.env.TESTNET === "true" ? (0, common_1.getNodeUrl)("sepolia", true) : (0, common_1.getNodeUrl)("mainnet", true);
+const ethersProvider = new ethers_1.ethers.providers.JsonRpcProvider(nodeURL);
+const ethersSigner = ethers_1.ethers.Wallet.fromMnemonic((0, helpers_2.requireEnv)("MNEMONIC")).connect(ethersProvider);
 // Get the HubPool contract instance.
-if (!process.env.HUB_POOL_ADDRESS) {
-    throw new Error("Environment variable HUB_POOL_ADDRESS is not set");
-}
-const hubPoolAddress = ethers_1.ethers.utils.getAddress(process.env.HUB_POOL_ADDRESS);
+const hubPoolAddress = ethers_1.ethers.utils.getAddress((0, helpers_2.requireEnv)("HUB_POOL_ADDRESS"));
 const hubPool = typechain_1.HubPool__factory.connect(hubPoolAddress, ethersProvider);
 // Parse arguments
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).option("netSendAmount", {
@@ -45,7 +41,7 @@ async function proposeRebalanceToSpokePool() {
     if (evmChainId !== constants_1.CHAIN_IDs.MAINNET && evmChainId !== constants_1.CHAIN_IDs.SEPOLIA)
         throw new Error("Unsupported EVM chain ID");
     const solanaCluster = evmChainId === constants_1.CHAIN_IDs.MAINNET ? "mainnet" : "devnet";
-    const solanaChainId = ethers_1.BigNumber.from(BigInt(ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.toUtf8Bytes(`solana-${solanaCluster}`))) & BigInt("0xFFFFFFFFFFFFFFFF"));
+    const solanaChainId = (0, helpers_2.getSolanaChainId)(solanaCluster);
     const l1TokenAddress = constants_1.TOKEN_SYMBOLS_MAP.USDC.addresses[evmChainId];
     // Construct simple merkle tree for the pool rebalance.
     const { poolRebalanceTree } = (0, poolRebalanceTree_1.constructSimpleRebalanceTree)(l1TokenAddress, netSendAmount, solanaChainId);

package/dist/scripts/svm/publicKeyToAddress.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const SvmUtils_1 = require("../../src/SvmUtils");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
+const svm_1 = require("../../src/svm");
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).option("publicKey", {
     type: "string",
     demandOption: true,
@@ -13,7 +13,7 @@ const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).option("
 }).argv;
 async function logEvmAddress() {
     const publicKey = (await argv).publicKey;
-    const evmAddress = (0, SvmUtils_1.publicKeyToEvmAddress)(publicKey);
+    const evmAddress = (0, svm_1.publicKeyToEvmAddress)(publicKey);
     console.log("Public Key:", publicKey);
     console.log("Associated Ethereum Address:", evmAddress);
 }

package/dist/scripts/svm/queryDeposits.js

@@ -32,7 +32,7 @@ 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 SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
@@ -57,7 +57,7 @@ async function queryDeposits() {
         { Property: "statePda", Value: statePda.toString() },
     ]);
     try {
-        const events = await (0, SvmUtils_1.readProgramEvents)(provider.connection, program);
+        const events = await (0, svm_1.readProgramEvents)(provider.connection, program);
         const depositEvents = events.filter((event) => event.name === "v3FundsDeposited");
         if (depositEvents.length === 0) {
             console.log("No deposit events found for the given seed.");