@across-protocol/contracts 3.0.17 → 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.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/scripts/svm/addressToPublicKey.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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", {
+    type: "string",
+    demandOption: true,
+    describe: "Ethereum address to convert",
+}).argv;
+async function logPublicKey() {
+    const address = (await argv).address;
+    const publicKey = (0, svm_1.evmAddressToPublicKey)(address);
+    console.log("Ethereum Address:", address);
+    console.log("Associated Public Key:", publicKey.toString());
+}
+logPublicKey();

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

@@ -0,0 +1,25 @@
+/**
+ * Script: Bridge USDC Liability to Hub Pool
+ *
+ * This script bridges pending USDC liabilities from the Solana Spoke Pool to the Ethereum Hub Pool using the CCTP
+ * (Circle Cross-Chain Transfer Protocol). It manages CCTP message attestations, verifies transfer completion, and
+ * updates the Hub Pool’s USDC balance.
+ *
+ * Required Environment Variables:
+ * - MNEMONIC: Wallet mnemonic to sign the Ethereum transaction.
+ * - HUB_POOL_ADDRESS: Ethereum address of the Hub Pool.
+ * - NODE_URL_${CHAIN_ID}: Ethereum RPC URL (must point to the Mainnet or Sepolia depending on Solana cluster).
+ *
+ * Example Usage:
+ * NODE_URL_11155111=$NODE_URL_11155111 \
+ * MNEMONIC=$MNEMONIC \
+ * HUB_POOL_ADDRESS=$HUB_POOL_ADDRESS \
+ * anchor run bridgeLiabilityToHubPool \
+ * --provider.cluster "devnet" \
+ * --provider.wallet $SOLANA_PKEY_PATH
+ *
+ * Note:
+ * - Ensure all required environment variables are properly configured.
+ * - Pending USDC liabilities must exist in the Solana Spoke Pool for the script to execute.
+ */
+export {};

package/dist/scripts/svm/bridgeLiabilityToHubPool.js

@@ -0,0 +1,221 @@
+"use strict";
+/**
+ * Script: Bridge USDC Liability to Hub Pool
+ *
+ * This script bridges pending USDC liabilities from the Solana Spoke Pool to the Ethereum Hub Pool using the CCTP
+ * (Circle Cross-Chain Transfer Protocol). It manages CCTP message attestations, verifies transfer completion, and
+ * updates the Hub Pool’s USDC balance.
+ *
+ * Required Environment Variables:
+ * - MNEMONIC: Wallet mnemonic to sign the Ethereum transaction.
+ * - HUB_POOL_ADDRESS: Ethereum address of the Hub Pool.
+ * - NODE_URL_${CHAIN_ID}: Ethereum RPC URL (must point to the Mainnet or Sepolia depending on Solana cluster).
+ *
+ * Example Usage:
+ * NODE_URL_11155111=$NODE_URL_11155111 \
+ * MNEMONIC=$MNEMONIC \
+ * HUB_POOL_ADDRESS=$HUB_POOL_ADDRESS \
+ * anchor run bridgeLiabilityToHubPool \
+ * --provider.cluster "devnet" \
+ * --provider.wallet $SOLANA_PKEY_PATH
+ *
+ * Note:
+ * - Ensure all required environment variables are properly configured.
+ * - Pending USDC liabilities must exist in the Solana Spoke Pool for the script to execute.
+ */
+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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const anchor = __importStar(require("@coral-xyz/anchor"));
+const anchor_1 = require("@coral-xyz/anchor");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+// eslint-disable-next-line camelcase
+const constants_1 = require("./utils/constants");
+const constants_2 = require("@across-protocol/constants");
+const common_1 = require("@uma/common");
+const ethers_1 = require("ethers");
+const cctpHelpers_1 = require("../../test/svm/cctpHelpers");
+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");
+// CCTP domains.
+const ethereumDomain = 0; // Ethereum
+const solanaDomain = 5; // Solana
+// Set up Ethereum provider and signer.
+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.
+const hubPoolAddress = ethers_1.ethers.utils.getAddress((0, helpers_1.requireEnv)("HUB_POOL_ADDRESS")); // Used to check USDC balance before and after.
+const messageTransmitterAbi = [
+    {
+        inputs: [
+            {
+                internalType: "bytes",
+                name: "message",
+                type: "bytes",
+            },
+            {
+                internalType: "bytes",
+                name: "attestation",
+                type: "bytes",
+            },
+        ],
+        name: "receiveMessage",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "success",
+                type: "bool",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "bytes32",
+                name: "",
+                type: "bytes32",
+            },
+        ],
+        name: "usedNonces",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+];
+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 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;
+    const cctpMessageTransmitter = isDevnet
+        ? constants_1.SEPOLIA_CCTP_MESSAGE_TRANSMITTER_ADDRESS
+        : constants_1.MAINNET_CCTP_MESSAGE_TRANSMITTER_ADDRESS;
+    const messageTransmitter = new ethers_1.ethers.Contract(cctpMessageTransmitter, messageTransmitterAbi, ethersSigner);
+    const evmChainId = (await ethersProvider.getNetwork()).chainId;
+    const usdcAddress = constants_2.TOKEN_SYMBOLS_MAP.USDC.addresses[evmChainId];
+    const usdc = typechain_1.BondToken__factory.connect(usdcAddress, ethersProvider);
+    const usdcBalanceBefore = await usdc.balanceOf(hubPoolAddress);
+    console.log("Receiving liability from Solana Spoke Pool to Ethereum Hub Pool...");
+    console.table([
+        { Property: "isTestnet", Value: isDevnet },
+        { Property: "hubPoolAddress", Value: hubPoolAddress },
+        { Property: "svmSpokeProgramProgramId", Value: svmSpokeProgram.programId.toString() },
+        { Property: "providerPublicKey", Value: provider.wallet.publicKey.toString() },
+        { Property: "usdcBalanceBefore", Value: usdcBalanceBefore.toString() },
+    ]);
+    const [transferLiability] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("transfer_liability"), new web3_js_1.PublicKey(svmUsdc).toBuffer()], svmSpokeProgram.programId);
+    const liability = await svmSpokeProgram.account.transferLiability.fetch(transferLiability);
+    console.log(`Pending transfer liability: ${(0, helpers_1.formatUsdc)(ethers_1.BigNumber.from(liability.pendingToHubPool.toString()))} USDC.`);
+    if (liability.pendingToHubPool.eq(new anchor_1.BN(0))) {
+        console.log("No pending transfer liability to bridge. Exiting...");
+        return;
+    }
+    console.log("Bridging liability to hub pool...");
+    const txHash = await bridgeTokensToHubPool(liability.pendingToHubPool, provider.wallet, statePda, new web3_js_1.PublicKey(svmUsdc));
+    const attestationResponse = await (0, cctpHelpers_1.getMessages)(txHash, solanaDomain, irisApiUrl);
+    const { attestation, message, eventNonce } = attestationResponse.messages[0];
+    console.log("CCTP attestation response:", attestationResponse.messages[0]);
+    const nonceHash = ethers_1.ethers.utils.solidityKeccak256(["uint32", "uint64"], [solanaDomain, eventNonce]);
+    const usedNonces = await messageTransmitter.usedNonces(nonceHash);
+    if (usedNonces.eq(1)) {
+        console.log(`Skipping already received message. Exiting...`);
+        return;
+    }
+    console.log("Receiving message from CCTP...");
+    const receiveTx = await messageTransmitter.receiveMessage(message, attestation);
+    console.log(`Tx hash: ${receiveTx.hash}`);
+    await receiveTx.wait();
+    console.log(`Received message`);
+    const usdcBalanceAfter = await usdc.balanceOf(hubPoolAddress);
+    console.log(`Hub Pool USDC balance after: ${(0, helpers_1.formatUsdc)(usdcBalanceAfter)}. Received ${(0, helpers_1.formatUsdc)(usdcBalanceAfter.sub(usdcBalanceBefore))} USDC.`);
+    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 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 [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);
+    const [remoteTokenMessenger] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("remote_token_messenger"), Buffer.from(anchor.utils.bytes.utf8.encode(ethereumDomain.toString()))], tokenMessengerMinterProgram.programId);
+    const [tokenMinter] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_minter")], tokenMessengerMinterProgram.programId);
+    const [localToken] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("local_token"), inputToken.toBuffer()], tokenMessengerMinterProgram.programId);
+    const [cctpEventAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("__event_authority")], tokenMessengerMinterProgram.programId);
+    const messageSentEventData = anchor.web3.Keypair.generate(); // This will hold the message sent event data.
+    const bridgeTokensToHubPoolAccounts = {
+        payer: signer.publicKey,
+        mint: inputToken,
+        state: statePda,
+        transferLiability,
+        vault,
+        tokenMessengerMinterSenderAuthority,
+        messageTransmitter,
+        tokenMessenger,
+        remoteTokenMessenger,
+        tokenMinter,
+        localToken,
+        messageSentEventData: messageSentEventData.publicKey,
+        messageTransmitterProgram: messageTransmitterProgram.programId,
+        tokenMessengerMinterProgram: tokenMessengerMinterProgram.programId,
+        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        systemProgram: web3_js_1.SystemProgram.programId,
+        cctpEventAuthority: cctpEventAuthority,
+        program: svmSpokeProgram.programId,
+    };
+    const initialVaultBalance = (await provider.connection.getTokenAccountBalance(vault)).value.amount;
+    const tx = await svmSpokeProgram.methods
+        .bridgeTokensToHubPool(new anchor_1.BN(amount))
+        .accounts(bridgeTokensToHubPoolAccounts)
+        .signers([messageSentEventData])
+        .rpc();
+    const finalVaultBalance = (await provider.connection.getTokenAccountBalance(vault)).value.amount;
+    console.log(`SVM Spoke Pool Initial Vault balance: ${(0, helpers_1.formatUsdc)(ethers_1.BigNumber.from(initialVaultBalance))} USDC.`);
+    console.log(`SVM Spoke Pool Final Vault balance: ${(0, helpers_1.formatUsdc)(ethers_1.BigNumber.from(finalVaultBalance))} USDC.`);
+    console.log(`Sent ${(0, helpers_1.formatUsdc)(ethers_1.BigNumber.from(initialVaultBalance).sub(ethers_1.BigNumber.from(finalVaultBalance)))} USDC through CCTP.`);
+    return tx;
+}
+// Run the bridgeLiabilityToHubPool function
+bridgeLiabilityToHubPool();

package/dist/scripts/svm/closeRelayerPdas.js

@@ -33,8 +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 SvmUtils_2 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
@@ -55,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) {
@@ -78,7 +77,7 @@ async function closeExpiredRelays() {
 }
 async function closeFillPda(eventData, seed) {
     // Accept seed as a parameter
-    const relayData = {
+    const relayEventData = {
         depositor: new web3_js_1.PublicKey(eventData.depositor),
         recipient: new web3_js_1.PublicKey(eventData.recipient),
         exclusiveRelayer: new web3_js_1.PublicKey(eventData.exclusiveRelayer),
@@ -90,13 +89,13 @@ async function closeFillPda(eventData, seed) {
         depositId: eventData.depositId,
         fillDeadline: eventData.fillDeadline,
         exclusivityDeadline: eventData.exclusivityDeadline,
-        message: Buffer.from(eventData.message),
+        messageHash: eventData.messageHash,
     };
     const [statePda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], programId);
     // 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_2.calculateRelayHashUint8Array)(relayData, 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
@@ -106,8 +105,8 @@ async function closeFillPda(eventData, seed) {
             return;
         }
         // Display additional information in a table
-        console.log("Found a relay to close. Relay Data:");
-        console.table(Object.entries(relayData).map(([key, value]) => ({
+        console.log("Found a relay to close. Relay event data:");
+        console.table(Object.entries(relayEventData).map(([key, value]) => ({
             key,
             value: value.toString(),
         })));
@@ -116,7 +115,7 @@ async function closeFillPda(eventData, seed) {
             { Property: "Fill Status PDA", Value: fillStatusPda.toString() },
             { Property: "Relay Hash", Value: Buffer.from(relayHashUint8Array).toString("hex") },
         ]);
-        const tx = await program.methods.closeFillPda(Array.from(relayHashUint8Array), relayData)
+        const tx = await program.methods.closeFillPda()
             .accounts({
             state: statePda,
             signer: provider.wallet.publicKey,

package/dist/scripts/svm/enableRoute.js

@@ -39,6 +39,7 @@ anchor.setProvider(provider);
 const idl = require("../../target/idl/svm_spoke.json");
 const program = new anchor_1.Program(idl, provider);
 const programId = program.programId;
+console.log("SVM-Spoke Program ID:", programId.toString());
 // Parse arguments
 const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .option("seed", { type: "string", demandOption: true, describe: "Seed for the state account PDA" })
@@ -54,7 +55,12 @@ async function enableRoute() {
     // Define the state account PDA
     const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], programId);
     // Define the route account PDA
-    const [routePda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("route"), originToken.toBytes(), statePda.toBytes(), chainId.toArrayLike(Buffer, "le", 8)], programId);
+    const [routePda] = web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from("route"),
+        originToken.toBytes(),
+        seed.toArrayLike(Buffer, "le", 8),
+        chainId.toArrayLike(Buffer, "le", 8),
+    ], programId);
     // Define the signer (replace with your actual signer)
     const signer = provider.wallet.publicKey;
     console.log("Enabling route...");

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

@@ -0,0 +1,29 @@
+/**
+ * Script: Execute USDC Rebalance to Hub Pool
+ *
+ * This script executes a previously proposed root bundle on the Hub Pool to rebalance USDC from the Solana Spoke Pool
+ * to the Ethereum Hub Pool. It handles CCTP attestations, relayer refund leaf execution, and prepares pending
+ * liabilities for bridging back to the Hub Pool.
+ *
+ * Required Environment Variables:
+ * - MNEMONIC: Wallet mnemonic to sign the Ethereum transaction.
+ * - HUB_POOL_ADDRESS: Ethereum address of the Hub Pool.
+ * - 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:
+ * NODE_URL_11155111=$NODE_URL_11155111 \
+ * MNEMONIC=$MNEMONIC \
+ * HUB_POOL_ADDRESS=$HUB_POOL_ADDRESS \
+ * anchor run executeRebalanceToHubPool \
+ * --provider.cluster "devnet" \
+ * --provider.wallet $SOLANA_PKEY_PATH \
+ * -- --netSendAmount 7
+ *
+ * Note:
+ * - Ensure all required environment variables are properly configured.
+ */
+export {};