Skip to content

Commit c2a233f

Browse files
committed
fix: fixes
Signed-off-by: Pablo Maldonado <[email protected]>
1 parent 3e1fff2 commit c2a233f

File tree

1 file changed

+10
-25
lines changed

1 file changed

+10
-25
lines changed

deploy/063_deploy_solana_adapter.ts

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,13 @@
1-
import { utils } from "@coral-xyz/anchor";
1+
import { getAssociatedTokenAddressSync } from "@solana/spl-token";
2+
import { PublicKey } from "@solana/web3.js";
23
import { DeployFunction } from "hardhat-deploy/types";
34
import { HardhatRuntimeEnvironment } from "hardhat/types";
45
import { getDeployedAddress } from "../src/DeploymentUtils";
6+
import { fromBase58ToBytes32 } from "../src/svm/web3-v1";
57
import { SOLANA_SPOKE_STATE_SEED } from "../src/svm/web3-v1/constants";
68
import { getSolanaChainId } from "../src/svm/web3-v1/helpers";
79
import { CHAIN_IDs } from "../utils";
8-
import { USDC } from "./consts";
9-
import { getAssociatedTokenAddressSync } from "@solana/spl-token";
10-
import { PublicKey } from "@solana/web3.js";
11-
12-
const fromBase58 = (input: string) => {
13-
const decodedBytes = utils.bytes.bs58.decode(input);
14-
return "0x" + Buffer.from(decodedBytes).toString("hex");
15-
};
16-
17-
const CCTP_TOKEN_MESSENGER_V1 = {
18-
[CHAIN_IDs.MAINNET]: "0xbd3fa81b58ba92a82136038b25adec7066af3155",
19-
[CHAIN_IDs.SEPOLIA]: "0x9f3B8679c73C2Fef8b59B4f3444d4e156fb70AA5",
20-
};
21-
22-
const CCTP_MESSAGE_TRANSMITTER_V1 = {
23-
[CHAIN_IDs.MAINNET]: "0x0a992d191deec32afe36203ad87d7d289a738f81",
24-
[CHAIN_IDs.SEPOLIA]: "0x7865fAfC2db2093669d92c0F33AeEF291086BEFD",
25-
};
10+
import { L1_ADDRESS_MAP, USDC } from "./consts";
2611

2712
const SOLANA_USDC = {
2813
mainnet: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
@@ -35,19 +20,19 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3520
const solanaTargetNetwork = chainId != CHAIN_IDs.MAINNET ? "devnet" : "mainnet";
3621

3722
const l1Usdc = USDC[chainId];
38-
const cctpTokenMessenger = CCTP_TOKEN_MESSENGER_V1[chainId];
39-
const cctpMessageTransmitter = CCTP_MESSAGE_TRANSMITTER_V1[chainId];
23+
const cctpTokenMessenger = L1_ADDRESS_MAP[chainId].cctpTokenMessenger;
24+
const cctpMessageTransmitter = L1_ADDRESS_MAP[chainId].cctpMessageTransmitter;
4025
const solanaSpokePool = getDeployedAddress("SvmSpoke", getSolanaChainId(solanaTargetNetwork).toString());
4126
if (!solanaSpokePool) {
4227
throw new Error("SvmSpoke not deployed");
4328
}
44-
const solanaUsdc = fromBase58(SOLANA_USDC[solanaTargetNetwork]);
29+
const solanaUsdc = fromBase58ToBytes32(SOLANA_USDC[solanaTargetNetwork]);
4530
const mint = new PublicKey(SOLANA_USDC[solanaTargetNetwork]);
4631
const seeds = [Buffer.from("state"), SOLANA_SPOKE_STATE_SEED.toArrayLike(Buffer, "le", 8)];
4732
const [state] = PublicKey.findProgramAddressSync(seeds, new PublicKey(solanaSpokePool));
4833
const vault = getAssociatedTokenAddressSync(mint, state, true);
49-
const solanaSpokePoolUsdcVault = fromBase58(vault.toBase58());
50-
const solanaSpokePoolBytes32 = fromBase58(solanaSpokePool);
34+
const solanaSpokePoolUsdcVault = fromBase58ToBytes32(vault.toBase58());
35+
const solanaSpokePoolBytes32 = fromBase58ToBytes32(solanaSpokePool);
5136

5237
await hre.deployments.deploy("Solana_Adapter", {
5338
from: deployer,
@@ -65,4 +50,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
6550
};
6651

6752
module.exports = func;
68-
func.tags = ["Solana_Adapter"];
53+
func.tags = ["SolanaAdapter", "mainnet"];

0 commit comments

Comments
 (0)