@across-protocol/contracts 4.0.11 → 4.0.13

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,23 +89,42 @@ 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);
     const tokenDecimals = (await (0, spl_token_1.getMint)(provider.connection, inputToken, undefined, spl_token_1.TOKEN_PROGRAM_ID)).decimals;
+    const depositData = {
+        depositor: signer.publicKey,
+        recipient,
+        inputToken,
+        outputToken,
+        inputAmount,
+        outputAmount,
+        destinationChainId,
+        exclusiveRelayer,
+        quoteTimestamp: new anchor_1.BN(quoteTimestamp),
+        fillDeadline: new anchor_1.BN(fillDeadline),
+        exclusivityParameter: new anchor_1.BN(exclusivityDeadline),
+        message,
+    };
+    const delegatePda = (0, web3_v1_1.getDepositPda)(depositData, program.programId);
     // 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({
+    const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(userTokenAccount, inputToken, delegatePda, signer.publicKey, BigInt(inputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
+    const depositAccounts = {
         state: statePda,
-        route: routePda,
+        delegate: delegatePda,
         signer: signer.publicKey,
-        userTokenAccount,
+        depositorTokenAccount: userTokenAccount,
         vault: vault,
-        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         mint: inputToken,
-    })
+        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+        systemProgram: web3_js_1.SystemProgram.programId,
+        program: programId,
+    };
+    const depositIx = await program.methods
+        .deposit(signer.publicKey, recipient, inputToken, outputToken, inputAmount, outputAmount, destinationChainId, exclusiveRelayer, quoteTimestamp, fillDeadline, exclusivityDeadline, message)
+        .accounts(depositAccounts)
         .instruction();
     // Create a custom instruction with arbitrary data
     const depositTx = new web3_js_1.Transaction().add(approveIx, depositIx);
@@ -127,5 +139,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

@@ -66,7 +66,7 @@ async function fillRelay() {
     const originChainId = new anchor_1.BN(resolvedArgv.originChainId);
     const depositId = (0, web3_v1_1.intToU8Array32)(new anchor_1.BN(resolvedArgv.depositId));
     const fillDeadline = resolvedArgv.fillDeadline || Math.floor(Date.now() / 1000) + 60; // Current time + 1 minute
-    const exclusivityDeadline = resolvedArgv.exclusivityDeadline || Math.floor(Date.now() / 1000) + 30; // Current time + 30 seconds
+    const exclusivityDeadline = resolvedArgv.exclusivityDeadline ?? 0; // default to 0
     const message = Buffer.from("");
     const seed = new anchor_1.BN(resolvedArgv.seed);
     const relayData = {
@@ -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
@@ -123,12 +123,14 @@ async function fillRelay() {
         { pubkey: recipientTokenAccount, isWritable: true, isSigner: false },
     ])
         .instruction();
-    // Delegate state PDA to pull relayer tokens.
-    const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(relayerTokenAccount, outputToken, statePda, signer.publicKey, BigInt(relayData.outputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
+    const delegate = (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, chainId, signer.publicKey, program.programId).pda;
+    // Delegate fill delegate PDA to pull relayer tokens.
+    const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(relayerTokenAccount, outputToken, delegate, signer.publicKey, BigInt(relayData.outputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
     const fillDataValues = [Array.from(relayHashUint8Array), relayData, chainId, signer.publicKey];
     const fillAccounts = {
         state: statePda,
         signer: signer.publicKey,
+        delegate,
         instructionParams: program.programId,
         mint: outputToken,
         relayerTokenAccount: relayerTokenAccount,
@@ -148,5 +150,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();

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

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

package/dist/scripts/svm/squadsIdlUpgrade.js

@@ -0,0 +1,76 @@
+"use strict";
+// This script prepares transaction for finalizing IDL upgrade and prints out Base58 encoded transaction that can be
+// imported in the Squads transaction builder. This requires one first to have written the upgraded IDL to the buffer
+// account (anchor idl write-buffer) and set its authority to the Squads multisig (anchor idl set-authority).
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const web3_js_1 = require("@solana/web3.js");
+const yargs_1 = __importDefault(require("yargs"));
+const helpers_1 = require("yargs/helpers");
+const web3_js_2 = require("@solana/web3.js");
+const sha2_1 = require("@noble/hashes/sha2");
+const bs58_1 = __importDefault(require("bs58"));
+// Parse arguments
+const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
+    .option("programId", { type: "string", demandOption: true, describe: "Upgrade IDL for the given program ID" })
+    .option("idlBuffer", { type: "string", demandOption: true, describe: "Buffer account where IDL has been written" })
+    .option("closeRecipient", { type: "string", demandOption: true, describe: "Account to receive closed buffer SOL" })
+    .option("multisig", { type: "string", demandOption: true, describe: "Multisig controlling the upgrade" }).argv;
+async function squadsIdlUpgrade() {
+    const resolvedArgv = await argv;
+    const programId = new web3_js_1.PublicKey(resolvedArgv.programId);
+    const idlBuffer = new web3_js_1.PublicKey(resolvedArgv.idlBuffer);
+    const multisig = new web3_js_1.PublicKey(resolvedArgv.multisig);
+    const closeRecipient = new web3_js_1.PublicKey(resolvedArgv.closeRecipient);
+    // Get the deterministic IDL address for the program:
+    const base = web3_js_1.PublicKey.findProgramAddressSync([], programId)[0];
+    const idlAddress = await web3_js_1.PublicKey.createWithSeed(base, "anchor:idl", programId);
+    console.log("Creating IDL upgrade transaction...");
+    console.table([
+        { Property: "programId", Value: programId.toString() },
+        { Property: "idlBuffer", Value: idlBuffer.toString() },
+        { Property: "idlAddress", Value: idlAddress.toString() },
+        { Property: "multisig", Value: multisig.toString() },
+        { Property: "closeRecipient", Value: closeRecipient.toString() },
+    ]);
+    const idlSetBufferAccounts = [
+        { pubkey: idlBuffer, isSigner: false, isWritable: true },
+        { pubkey: idlAddress, isSigner: false, isWritable: true },
+        { pubkey: multisig, isSigner: true, isWritable: false },
+    ];
+    const idlSetBufferInstructionData = Buffer.concat([
+        Buffer.from((0, sha2_1.sha256)("anchor:idl")).slice(0, 8).reverse(),
+        Buffer.from([3]), // IdlInstruction::SetBuffer
+    ]);
+    const idlSetBufferInstructionCtorFields = {
+        keys: idlSetBufferAccounts,
+        programId: programId,
+        data: idlSetBufferInstructionData,
+    };
+    const idlSetBufferInstruction = new web3_js_2.TransactionInstruction(idlSetBufferInstructionCtorFields);
+    const idlCloseAccounts = [
+        { pubkey: idlBuffer, isSigner: false, isWritable: true },
+        { pubkey: multisig, isSigner: true, isWritable: false },
+        { pubkey: closeRecipient, isSigner: false, isWritable: true },
+    ];
+    const idlCloseData = Buffer.concat([
+        Buffer.from((0, sha2_1.sha256)("anchor:idl")).slice(0, 8).reverse(),
+        Buffer.from([5]), // IdlInstruction::Close
+    ]);
+    const idlCloseCtorFields = {
+        keys: idlCloseAccounts,
+        programId: programId,
+        data: idlCloseData,
+    };
+    const idlCloseInstruction = new web3_js_2.TransactionInstruction(idlCloseCtorFields);
+    const multisigTransaction = new web3_js_2.Transaction().add(idlSetBufferInstruction).add(idlCloseInstruction);
+    multisigTransaction.recentBlockhash = "11111111111111111111111111111111"; // Placeholder blockhash
+    multisigTransaction.feePayer = programId; // Placeholder fee payer as we are not signing the transaction
+    const serializedMultisigTransaction = multisigTransaction.serializeMessage();
+    console.log("IDL upgrade transaction, import it into the multisig:");
+    console.log(bs58_1.default.encode(serializedMultisigTransaction));
+}
+// Run the squadsIdlUpgrade function
+squadsIdlUpgrade();