feat: remove solana web3 v1 related functions from exports

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@across-protocol/contracts",
-  "version": "3.0.25",
+  "version": "3.0.26",
   "author": "UMA Team",
   "license": "AGPL-3.0-only",
   "repository": {

scripts/svm/addressToPublicKey.ts

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

scripts/svm/bridgeLiabilityToHubPool.ts

@@ -38,12 +38,16 @@ import {
   SOLANA_SPOKE_STATE_SEED,
   SOLANA_USDC_DEVNET,
   SOLANA_USDC_MAINNET,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 
 import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 import { getNodeUrl } from "@uma/common";
 import { BigNumber, ethers } from "ethers";
-import { getMessageTransmitterProgram, getSpokePoolProgram, getTokenMessengerMinterProgram } from "../../src/svm";
+import {
+  getMessageTransmitterProgram,
+  getSpokePoolProgram,
+  getTokenMessengerMinterProgram,
+} from "../../src/svm/web3-v1";
 import { BondToken__factory } from "../../typechain";
 import { formatUsdc, requireEnv } from "./utils/helpers";
 

scripts/svm/closeRelayerPdas.ts

@@ -5,7 +5,7 @@ import { AnchorProvider, BN } from "@coral-xyz/anchor";
 import { PublicKey, SystemProgram } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { calculateRelayEventHashUint8Array, getSpokePoolProgram, readProgramEvents } from "../../src/svm";
+import { calculateRelayEventHashUint8Array, getSpokePoolProgram, readProgramEvents } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/enableRoute.ts

@@ -6,7 +6,7 @@ import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddres
 import { PublicKey, SystemProgram } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSpokePoolProgram } from "../../src/svm";
+import { getSpokePoolProgram } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/executeRebalanceToHubPool.ts

@@ -67,9 +67,9 @@ import {
   SOLANA_SPOKE_STATE_SEED,
   SOLANA_USDC_DEVNET,
   SOLANA_USDC_MAINNET,
-  SvmSpokeAnchor,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../src/types/svm";
+import { SvmSpokeAnchor } from "../../src/svm";
 
 // Set up Solana provider.
 const provider = AnchorProvider.env();

scripts/svm/executeRebalanceToSpokePool.ts

@@ -26,7 +26,7 @@ import {
   isSolanaDevnet,
   SOLANA_USDC_DEVNET,
   SOLANA_USDC_MAINNET,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { HubPool__factory } from "../../typechain";
 import { requireEnv } from "./utils/helpers";
 import { constructSimpleRebalanceTree } from "./utils/poolRebalanceTree";

scripts/svm/fakeFillWithRandomDistribution.ts

@@ -21,7 +21,7 @@ import {
   getSpokePoolProgram,
   loadFillV3RelayParams,
   sendTransactionWithLookupTable,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { FillDataParams, FillDataValues } from "../../src/types/svm";
 
 // Set up the provider and signer.

scripts/svm/initialize.ts

@@ -5,7 +5,7 @@ import { AnchorProvider, BN } from "@coral-xyz/anchor";
 import { PublicKey, SystemProgram } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { evmAddressToPublicKey, getSpokePoolProgram } from "../../src/svm";
+import { evmAddressToPublicKey, getSpokePoolProgram } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/proposeRebalanceToHubPool.ts

@@ -30,7 +30,7 @@ import { getNodeUrl } from "@uma/common";
 import { BigNumber, ethers } from "ethers";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSolanaChainId, SOLANA_USDC_DEVNET, SOLANA_USDC_MAINNET } from "../../src/svm";
+import { getSolanaChainId, SOLANA_USDC_DEVNET, SOLANA_USDC_MAINNET } from "../../src/svm/web3-v1";
 import { BondToken__factory, HubPool__factory } from "../../typechain";
 import { CHAIN_IDs } from "../../utils/constants";
 import {

scripts/svm/proposeRebalanceToSpokePool.ts

@@ -13,7 +13,7 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "../../utils/constants";
 // eslint-disable-next-line camelcase
-import { getSolanaChainId } from "../../src/svm";
+import { getSolanaChainId } from "../../src/svm/web3-v1";
 import { BondToken__factory, HubPool__factory } from "../../typechain";
 import { requireEnv } from "./utils/helpers";
 import { constructSimpleRebalanceTree } from "./utils/poolRebalanceTree";

scripts/svm/publicKeyToAddress.ts

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

scripts/svm/queryDeposits.ts

@@ -5,7 +5,7 @@ import { AnchorProvider, BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSpokePoolProgram, readProgramEvents } from "../../src/svm";
+import { getSpokePoolProgram, readProgramEvents } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/queryEvents.ts

@@ -3,7 +3,7 @@ import * as anchor from "@coral-xyz/anchor";
 import { AnchorProvider, Program } from "@coral-xyz/anchor";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { readProgramEvents, stringifyCpiEvent } from "../../src/svm";
+import { readProgramEvents, stringifyCpiEvent } from "../../src/svm/web3-v1";
 import { SvmSpoke } from "../../target/types/svm_spoke";
 
 // Set up the provider

scripts/svm/queryEventsV2.ts

@@ -1,9 +1,11 @@
 // This script queries the events of the spoke pool and prints them in a human readable format.
 import { AnchorProvider } from "@coral-xyz/anchor";
 import { address, createSolanaRpc } from "@solana/web3-v2.js";
+import { stringifyCpiEvent } from "../../src/svm/web3-v1";
+import { SvmSpokeIdl } from "../../src/svm";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { readProgramEventsV2, stringifyCpiEvent, SvmSpokeIdl } from "../../src/svm";
+import { readProgramEvents } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();
@@ -41,9 +43,9 @@ async function queryEvents(): Promise<void> {
   const eventName = argv.eventName || "any";
   const programId = argv.programId;
   const rpc = createSolanaRpc(provider.connection.rpcEndpoint);
-  const events = await readProgramEventsV2(rpc, address(programId), SvmSpokeIdl, "confirmed");
-  const filteredEvents = events.filter((event) => (eventName == "any" ? true : event.name == eventName));
-  const formattedEvents = filteredEvents.map((event) => stringifyCpiEvent(event));
+  const events = await readProgramEvents(rpc, address(programId), SvmSpokeIdl, "confirmed");
+  const filteredEvents = events.filter((event: any) => (eventName == "any" ? true : event.name == eventName));
+  const formattedEvents = filteredEvents.map((event: any) => stringifyCpiEvent(event));
 
   console.log(JSON.stringify(formattedEvents, null, 2));
 }

scripts/svm/queryFills.ts

@@ -5,7 +5,7 @@ import { AnchorProvider, BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSpokePoolProgram, readProgramEvents, strPublicKey, u8Array32ToInt } from "../../src/svm";
+import { getSpokePoolProgram, readProgramEvents, strPublicKey, u8Array32ToInt } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/queryRoute.ts

@@ -11,7 +11,7 @@ import {
 import { PublicKey } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSpokePoolProgram } from "../../src/svm";
+import { getSpokePoolProgram } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/queryState.ts

@@ -5,7 +5,7 @@ import { AnchorProvider, BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSpokePoolProgram } from "../../src/svm";
+import { getSpokePoolProgram } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/remoteHubPoolPauseDeposits.ts

@@ -19,7 +19,7 @@ import {
   getMessageTransmitterProgram,
   getSpokePoolProgram,
   isSolanaDevnet,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { HubPool__factory } from "../../typechain";
 import { requireEnv } from "./utils/helpers";
 

scripts/svm/remoteHubPoolSetDepositRoute.ts

@@ -24,7 +24,7 @@ import {
   isSolanaDevnet,
   SOLANA_USDC_DEVNET,
   SOLANA_USDC_MAINNET,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { HubPool__factory } from "../../typechain";
 import { CHAIN_IDs } from "../../utils/constants";
 import { requireEnv } from "./utils/helpers";

scripts/svm/remotePauseDeposits.ts

@@ -20,7 +20,7 @@ import {
   isSolanaDevnet,
   MAINNET_CCTP_MESSAGE_TRANSMITTER_ADDRESS,
   SEPOLIA_CCTP_MESSAGE_TRANSMITTER_ADDRESS,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { CHAIN_IDs } from "../../utils/constants";
 import { requireEnv } from "./utils/helpers";
 

scripts/svm/simpleDeposit.ts

@@ -12,7 +12,7 @@ import {
 import { PublicKey, Transaction, sendAndConfirmTransaction } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSpokePoolProgram } from "../../src/svm";
+import { getSpokePoolProgram } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/simpleFakeRelayerRepayment.ts

@@ -24,7 +24,7 @@ import {
 import { MerkleTree } from "@uma/common/dist/MerkleTree";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSpokePoolProgram, loadExecuteRelayerRefundLeafParams, relayerRefundHashFn } from "../../src/svm";
+import { getSpokePoolProgram, loadExecuteRelayerRefundLeafParams, relayerRefundHashFn } from "../../src/svm/web3-v1";
 import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../src/types/svm";
 
 // Set up the provider

scripts/svm/simpleFill.ts

@@ -14,7 +14,7 @@ import {
 import { PublicKey, SystemProgram, Transaction, sendAndConfirmTransaction } from "@solana/web3.js";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { calculateRelayHashUint8Array, getSpokePoolProgram, intToU8Array32 } from "../../src/svm";
+import { calculateRelayHashUint8Array, getSpokePoolProgram, intToU8Array32 } from "../../src/svm/web3-v1";
 
 // Set up the provider
 const provider = AnchorProvider.env();

scripts/svm/utils/helpers.ts

@@ -2,7 +2,7 @@ import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { MerkleTree } from "@uma/common";
 import { BigNumber, ethers } from "ethers";
-import { relayerRefundHashFn } from "../../../src/svm";
+import { relayerRefundHashFn } from "../../../src/svm/web3-v1";
 import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../../src/types/svm";
 
 export const requireEnv = (name: string): string => {

src/svm/index.ts

@@ -1,4 +1,3 @@
-export * from "./web3-v1";
 export * from "./web3-v2";
 export * from "./assets";
 export * from "./clients";

src/svm/web3-v2/solanaProgramUtils.ts

@@ -17,7 +17,7 @@ type GetSignaturesForAddressTransaction = ReturnType<GetSignaturesForAddressApi[
 /**
  * Reads all events for a specific program.
  */
-export async function readProgramEventsV2(
+export async function readProgramEvents(
   rpc: web3.Rpc<web3.SolanaRpcApiFromTransport<RpcTransport>>,
   program: Address,
   anchorIdl: Idl,
@@ -42,7 +42,7 @@ export async function readProgramEventsV2(
   // Fetch events for all signatures in parallel
   const eventsWithSlots = await Promise.all(
     allSignatures.map(async (signatureTransaction) => {
-      const events = await readEventsV2(rpc, signatureTransaction.signature, program, anchorIdl, finality);
+      const events = await readEvents(rpc, signatureTransaction.signature, program, anchorIdl, finality);
 
       return events.map((event) => ({
         ...event,
@@ -60,7 +60,7 @@ export async function readProgramEventsV2(
 /**
  * Reads events from a transaction.
  */
-export async function readEventsV2(
+export async function readEvents(
   rpc: web3.Rpc<web3.SolanaRpcApiFromTransport<RpcTransport>>,
   txSignature: Signature,
   programId: Address,

test/svm/MulticallHandler.ts

@@ -8,7 +8,7 @@ import {
   createTransferCheckedInstruction,
 } from "@solana/spl-token";
 import { MulticallHandler } from "../../target/types/multicall_handler";
-import { MulticallHandlerCoder } from "../../src/svm";
+import { MulticallHandlerCoder } from "../../src/svm/web3-v1";
 import { common } from "./SvmSpoke.common";
 
 const { provider, owner, connection, assertSE } = common;

test/svm/SvmSpoke.Bundle.ts

@@ -16,7 +16,7 @@ import {
   readEventsUntilFound,
   relayerRefundHashFn,
   sendTransactionWithLookupTable,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../src/types/svm";
 import { MerkleTree } from "../../utils";
 import { common } from "./SvmSpoke.common";

test/svm/SvmSpoke.Deposit.ts

@@ -17,7 +17,7 @@ import {
 import { PublicKey, Keypair, Transaction, sendAndConfirmTransaction } from "@solana/web3.js";
 import { common } from "./SvmSpoke.common";
 import { DepositDataValues } from "../../src/types/svm";
-import { intToU8Array32, readEventsUntilFound } from "../../src/svm";
+import { intToU8Array32, readEventsUntilFound } from "../../src/svm/web3-v1";
 const { provider, connection, program, owner, seedBalance, initializeState, depositData } = common;
 const { createRoutePda, getVaultAta, assertSE, assert, getCurrentTime, depositQuoteTimeBuffer, fillDeadlineBuffer } =
   common;

test/svm/SvmSpoke.Fill.AcrossPlus.ts

@@ -29,7 +29,7 @@ import {
   sendTransactionWithLookupTable,
   loadFillV3RelayParams,
   intToU8Array32,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { MulticallHandler } from "../../target/types/multicall_handler";
 import { common } from "./SvmSpoke.common";
 import { FillDataParams, FillDataValues } from "../../src/types/svm";

test/svm/SvmSpoke.Fill.ts

@@ -22,7 +22,7 @@ import {
   sendTransactionWithLookupTable,
   hashNonEmptyMessage,
   intToU8Array32,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { common } from "./SvmSpoke.common";
 import { testAcrossPlusMessage } from "./utils";
 import { FillDataValues, RelayData } from "../../src/types/svm";

test/svm/SvmSpoke.HandleReceiveMessage.ts

@@ -5,7 +5,7 @@ import { Keypair } from "@solana/web3.js";
 import { assert } from "chai";
 import * as crypto from "crypto";
 import { ethers } from "ethers";
-import { encodeMessageHeader, evmAddressToPublicKey } from "../../src/svm";
+import { encodeMessageHeader, evmAddressToPublicKey } from "../../src/svm/web3-v1";
 import { MessageTransmitter } from "../../target/types/message_transmitter";
 import { SvmSpoke } from "../../target/types/svm_spoke";
 import { common } from "./SvmSpoke.common";

test/svm/SvmSpoke.Ownership.ts

@@ -3,7 +3,7 @@ import { BN } from "@coral-xyz/anchor";
 import { Keypair, PublicKey } from "@solana/web3.js";
 import { assert } from "chai";
 import { common } from "./SvmSpoke.common";
-import { readEventsUntilFound } from "../../src/svm";
+import { readEventsUntilFound } from "../../src/svm/web3-v1";
 
 const { provider, program, owner, initializeState, crossDomainAdmin, assertSE } = common;
 

test/svm/SvmSpoke.RefundClaims.ts

@@ -6,7 +6,7 @@ import { common } from "./SvmSpoke.common";
 import { MerkleTree } from "@uma/common/dist/MerkleTree";
 import { createMint, getOrCreateAssociatedTokenAccount, mintTo, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../src/types/svm";
-import { loadExecuteRelayerRefundLeafParams, readEventsUntilFound, relayerRefundHashFn } from "../../src/svm";
+import { loadExecuteRelayerRefundLeafParams, readEventsUntilFound, relayerRefundHashFn } from "../../src/svm/web3-v1";
 
 const { provider, program, owner, initializeState, connection, chainId, assertSE } = common;
 

test/svm/SvmSpoke.Routes.ts

@@ -4,7 +4,7 @@ import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, createMint, getAccount }
 import { PublicKey, Keypair } from "@solana/web3.js";
 import { assert } from "chai";
 import { common } from "./SvmSpoke.common";
-import { readEventsUntilFound } from "../../src/svm";
+import { readEventsUntilFound } from "../../src/svm/web3-v1";
 
 const { provider, program, owner, initializeState, createRoutePda, getVaultAta } = common;
 

test/svm/SvmSpoke.SlowFill.AcrossPlus.ts

@@ -30,7 +30,7 @@ import {
   loadRequestV3SlowFillParams,
   loadExecuteV3SlowRelayLeafParams,
   intToU8Array32,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { MulticallHandler } from "../../target/types/multicall_handler";
 import { common } from "./SvmSpoke.common";
 import {

test/svm/SvmSpoke.SlowFill.ts

@@ -19,7 +19,7 @@ import {
   intToU8Array32,
   readEventsUntilFound,
   slowFillHashFn,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { testAcrossPlusMessage } from "./utils";
 
 const { provider, connection, program, owner, chainId, seedBalance, initializeState } = common;

test/svm/SvmSpoke.TokenBridge.ts

@@ -10,7 +10,7 @@ import {
   loadExecuteRelayerRefundLeafParams,
   readEventsUntilFound,
   relayerRefundHashFn,
-} from "../../src/svm";
+} from "../../src/svm/web3-v1";
 import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../src/types/svm";
 import { MessageTransmitter } from "../../target/types/message_transmitter";
 import { TokenMessengerMinter } from "../../target/types/token_messenger_minter";

test/svm/SvmSpoke.common.ts

@@ -5,7 +5,7 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import { assert } from "chai";
 import { randomBytes } from "crypto";
 import { ethers } from "ethers";
-import { evmAddressToPublicKey } from "../../src/svm";
+import { evmAddressToPublicKey } from "../../src/svm/web3-v1";
 import { DepositData } from "../../src/types/svm";
 import { SvmSpoke } from "../../target/types/svm_spoke";