@across-protocol/contracts 4.0.12 → 4.0.13

package/README.md

@@ -31,17 +31,20 @@ Note if you get build issues on the initial `yarn` command try downgrading to no
 
 ```shell
 yarn
-yarn build # Will build all code. Compile solidity & rust, generate ts outputs
+yarn build # Will build all code. Compile solidity & rust (local toolchain), generate ts outputs
+yarn build-verified # Will build all code. Compile solidity & rust (verified docker build), generate ts outputs
 ```
 
 ## Test
 
 ```shell
-yarn test # Run all unit tests without gas analysis
+yarn test # Run all unit tests without gas analysis, using local toolchain SVM build
+yarn test-verified # Run all unit tests (without gas analysis) with verified SVM docker build
 yarn test:gas-analytics # Run only tests that count gas costs
 yarn test:report-gas # Run unit tests with hardhat-gas-reporter enabled
 yarn test-evm # Only test EVM code
-yarn test-svm # Only test SVM code
+yarn test-svm # Only test SVM code (local toolchain build)
+yarn test-svm-solana-verify # Only test SVM code (verified docker build)
 ```
 
 ## Lint
@@ -56,11 +59,187 @@ yarn lint-fix
 
 ## Deploy and Verify
 
+### EVM
+
 ```shell
 NODE_URL_1=https://mainnet.infura.com/xxx yarn hardhat deploy --tags HubPool --network mainnet
 ETHERSCAN_API_KEY=XXX yarn hardhat etherscan-verify --network mainnet --license AGPL-3.0 --force-license --solc-input
 ```
 
+### SVM
+
+Before deploying for the first time make sure all program IDs in `lib.rs` and `Anchor.toml` are the same as listed when running `anchor keys list`. If not, update them to match the deployment keypairs under `target/deploy/` and commit the changes.
+
+Make sure to use the verified docker binaries that can be built:
+
+```shell
+unset IS_TEST # Ensures the production build is used (not the test feature)
+yarn build-svm-solana-verify # Builds verified SVM binaries
+yarn generate-svm-artifacts # Builds IDLs
+```
+
+Export required environment variables, e.g.:
+
+```shell
+export RPC_URL=https://api.devnet.solana.com
+export KEYPAIR=~/.config/solana/dev-wallet.json
+export PROGRAM=svm_spoke # Also repeat the deployment process for multicall_handler
+export PROGRAM_ID=$(cat target/idl/$PROGRAM.json | jq -r ".address")
+export MULTISIG= # Export the Squads vault, not the multisig address!
+```
+
+For the initial deployment also need these:
+
+```shell
+export SVM_CHAIN_ID=$(cast to-dec $(cast shr $(cast shl $(cast keccak solana-devnet) 208) 208))
+export HUB_POOL=0x14224e63716afAcE30C9a417E0542281869f7d9e # This is for sepolia, update for mainnet
+export DEPOSIT_QUOTE_TIME_BUFFER=3600
+export FILL_DEADLINE_BUFFER=21600
+```
+
+#### Initial deployment
+
+Deploy the program and set the upgrade authority to the multisig:
+
+```shell
+solana program deploy \
+  --url $RPC_URL target/deploy/$PROGRAM.so \
+  --keypair $KEYPAIR \
+  --program-id target/deploy/$PROGRAM-keypair.json \
+  --with-compute-unit-price 50000 \
+  --max-sign-attempts 100
+solana program set-upgrade-authority \
+  --url $RPC_URL \
+  --keypair $KEYPAIR \
+  --skip-new-upgrade-authority-signer-check \
+  $PROGRAM_ID \
+  --new-upgrade-authority $MULTISIG
+```
+
+Update and commit `deployments/deployments.json` with the deployed program ID and deployment slot.
+
+Upload the IDL and set the upgrade authority to the multisig:
+
+```shell
+anchor idl init \
+  --provider.cluster $RPC_URL \
+  --provider.wallet $KEYPAIR \
+  --filepath target/idl/$PROGRAM.json \
+  $PROGRAM_ID
+anchor idl set-authority \
+  --provider.cluster $RPC_URL \
+  --provider.wallet $KEYPAIR \
+  --program-id $PROGRAM_ID \
+  --new-authority $MULTISIG
+```
+
+`svm_spoke` also requires initialization and transfer of ownership on the first deployment:
+
+```shell
+anchor run initialize \
+  --provider.cluster $RPC_URL \
+  --provider.wallet $KEYPAIR -- \
+  --chainId $SVM_CHAIN_ID \
+  --remoteDomain 0 \
+  --crossDomainAdmin $HUB_POOL \
+  --svmAdmin $MULTISIG \
+  --depositQuoteTimeBuffer $DEPOSIT_QUOTE_TIME_BUFFER \
+  --fillDeadlineBuffer $FILL_DEADLINE_BUFFER
+```
+
+Create the vault for accepting deposits, e.g.:
+
+```shell
+export MINT=4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU # This is USDC on devnet, update with address for mainnet
+anchor run createVault \
+  --provider.cluster $RPC_URL \
+  --provider.wallet $KEYPAIR -- \
+  --originToken $MINT
+```
+
+#### Upgrades
+
+Initiate the program upgrade:
+
+```shell
+solana program write-buffer \
+  --url $RPC_URL \
+  --keypair $KEYPAIR \
+  --with-compute-unit-price 50000 \
+  --max-sign-attempts 100 \
+  --use-rpc \
+  target/deploy/$PROGRAM.so
+export BUFFER= # Export the logged buffer address from the command above
+solana program set-buffer-authority \
+  --url $RPC_URL \
+  --keypair $KEYPAIR \
+  $BUFFER \
+  --new-buffer-authority $MULTISIG
+```
+
+Add the program ID to Squads multisig (`https://devnet.squads.so/` for devnet and `https://app.squads.so/` for mainnet) in the Developers/Programs section. Then add the upgrade filling in the buffer address and buffer refund. After creating the upgrade verify the buffer authority as prompted and proceed with initiating the upgrade. Once all required signers have approved, execute the upgrade in the transactions section.
+
+Start the IDL upgrade by writing it to the buffer:
+
+```shell
+anchor idl write-buffer \
+  --provider.cluster $RPC_URL \
+  --provider.wallet $KEYPAIR \
+  --filepath target/idl/$PROGRAM.json \
+  $PROGRAM_ID
+export IDL_BUFFER= # Export the logged IDL buffer address from the command above
+anchor idl set-authority \
+  --provider.cluster $RPC_URL \
+  --provider.wallet $KEYPAIR \
+  --program-id $PROGRAM_ID \
+  --new-authority $MULTISIG \
+  $IDL_BUFFER
+```
+
+Construct the multisig transaction for finalizing the IDL upgrade. Copy the printed base58 encoded transaction from below command and import it into the Squads multisig for approval and execution:
+
+```shell
+anchor run squadsIdlUpgrade -- \
+  --programId $PROGRAM_ID \
+  --idlBuffer $IDL_BUFFER \
+  --multisig $MULTISIG \
+  --closeRecipient $(solana address --keypair $KEYPAIR)
+```
+
+#### Verify
+
+Start with verifying locally that the deployed program matches the source code of the public repository:
+
+```shell
+solana-verify verify-from-repo \
+  --url $RPC_URL \
+  --program-id $PROGRAM_ID \
+   --library-name $PROGRAM \
+  https://github.com/across-protocol/contracts
+```
+
+When prompted, don't yet upload the verification data to the blockchain as that should be done by the multisig. Proceed with creating the upload transaction and then import and sign/execute it in the Squads multisig:
+
+```shell
+solana-verify export-pda-tx \
+  --url $RPC_URL \
+  --program-id $PROGRAM_ID \
+  --library-name $PROGRAM  \
+  --uploader $MULTISIG \
+  https://github.com/across-protocol/contracts
+```
+
+Note that the initial upload transaction might fail if the multisig vault does not have enough SOL for PDA creation. In that case, transfer the required funds to the multisig vault before executing the upload transaction.
+
+Finally, submit the verification to OtterSec API (only works on mainnet):
+
+```shell
+solana-verify remote submit-job \
+  --url $RPC_URL \
+  --program-id $PROGRAM_ID \
+  --uploader $MULTISIG
+```
+
 ## Miscellaneous topics
 
 ### Manually Finalizing Scroll Claims from L2 -> L1 (Mainnet | Sepolia)

package/dist/deployments/deployments.json

@@ -34,7 +34,8 @@
         "Ink_Adapter": { "address": "0x7e90a40c7519b041a7df6498fbf5662e8cfc61d2", "blockNumber": 21438590 },
         "Cher_Adapter": { "address": "0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2", "blockNumber": 21597341 },
         "Lens_Adapter": { "address": "0x63AC22131eD457aeCbD63e6c4C7eeC7BBC74fF1F", "blockNumber": 22167069 },
-        "DoctorWho_Adapter": { "address": "0xFADcC43096756e1527306FD92982FEbBe3c629Fa", "blockNumber": 21773451 }
+        "DoctorWho_Adapter": { "address": "0xFADcC43096756e1527306FD92982FEbBe3c629Fa", "blockNumber": 21773451 },
+        "Solana_Adapter": { "address": "0x1E22A3146439C68A2d247448372AcAEe9E201AB1", "blockNumber": 22566473 }
     },
     "10": {
         "SpokePool": { "address": "0x6f26Bf09B1C792e3228e5467807a900A503c0281", "blockNumber": 93903076 },
@@ -169,7 +170,8 @@
         "Lisk_Adapter": { "address": "0x13a8B1D6443016424e2b8Bac40dD884Ee679AFc4", "blockNumber": 6226289 },
         "Lens_Adapter": { "address": "0x8fac6F764ae0b4F632FE2E6c938ED5637E629ff2", "blockNumber": 7448085 },
         "Blast_Adapter": { "address": "0x09500Ffd743e01B4146a4BA795231Ca7Ca37819f", "blockNumber": 6233857 },
-        "DoctorWho_Adapter": { "address": "0x2b482aFb675e1F231521d5E56770ce4aac592246", "blockNumber": 7698546 }
+        "DoctorWho_Adapter": { "address": "0x2b482aFb675e1F231521d5E56770ce4aac592246", "blockNumber": 7698546 },
+        "Solana_Adapter": { "address": "0x9b2c2f3fD98cF8468715Be31155cc053C56f822A", "blockNumber": 8409722 }
     },
     "37111": {
         "SpokePool": { "address": "0x6A0a7f39530923911832Dd60667CE5da5449967B", "blockNumber": 156275 },

package/dist/scripts/svm/buildHelpers/generateSvmClients.js

@@ -16,11 +16,7 @@ codama.accept((0, renderers_js_1.renderVisitor)(path_1.default.join(exports.clie
 // Generate MulticallHandler clients
 codama = (0, codama_1.createFromRoot)((0, nodes_from_anchor_1.rootNodeFromAnchor)(assets_1.MulticallHandlerIdl));
 codama.accept((0, renderers_js_1.renderVisitor)(path_1.default.join(exports.clientsPath, "MulticallHandler")));
-// codama = createFromRoot(rootNodeFromAnchor(MessageTransmitterIdl as AnchorIdl));
-// codama.accept(
-//     renderJavaScriptVisitor(path.join(clientsPath, "MessageTransmitter"))
-// );
-// codama = createFromRoot(rootNodeFromAnchor(TokenMessengerMinterIdl as AnchorIdl));
-// codama.accept(
-//     renderJavaScriptVisitor(path.join(clientsPath, "TokenMessengerMinter"))
-// );
+codama = (0, codama_1.createFromRoot)((0, nodes_from_anchor_1.rootNodeFromAnchor)(assets_1.MessageTransmitterIdl));
+codama.accept((0, renderers_js_1.renderVisitor)(path_1.default.join(exports.clientsPath, "MessageTransmitter")));
+codama = (0, codama_1.createFromRoot)((0, nodes_from_anchor_1.rootNodeFromAnchor)(assets_1.TokenMessengerMinterIdl));
+codama.accept((0, renderers_js_1.renderVisitor)(path_1.default.join(exports.clientsPath, "TokenMessengerMinter")));

package/dist/scripts/svm/createVault.js

@@ -45,11 +45,11 @@ 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("seed", { type: "string", demandOption: false, describe: "Seed for the state account PDA" })
     .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 seed = resolvedArgv.seed ? new anchor_1.BN(resolvedArgv.seed) : web3_v1_1.SOLANA_SPOKE_STATE_SEED;
     const originToken = new web3_js_1.PublicKey(resolvedArgv.originToken);
     // Define the state account PDA
     const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], programId);

package/dist/scripts/svm/initialize.js

@@ -40,11 +40,12 @@ const program = (0, web3_v1_1.getSpokePoolProgram)(provider);
 const programId = program.programId;
 // 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("initNumbDeposits", { type: "string", demandOption: true, describe: "Init numb of deposits" })
+    .option("seed", { type: "string", demandOption: false, describe: "Seed for the state account PDA" })
+    .option("initNumbDeposits", { type: "string", demandOption: false, describe: "Init numb of deposits" })
     .option("chainId", { type: "string", demandOption: true, describe: "Chain ID" })
     .option("remoteDomain", { type: "number", demandOption: true, describe: "CCTP domain for Mainnet Ethereum" })
     .option("crossDomainAdmin", { type: "string", demandOption: true, describe: "HubPool on Mainnet Ethereum" })
+    .option("svmAdmin", { type: "string", demandOption: false, describe: "SVM admin" })
     .option("depositQuoteTimeBuffer", {
     type: "number",
     demandOption: false,
@@ -54,16 +55,17 @@ const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .option("fillDeadlineBuffer", {
     type: "number",
     demandOption: false,
-    default: 3600 * 4,
+    default: 3600 * 6,
     describe: "Fill deadline buffer",
 }).argv;
 async function initialize() {
     const resolvedArgv = await argv;
-    const seed = new anchor_1.BN(resolvedArgv.seed);
-    const initialNumberOfDeposits = new anchor_1.BN(resolvedArgv.initNumbDeposits);
+    const seed = resolvedArgv.seed ? new anchor_1.BN(resolvedArgv.seed) : web3_v1_1.SOLANA_SPOKE_STATE_SEED;
+    const initialNumberOfDeposits = resolvedArgv.initNumbDeposits ? new anchor_1.BN(resolvedArgv.initNumbDeposits) : new anchor_1.BN(0);
     const chainId = new anchor_1.BN(resolvedArgv.chainId);
     const remoteDomain = resolvedArgv.remoteDomain;
     const crossDomainAdmin = (0, web3_v1_1.evmAddressToPublicKey)(resolvedArgv.crossDomainAdmin); // Use the function to cast the value
+    const svmAdmin = resolvedArgv.svmAdmin ? new web3_js_1.PublicKey(resolvedArgv.svmAdmin) : provider.wallet.publicKey;
     const depositQuoteTimeBuffer = resolvedArgv.depositQuoteTimeBuffer;
     const fillDeadlineBuffer = resolvedArgv.fillDeadlineBuffer;
     // Define the state account PDA
@@ -82,6 +84,7 @@ async function initialize() {
         { Property: "chainId", Value: chainId.toString() },
         { Property: "remoteDomain", Value: remoteDomain.toString() },
         { Property: "crossDomainAdmin", Value: crossDomainAdmin.toString() },
+        { Property: "svmAdmin", Value: svmAdmin.toString() },
         { Property: "depositQuoteTimeBuffer", Value: depositQuoteTimeBuffer.toString() },
         { Property: "fillDeadlineBuffer", Value: fillDeadlineBuffer.toString() },
     ]);
@@ -93,6 +96,17 @@ async function initialize() {
     })
         .rpc();
     console.log("Transaction signature:", tx);
+    if (!svmAdmin.equals(provider.wallet.publicKey)) {
+        console.log("Transferring ownership to SVM admin...");
+        const tx = await program.methods
+            .transferOwnership(svmAdmin)
+            .accountsPartial({
+            state: statePda,
+            signer: signer,
+        })
+            .rpc();
+        console.log("Transfer ownership transaction signature:", tx);
+    }
 }
 // Run the initialize function
 initialize();

package/dist/scripts/svm/nativeDeposit.js

@@ -109,17 +109,38 @@ async function nativeDeposit() {
     const lastIxs = existingTokenAccount
         ? []
         : [(0, spl_token_1.createCloseAccountInstruction)(userTokenAccount, signer.publicKey, signer.publicKey)];
+    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,
+        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 the deposit transaction
     const depositTx = new web3_js_1.Transaction().add(transferIx, syncOrCreateIx, approveIx, depositIx, ...lastIxs);

package/dist/scripts/svm/simpleDeposit.js

@@ -93,17 +93,38 @@ async function deposit() {
     ]);
     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,
+        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);

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 = {
@@ -123,13 +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: (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, chainId, signer.publicKey, program.programId).pda,
+        delegate,
         instructionParams: program.programId,
         mint: outputToken,
         relayerTokenAccount: relayerTokenAccount,

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();

package/dist/src/svm/assets/idl/svm_spoke.json

@@ -4505,93 +4505,78 @@
   "errors": [
     {
       "code": 6000,
-      "name": "NotOwner",
-      "msg": "Only the owner can call this function!"
+      "name": "InvalidQuoteTimestamp",
+      "msg": "Invalid quote timestamp!"
     },
     {
       "code": 6001,
-      "name": "InvalidRelayHash",
-      "msg": "Invalid relay hash!"
+      "name": "InvalidFillDeadline",
+      "msg": "Invalid fill deadline!"
     },
     {
       "code": 6002,
-      "name": "CanOnlyCloseFillStatusPdaIfFillDeadlinePassed",
-      "msg": "The fill deadline has not passed!"
+      "name": "NotExclusiveRelayer",
+      "msg": "Caller is not the exclusive relayer and exclusivity deadline has not passed!"
     },
     {
       "code": 6003,
-      "name": "NotRelayer",
-      "msg": "The caller is not the relayer!"
+      "name": "NoSlowFillsInExclusivityWindow",
+      "msg": "The Deposit is still within the exclusivity window!"
     },
     {
       "code": 6004,
-      "name": "CannotSetCurrentTime",
-      "msg": "Cannot set time if not in test mode!"
+      "name": "RelayFilled",
+      "msg": "The relay has already been filled!"
     },
     {
       "code": 6005,
-      "name": "InvalidRemoteDomain",
-      "msg": "Invalid remote domain!"
+      "name": "InvalidSlowFillRequest",
+      "msg": "Slow fill requires status of Unfilled!"
     },
     {
       "code": 6006,
-      "name": "InvalidRemoteSender",
-      "msg": "Invalid remote sender!"
+      "name": "ExpiredFillDeadline",
+      "msg": "The fill deadline has passed!"
     },
     {
       "code": 6007,
-      "name": "InvalidMint",
-      "msg": "Invalid mint!"
+      "name": "InvalidMerkleProof",
+      "msg": "Invalid Merkle proof!"
     },
     {
       "code": 6008,
-      "name": "ExceededPendingBridgeAmount",
-      "msg": "Exceeded pending bridge amount to HubPool!"
+      "name": "InvalidChainId",
+      "msg": "Invalid chain id!"
     },
     {
       "code": 6009,
-      "name": "ParamsWriteOverflow",
-      "msg": "Overflow writing to parameters account!"
+      "name": "InvalidMerkleLeaf",
+      "msg": "Invalid Merkle leaf!"
     },
     {
       "code": 6010,
-      "name": "InvalidRefund",
-      "msg": "Invalid refund address!"
+      "name": "ClaimedMerkleLeaf",
+      "msg": "Leaf already claimed!"
     },
     {
       "code": 6011,
-      "name": "ZeroRefundClaim",
-      "msg": "Zero relayer refund claim!"
+      "name": "DepositsArePaused",
+      "msg": "Deposits are currently paused!"
     },
     {
       "code": 6012,
-      "name": "NonZeroRefundClaim",
-      "msg": "Cannot close non-zero relayer refund claim!"
+      "name": "FillsArePaused",
+      "msg": "Fills are currently paused!"
     },
     {
       "code": 6013,
-      "name": "InvalidClaimInitializer",
-      "msg": "Invalid claim initializer!"
+      "name": "InsufficientSpokePoolBalanceToExecuteLeaf",
+      "msg": "Insufficient spoke pool balance to execute leaf"
     },
     {
       "code": 6014,
-      "name": "InvalidRefundTokenAccount",
-      "msg": "Invalid refund token account!"
-    },
-    {
-      "code": 6015,
-      "name": "InvalidProductionSeed",
-      "msg": "Seed must be 0 in production!"
-    },
-    {
-      "code": 6016,
-      "name": "InvalidATACreationAccounts",
-      "msg": "Invalid remaining accounts for ATA creation!"
-    },
-    {
-      "code": 6017,
-      "name": "InvalidDelegatePda",
-      "msg": "Invalid delegate PDA!"
+      "name": "InvalidExclusiveRelayer",
+      "msg": "Invalid exclusive relayer!"
     }
   ],
   "types": [