refactor(svm): restructure utils into modular files under src folder

scripts/svm/addressToPublicKey.ts

@@ -1,4 +1,4 @@
-import { evmAddressToPublicKey } from "../../src/SvmUtils";
+import { evmAddressToPublicKey } from "../../src/svm";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 const argv = yargs(hideBin(process.argv)).option("address", {

scripts/svm/closeRelayerPdas.ts

@@ -6,7 +6,7 @@ import { PublicKey, SystemProgram } from "@solana/web3.js";
 import { SvmSpoke } from "../../target/types/svm_spoke";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { calculateRelayEventHashUint8Array, readProgramEvents } from "../../src/SvmUtils";
+import { calculateRelayEventHashUint8Array, readProgramEvents } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/executeRebalanceToHubPool.ts

@@ -68,11 +68,8 @@ import {
 
 import { getNodeUrl, MerkleTree } from "@uma/common";
 import { decodeMessageHeader, getMessages } from "../../test/svm/cctpHelpers";
-import {
-  loadExecuteRelayerRefundLeafParams,
-  RelayerRefundLeafSolana,
-  RelayerRefundLeafType,
-} from "../../test/svm/utils";
+import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../src/types/svm";
+import { loadExecuteRelayerRefundLeafParams } from "../../src/svm";
 
 // Set up Solana provider.
 const provider = AnchorProvider.env();

scripts/svm/executeRebalanceToSpokePool.ts

@@ -12,7 +12,7 @@ import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "../../utils/constants";
 import { SvmSpoke } from "../../target/types/svm_spoke";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { evmAddressToPublicKey } from "../../src/SvmUtils";
+import { evmAddressToPublicKey } from "../../src/svm";
 import { MessageTransmitter } from "../../target/types/message_transmitter";
 import { TokenMessengerMinter } from "../../target/types/token_messenger_minter";
 import { ethers, BigNumber } from "ethers";

scripts/svm/fakeFillWithRandomDistribution.ts

@@ -19,10 +19,10 @@ import {
   AcrossPlusMessageCoder,
   MulticallHandlerCoder,
   calculateRelayHashUint8Array,
+  loadFillV3RelayParams,
   sendTransactionWithLookupTable,
-} from "../../src/SvmUtils";
-import { FillDataParams, FillDataValues } from "../../test/svm/SvmSpoke.common";
-import { loadFillV3RelayParams } from "../../test/svm/utils";
+} from "../../src/svm";
+import { FillDataParams, FillDataValues } from "../../src/types/svm";
 
 // Set up the provider and signer.
 const provider = AnchorProvider.env();

scripts/svm/initialize.ts

@@ -6,7 +6,7 @@ import { PublicKey, SystemProgram } from "@solana/web3.js";
 import { SvmSpoke } from "../../target/types/svm_spoke";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { evmAddressToPublicKey } from "../../src/SvmUtils";
+import { evmAddressToPublicKey } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/publicKeyToAddress.ts

@@ -1,6 +1,6 @@
-import { publicKeyToEvmAddress } from "../../src/SvmUtils";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
+import { publicKeyToEvmAddress } from "../../src/svm";
 
 const argv = yargs(hideBin(process.argv)).option("publicKey", {
   type: "string",

scripts/svm/queryDeposits.ts

@@ -6,7 +6,7 @@ import { PublicKey } from "@solana/web3.js";
 import { SvmSpoke } from "../../target/types/svm_spoke";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { readProgramEvents } from "../../src/SvmUtils";
+import { readProgramEvents } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/queryFills.ts

@@ -6,8 +6,7 @@ import { PublicKey } from "@solana/web3.js";
 import { SvmSpoke } from "../../target/types/svm_spoke";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { readProgramEvents, strPublicKey } from "../../src/SvmUtils";
-import { u8Array32ToInt } from "../../test/svm/utils";
+import { readProgramEvents } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();
@@ -47,27 +46,30 @@ async function queryFills(): Promise<void> {
       console.log("No fill events found for the given seed.");
       return;
     }
+
     console.log("Fill events fetched successfully:");
     fillEvents.forEach((event, index) => {
       console.log(`Fill Event ${index + 1}:`);
       console.table([
-        { Property: "inputToken", Value: strPublicKey(event.data.inputToken) },
-        { Property: "outputToken", Value: strPublicKey(event.data.outputToken) },
+        { Property: "inputToken", Value: new PublicKey(event.data.inputToken).toString() },
+        { Property: "outputToken", Value: new PublicKey(event.data.outputToken).toString() },
         { Property: "inputAmount", Value: 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() },
         { Property: "depositId", Value: event.data.depositId.toString() },
-        { Property: "depositIdNum", Value: u8Array32ToInt(event.data.depositId).toString() },
         { Property: "fillDeadline", Value: event.data.fillDeadline.toString() },
         { Property: "exclusivityDeadline", Value: event.data.exclusivityDeadline.toString() },
-        { Property: "exclusiveRelayer", Value: strPublicKey(event.data.exclusiveRelayer) },
-        { Property: "relayer", Value: strPublicKey(event.data.relayer) },
-        { Property: "depositor", Value: strPublicKey(event.data.depositor) },
-        { Property: "recipient", Value: strPublicKey(event.data.recipient) },
-        { Property: "messageHash", Value: event.data.messageHash.toString() },
-        { Property: "updatedRecipient", Value: strPublicKey(event.data.relayExecutionInfo.updatedRecipient) },
-        { Property: "updatedMessageHash", Value: event.data.relayExecutionInfo.updatedMessageHash.toString() },
+        { Property: "exclusiveRelayer", Value: new PublicKey(event.data.exclusiveRelayer).toString() },
+        { Property: "relayer", Value: new PublicKey(event.data.relayer).toString() },
+        { Property: "depositor", Value: new PublicKey(event.data.depositor).toString() },
+        { Property: "recipient", Value: new PublicKey(event.data.recipient).toString() },
+        { Property: "message", Value: event.data.message.toString() },
+        {
+          Property: "updatedRecipient",
+          Value: new PublicKey(event.data.relayExecutionInfo.updatedRecipient).toString(),
+        },
+        { Property: "updatedMessage", Value: event.data.relayExecutionInfo.updatedMessage.toString() },
         { Property: "updatedOutputAmount", Value: event.data.relayExecutionInfo.updatedOutputAmount.toString() },
         { Property: "fillType", Value: event.data.relayExecutionInfo.fillType },
       ]);

scripts/svm/simpleFakeRelayerRepayment.ts

@@ -25,12 +25,8 @@ import { SvmSpoke } from "../../target/types/svm_spoke";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { MerkleTree } from "@uma/common/dist/MerkleTree";
-import {
-  relayerRefundHashFn,
-  RelayerRefundLeafType,
-  RelayerRefundLeafSolana,
-  loadExecuteRelayerRefundLeafParams,
-} from "../../test/svm/utils";
+import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../src/types/svm";
+import { loadExecuteRelayerRefundLeafParams, relayerRefundHashFn } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/simpleFill.ts

@@ -15,8 +15,7 @@ import {
 import { SvmSpoke } from "../../target/types/svm_spoke";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { calculateRelayHashUint8Array } from "../../src/SvmUtils";
-import { intToU8Array32 } from "../../test/svm/utils";
+import { calculateRelayHashUint8Array } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();
@@ -36,7 +35,7 @@ const argv = yargs(hideBin(process.argv))
   .option("inputAmount", { type: "number", 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: "string", demandOption: true, describe: "Deposit ID" })
+  .option("depositId", { type: "array", demandOption: true, describe: "Deposit ID" })
   .option("fillDeadline", { type: "number", demandOption: false, describe: "Fill deadline" })
   .option("exclusivityDeadline", { type: "number", demandOption: false, describe: "Exclusivity deadline" }).argv;
 
@@ -50,7 +49,7 @@ async function fillV3Relay(): Promise<void> {
   const inputAmount = new BN(resolvedArgv.inputAmount);
   const outputAmount = new BN(resolvedArgv.outputAmount);
   const originChainId = new BN(resolvedArgv.originChainId);
-  const depositId = intToU8Array32(new BN(resolvedArgv.depositId));
+  const depositId = 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 message = Buffer.from("");
@@ -65,7 +64,7 @@ async function fillV3Relay(): Promise<void> {
     inputAmount,
     outputAmount,
     originChainId,
-    depositId,
+    depositId: depositId.map((id) => Number(id)),
     fillDeadline,
     exclusivityDeadline,
     message,
@@ -155,7 +154,7 @@ async function fillV3Relay(): Promise<void> {
       state: statePda,
       signer: signer.publicKey,
       instructionParams: program.programId,
-      mint: outputToken,
+      mintAccount: outputToken,
       relayerTokenAccount: relayerTokenAccount,
       recipientTokenAccount: recipientTokenAccount,
       fillStatus: fillStatusPda,

scripts/svm/utils/helpers.ts

@@ -1,8 +1,9 @@
 import { utils as anchorUtils, BN } from "@coral-xyz/anchor";
-import { relayerRefundHashFn, RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../../test/svm/utils";
 import { BigNumber, ethers } from "ethers";
 import { PublicKey } from "@solana/web3.js";
 import { MerkleTree } from "@uma/common";
+import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../../src/types/svm";
+import { relayerRefundHashFn } from "../../../src/svm";
 
 export const requireEnv = (name: string): string => {
   if (!process.env[name]) throw new Error(`Environment variable ${name} is not set`);