@across-protocol/contracts 4.0.11 → 4.0.12

package/dist/test/svm/SvmSpoke.SlowFill.js

@@ -32,11 +32,10 @@ const SvmSpoke_common_1 = require("./SvmSpoke.common");
 const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
 const web3_v1_1 = require("../../src/svm/web3-v1");
 const utils_1 = require("./utils");
-const { provider, connection, program, owner, chainId, seedBalance, initializeState } = SvmSpoke_common_1.common;
-const { recipient, setCurrentTime, assertSE, assert } = SvmSpoke_common_1.common;
+const { provider, connection, program, owner, chainId, seedBalance, initializeState, recipient, setCurrentTime, assertSE, assert, } = SvmSpoke_common_1.common;
 describe("svm_spoke.slow_fill", () => {
     anchor.setProvider(provider);
-    const payer = anchor.AnchorProvider.env().wallet.payer;
+    const { payer } = anchor.AnchorProvider.env().wallet;
     const relayer = web3_js_1.Keypair.generate();
     const otherRelayer = web3_js_1.Keypair.generate();
     const { encodedMessage, fillRemainingAccounts } = (0, utils_1.testAcrossPlusMessage)();
@@ -47,7 +46,7 @@ describe("svm_spoke.slow_fill", () => {
     let requestAccounts; // Store accounts to simplify program interactions.
     let fillAccounts;
     const initialMintAmount = 10_000_000_000;
-    async function updateRelayData(newRelayData) {
+    const updateRelayData = async (newRelayData) => {
         relayData = newRelayData;
         const relayHashUint8Array = (0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId);
         [fillStatus] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], program.programId);
@@ -64,6 +63,7 @@ describe("svm_spoke.slow_fill", () => {
         };
         fillAccounts = {
             state,
+            delegate: (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId).pda,
             signer: relayer.publicKey,
             instructionParams: program.programId,
             mint: mint,
@@ -74,7 +74,7 @@ describe("svm_spoke.slow_fill", () => {
             associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             systemProgram: anchor.web3.SystemProgram.programId,
         };
-    }
+    };
     const relaySlowFillRootBundle = async (slowRelayLeafRecipient = recipient, slowRelayLeafChainId = chainId, message = encodedMessage) => {
         //TODO: verify that the leaf structure created here is equivalent to the one created by the EVM logic. I think
         // I've gotten the concatenation, endianness, etc correct but want to be sure.
@@ -104,7 +104,7 @@ describe("svm_spoke.slow_fill", () => {
         const proof = merkleTree.getProof(slowRelayLeafs[0]);
         const leaf = slowRelayLeafs[0];
         let stateAccountData = await program.account.state.fetch(state);
-        const rootBundleId = stateAccountData.rootBundleId;
+        const { rootBundleId } = stateAccountData;
         const rootBundleIdBuffer = Buffer.alloc(4);
         rootBundleIdBuffer.writeUInt32LE(rootBundleId);
         const seeds = [Buffer.from("root_bundle"), seed.toArrayLike(Buffer, "le", 8), rootBundleIdBuffer];
@@ -152,7 +152,7 @@ describe("svm_spoke.slow_fill", () => {
         };
         await updateRelayData(initialRelayData);
     });
-    it("Requests a V3 slow fill, verify the event & state change", async () => {
+    it("Requests a slow fill, verify the event & state change", async () => {
         // Attempt to request a slow fill before the exclusivityDeadline
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
@@ -178,14 +178,16 @@ describe("svm_spoke.slow_fill", () => {
             if (key === "message") {
                 assertSE(event.messageHash, (0, web3_v1_1.hashNonEmptyMessage)(value), `MessageHash should match`);
             }
-            else
+            else {
                 assertSE(event[key], value, `${key.charAt(0).toUpperCase() + key.slice(1)} should match`);
+            }
         });
     });
-    it("Fails to request a V3 slow fill if the relay has already been filled", async () => {
-        const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
+    it("Fails to request a slow fill if the relay has already been filled", async () => {
+        const relayHashUint8Array = (0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHash = Array.from(relayHashUint8Array);
         // Fill the relay first
-        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(fillAccounts.relayerTokenAccount, fillAccounts.mint, fillAccounts.state, fillAccounts.signer, BigInt(relayData.outputAmount.toString()), tokenDecimals);
+        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(fillAccounts.relayerTokenAccount, fillAccounts.mint, (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId).pda, fillAccounts.signer, BigInt(relayData.outputAmount.toString()), tokenDecimals);
         const fillIx = await program.methods
             .fillRelay(relayHash, relayData, new anchor_1.BN(1), relayer.publicKey)
             .accounts(fillAccounts)
@@ -231,7 +233,7 @@ describe("svm_spoke.slow_fill", () => {
         assert.equal(JSON.stringify(fillStatusAccount.status), `{\"requestedSlowFill\":{}}`, "FillStatus should be RequestedSlowFill");
         assert.equal(fillStatusAccount.relayer.toString(), relayer.publicKey.toString(), "Caller should be set as relayer");
     });
-    it("Fails to request a V3 slow fill multiple times for the same fill", async () => {
+    it("Fails to request a slow fill multiple times for the same fill", async () => {
         const relayHash = (0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId);
         // Set the contract time to be after the exclusivityDeadline
         await setCurrentTime(program, state, relayer, new anchor_1.BN(relayData.exclusivityDeadline + 1));
@@ -254,12 +256,12 @@ describe("svm_spoke.slow_fill", () => {
             assert.include(err.toString(), "InvalidSlowFillRequest", "Expected InvalidSlowFillRequest error");
         }
     });
-    it("Executes V3 slow relay leaf, verify the event & state change", async () => {
+    it("Executes slow relay leaf, verify the event & state change", async () => {
         // Relay root bundle with slow fill leaf.
         const { relayHash, leaf, rootBundleId, proofAsNumbers, rootBundle } = await relaySlowFillRootBundle();
         const iVaultBal = (await connection.getTokenAccountBalance(vault)).value.amount;
         const iRecipientBal = (await connection.getTokenAccountBalance(recipientTA)).value.amount;
-        // Attempt to execute V3 slow relay leaf before requesting slow fill. This should fail before requested,
+        // Attempt to execute slow relay leaf before requesting slow fill. This should fail before requested,
         // even if there is a valid proof.
         const executeSlowRelayLeafAccounts = {
             state: state,
@@ -284,13 +286,13 @@ describe("svm_spoke.slow_fill", () => {
         catch (err) {
             assert.include(err.toString(), "AccountNotInitialized", "Expected AccountNotInitialized error");
         }
-        // Request V3 slow fill
+        // Request slow fill
         await program.methods
             .requestSlowFill(Array.from(relayHash), leaf.relayData)
             .accounts(requestAccounts)
             .signers([relayer])
             .rpc();
-        // Execute V3 slow relay leaf after requesting slow fill
+        // Execute slow relay leaf after requesting slow fill
         const ix = await program.methods
             .executeSlowRelayLeaf(Array.from(relayHash), leaf, rootBundleId, proofAsNumbers)
             .accounts(executeSlowRelayLeafAccounts)
@@ -314,8 +316,9 @@ describe("svm_spoke.slow_fill", () => {
             if (key === "message") {
                 assertSE(event.messageHash, (0, web3_v1_1.hashNonEmptyMessage)(value), `MessageHash should match`);
             }
-            else
+            else {
                 assertSE(event[key], value, `${key.charAt(0).toUpperCase() + key.slice(1)} should match`);
+            }
         });
         // RelayExecutionInfo should match.
         assertSE(event.relayExecutionInfo.updatedRecipient, relayData.recipient, "UpdatedRecipient should match");
@@ -326,7 +329,7 @@ describe("svm_spoke.slow_fill", () => {
         assertSE(event.repaymentChainId, new anchor_1.BN(0), "Repayment chain id should be 0");
         assertSE(event.relayer, web3_js_1.PublicKey.default, "Repayment address should be 0");
     });
-    it("Fails to request a V3 slow fill when fills are paused", async () => {
+    it("Fails to request a slow fill when fills are paused", async () => {
         // Pause fills
         const pauseFillsAccounts = {
             state: state,
@@ -351,15 +354,15 @@ describe("svm_spoke.slow_fill", () => {
             assert.strictEqual(err.error.errorCode.code, "FillsArePaused", "Expected error code FillsArePaused");
         }
     });
-    it("Fails to execute V3 slow relay leaf to wrong recipient", async () => {
-        // Request V3 slow fill.
+    it("Fails to execute slow relay leaf to wrong recipient", async () => {
+        // Request slow fill.
         const { relayHash, leaf, rootBundleId, proofAsNumbers, rootBundle } = await relaySlowFillRootBundle();
         await program.methods
             .requestSlowFill(Array.from(relayHash), leaf.relayData)
             .accounts(requestAccounts)
             .signers([relayer])
             .rpc();
-        // Try to execute V3 slow relay leaf with wrong recipient token account should fail.
+        // Try to execute slow relay leaf with wrong recipient token account should fail.
         const wrongRecipient = web3_js_1.Keypair.generate().publicKey;
         const wrongRecipientTA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, mint, wrongRecipient)).address;
         try {
@@ -387,8 +390,8 @@ describe("svm_spoke.slow_fill", () => {
             assert.strictEqual(err.error.errorCode.code, "ConstraintTokenOwner", "Expected error code ConstraintTokenOwner");
         }
     });
-    it("Cannot replay execute V3 slow relay leaf against wrong fill status account", async () => {
-        // Request V3 slow fill for the first recipient.
+    it("Cannot replay execute slow relay leaf against wrong fill status account", async () => {
+        // Request slow fill for the first recipient.
         const firstRecipient = web3_js_1.Keypair.generate().publicKey;
         const { relayHash: firstRelayHash, leaf: firstLeaf, rootBundleId: firstRootBundleId, proofAsNumbers: firstProofAsNumbers, rootBundle: firstRootBundle, } = await relaySlowFillRootBundle(firstRecipient);
         await program.methods
@@ -398,7 +401,7 @@ describe("svm_spoke.slow_fill", () => {
             .rpc();
         const firstRecipientTA = recipientTA; // Global recipientTA will get updated when passing the second relayData.
         const firstFillStatus = fillStatus; // Global fillStatus will get updated when passing the second relayData.
-        // Request V3 slow fill for the second recipient.
+        // Request slow fill for the second recipient.
         // Note: we could also had generated single slow relay root for both recipients, but having them relayed in separate
         // root bundles makes it easier to reuse existing test code.
         const secondRecipient = web3_js_1.Keypair.generate().publicKey;
@@ -410,7 +413,7 @@ describe("svm_spoke.slow_fill", () => {
             .rpc();
         const secondFillStatus = fillStatus; // Global fillStatus got updated with the second relayData.
         const iFirstRecipientBal = (await connection.getTokenAccountBalance(firstRecipientTA)).value.amount;
-        // Execute V3 slow relay leaf for the first recipient.
+        // Execute slow relay leaf for the first recipient.
         const executeSlowRelayLeafAccounts = {
             state,
             rootBundle: firstRootBundle,
@@ -430,7 +433,7 @@ describe("svm_spoke.slow_fill", () => {
             .rpc();
         const fFirstRecipientBal = (await connection.getTokenAccountBalance(firstRecipientTA)).value.amount;
         assert.strictEqual(BigInt(fFirstRecipientBal) - BigInt(iFirstRecipientBal), BigInt(firstLeaf.updatedOutputAmount.toString()), "First recipient balance should be increased by its relay amount");
-        // Try to replay execute V3 slow relay leaf for the first recipient using the fill status account that is derived
+        // Try to replay execute slow relay leaf for the first recipient using the fill status account that is derived
         // from the second relay hash. This should fail due to mismatching relay hash.
         try {
             const executeSlowRelayLeafAccounts = {
@@ -457,8 +460,8 @@ describe("svm_spoke.slow_fill", () => {
             assert.strictEqual(err.error.errorCode.code, "InvalidRelayHash", "Expected error code InvalidRelayHash");
         }
     });
-    it("Fails to execute V3 slow relay leaf for mint inconsistent output_token", async () => {
-        // Request V3 slow fill.
+    it("Fails to execute slow relay leaf for mint inconsistent output_token", async () => {
+        // Request slow fill.
         const { relayHash, leaf, rootBundleId, proofAsNumbers, rootBundle } = await relaySlowFillRootBundle();
         await program.methods
             .requestSlowFill(Array.from(relayHash), leaf.relayData)
@@ -470,7 +473,7 @@ describe("svm_spoke.slow_fill", () => {
         const wrongRecipientTA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, wrongMint, recipient)).address;
         const wrongVault = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, wrongMint, state, true)).address;
         await (0, spl_token_1.mintTo)(connection, payer, wrongMint, wrongVault, provider.publicKey, initialMintAmount);
-        // Try to execute V3 slow relay leaf with inconsistent mint should fail.
+        // Try to execute slow relay leaf with inconsistent mint should fail.
         try {
             const executeSlowRelayLeafAccounts = {
                 state,
@@ -496,8 +499,8 @@ describe("svm_spoke.slow_fill", () => {
             assert.strictEqual(err.error.errorCode.code, "InvalidMint", "Expected error code InvalidMint");
         }
     });
-    it("Cannot execute V3 slow relay leaf targeted at another chain", async () => {
-        // Request V3 slow fill for another chain.
+    it("Cannot execute slow relay leaf targeted at another chain", async () => {
+        // Request slow fill for another chain.
         const anotherChainId = new anchor_1.BN(Math.floor(Math.random() * 1000000));
         const { relayHash, leaf, rootBundleId, proofAsNumbers, rootBundle } = await relaySlowFillRootBundle(undefined, anotherChainId);
         await program.methods
@@ -505,7 +508,7 @@ describe("svm_spoke.slow_fill", () => {
             .accounts(requestAccounts)
             .signers([relayer])
             .rpc();
-        // Trying to execute V3 slow relay leaf for another chain should fail as the program overrides chain_id that should
+        // Trying to execute slow relay leaf for another chain should fail as the program overrides chain_id that should
         // invalidate the proofs.
         try {
             const executeSlowRelayLeafAccounts = {
@@ -535,13 +538,13 @@ describe("svm_spoke.slow_fill", () => {
     it("Emits zeroed hash for empty message", async () => {
         // Relay root bundle of slow fill leaf with empty message.
         const { relayHash, leaf, rootBundleId, proofAsNumbers, rootBundle } = await relaySlowFillRootBundle(undefined, undefined, Buffer.alloc(0));
-        // Request V3 slow fill
+        // Request slow fill
         const tx1 = await program.methods
             .requestSlowFill(Array.from(relayHash), leaf.relayData)
             .accounts(requestAccounts)
             .signers([relayer])
             .rpc();
-        // Execute V3 slow relay leaf after requesting slow fill
+        // Execute slow relay leaf after requesting slow fill
         const executeSlowRelayLeafAccounts = {
             state,
             rootBundle,

package/dist/test/svm/SvmSpoke.common.d.ts

@@ -1,6 +1,6 @@
 import * as anchor from "@coral-xyz/anchor";
 import { BN, Program } from "@coral-xyz/anchor";
-import { PublicKey } from "@solana/web3.js";
+import { PublicKey, Signer } from "@solana/web3.js";
 import { DepositData } from "../../src/types/svm";
 import { SvmSpoke } from "../../target/types/svm_spoke";
 declare function setCurrentTime(program: Program<SvmSpoke>, state: any, signer: anchor.web3.Keypair, newTime: BN): Promise<void>;
@@ -39,8 +39,7 @@ export declare const common: {
         state: anchor.web3.PublicKey;
         seed: anchor.BN;
     }>;
-    createRoutePda: (originToken: PublicKey, seed: BN, routeChainId: BN) => anchor.web3.PublicKey;
-    getVaultAta: (tokenMint: PublicKey, state: PublicKey) => Promise<anchor.web3.PublicKey>;
+    getOrCreateVaultAta: (payer: Signer, tokenMint: PublicKey, state: PublicKey) => Promise<anchor.web3.PublicKey>;
     setCurrentTime: typeof setCurrentTime;
     getCurrentTime: typeof getCurrentTime;
     assert: Chai.AssertStatic;

package/dist/test/svm/SvmSpoke.common.js

@@ -73,19 +73,11 @@ const initializeState = async (seed, initialState) => {
         .rpc();
     return { state, seed: actualSeed };
 };
-const createRoutePda = (originToken, seed, routeChainId) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from("route"),
-        originToken.toBytes(),
-        seed.toArrayLike(Buffer, "le", 8),
-        routeChainId.toArrayLike(Buffer, "le", 8),
-    ], program.programId)[0];
-};
-const getVaultAta = async (tokenMint, state) => {
+const getOrCreateVaultAta = async (payer, tokenMint, state) => {
     const tokenMintAccount = await provider.connection.getAccountInfo(tokenMint);
     if (tokenMintAccount === null)
         throw new Error("Token Mint account not found");
-    return (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, state, true, tokenMintAccount.owner, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
+    return (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, tokenMint, state, true, undefined, undefined, tokenMintAccount.owner, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID)).address;
 };
 async function setCurrentTime(program, state, signer, newTime) {
     let setCurrentTimeAccounts = { state, signer: signer.publicKey };
@@ -125,8 +117,7 @@ exports.common = {
     depositQuoteTimeBuffer,
     fillDeadlineBuffer,
     initializeState,
-    createRoutePda,
-    getVaultAta,
+    getOrCreateVaultAta,
     setCurrentTime,
     getCurrentTime,
     assert: chai_1.assert,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@across-protocol/contracts",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "author": "UMA Team",
   "license": "AGPL-3.0-only",
   "repository": {

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

@@ -1 +0,0 @@
-import "dotenv/config";

package/dist/scripts/svm/remoteHubPoolSetDepositRoute.js

@@ -1,252 +0,0 @@
-"use strict";
-// This script bridges remote call to pause deposits on Solana Spoke Pool. Required environment:
-// - 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;
-    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;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-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");
-const common_1 = require("@uma/common");
-require("dotenv/config");
-const ethers_1 = require("ethers");
-const yargs_1 = __importDefault(require("yargs"));
-const helpers_1 = require("yargs/helpers");
-const web3_v1_1 = require("../../src/svm/web3-v1");
-const typechain_1 = require("../../typechain");
-const constants_1 = require("../../utils/constants");
-const helpers_2 = require("./utils/helpers");
-// Set up Solana provider.
-const provider = anchor_1.AnchorProvider.env();
-anchor.setProvider(provider);
-// Parse arguments
-const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
-    .option("originChainId", { type: "string", demandOption: true, describe: "Origin chain ID" })
-    .option("destinationChainId", { type: "string", demandOption: true, describe: "Destination chain ID" })
-    .option("depositsEnabled", { type: "boolean", demandOption: true, describe: "Deposits enabled" })
-    .option("resumeRemoteTx", { type: "string", demandOption: false, describe: "Resume receiving remote tx" }).argv;
-async function remoteHubPoolSetDepositRoute() {
-    const resolvedArgv = await argv;
-    const originChainId = resolvedArgv.originChainId;
-    const destinationChainId = resolvedArgv.destinationChainId;
-    const depositsEnabled = resolvedArgv.depositsEnabled;
-    const seed = new anchor_1.BN(0);
-    const resumeRemoteTx = resolvedArgv.resumeRemoteTx;
-    // Set up Ethereum provider and signer.
-    const isDevnet = (0, web3_v1_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_2.requireEnv)("MNEMONIC")).connect(ethersProvider);
-    const hubPoolAddress = (0, helpers_2.requireEnv)("HUB_POOL_ADDRESS");
-    const usdcProgramId = isDevnet ? web3_v1_1.SOLANA_USDC_DEVNET : web3_v1_1.SOLANA_USDC_MAINNET;
-    const originToken = new web3_js_1.PublicKey(usdcProgramId);
-    const originTokenAddress = (0, web3_v1_1.fromBytes32ToAddress)((0, web3_v1_1.fromBase58ToBytes32)(originToken.toBase58()));
-    // CCTP domains.
-    const remoteDomain = 0; // Ethereum
-    // Get Solana programs and accounts.
-    const svmSpokeProgram = (0, web3_v1_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"),
-        originToken.toBytes(),
-        seed.toArrayLike(Buffer, "le", 8),
-        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 messageTransmitterProgram = (0, web3_v1_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);
-    const [eventAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("__event_authority")], svmSpokeProgram.programId);
-    const irisApiUrl = isDevnet ? web3_v1_1.CIRCLE_IRIS_API_URL_DEVNET : web3_v1_1.CIRCLE_IRIS_API_URL_MAINNET;
-    const solanaCluster = isDevnet ? "devnet" : "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;
-    if (evmChainId !== supportedEvmChainId) {
-        throw new Error(`Chain ID ${evmChainId} does not match expected Solana cluster ${solanaCluster}`);
-    }
-    const hubPool = typechain_1.HubPool__factory.connect(hubPoolAddress, ethersProvider);
-    console.log("Remotely configuring deposit route...");
-    console.table([
-        { Property: "seed", Value: seed.toString() },
-        { Property: "evmChainId", Value: evmChainId.toString() },
-        { Property: "originChainId", Value: originChainId },
-        { Property: "destinationChainId", Value: destinationChainId },
-        { Property: "depositsEnabled", Value: depositsEnabled },
-        { Property: "svmSpokeProgramProgramId", Value: svmSpokeProgram.programId.toString() },
-        { Property: "providerPublicKey", Value: provider.wallet.publicKey.toString() },
-        { Property: "statePda", Value: statePda.toString() },
-        { Property: "messageTransmitterProgramId", Value: messageTransmitterProgram.programId.toString() },
-        { Property: "messageTransmitterState", Value: messageTransmitterState.toString() },
-        { Property: "authorityPda", Value: authorityPda.toString() },
-        { Property: "selfAuthority", Value: selfAuthority.toString() },
-        { Property: "eventAuthority", Value: eventAuthority.toString() },
-        { Property: "remoteSender", Value: ethersSigner.address },
-    ]);
-    // Send setDepositRoute call from Ethereum, unless resuming a remote transaction.
-    let remoteTxHash;
-    if (!resumeRemoteTx) {
-        console.log("Sending setDepositRoute message from HubPool...");
-        const tx = await hubPool
-            .connect(ethersSigner)
-            .setDepositRoute(originChainId, destinationChainId, originTokenAddress, depositsEnabled);
-        await tx.wait();
-        remoteTxHash = tx.hash;
-        console.log("Message sent on remote chain, tx", remoteTxHash);
-    }
-    else
-        remoteTxHash = resumeRemoteTx;
-    // Fetch attestation from CCTP attestation service.
-    const attestationResponse = await (0, web3_v1_1.getMessages)(remoteTxHash, remoteDomain, irisApiUrl);
-    const { attestation, message } = attestationResponse.messages[0];
-    console.log("CCTP attestation response:", attestationResponse.messages[0]);
-    // Accounts in CCTP message_transmitter receive_message instruction.
-    const nonce = (0, web3_v1_1.decodeMessageHeader)(Buffer.from(message.replace("0x", ""), "hex")).nonce;
-    const usedNonces = (await messageTransmitterProgram.methods
-        .getNoncePda({
-        nonce: new anchor_1.BN(nonce.toString()),
-        sourceDomain: remoteDomain,
-    })
-        .accounts({
-        messageTransmitter: messageTransmitterState,
-    })
-        .view());
-    const receiveMessageAccounts = {
-        payer: provider.wallet.publicKey,
-        caller: provider.wallet.publicKey,
-        authorityPda,
-        messageTransmitter: messageTransmitterState,
-        usedNonces,
-        receiver: svmSpokeProgram.programId,
-        systemProgram: anchor_1.web3.SystemProgram.programId,
-    };
-    // accountMetas list to pass to remaining accounts when receiving message via CCTP.
-    const remainingAccounts = [];
-    // state in HandleReceiveMessage accounts (used for remote domain and sender authentication).
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: false,
-        pubkey: statePda,
-    });
-    // self_authority in HandleReceiveMessage accounts, also signer in self-invoked CPIs.
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: false,
-        pubkey: selfAuthority,
-    });
-    // program in HandleReceiveMessage accounts.
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: false,
-        pubkey: svmSpokeProgram.programId,
-    });
-    // payer
-    remainingAccounts.push({
-        isSigner: true,
-        isWritable: true,
-        pubkey: provider.wallet.publicKey,
-    });
-    // state in self-invoked CPIs (state can change as a result of remote call).
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: statePda,
-    });
-    // route
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: routePda,
-    });
-    // vault
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: vault,
-    });
-    // origin token mint
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: originToken,
-    });
-    // token_program
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: spl_token_1.TOKEN_PROGRAM_ID,
-    });
-    // associated_token_program
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-    });
-    // system_program
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: web3_js_1.SystemProgram.programId,
-    });
-    // event_authority in self-invoked CPIs (appended by Anchor with event_cpi macro).
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: eventAuthority,
-    });
-    // program
-    remainingAccounts.push({
-        isSigner: false,
-        isWritable: true,
-        pubkey: svmSpokeProgram.programId,
-    });
-    // Receive remote message on Solana.
-    console.log("Receiving message on Solana...");
-    const receiveMessageTx = await messageTransmitterProgram.methods
-        .receiveMessage({
-        message: Buffer.from(message.replace("0x", ""), "hex"),
-        attestation: Buffer.from(attestation.replace("0x", ""), "hex"),
-    })
-        .accounts(receiveMessageAccounts)
-        .remainingAccounts(remainingAccounts)
-        .rpc();
-    console.log("\nReceived remote message");
-    console.log("Your transaction signature", receiveMessageTx);
-    let routeAccount = await svmSpokeProgram.account.route.fetch(routePda);
-    console.log("Updated deposit route state to: enabled =", routeAccount.enabled);
-}
-remoteHubPoolSetDepositRoute()
-    .then(() => {
-    process.exit(0);
-})
-    .catch((err) => {
-    console.error(err);
-    process.exit(1);
-});

package/dist/src/svm/clients/SvmSpoke/accounts/route.d.ts

@@ -1,27 +0,0 @@
-/**
- * This code was AUTOGENERATED using the codama library.
- * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun codama to update it.
- *
- * @see https://github.com/codama-idl/codama
- */
-import { fetchEncodedAccount, fetchEncodedAccounts, type Account, type Address, type Codec, type Decoder, type EncodedAccount, type Encoder, type FetchAccountConfig, type FetchAccountsConfig, type MaybeAccount, type MaybeEncodedAccount, type ReadonlyUint8Array } from '@solana/kit';
-export declare const ROUTE_DISCRIMINATOR: Uint8Array;
-export declare function getRouteDiscriminatorBytes(): ReadonlyUint8Array;
-export type Route = {
-    discriminator: ReadonlyUint8Array;
-    enabled: boolean;
-};
-export type RouteArgs = {
-    enabled: boolean;
-};
-export declare function getRouteEncoder(): Encoder<RouteArgs>;
-export declare function getRouteDecoder(): Decoder<Route>;
-export declare function getRouteCodec(): Codec<RouteArgs, Route>;
-export declare function decodeRoute<TAddress extends string = string>(encodedAccount: EncodedAccount<TAddress>): Account<Route, TAddress>;
-export declare function decodeRoute<TAddress extends string = string>(encodedAccount: MaybeEncodedAccount<TAddress>): MaybeAccount<Route, TAddress>;
-export declare function fetchRoute<TAddress extends string = string>(rpc: Parameters<typeof fetchEncodedAccount>[0], address: Address<TAddress>, config?: FetchAccountConfig): Promise<Account<Route, TAddress>>;
-export declare function fetchMaybeRoute<TAddress extends string = string>(rpc: Parameters<typeof fetchEncodedAccount>[0], address: Address<TAddress>, config?: FetchAccountConfig): Promise<MaybeAccount<Route, TAddress>>;
-export declare function fetchAllRoute(rpc: Parameters<typeof fetchEncodedAccounts>[0], addresses: Array<Address>, config?: FetchAccountsConfig): Promise<Account<Route>[]>;
-export declare function fetchAllMaybeRoute(rpc: Parameters<typeof fetchEncodedAccounts>[0], addresses: Array<Address>, config?: FetchAccountsConfig): Promise<MaybeAccount<Route>[]>;
-export declare function getRouteSize(): number;

package/dist/src/svm/clients/SvmSpoke/accounts/route.js

@@ -1,66 +0,0 @@
-"use strict";
-/**
- * This code was AUTOGENERATED using the codama library.
- * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun codama to update it.
- *
- * @see https://github.com/codama-idl/codama
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ROUTE_DISCRIMINATOR = void 0;
-exports.getRouteDiscriminatorBytes = getRouteDiscriminatorBytes;
-exports.getRouteEncoder = getRouteEncoder;
-exports.getRouteDecoder = getRouteDecoder;
-exports.getRouteCodec = getRouteCodec;
-exports.decodeRoute = decodeRoute;
-exports.fetchRoute = fetchRoute;
-exports.fetchMaybeRoute = fetchMaybeRoute;
-exports.fetchAllRoute = fetchAllRoute;
-exports.fetchAllMaybeRoute = fetchAllMaybeRoute;
-exports.getRouteSize = getRouteSize;
-const kit_1 = require("@solana/kit");
-exports.ROUTE_DISCRIMINATOR = new Uint8Array([
-    80, 179, 58, 115, 52, 19, 146, 134,
-]);
-function getRouteDiscriminatorBytes() {
-    return (0, kit_1.fixEncoderSize)((0, kit_1.getBytesEncoder)(), 8).encode(exports.ROUTE_DISCRIMINATOR);
-}
-function getRouteEncoder() {
-    return (0, kit_1.transformEncoder)((0, kit_1.getStructEncoder)([
-        ['discriminator', (0, kit_1.fixEncoderSize)((0, kit_1.getBytesEncoder)(), 8)],
-        ['enabled', (0, kit_1.getBooleanEncoder)()],
-    ]), (value) => ({ ...value, discriminator: exports.ROUTE_DISCRIMINATOR }));
-}
-function getRouteDecoder() {
-    return (0, kit_1.getStructDecoder)([
-        ['discriminator', (0, kit_1.fixDecoderSize)((0, kit_1.getBytesDecoder)(), 8)],
-        ['enabled', (0, kit_1.getBooleanDecoder)()],
-    ]);
-}
-function getRouteCodec() {
-    return (0, kit_1.combineCodec)(getRouteEncoder(), getRouteDecoder());
-}
-function decodeRoute(encodedAccount) {
-    return (0, kit_1.decodeAccount)(encodedAccount, getRouteDecoder());
-}
-async function fetchRoute(rpc, address, config) {
-    const maybeAccount = await fetchMaybeRoute(rpc, address, config);
-    (0, kit_1.assertAccountExists)(maybeAccount);
-    return maybeAccount;
-}
-async function fetchMaybeRoute(rpc, address, config) {
-    const maybeAccount = await (0, kit_1.fetchEncodedAccount)(rpc, address, config);
-    return decodeRoute(maybeAccount);
-}
-async function fetchAllRoute(rpc, addresses, config) {
-    const maybeAccounts = await fetchAllMaybeRoute(rpc, addresses, config);
-    (0, kit_1.assertAccountsExist)(maybeAccounts);
-    return maybeAccounts;
-}
-async function fetchAllMaybeRoute(rpc, addresses, config) {
-    const maybeAccounts = await (0, kit_1.fetchEncodedAccounts)(rpc, addresses, config);
-    return maybeAccounts.map((maybeAccount) => decodeRoute(maybeAccount));
-}
-function getRouteSize() {
-    return 9;
-}