@across-protocol/contracts 4.0.12 → 4.0.14-alpha.1

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,191 @@ 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
+export MAX_LEN=$(( 2 * $(stat -c %s target/deploy/$PROGRAM.so) )) # Reserve twice the size of the program for future upgrades
+```
+
+#### Initial deployment
+
+Deploy the program and set the upgrade authority to the multisig:
+
+```shell
+solana program deploy \
+  --url $RPC_URL \
+  --keypair $KEYPAIR \
+  --program-id target/deploy/$PROGRAM-keypair.json \
+  --max-len $MAX_LEN \
+  --with-compute-unit-price 50000 \
+  --max-sign-attempts 100 \
+  --use-rpc \
+  target/deploy/$PROGRAM.so
+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 },
@@ -206,8 +208,8 @@
     },
     "133268194659241": {
         "SvmSpoke": {
-            "address": "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq",
-            "blockNumber": 356313770
+            "address": "4Jg83Lhggz2EdzSsDX2NVcEK56F25jJKK5btUbHAU4Xu",
+            "blockNumber": 388467389
         },
         "MulticallHandler": {
             "address": "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h",
@@ -224,8 +226,8 @@
     },
     "34268394551451": {
         "SvmSpoke": {
-            "address": "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq",
-            "blockNumber": 317101505
+            "address": "4Jg83Lhggz2EdzSsDX2NVcEK56F25jJKK5btUbHAU4Xu",
+            "blockNumber": 347611576
         },
         "MulticallHandler": {
             "address": "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h",

package/dist/scripts/svm/closeRelayerPdas.js

@@ -82,7 +82,7 @@ async function closeFillPda(eventData, seed) {
         exclusiveRelayer: new web3_js_1.PublicKey(eventData.exclusiveRelayer),
         inputToken: new web3_js_1.PublicKey(eventData.inputToken),
         outputToken: new web3_js_1.PublicKey(eventData.outputToken),
-        inputAmount: new anchor_1.BN(eventData.inputAmount),
+        inputAmount: eventData.inputAmount,
         outputAmount: new anchor_1.BN(eventData.outputAmount),
         originChainId: new anchor_1.BN(eventData.originChainId),
         depositId: eventData.depositId,

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/fakeFillWithRandomDistribution.js

@@ -48,10 +48,10 @@ const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .option("exclusiveRelayer", { type: "string", demandOption: false, describe: "Exclusive relayer public key" })
     .option("inputToken", { type: "string", demandOption: true, describe: "Input token public key" })
     .option("outputToken", { type: "string", demandOption: true, describe: "Output token public key" })
-    .option("inputAmount", { type: "number", demandOption: true, describe: "Input amount" })
+    .option("inputAmount", { type: "string", demandOption: true, describe: "Input amount" })
     .option("outputAmount", { type: "number", demandOption: true, describe: "Output amount" })
     .option("originChainId", { type: "string", demandOption: true, describe: "Origin chain ID" })
-    .option("depositId", { type: "array", demandOption: true, describe: "Deposit ID" })
+    .option("depositId", { type: "string", demandOption: true, describe: "Deposit ID" })
     .option("fillDeadline", { type: "number", demandOption: false, describe: "Fill deadline" })
     .option("exclusivityDeadline", { type: "number", demandOption: false, describe: "Exclusivity deadline" })
     .option("repaymentChain", { type: "number", demandOption: false, description: "Repayment chain ID" })
@@ -65,10 +65,10 @@ async function fillRelayToRandom() {
     const exclusiveRelayer = new web3_js_1.PublicKey(resolvedArgv.exclusiveRelayer || web3_js_1.PublicKey.default.toString());
     const inputToken = new web3_js_1.PublicKey(resolvedArgv.inputToken);
     const outputToken = new web3_js_1.PublicKey(resolvedArgv.outputToken);
-    const inputAmount = new anchor_1.BN(resolvedArgv.inputAmount);
+    const inputAmount = (0, web3_v1_1.intToU8Array32)(new anchor_1.BN(resolvedArgv.inputAmount));
     const outputAmount = new anchor_1.BN(resolvedArgv.outputAmount);
     const originChainId = new anchor_1.BN(resolvedArgv.originChainId);
-    const depositId = resolvedArgv.depositId.map((id) => id); // Ensure depositId is an array of BN
+    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 repaymentChain = new anchor_1.BN(resolvedArgv.repaymentChain || 1);
@@ -148,8 +148,9 @@ async function fillRelayToRandom() {
         key,
         value: key === "message" ? value.toString("hex") : value.toString(),
     })));
-    // 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);
+    // Delegate to pull relayer tokens.
+    const delegatePda = (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, repaymentChain, repaymentAddress, program.programId).pda;
+    const approveInstruction = await (0, spl_token_1.createApproveCheckedInstruction)(relayerTokenAccount, outputToken, delegatePda, 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 fillRelayValues = [relayHash, relayData, repaymentChain, repaymentAddress];
     if (bufferParams) {
@@ -162,7 +163,7 @@ async function fillRelayToRandom() {
     const fillAccounts = {
         state: statePda,
         signer: signer.publicKey,
-        delegate: (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, repaymentChain, repaymentAddress, program.programId).pda,
+        delegate: delegatePda,
         instructionParams,
         mint: outputToken,
         relayerTokenAccount,

package/dist/scripts/svm/findFillStatusPdaFromEvent.js

@@ -77,7 +77,7 @@ async function findFillStatusPda() {
         exclusiveRelayer: convertAddress(resolvedArgv.exclusive_relayer),
         inputToken: convertAddress(resolvedArgv.input_token),
         outputToken: convertAddress(resolvedArgv.output_token),
-        inputAmount: new anchor_1.BN(resolvedArgv.input_amount),
+        inputAmount: (0, web3_v1_1.intToU8Array32)(new anchor_1.BN(resolvedArgv.input_amount)),
         outputAmount: new anchor_1.BN(resolvedArgv.output_amount),
         originChainId: new anchor_1.BN(resolvedArgv.origin_chain_id),
         depositId: parseStringToUint8Array(resolvedArgv.deposit_id),

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

@@ -45,7 +45,7 @@ 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("outputAmount", { type: "string", 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() {
@@ -55,7 +55,7 @@ async function nativeDeposit() {
     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 outputAmount = (0, web3_v1_1.intToU8Array32)(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;
@@ -79,7 +79,7 @@ async function nativeDeposit() {
         { property: "inputToken", value: inputToken.toString() },
         { property: "outputToken", value: outputToken.toString() },
         { property: "inputAmount", value: inputAmount.toString() },
-        { property: "outputAmount", value: outputAmount.toString() },
+        { property: "outputAmount", value: (0, web3_v1_1.u8Array32ToInt)(outputAmount).toString() },
         { property: "destinationChainId", value: destinationChainId.toString() },
         { property: "quoteTimestamp", value: quoteTimestamp.toString() },
         { property: "fillDeadline", value: fillDeadline.toString() },
@@ -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/queryEvents.js

@@ -65,7 +65,7 @@ async function queryEvents() {
     const eventName = argv.eventName || "any";
     const events = await (0, web3_v1_1.readProgramEvents)(provider.connection, program, "confirmed");
     const filteredEvents = events.filter((event) => (eventName == "any" ? true : event.name == eventName));
-    const formattedEvents = filteredEvents.map((event) => (0, web3_v1_1.stringifyCpiEvent)(event));
+    const formattedEvents = filteredEvents.map((event) => (0, web3_v1_1.stringifyCpiEvent)(event.data, event.name));
     console.log(JSON.stringify(formattedEvents, null, 2));
 }
 // Run the queryEvents function

package/dist/scripts/svm/queryEventsV2.js

@@ -49,7 +49,7 @@ async function queryEvents() {
     const rpcSubscriptions = (0, kit_1.createSolanaRpcSubscriptions)(rpcEndpoint.replace(/^http(s?):\/\//i, (_m, s) => `ws${s ?? ""}://`));
     const events = await (0, svm_2.readProgramEvents)({ rpc, rpcSubscriptions }, (0, kit_1.address)(programId), svm_1.SvmSpokeIdl, "confirmed");
     const filteredEvents = events.filter((e) => (eventName === "any" ? true : e.name === eventName));
-    const formattedEvents = filteredEvents.map(web3_v1_1.stringifyCpiEvent);
+    const formattedEvents = filteredEvents.map((event) => (0, web3_v1_1.stringifyCpiEvent)(event.data, event.name));
     console.log(JSON.stringify(formattedEvents, null, 2));
 }
 // Run the queryEvents function

package/dist/scripts/svm/queryFills.js

@@ -67,7 +67,7 @@ async function queryFills() {
             console.table([
                 { Property: "inputToken", Value: (0, web3_v1_1.strPublicKey)(event.data.inputToken) },
                 { Property: "outputToken", Value: (0, web3_v1_1.strPublicKey)(event.data.outputToken) },
-                { Property: "inputAmount", Value: event.data.inputAmount.toString() },
+                { Property: "inputAmount", Value: (0, web3_v1_1.u8Array32ToInt)(event.data.inputAmount).toString() },
                 { Property: "outputAmount", Value: event.data.outputAmount.toString() },
                 { Property: "repaymentChainId", Value: event.data.repaymentChainId.toString() },
                 { Property: "originChainId", Value: event.data.originChainId.toString() },

package/dist/scripts/svm/simpleDeposit.js

@@ -47,7 +47,7 @@ const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .option("inputToken", { type: "string", demandOption: true, describe: "Input token 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("outputAmount", { type: "string", 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 deposit() {
@@ -57,7 +57,7 @@ async function deposit() {
     const inputToken = new web3_js_1.PublicKey(resolvedArgv.inputToken);
     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 outputAmount = (0, web3_v1_1.intToU8Array32)(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;
@@ -79,7 +79,7 @@ async function deposit() {
         { property: "inputToken", value: inputToken.toString() },
         { property: "outputToken", value: outputToken.toString() },
         { property: "inputAmount", value: inputAmount.toString() },
-        { property: "outputAmount", value: outputAmount.toString() },
+        { property: "outputAmount", value: (0, web3_v1_1.u8Array32ToInt)(outputAmount).toString() },
         { property: "destinationChainId", value: destinationChainId.toString() },
         { property: "quoteTimestamp", value: quoteTimestamp.toString() },
         { property: "fillDeadline", value: fillDeadline.toString() },
@@ -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/simpleFakeRelayerRepayment.js

@@ -68,20 +68,27 @@ async function testBundleLogic() {
     const tokenDecimals = (await (0, spl_token_1.getMint)(provider.connection, inputToken, undefined, spl_token_1.TOKEN_PROGRAM_ID)).decimals;
     // 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.
-    web3_js_1.PublicKey.default, // exclusiveRelayer
-    Math.floor(Date.now() / 1000) - 1, // quoteTimestamp
-    Math.floor(Date.now() / 1000) + 3600, // fillDeadline
-    0, // exclusivityDeadline
-    Buffer.from([]) // message
-    )
+    const depositData = {
+        depositor: signer.publicKey,
+        recipient: signer.publicKey, // recipient is the signer for this example
+        inputToken,
+        outputToken: inputToken, // Re-use inputToken as outputToken. does not matter for this deposit.
+        inputAmount,
+        outputAmount: (0, web3_v1_1.intToU8Array32)(inputAmount),
+        destinationChainId: new anchor_1.BN(11155111),
+        exclusiveRelayer: web3_js_1.PublicKey.default,
+        quoteTimestamp: new anchor_1.BN(Math.floor(Date.now() / 1000) - 1),
+        fillDeadline: new anchor_1.BN(Math.floor(Date.now() / 1000) + 3600),
+        exclusivityParameter: new anchor_1.BN(0),
+        message: Buffer.from([]),
+    };
+    const delegatePda = (0, web3_v1_1.getDepositPda)(depositData, program.programId);
+    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 depositIx = await program.methods.deposit(depositData.depositor, depositData.recipient, depositData.inputToken, depositData.outputToken, depositData.inputAmount, depositData.outputAmount, depositData.destinationChainId, depositData.exclusiveRelayer, depositData.quoteTimestamp.toNumber(), depositData.fillDeadline.toNumber(), depositData.exclusivityParameter.toNumber(), Buffer.from([]))
         .accounts({
         state: statePda,
+        delegate: delegatePda,
         signer: signer.publicKey,
         userTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, signer.publicKey),
         vault: vault,
@@ -122,7 +129,7 @@ async function testBundleLogic() {
     const rootBundleId = state.rootBundleId;
     const rootBundleIdBuffer = Buffer.alloc(4);
     rootBundleIdBuffer.writeUInt32LE(rootBundleId);
-    const seeds = [Buffer.from("root_bundle"), statePda.toBuffer(), rootBundleIdBuffer];
+    const seeds = [Buffer.from("root_bundle"), seed.toArrayLike(Buffer, "le", 8), rootBundleIdBuffer];
     const [rootBundle] = web3_js_1.PublicKey.findProgramAddressSync(seeds, programId);
     console.table([
         { property: "State PDA", value: statePda.toString() },