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

* refactor(svm): restructure utils into modular files under src folder for better organization

Signed-off-by: Pablo Maldonado <[email protected]>

* fix: imports

Signed-off-by: Pablo Maldonado <[email protected]>

* fix: anchor

Signed-off-by: Pablo Maldonado <[email protected]>

* refactor: comments

Signed-off-by: Pablo Maldonado <[email protected]>

* fix: test

Signed-off-by: Pablo Maldonado <[email protected]>

* refactor: comments

Signed-off-by: Pablo Maldonado <[email protected]>

* fixes

Signed-off-by: Pablo Maldonado <[email protected]>

---------

Signed-off-by: Pablo Maldonado <[email protected]>

Author: md0x

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, strPublicKey, u8Array32ToInt } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();

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