fix(svm): use bytes32 for foreign amounts (#1045)

* fix(svm): use bytes32 for foreign amounts

Signed-off-by: Reinis Martinsons <[email protected]>

* fix: update tests for bytes32 amounts

Signed-off-by: Reinis Martinsons <[email protected]>

* update scripts for bytes32 amounts

Signed-off-by: Reinis Martinsons <[email protected]>

* fix: update scripts

Signed-off-by: Reinis Martinsons <[email protected]>

---------

Signed-off-by: Reinis Martinsons <[email protected]>

Author: Reinis-FRP

programs/svm-spoke/src/common/relay_data.rs

@@ -7,7 +7,7 @@ pub struct RelayData {
     pub exclusive_relayer: Pubkey,
     pub input_token: Pubkey,
     pub output_token: Pubkey,
-    pub input_amount: u64,
+    pub input_amount: [u8; 32],
     pub output_amount: u64,
     pub origin_chain_id: u64,
     pub deposit_id: [u8; 32],

programs/svm-spoke/src/event.rs

@@ -39,7 +39,7 @@ pub struct FundsDeposited {
     pub input_token: Pubkey,
     pub output_token: Pubkey,
     pub input_amount: u64,
-    pub output_amount: u64,
+    pub output_amount: [u8; 32],
     pub destination_chain_id: u64,
     pub deposit_id: [u8; 32],
     pub quote_timestamp: u32,
@@ -71,7 +71,7 @@ pub struct RelayExecutionEventInfo {
 pub struct FilledRelay {
     pub input_token: Pubkey,
     pub output_token: Pubkey,
-    pub input_amount: u64,
+    pub input_amount: [u8; 32],
     pub output_amount: u64,
     pub repayment_chain_id: u64,
     pub origin_chain_id: u64,
@@ -91,7 +91,7 @@ pub struct FilledRelay {
 pub struct RequestedSlowFill {
     pub input_token: Pubkey,
     pub output_token: Pubkey,
-    pub input_amount: u64,
+    pub input_amount: [u8; 32],
     pub output_amount: u64,
     pub origin_chain_id: u64,
     pub deposit_id: [u8; 32],

programs/svm-spoke/src/instructions/deposit.rs

@@ -21,15 +21,7 @@ use crate::{
 
 #[event_cpi]
 #[derive(Accounts)]
-#[instruction(
-    depositor: Pubkey,
-    recipient: Pubkey,
-    input_token: Pubkey,
-    output_token: Pubkey,
-    input_amount: u64,
-    output_amount: u64,
-    destination_chain_id: u64
-)]
+#[instruction(depositor: Pubkey, recipient: Pubkey, input_token: Pubkey)]
 pub struct Deposit<'info> {
     #[account(mut)]
     pub signer: Signer<'info>,
@@ -82,7 +74,7 @@ pub fn _deposit(
     input_token: Pubkey,
     output_token: Pubkey,
     input_amount: u64,
-    output_amount: u64,
+    output_amount: [u8; 32],
     destination_chain_id: u64,
     exclusive_relayer: Pubkey,
     deposit_id: [u8; 32],
@@ -160,7 +152,7 @@ pub fn deposit(
     input_token: Pubkey,
     output_token: Pubkey,
     input_amount: u64,
-    output_amount: u64,
+    output_amount: [u8; 32],
     destination_chain_id: u64,
     exclusive_relayer: Pubkey,
     quote_timestamp: u32,
@@ -212,7 +204,7 @@ pub fn deposit_now(
     input_token: Pubkey,
     output_token: Pubkey,
     input_amount: u64,
-    output_amount: u64,
+    output_amount: [u8; 32],
     destination_chain_id: u64,
     exclusive_relayer: Pubkey,
     fill_deadline_offset: u32,
@@ -264,7 +256,7 @@ pub fn unsafe_deposit(
     input_token: Pubkey,
     output_token: Pubkey,
     input_amount: u64,
-    output_amount: u64,
+    output_amount: [u8; 32],
     destination_chain_id: u64,
     exclusive_relayer: Pubkey,
     deposit_nonce: u64,

programs/svm-spoke/src/lib.rs

@@ -217,6 +217,7 @@ pub mod svm_spoke {
     ///   amount will be sent to the relayer on their repayment chain of choice as a refund following an optimistic
     ///   challenge window in the HubPool, less a system fee.
     /// - output_amount: The amount of output tokens that the relayer will send to the recipient on the destination.
+    ///   This is big-endian encoded as a 32-byte array to match its underlying byte representation on EVM side.
     /// - destination_chain_id: The destination chain identifier where the fill should be made.
     /// - exclusive_relayer: The relayer that will be exclusively allowed to fill this deposit before the exclusivity
     ///   deadline timestamp. This must be a valid, non-zero address if the exclusivity deadline is greater than the
@@ -238,7 +239,7 @@ pub mod svm_spoke {
         input_token: Pubkey,
         output_token: Pubkey,
         input_amount: u64,
-        output_amount: u64,
+        output_amount: [u8; 32],
         destination_chain_id: u64,
         exclusive_relayer: Pubkey,
         quote_timestamp: u32,
@@ -272,7 +273,7 @@ pub mod svm_spoke {
         input_token: Pubkey,
         output_token: Pubkey,
         input_amount: u64,
-        output_amount: u64,
+        output_amount: [u8; 32],
         destination_chain_id: u64,
         exclusive_relayer: Pubkey,
         fill_deadline_offset: u32,
@@ -308,7 +309,7 @@ pub mod svm_spoke {
         input_token: Pubkey,
         output_token: Pubkey,
         input_amount: u64,
-        output_amount: u64,
+        output_amount: [u8; 32],
         destination_chain_id: u64,
         exclusive_relayer: Pubkey,
         deposit_nonce: u64,
@@ -391,6 +392,7 @@ pub mod svm_spoke {
     ///     token on the repayment chain will be sent as a refund to the caller.
     ///   - output_token: The token that the caller will send to the recipient on this chain.
     ///   - input_amount: This amount, less a system fee, will be sent to the caller on their repayment chain.
+    ///     This is big-endian encoded as a 32-byte array to match its underlying byte representation on EVM side
     ///   - output_amount: The amount of output tokens that the caller will send to the recipient.
     ///   - origin_chain_id: The origin chain identifier.
     ///   - exclusive_relayer: The relayer that will be exclusively allowed to fill this deposit before the

programs/svm-spoke/src/utils/delegate_utils.rs

@@ -13,7 +13,7 @@ pub struct DepositSeedData<'a> {
     pub input_token: Pubkey,
     pub output_token: Pubkey,
     pub input_amount: u64,
-    pub output_amount: u64,
+    pub output_amount: [u8; 32],
     pub destination_chain_id: u64,
     pub exclusive_relayer: Pubkey,
     pub quote_timestamp: u32,
@@ -29,7 +29,7 @@ pub struct DepositNowSeedData<'a> {
     pub input_token: Pubkey,
     pub output_token: Pubkey,
     pub input_amount: u64,
-    pub output_amount: u64,
+    pub output_amount: [u8; 32],
     pub destination_chain_id: u64,
     pub exclusive_relayer: Pubkey,
     pub fill_deadline_offset: u32,

scripts/svm/closeRelayerPdas.ts

@@ -65,7 +65,7 @@ async function closeFillPda(eventData: any, seed: BN): Promise<void> {
     exclusiveRelayer: new PublicKey(eventData.exclusiveRelayer),
     inputToken: new PublicKey(eventData.inputToken),
     outputToken: new PublicKey(eventData.outputToken),
-    inputAmount: new BN(eventData.inputAmount),
+    inputAmount: eventData.inputAmount,
     outputAmount: new BN(eventData.outputAmount),
     originChainId: new BN(eventData.originChainId),
     depositId: eventData.depositId,

scripts/svm/fakeFillWithRandomDistribution.ts

@@ -20,6 +20,7 @@ import {
   calculateRelayHashUint8Array,
   getFillRelayDelegatePda,
   getSpokePoolProgram,
+  intToU8Array32,
   loadFillRelayParams,
   sendTransactionWithLookupTable,
 } from "../../src/svm/web3-v1";
@@ -40,10 +41,10 @@ const argv = yargs(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" })
@@ -58,10 +59,10 @@ async function fillRelayToRandom(): Promise<void> {
   const exclusiveRelayer = new PublicKey(resolvedArgv.exclusiveRelayer || PublicKey.default.toString());
   const inputToken = new PublicKey(resolvedArgv.inputToken);
   const outputToken = new PublicKey(resolvedArgv.outputToken);
-  const inputAmount = new BN(resolvedArgv.inputAmount);
+  const inputAmount = intToU8Array32(new BN(resolvedArgv.inputAmount));
   const outputAmount = new BN(resolvedArgv.outputAmount);
   const originChainId = new BN(resolvedArgv.originChainId);
-  const depositId = (resolvedArgv.depositId as number[]).map((id) => id); // Ensure depositId is an array of BN
+  const depositId = intToU8Array32(new 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 BN(resolvedArgv.repaymentChain || 1);
@@ -171,11 +172,17 @@ async function fillRelayToRandom(): Promise<void> {
     }))
   );
 
-  // Delegate state PDA to pull relayer tokens.
+  // Delegate to pull relayer tokens.
+  const delegatePda = getFillRelayDelegatePda(
+    relayHashUint8Array,
+    repaymentChain,
+    repaymentAddress,
+    program.programId
+  ).pda;
   const approveInstruction = await createApproveCheckedInstruction(
     relayerTokenAccount,
     outputToken,
-    statePda,
+    delegatePda,
     signer.publicKey,
     BigInt(relayData.outputAmount.toString()),
     tokenDecimals,
@@ -199,7 +206,7 @@ async function fillRelayToRandom(): Promise<void> {
   const fillAccounts = {
     state: statePda,
     signer: signer.publicKey,
-    delegate: getFillRelayDelegatePda(relayHashUint8Array, repaymentChain, repaymentAddress, program.programId).pda,
+    delegate: delegatePda,
     instructionParams,
     mint: outputToken,
     relayerTokenAccount,

scripts/svm/findFillStatusPdaFromEvent.ts

@@ -21,7 +21,12 @@ import { PublicKey } from "@solana/web3.js";
 import { BN } from "@coral-xyz/anchor";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { calculateRelayEventHashUint8Array, getSpokePoolProgram, evmAddressToPublicKey } from "../../src/svm/web3-v1";
+import {
+  calculateRelayEventHashUint8Array,
+  getSpokePoolProgram,
+  evmAddressToPublicKey,
+  intToU8Array32,
+} from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = anchor.AnchorProvider.env();
@@ -53,7 +58,7 @@ async function findFillStatusPda() {
     exclusiveRelayer: convertAddress(resolvedArgv.exclusive_relayer),
     inputToken: convertAddress(resolvedArgv.input_token),
     outputToken: convertAddress(resolvedArgv.output_token),
-    inputAmount: new BN(resolvedArgv.input_amount),
+    inputAmount: intToU8Array32(new BN(resolvedArgv.input_amount)),
     outputAmount: new BN(resolvedArgv.output_amount),
     originChainId: new BN(resolvedArgv.origin_chain_id),
     depositId: parseStringToUint8Array(resolvedArgv.deposit_id),

scripts/svm/nativeDeposit.ts

@@ -23,7 +23,14 @@ import {
 } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getDepositPda, getDepositSeedHash, getSpokePoolProgram, SOLANA_SPOKE_STATE_SEED } from "../../src/svm/web3-v1";
+import {
+  getDepositPda,
+  getDepositSeedHash,
+  getSpokePoolProgram,
+  intToU8Array32,
+  SOLANA_SPOKE_STATE_SEED,
+  u8Array32ToInt,
+} from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();
@@ -37,7 +44,7 @@ const argv = yargs(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;
 
@@ -48,7 +55,7 @@ async function nativeDeposit(): Promise<void> {
   const inputToken = NATIVE_MINT;
   const outputToken = new PublicKey(resolvedArgv.outputToken);
   const inputAmount = new BN(resolvedArgv.inputAmount);
-  const outputAmount = new BN(resolvedArgv.outputAmount);
+  const outputAmount = intToU8Array32(new BN(resolvedArgv.outputAmount));
   const destinationChainId = new BN(resolvedArgv.destinationChainId);
   const exclusiveRelayer = PublicKey.default;
   const quoteTimestamp = Math.floor(Date.now() / 1000) - 1;
@@ -85,7 +92,7 @@ async function nativeDeposit(): Promise<void> {
     { property: "inputToken", value: inputToken.toString() },
     { property: "outputToken", value: outputToken.toString() },
     { property: "inputAmount", value: inputAmount.toString() },
-    { property: "outputAmount", value: outputAmount.toString() },
+    { property: "outputAmount", value: u8Array32ToInt(outputAmount).toString() },
     { property: "destinationChainId", value: destinationChainId.toString() },
     { property: "quoteTimestamp", value: quoteTimestamp.toString() },
     { property: "fillDeadline", value: fillDeadline.toString() },

scripts/svm/queryEvents.ts

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