@across-protocol/contracts 4.0.11 → 4.0.12

package/dist/scripts/svm/{enableRoute.js → createVault.js}

@@ -1,5 +1,7 @@
 "use strict";
-// This script is used by a chain admin to enable or disable a route for a token on the Solana Spoke Pool.
+// This script can be used by a anyone to create a vault for a token on the Solana Spoke Pool. Note that this is a
+// permissionless operation, only requiring the caller to spend rent-exempt deposit to create the vault account that is
+// not recoverable. Similar to other chains, this enables one to deposit and fill non-whitelisted tokens.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -37,59 +39,35 @@ const web3_v1_1 = require("../../src/svm/web3-v1");
 // Set up the provider
 const provider = anchor_1.AnchorProvider.env();
 anchor.setProvider(provider);
+const payer = anchor.AnchorProvider.env().wallet.payer;
 const program = (0, web3_v1_1.getSpokePoolProgram)(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" })
-    .option("originToken", { type: "string", demandOption: true, describe: "Origin token public key" })
-    .option("chainId", { type: "string", demandOption: true, describe: "Chain ID" })
-    .option("enabled", { type: "boolean", demandOption: true, describe: "Enable or disable the route" }).argv;
-async function enableRoute() {
+    .option("originToken", { type: "string", demandOption: true, describe: "Origin token public key" }).argv;
+async function createVault() {
     const resolvedArgv = await argv;
     const seed = new anchor_1.BN(resolvedArgv.seed);
     const originToken = new web3_js_1.PublicKey(resolvedArgv.originToken);
-    const chainId = new anchor_1.BN(resolvedArgv.chainId);
-    const enabled = resolvedArgv.enabled;
     // 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(),
-        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...");
+    console.log("Creating vault...");
     console.table([
         { Property: "seed", Value: seed.toString() },
         { Property: "originToken", Value: originToken.toString() },
-        { Property: "chainId", Value: chainId.toString() },
-        { Property: "enabled", Value: enabled },
         { Property: "programId", Value: programId.toString() },
         { Property: "providerPublicKey", Value: provider.wallet.publicKey.toString() },
         { Property: "statePda", Value: statePda.toString() },
-        { Property: "routePda", Value: routePda.toString() },
     ]);
     // Create ATA for the origin token to be stored by state (vault).
-    const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(originToken, statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
-    const tx = await program.methods.setEnableRoute(originToken, chainId, enabled)
-        .accounts({
-        signer: signer,
-        payer: signer,
-        state: statePda,
-        route: routePda,
-        vault: vault,
-        originTokenMint: originToken,
-        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-        associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-        systemProgram: web3_js_1.SystemProgram.programId,
-    })
-        .rpc();
-    console.log("Transaction signature:", tx);
+    const vault = await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, originToken, statePda, true, "confirmed", {
+        commitment: "confirmed",
+    }, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
+    console.log("Created vault:", vault.address.toString());
 }
-// Run the enableRoute function
-enableRoute();
+// Run the createVault function
+createVault();

package/dist/scripts/svm/fakeFillWithRandomDistribution.js

@@ -58,7 +58,7 @@ const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .option("repaymentAddress", { type: "string", demandOption: false, description: "Repayment address" })
     .option("distributionCount", { type: "number", demandOption: false, describe: "Distribution count" })
     .option("bufferParams", { type: "boolean", demandOption: false, describe: "Use buffer account for params" }).argv;
-async function fillV3RelayToRandom() {
+async function fillRelayToRandom() {
     const resolvedArgv = await argv;
     const depositor = new web3_js_1.PublicKey(resolvedArgv.depositor);
     const handler = new web3_js_1.PublicKey(resolvedArgv.handler);
@@ -120,7 +120,7 @@ async function fillV3RelayToRandom() {
         exclusivityDeadline,
         message: encodedMessage,
     };
-    console.log("Filling V3 Relay with handler...");
+    console.log("Filling Relay with handler...");
     // Define the state account PDA
     const [statePda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], programId);
     // Fetch the state from the on-chain program to get chainId
@@ -151,17 +151,18 @@ async function fillV3RelayToRandom() {
     // Delegate state PDA to pull relayer tokens.
     const approveInstruction = await (0, spl_token_1.createApproveCheckedInstruction)(relayerTokenAccount, outputToken, statePda, signer.publicKey, BigInt(relayData.outputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
     // Prepare fill instruction as we will need to use Address Lookup Table (ALT).
-    const fillV3RelayValues = [relayHash, relayData, repaymentChain, repaymentAddress];
+    const fillRelayValues = [relayHash, relayData, repaymentChain, repaymentAddress];
     if (bufferParams) {
-        await (0, web3_v1_1.loadFillRelayParams)(program, signer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
+        await (0, web3_v1_1.loadFillRelayParams)(program, signer, fillRelayValues[1], fillRelayValues[2], fillRelayValues[3]);
     }
-    const fillV3RelayParams = bufferParams ? [fillV3RelayValues[0], null, null, null] : fillV3RelayValues;
+    const fillRelayParams = bufferParams ? [fillRelayValues[0], null, null, null] : fillRelayValues;
     const [instructionParams] = bufferParams
         ? web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("instruction_params"), signer.publicKey.toBuffer()], program.programId)
         : [program.programId];
     const fillAccounts = {
         state: statePda,
         signer: signer.publicKey,
+        delegate: (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, repaymentChain, repaymentAddress, program.programId).pda,
         instructionParams,
         mint: outputToken,
         relayerTokenAccount,
@@ -177,7 +178,7 @@ async function fillV3RelayToRandom() {
         ...multicallHandlerCoder.compiledKeyMetas,
     ];
     const fillInstruction = await program.methods
-        .fillRelay(...fillV3RelayParams)
+        .fillRelay(...fillRelayParams)
         .accounts(fillAccounts)
         .remainingAccounts(remainingAccounts)
         .instruction();
@@ -185,5 +186,5 @@ async function fillV3RelayToRandom() {
     const { txSignature } = await (0, web3_v1_1.sendTransactionWithLookupTable)(provider.connection, [approveInstruction, fillInstruction], signer);
     console.log("Transaction signature:", txSignature);
 }
-// Run the fillV3RelayToRandom function
-fillV3RelayToRandom();
+// Run the fillRelayToRandom function
+fillRelayToRandom();

package/dist/scripts/svm/nativeDeposit.js

@@ -0,0 +1,138 @@
+"use strict";
+// This script is used to initiate a native token Solana deposit. useful in testing.
+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 yargs_1 = __importDefault(require("yargs"));
+const helpers_1 = require("yargs/helpers");
+const web3_v1_1 = require("../../src/svm/web3-v1");
+// Set up the provider
+const provider = anchor_1.AnchorProvider.env();
+anchor.setProvider(provider);
+const program = (0, web3_v1_1.getSpokePoolProgram)(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("recipient", { type: "string", demandOption: true, describe: "Recipient public key" })
+    .option("outputToken", { type: "string", demandOption: true, describe: "Output token public key" })
+    .option("inputAmount", { type: "number", demandOption: true, describe: "Input amount" })
+    .option("outputAmount", { type: "number", demandOption: true, describe: "Output amount" })
+    .option("destinationChainId", { type: "string", demandOption: true, describe: "Destination chain ID" })
+    .option("integratorId", { type: "string", demandOption: false, describe: "integrator ID" }).argv;
+async function nativeDeposit() {
+    const resolvedArgv = await argv;
+    const seed = web3_v1_1.SOLANA_SPOKE_STATE_SEED;
+    const recipient = new web3_js_1.PublicKey(resolvedArgv.recipient);
+    const inputToken = spl_token_1.NATIVE_MINT;
+    const outputToken = new web3_js_1.PublicKey(resolvedArgv.outputToken);
+    const inputAmount = new anchor_1.BN(resolvedArgv.inputAmount);
+    const outputAmount = new anchor_1.BN(resolvedArgv.outputAmount);
+    const destinationChainId = new anchor_1.BN(resolvedArgv.destinationChainId);
+    const exclusiveRelayer = web3_js_1.PublicKey.default;
+    const quoteTimestamp = Math.floor(Date.now() / 1000) - 1;
+    const fillDeadline = quoteTimestamp + 3600; // 1 hour from now
+    const exclusivityDeadline = 0;
+    const message = Buffer.from([]); // Convert to Buffer
+    const integratorId = resolvedArgv.integratorId || "";
+    // Define the state account PDA
+    const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], programId);
+    // Define the signer (replace with your actual signer)
+    const signer = provider.wallet.payer;
+    // Find ATA for the input token to be stored by state (vault).
+    const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
+    const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, signer.publicKey);
+    const userTokenAccountInfo = await provider.connection.getAccountInfo(userTokenAccount);
+    const existingTokenAccount = userTokenAccountInfo !== null && userTokenAccountInfo.owner.equals(spl_token_1.TOKEN_PROGRAM_ID);
+    console.log("Depositing...");
+    console.table([
+        { property: "seed", value: seed.toString() },
+        { property: "recipient", value: recipient.toString() },
+        { property: "inputToken", value: inputToken.toString() },
+        { property: "outputToken", value: outputToken.toString() },
+        { property: "inputAmount", value: inputAmount.toString() },
+        { property: "outputAmount", value: outputAmount.toString() },
+        { property: "destinationChainId", value: destinationChainId.toString() },
+        { property: "quoteTimestamp", value: quoteTimestamp.toString() },
+        { property: "fillDeadline", value: fillDeadline.toString() },
+        { property: "exclusivityDeadline", value: exclusivityDeadline.toString() },
+        { property: "message", value: message.toString("hex") },
+        { property: "integratorId", value: integratorId },
+        { property: "programId", value: programId.toString() },
+        { property: "providerPublicKey", value: provider.wallet.publicKey.toString() },
+        { property: "statePda", value: statePda.toString() },
+        { property: "vault", value: vault.toString() },
+        { property: "userTokenAccount", value: userTokenAccount.toString() },
+        { property: "existingTokenAccount", value: existingTokenAccount },
+    ]);
+    const tokenDecimals = (await (0, spl_token_1.getMint)(provider.connection, inputToken, undefined, spl_token_1.TOKEN_PROGRAM_ID)).decimals;
+    // Will need to add rent exemption to the deposit amount if the user token account does not exist.
+    const rentExempt = existingTokenAccount ? 0 : await (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(provider.connection);
+    const transferIx = web3_js_1.SystemProgram.transfer({
+        fromPubkey: signer.publicKey,
+        toPubkey: userTokenAccount,
+        lamports: BigInt(inputAmount.toString()) + BigInt(rentExempt),
+    });
+    // Create wSOL user account if it doesn't exist, otherwise sync its native balance.
+    const syncOrCreateIx = existingTokenAccount
+        ? (0, spl_token_1.createSyncNativeInstruction)(userTokenAccount)
+        : (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(signer.publicKey, userTokenAccount, signer.publicKey, inputToken);
+    // Close the user token account if it did not exist before.
+    const lastIxs = existingTokenAccount
+        ? []
+        : [(0, spl_token_1.createCloseAccountInstruction)(userTokenAccount, signer.publicKey, signer.publicKey)];
+    // Delegate state PDA to pull depositor tokens.
+    const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(userTokenAccount, inputToken, statePda, signer.publicKey, BigInt(inputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
+    const depositIx = await program.methods.deposit(signer.publicKey, recipient, inputToken, outputToken, inputAmount, outputAmount, destinationChainId, exclusiveRelayer, quoteTimestamp, fillDeadline, exclusivityDeadline, message)
+        .accounts({
+        state: statePda,
+        signer: signer.publicKey,
+        userTokenAccount,
+        vault: vault,
+        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        mint: inputToken,
+    })
+        .instruction();
+    // Create the deposit transaction
+    const depositTx = new web3_js_1.Transaction().add(transferIx, syncOrCreateIx, approveIx, depositIx, ...lastIxs);
+    if (integratorId !== "") {
+        const MemoIx = new web3_js_1.TransactionInstruction({
+            keys: [{ pubkey: signer.publicKey, isSigner: true, isWritable: true }],
+            data: Buffer.from(integratorId, "utf-8"),
+            programId: new web3_js_1.PublicKey("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr"), // Memo program ID
+        });
+        depositTx.add(MemoIx);
+    }
+    const tx = await (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, depositTx, [signer]);
+    console.log("Transaction signature:", tx);
+}
+// Run the nativeDeposit function
+nativeDeposit();

package/dist/scripts/svm/queryEventsV2.js

@@ -20,8 +20,8 @@ const argvPromise = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     describe: "Name of the event to query",
     choices: [
         "any",
-        "FilledV3Relay",
-        "V3FundsDeposited",
+        "FilledRelay",
+        "FundsDeposited",
         "EnabledDepositRoute",
         "RelayedRootBundle",
         "ExecutedRelayerRefundRoot",
@@ -30,7 +30,7 @@ const argvPromise = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
         "PausedFills",
         "SetXDomainAdmin",
         "EmergencyDeletedRootBundle",
-        "RequestedV3SlowFill",
+        "RequestedSlowFill",
         "ClaimedRelayerRefund",
         "TokensBridged",
     ],

package/dist/scripts/svm/{queryRoute.js → queryVault.js}

@@ -1,5 +1,5 @@
 "use strict";
-// This script fetches route information for a given spoke pool, originToken and chainId.
+// This script fetches vault information for a given spoke pool and originToken.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -43,51 +43,36 @@ 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" })
-    .option("originToken", { type: "string", demandOption: true, describe: "Origin token public key" })
-    .option("chainId", { type: "string", demandOption: true, describe: "Chain ID" }).argv;
-async function queryRoute() {
+    .option("originToken", { type: "string", demandOption: true, describe: "Origin token public key" }).argv;
+async function queryVault() {
     const resolvedArgv = await argv;
     const seed = new anchor_1.BN(resolvedArgv.seed);
     const originToken = Array.from(new web3_js_1.PublicKey(resolvedArgv.originToken).toBytes());
-    const chainId = new anchor_1.BN(resolvedArgv.chainId);
     // 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"),
-        Buffer.from(originToken),
-        seed.toArrayLike(Buffer, "le", 8),
-        chainId.toArrayLike(Buffer, "le", 8),
-    ], programId);
     // Compute the vault address
     const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(new web3_js_1.PublicKey(originToken), statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
-    console.log("Querying route...");
+    console.log("Querying vault...");
     console.table([
         { Property: "seed", Value: seed.toString() },
         { Property: "originToken", Value: new web3_js_1.PublicKey(originToken).toString() },
-        { Property: "chainId", Value: chainId.toString() },
         { Property: "programId", Value: programId.toString() },
         { Property: "statePda", Value: statePda.toString() },
-        { Property: "routePda", Value: routePda.toString() },
         { Property: "vault", Value: vault.toString() },
     ]);
     try {
-        const route = await program.account.route.fetch(routePda);
         const vaultAccount = await (0, spl_token_1.getAccount)(provider.connection, vault);
-        console.log("Route fetched successfully:");
-        console.table([
-            { Property: "Enabled", Value: route.enabled },
-            { Property: "vaultBalance", Value: vaultAccount.amount.toString() },
-        ]);
+        console.log("Vault fetched successfully:");
+        console.table([{ Property: "vaultBalance", Value: vaultAccount.amount.toString() }]);
     }
     catch (error) {
         if (error.message.includes("Account does not exist or has no data")) {
-            console.log("No route has been created for the given origin token and chain ID.");
+            console.log("No vault has been created for the given origin token.");
         }
         else {
-            console.error("An error occurred while fetching the route:", error);
+            console.error("An error occurred while fetching the vault:", error);
         }
     }
 }
-// Run the queryRoute function
-queryRoute();
+// Run the queryVault function
+queryVault();

package/dist/scripts/svm/remoteHubPoolPauseDeposits.js

@@ -74,7 +74,7 @@ async function remoteHubPoolPauseDeposit() {
     const irisApiUrl = isDevnet ? web3_v1_1.CIRCLE_IRIS_API_URL_DEVNET : web3_v1_1.CIRCLE_IRIS_API_URL_MAINNET;
     const hubPool = typechain_1.HubPool__factory.connect(hubPoolAddress, ethersProvider);
     const spokePoolIface = new ethers_1.ethers.utils.Interface(["function pauseDeposits(bool pause)"]);
-    console.log("Remotely configuring deposit route...");
+    console.log("Remotely pausing deposits...");
     console.table([
         { Property: "seed", Value: seed.toString() },
         { Property: "chainId", Value: chainId.toString() },
@@ -176,7 +176,7 @@ async function remoteHubPoolPauseDeposit() {
     console.log("\nReceived remote message");
     console.log("Your transaction signature", receiveMessageTx);
     let stateAccount = await svmSpokeProgram.account.state.fetch(statePda);
-    console.log("Updated deposit route state to: pausedDeposits =", stateAccount.pausedDeposits);
+    console.log("Updated deposit state to: pausedDeposits =", stateAccount.pausedDeposits);
 }
 remoteHubPoolPauseDeposit()
     .then(() => {

package/dist/scripts/svm/simpleDeposit.js

@@ -68,18 +68,11 @@ async function deposit() {
     const integratorId = resolvedArgv.integratorId || "";
     // 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"),
-        inputToken.toBytes(),
-        seed.toArrayLike(Buffer, "le", 8),
-        destinationChainId.toArrayLike(Buffer, "le", 8),
-    ], programId);
     // Define the signer (replace with your actual signer)
     const signer = provider.wallet.payer;
-    // Find ATA for the input token to be stored by state (vault). This was created when the route was enabled.
+    // Find ATA for the input token to be stored by state (vault). This should have been created before the deposit is attempted.
     const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
-    console.log("Depositing V3...");
+    console.log("Depositing...");
     console.table([
         { property: "seed", value: seed.toString() },
         { property: "recipient", value: recipient.toString() },
@@ -96,7 +89,6 @@ async function deposit() {
         { property: "programId", value: programId.toString() },
         { property: "providerPublicKey", value: provider.wallet.publicKey.toString() },
         { property: "statePda", value: statePda.toString() },
-        { property: "routePda", value: routePda.toString() },
         { property: "vault", value: vault.toString() },
     ]);
     const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, signer.publicKey);
@@ -106,7 +98,6 @@ async function deposit() {
     const depositIx = await program.methods.deposit(signer.publicKey, recipient, inputToken, outputToken, inputAmount, outputAmount, destinationChainId, exclusiveRelayer, quoteTimestamp, fillDeadline, exclusivityDeadline, message)
         .accounts({
         state: statePda,
-        route: routePda,
         signer: signer.publicKey,
         userTokenAccount,
         vault: vault,
@@ -127,5 +118,5 @@ async function deposit() {
     const tx = await (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, depositTx, [signer]);
     console.log("Transaction signature:", tx);
 }
-// Run the depositV3 function
+// Run the deposit function
 deposit();

package/dist/scripts/svm/simpleFakeRelayerRepayment.js

@@ -55,10 +55,6 @@ async function testBundleLogic() {
     const signer = provider.wallet.payer;
     console.log("Running from signer: ", signer.publicKey.toString());
     const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], programId);
-    // This assumes that the destination chain Id 11155111 has been enabled. This is the sepolia chain ID.
-    // I.e this test assumes that enableRoute has been called with destinationChainId 11155111 and inputToken.
-    const [routePda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("route"), inputToken.toBytes(), statePda.toBytes(), new anchor_1.BN(11155111).toArrayLike(Buffer, "le", 8)], // Assuming destinationChainId is 1
-    programId);
     const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
     console.table([
         { property: "seed", value: seed.toString() },
@@ -66,19 +62,18 @@ async function testBundleLogic() {
         { property: "inputToken", value: inputToken.toString() },
         { property: "signer", value: signer.publicKey.toString() },
         { property: "statePda", value: statePda.toString() },
-        { property: "routePda", value: routePda.toString() },
         { property: "vault", value: vault.toString() },
     ]);
     const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, signer.publicKey);
     const tokenDecimals = (await (0, spl_token_1.getMint)(provider.connection, inputToken, undefined, spl_token_1.TOKEN_PROGRAM_ID)).decimals;
-    // Use program.methods.depositV3 to send tokens to the spoke. note this is NOT a valid deposit, we just want to
+    // Use program.methods.deposit to send tokens to the spoke. note this is NOT a valid deposit, we just want to
     // seed tokens into the spoke to test repayment.
     // Delegate state PDA to pull depositor tokens.
     const inputAmount = amounts.reduce((acc, amount) => acc.add(amount), new anchor_1.BN(0));
     const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(userTokenAccount, inputToken, statePda, signer.publicKey, BigInt(inputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
     const depositIx = await program.methods.deposit(signer.publicKey, signer.publicKey, // recipient is the signer for this example
     inputToken, inputToken, // Re-use inputToken as outputToken. does not matter for this deposit.
-    inputAmount, new anchor_1.BN(0), new anchor_1.BN(11155111), // destinationChainId. assumed to be enabled, as with routePDA
+    inputAmount, new anchor_1.BN(0), new anchor_1.BN(11155111), // destinationChainId.
     web3_js_1.PublicKey.default, // exclusiveRelayer
     Math.floor(Date.now() / 1000) - 1, // quoteTimestamp
     Math.floor(Date.now() / 1000) + 3600, // fillDeadline
@@ -87,7 +82,6 @@ async function testBundleLogic() {
     )
         .accounts({
         state: statePda,
-        route: routePda,
         signer: signer.publicKey,
         userTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, signer.publicKey),
         vault: vault,
@@ -132,7 +126,6 @@ async function testBundleLogic() {
     const [rootBundle] = web3_js_1.PublicKey.findProgramAddressSync(seeds, programId);
     console.table([
         { property: "State PDA", value: statePda.toString() },
-        { property: "Route PDA", value: routePda.toString() },
         { property: "Root Bundle PDA", value: rootBundle.toString() },
         { property: "Signer", value: signer.publicKey.toString() },
     ]);

package/dist/scripts/svm/simpleFill.js

@@ -85,7 +85,7 @@ async function fillRelay() {
     };
     // Define the signer (replace with your actual signer)
     const signer = provider.wallet.payer;
-    console.log("Filling V3 Relay...");
+    console.log("Filling Relay...");
     // Define the state account PDA
     const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], programId);
     // Fetch the state from the on-chain program to get chainId
@@ -129,6 +129,7 @@ async function fillRelay() {
     const fillAccounts = {
         state: statePda,
         signer: signer.publicKey,
+        delegate: (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, chainId, signer.publicKey, program.programId).pda,
         instructionParams: program.programId,
         mint: outputToken,
         relayerTokenAccount: relayerTokenAccount,
@@ -148,5 +149,5 @@ async function fillRelay() {
     const tx = await (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, fillTx, [signer]);
     console.log("Transaction signature:", tx);
 }
-// Run the fillV3Relay function
+// Run the fillRelay function
 fillRelay();