feat: improve

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

Author: md0x

deploy/063_deploy_solana_adapter.ts

@@ -6,14 +6,9 @@ import { getDeployedAddress } from "../src/DeploymentUtils";
 import { fromBase58ToBytes32 } from "../src/svm/web3-v1";
 import { SOLANA_SPOKE_STATE_SEED } from "../src/svm/web3-v1/constants";
 import { getSolanaChainId } from "../src/svm/web3-v1/helpers";
-import { CHAIN_IDs } from "../utils";
+import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "../utils";
 import { L1_ADDRESS_MAP, USDC } from "./consts";
 
-const SOLANA_USDC = {
-  mainnet: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
-  devnet: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU",
-};
-
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployer } = await hre.getNamedAccounts();
   const chainId = parseInt(await hre.getChainId());
@@ -22,12 +17,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const l1Usdc = USDC[chainId];
   const cctpTokenMessenger = L1_ADDRESS_MAP[chainId].cctpTokenMessenger;
   const cctpMessageTransmitter = L1_ADDRESS_MAP[chainId].cctpMessageTransmitter;
-  const solanaSpokePool = getDeployedAddress("SvmSpoke", getSolanaChainId(solanaTargetNetwork).toString());
+  const solanaChainId = getSolanaChainId(solanaTargetNetwork);
+  const solanaSpokePool = getDeployedAddress("SvmSpoke", solanaChainId.toString());
   if (!solanaSpokePool) {
     throw new Error("SvmSpoke not deployed");
   }
-  const solanaUsdc = fromBase58ToBytes32(SOLANA_USDC[solanaTargetNetwork]);
-  const mint = new PublicKey(SOLANA_USDC[solanaTargetNetwork]);
+  const solanaUsdc = fromBase58ToBytes32(TOKEN_SYMBOLS_MAP.USDC.addresses[Number(solanaChainId)]);
+  const mint = new PublicKey(TOKEN_SYMBOLS_MAP.USDC.addresses[Number(solanaChainId)]);
   const seeds = [Buffer.from("state"), SOLANA_SPOKE_STATE_SEED.toArrayLike(Buffer, "le", 8)];
   const [state] = PublicKey.findProgramAddressSync(seeds, new PublicKey(solanaSpokePool));
   const vault = getAssociatedTokenAddressSync(mint, state, true);

package.json

@@ -42,7 +42,7 @@
     "pre-commit-hook": "sh scripts/preCommitHook.sh"
   },
   "dependencies": {
-    "@across-protocol/constants": "^3.1.32",
+    "@across-protocol/constants": "^3.1.38",
     "@coral-xyz/anchor": "^0.30.1",
     "@defi-wonderland/smock": "^2.3.4",
     "@eth-optimism/contracts": "^0.5.40",

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@across-protocol/constants@^3.1.32":
-  version "3.1.32"
-  resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.1.32.tgz#402cccb942f9dc4eb8dde5de7cf801835338c673"
-  integrity sha512-vSh0pKTE2mwM97Bv9WYCgJ51Pnw29xSKnfbgoSuEhCGrw6GGMeElcwiUqQeZNlF8eMn16y7KcymXR9X4i2sTMA==
+"@across-protocol/constants@^3.1.38":
+  version "3.1.38"
+  resolved "https://registry.npmjs.org/@across-protocol/constants/-/constants-3.1.38.tgz#63f4d9b86576b0003655152c51293dd1c7ab6a1f"
+  integrity sha512-/85ACwpu4oxAADOah8VP3esxU3FVb+RieMCINgn4oUf4Rq9cC1LSJm157hy5cc4CBUaySV312MP1iM1d8ysljA==
 
 "@across-protocol/contracts@^0.1.4":
   version "0.1.4"