Revert "feat(svm): include solana artifacts in package build output (#806)" (#857)

This reverts commit e03e0b6.

Author: md0x

.gitignore

@@ -32,4 +32,3 @@ target
 **/*.rs.bk
 test-ledger
 idls
-src/svm/assets 

deployments/deployments.json

@@ -170,11 +170,6 @@
     "SpokePoolVerifier": { "address": "0xB4A8d45647445EA9FC3E1058096142390683dBC2", "blockNumber": 1152853 },
     "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 1145284 }
   },
-  "1810017368444177321": {
-    "SvmSpoke": { "address": "YVMQN27RnCNt23NRxzJPumXRd8iovEfKtzkqyMc5vDt", "blockNumber": 0 },
-    "MessageTransmitter": { "address": "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd", "blockNumber": 0 },
-    "TokenMessengerMinter": { "address": "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3", "blockNumber": 0 }
-  },
   "1868": {
     "SpokePool": { "address": "0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96", "blockNumber": 1709997 },
     "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 1711482 }

index.ts

@@ -1,4 +1,3 @@
 export * from "./typechain";
 export * from "./src/DeploymentUtils";
 export * from "./utils";
-export * from "./src/svm";

package.json

@@ -26,17 +26,16 @@
     "lint-fix": "yarn prettier --write **/*.js **/*.ts ./programs/**/*.rs ./contracts**/*.sol && cargo +nightly fmt  --all && cargo clippy",
     "clean-fast": "for dir in node_modules cache cache-zk artifacts artifacts-zk dist typechain; do mv \"${dir}\" \"_${dir}\"; rm -rf \"_${dir}\" &; done",
     "clean": "rm -rf node_modules cache cache-zk artifacts artifacts-zk dist typechain",
-    "generate-svm-assets": "sh ./scripts/generate-svm-assets.sh",
     "build-evm": "hardhat compile",
     "build-svm": "echo 'Generating IDLs...' && anchor build > /dev/null 2>&1 || true && anchor run generateExternalTypes && anchor build",
     "build-ts": "tsc && rsync -a --include '*/' --include '*.d.ts' --exclude '*' ./typechain ./dist/",
-    "build": "yarn build-evm && yarn build-svm && yarn generate-svm-assets && yarn build-ts",
+    "build": "yarn build-evm && yarn build-svm && yarn build-ts",
     "test-evm": "IS_TEST=true hardhat test",
     "test-svm": "anchor test -- --features test",
     "test": "yarn test-evm && yarn test-svm",
     "test:report-gas": "IS_TEST=true REPORT_GAS=true hardhat test",
-    "generate-evm-assets": "rm -rf typechain && TYPECHAIN=ethers yarn hardhat typechain",
-    "prepublish": "yarn build && hardhat export --export-all ./cache/massExport.json && ts-node ./scripts/processHardhatExport.ts && prettier --write ./deployments/deployments.json && yarn generate-evm-assets",
+    "generate-contract-types": "rm -rf typechain && TYPECHAIN=ethers yarn hardhat typechain",
+    "prepublish": "yarn build && hardhat export --export-all ./cache/massExport.json && ts-node ./scripts/processHardhatExport.ts && prettier --write ./deployments/deployments.json && yarn generate-contract-types",
     "pre-commit-hook": "sh scripts/preCommitHook.sh"
   },
   "dependencies": {

scripts/generate-svm-assets.sh

@@ -24,10 +24,13 @@
  */
 
 import * as anchor from "@coral-xyz/anchor";
-import { AnchorProvider, BN } from "@coral-xyz/anchor";
+import { AnchorProvider, BN, Program } from "@coral-xyz/anchor";
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { PublicKey, SystemProgram } from "@solana/web3.js";
 // eslint-disable-next-line camelcase
+import { MessageTransmitter } from "../../target/types/message_transmitter";
+import { SvmSpoke } from "../../target/types/svm_spoke";
+// eslint-disable-next-line camelcase
 import {
   CIRCLE_IRIS_API_URL_DEVNET,
   CIRCLE_IRIS_API_URL_MAINNET,
@@ -43,7 +46,7 @@ import {
 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 { TokenMessengerMinter } from "../../target/types/token_messenger_minter";
 import { BondToken__factory } from "../../typechain";
 import { formatUsdc, requireEnv } from "./utils/helpers";
 
@@ -52,7 +55,10 @@ const provider = AnchorProvider.env();
 anchor.setProvider(provider);
 
 // Get Solana programs and IDLs.
-const svmSpokeProgram = getSpokePoolProgram(provider);
+const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
+const svmSpokeProgram = new Program<SvmSpoke>(svmSpokeIdl, provider);
+const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
+const tokenMessengerMinterIdl = require("../../target/idl/token_messenger_minter.json");
 
 // CCTP domains.
 const ethereumDomain = 0; // Ethereum
@@ -194,7 +200,7 @@ async function bridgeLiabilityToHubPool(): Promise<void> {
 }
 
 async function bridgeTokensToHubPool(amount: BN, signer: anchor.Wallet, statePda: PublicKey, inputToken: PublicKey) {
-  const messageTransmitterProgram = getMessageTransmitterProgram(provider);
+  const messageTransmitterProgram = new Program<MessageTransmitter>(messageTransmitterIdl, provider);
 
   const vault = getAssociatedTokenAddressSync(
     inputToken,
@@ -209,7 +215,7 @@ async function bridgeTokensToHubPool(amount: BN, signer: anchor.Wallet, statePda
     [Buffer.from("transfer_liability"), inputToken.toBuffer()],
     svmSpokeProgram.programId
   );
-  const tokenMessengerMinterProgram = getTokenMessengerMinterProgram(provider);
+  const tokenMessengerMinterProgram = new Program<TokenMessengerMinter>(tokenMessengerMinterIdl, provider);
 
   const [tokenMessengerMinterSenderAuthority] = PublicKey.findProgramAddressSync(
     [Buffer.from("sender_authority")],

scripts/svm/bridgeLiabilityToHubPool.ts

@@ -1,16 +1,18 @@
 // This script closes all Relayer PDAs associated with tracking fill Status. Relayers should do this periodically to
 // reclaim the lamports within these tracking accounts. Fill Status PDAs can be closed on the deposit has expired.
 import * as anchor from "@coral-xyz/anchor";
-import { AnchorProvider, BN } from "@coral-xyz/anchor";
+import { BN, Program, AnchorProvider } from "@coral-xyz/anchor";
 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, getSpokePoolProgram, readProgramEvents } from "../../src/svm";
+import { calculateRelayEventHashUint8Array, readProgramEvents } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();
 anchor.setProvider(provider);
-const program = getSpokePoolProgram(provider);
+const idl = require("../../target/idl/svm_spoke.json");
+const program = new Program<SvmSpoke>(idl, provider);
 const programId = program.programId;
 
 // Parse arguments

scripts/svm/closeRelayerPdas.ts

@@ -1,17 +1,18 @@
 // This script is used by a chain admin to enable or disable a route for a token on the Solana Spoke Pool.
 
 import * as anchor from "@coral-xyz/anchor";
-import { AnchorProvider, BN } from "@coral-xyz/anchor";
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from "@solana/spl-token";
+import { BN, Program, AnchorProvider } from "@coral-xyz/anchor";
 import { PublicKey, SystemProgram } from "@solana/web3.js";
+import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from "@solana/spl-token";
+import { SvmSpoke } from "../../target/types/svm_spoke";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { getSpokePoolProgram } from "../../src/svm";
 
 // Set up the provider
 const provider = AnchorProvider.env();
 anchor.setProvider(provider);
-const program = getSpokePoolProgram(provider);
+const idl = require("../../target/idl/svm_spoke.json");
+const program = new Program<SvmSpoke>(idl, provider);
 const programId = program.programId;
 console.log("SVM-Spoke Program ID:", programId.toString());
 

scripts/svm/enableRoute.ts

@@ -43,6 +43,8 @@ import {
 import { BigNumber, ethers } from "ethers";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
+import { MessageTransmitter } from "../../target/types/message_transmitter";
+import { SvmSpoke } from "../../target/types/svm_spoke";
 import { CHAIN_IDs } from "../../utils/constants";
 // eslint-disable-next-line camelcase
 import { HubPool__factory } from "../../typechain";
@@ -59,15 +61,12 @@ import {
   CIRCLE_IRIS_API_URL_MAINNET,
   decodeMessageHeader,
   getMessages,
-  getMessageTransmitterProgram,
   getSolanaChainId,
-  getSpokePoolProgram,
   isSolanaDevnet,
   loadExecuteRelayerRefundLeafParams,
   SOLANA_SPOKE_STATE_SEED,
   SOLANA_USDC_DEVNET,
   SOLANA_USDC_MAINNET,
-  SvmSpokeAnchor,
 } from "../../src/svm";
 import { RelayerRefundLeafSolana, RelayerRefundLeafType } from "../../src/types/svm";
 
@@ -76,9 +75,10 @@ const provider = AnchorProvider.env();
 anchor.setProvider(provider);
 
 // Get Solana programs.
-
-const svmSpokeProgram = getSpokePoolProgram(provider);
-const messageTransmitterProgram = getMessageTransmitterProgram(provider);
+const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
+const svmSpokeProgram = new Program<SvmSpoke>(svmSpokeIdl, provider);
+const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
+const messageTransmitterProgram = new Program<MessageTransmitter>(messageTransmitterIdl, provider);
 
 const [messageTransmitterState] = PublicKey.findProgramAddressSync(
   [Buffer.from("message_transmitter")],
@@ -340,7 +340,7 @@ async function executeRootBalanceOnHubPool(solanaChainId: BigNumber) {
 
 async function executeRelayerRefundLeaf(
   signer: anchor.Wallet,
-  program: Program<SvmSpokeAnchor>,
+  program: Program<SvmSpoke>,
   statePda: PublicKey,
   rootBundle: PublicKey,
   relayerRefundLeaf: RelayerRefundLeafSolana,

scripts/svm/executeRebalanceToHubPool.ts

@@ -4,13 +4,13 @@
 // - HUB_POOL_ADDRESS: Hub Pool address
 
 import * as anchor from "@coral-xyz/anchor";
-import { AnchorProvider, BN } from "@coral-xyz/anchor";
-import { getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID } from "@solana/spl-token";
+import { BN, Program, AnchorProvider } from "@coral-xyz/anchor";
 import { AccountMeta, PublicKey, SystemProgram } from "@solana/web3.js";
+import { TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from "@solana/spl-token";
 import { getNodeUrl } from "@uma/common";
 // eslint-disable-next-line camelcase
-import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
-import { BigNumber, ethers } from "ethers";
+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 {
@@ -19,26 +19,30 @@ import {
   decodeMessageHeader,
   evmAddressToPublicKey,
   getMessages,
-  getMessageTransmitterProgram,
   getSolanaChainId,
-  getSpokePoolProgram,
-  getTokenMessengerMinterProgram,
   isSolanaDevnet,
   SOLANA_USDC_DEVNET,
   SOLANA_USDC_MAINNET,
 } from "../../src/svm";
+import { MessageTransmitter } from "../../target/types/message_transmitter";
+import { TokenMessengerMinter } from "../../target/types/token_messenger_minter";
+import { ethers, BigNumber } from "ethers";
+// eslint-disable-next-line camelcase
 import { HubPool__factory } from "../../typechain";
-import { requireEnv } from "./utils/helpers";
 import { constructSimpleRebalanceTree } from "./utils/poolRebalanceTree";
+import { requireEnv } from "./utils/helpers";
 
 // Set up Solana provider.
 const provider = AnchorProvider.env();
 anchor.setProvider(provider);
 
 // Get Solana programs.
-const svmSpokeProgram = getSpokePoolProgram(provider);
-const messageTransmitterProgram = getMessageTransmitterProgram(provider);
-const tokenMessengerMinterProgram = getTokenMessengerMinterProgram(provider);
+const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
+const svmSpokeProgram = new Program<SvmSpoke>(svmSpokeIdl, provider);
+const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
+const messageTransmitterProgram = new Program<MessageTransmitter>(messageTransmitterIdl, provider);
+const tokenMessengerMinterIdl = require("../../target/idl/token_messenger_minter.json");
+const tokenMessengerMinterProgram = new Program<TokenMessengerMinter>(tokenMessengerMinterIdl, provider);
 
 // Set up Ethereum provider and signer.
 const isDevnet = isSolanaDevnet(provider);