refactor addresseses

Author: barnjamin

solana/ts/src/cctp/messageTransmitter/index.ts

@@ -9,7 +9,7 @@ import { UsedNonses } from "./UsedNonces";
 
 export const PROGRAM_IDS = ["CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd"] as const;
 
-export type ProgramId = (typeof PROGRAM_IDS)[number];
+export type ProgramId = (typeof PROGRAM_IDS)[number] | string;
 
 export type ReceiveTokenMessengerMinterMessageAccounts = {
     authority: PublicKey;

solana/ts/src/cctp/tokenMessengerMinter/index.ts

@@ -6,7 +6,7 @@ import { RemoteTokenMessenger } from "./RemoteTokenMessenger";
 
 export const PROGRAM_IDS = ["CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3"] as const;
 
-export type ProgramId = (typeof PROGRAM_IDS)[number];
+export type ProgramId = (typeof PROGRAM_IDS)[number] | string;
 
 export type DepositForBurnWithCallerAccounts = {
     senderAuthority: PublicKey;

solana/ts/src/matchingEngine/index.ts

@@ -53,7 +53,7 @@ import {
     ReservedFastFillSequence,
     RouterEndpoint,
 } from "./state";
-import { VAA, keccak256 } from "@wormhole-foundation/sdk-definitions";
+import { TokenRouterAddresses } from "../tokenRouter";
 
 export const PROGRAM_IDS = [
     "MatchingEngine11111111111111111111111111111",
@@ -64,7 +64,7 @@ export const FEE_PRECISION_MAX = 1_000_000n;
 
 export const CPI_EVENT_IX_SELECTOR = Uint8Array.from([228, 69, 165, 46, 81, 203, 154, 29]);
 
-export type ProgramId = (typeof PROGRAM_IDS)[number];
+export type ProgramId = (typeof PROGRAM_IDS)[number] | string;
 
 export type AddCctpRouterEndpointArgs = {
     chain: ChainId;
@@ -223,13 +223,17 @@ export class MatchingEngineProgram {
 
     program: Program<MatchingEngine>;
 
-    constructor(connection: Connection, programId: ProgramId, mint: PublicKey) {
+    constructor(
+        connection: Connection,
+        programId: ProgramId,
+        private _addresses: TokenRouterAddresses,
+    ) {
         this._programId = programId;
-        this._mint = mint;
+        this._mint = new PublicKey(_addresses.usdcMint);
         this.pdas = programDerivedAddresses(
             new PublicKey(programId),
-            mint,
-            this.coreBridgeProgramId(),
+            this._mint,
+            this.coreBridgeProgramId,
         );
         this.program = new Program(
             { ...(IDL as any), address: this._programId },
@@ -247,6 +251,10 @@ export class MatchingEngineProgram {
         return this._mint;
     }
 
+    get coreBridgeProgramId(): PublicKey {
+        return new PublicKey(this._addresses.coreBridge);
+    }
+
     onAuctionSettled(callback: (event: AuctionSettled, slot: number, signature: string) => void) {
         return this.program.addEventListener("auctionSettled", callback);
     }
@@ -2278,7 +2286,7 @@ export class MatchingEngineProgram {
     async publishMessageAccounts(auction: PublicKey): Promise<PublishMessageAccounts> {
         const coreMessage = this.coreMessageAddress(auction);
 
-        const coreBridgeProgram = this.coreBridgeProgramId();
+        const coreBridgeProgram = this.coreBridgeProgramId;
         const custodian = this.custodianAddress();
 
         return {
@@ -2365,53 +2373,23 @@ export class MatchingEngineProgram {
     }
 
     upgradeManagerProgram(): UpgradeManagerProgram {
-        switch (this._programId) {
-            case testnet(): {
-                return new UpgradeManagerProgram(
-                    this.program.provider.connection,
-                    "ucdP9ktgrXgEUnn6roqD2SfdGMR2JSiWHUKv23oXwxt",
-                );
-            }
-            case localnet(): {
-                return new UpgradeManagerProgram(
-                    this.program.provider.connection,
-                    "UpgradeManager11111111111111111111111111111",
-                );
-            }
-            default: {
-                throw new Error("unsupported network");
-            }
-        }
+        return new UpgradeManagerProgram(this.program.provider.connection, this._addresses);
     }
 
     tokenMessengerMinterProgram(): TokenMessengerMinterProgram {
         return new TokenMessengerMinterProgram(
             this.program.provider.connection,
-            "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3",
+            this._addresses.tokenMessenger,
         );
     }
 
     messageTransmitterProgram(): MessageTransmitterProgram {
         return new MessageTransmitterProgram(
             this.program.provider.connection,
-            "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd",
+            this._addresses.messageTransmitter,
         );
     }
 
-    coreBridgeProgramId(): PublicKey {
-        switch (this._programId) {
-            case testnet(): {
-                return new PublicKey("3u8hJUVTA4jH1wYAyUur7FFZVQ8H635K3tSHHF4ssjQ5");
-            }
-            case localnet(): {
-                return new PublicKey("worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth");
-            }
-            default: {
-                throw new Error("unsupported network");
-            }
-        }
-    }
-
     async computeDepositPenalty(
         auctionInfo: AuctionInfo,
         currentSlot: Uint64,

solana/ts/src/protocol/matchingEngine.ts

@@ -33,8 +33,13 @@ import { AuctionParameters, MatchingEngineProgram, ProgramId } from "../matching
 import { SolanaWormholeCore } from "@wormhole-foundation/sdk-solana-core";
 
 export interface SolanaMatchingEngineContracts {
+    tokenRouter: string;
     matchingEngine: string;
     usdcMint: string;
+    coreBridge: string;
+    messageTransmitter: string;
+    tokenMessenger: string;
+    upgradeManager: string;
 }
 
 export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
@@ -53,11 +58,10 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
             _connection,
             // TODO: BEN
             _contracts.matchingEngine as ProgramId,
-            new PublicKey(_contracts.usdcMint),
+            _contracts,
         );
 
         this.coreBridge = new SolanaWormholeCore(_network, _chain, _connection, {
-            coreBridge: this.coreBridgeProgramId().toBase58(),
             ...this._contracts,
         });
     }

solana/ts/src/protocol/tokenRouter.ts

@@ -10,19 +10,15 @@ import {
 } from "@solana/web3.js";
 import {
     FastMarketOrder,
-    FastTransfer,
-    Message,
     TokenRouter,
 } from "@wormhole-foundation/example-liquidity-layer-definitions";
-import { Chain, ChainId, Network, Platform, toChainId } from "@wormhole-foundation/sdk-base";
+import { ChainId, Network, Platform, toChainId } from "@wormhole-foundation/sdk-base";
 import {
-    AccountAddress,
-    ChainAddress,
     ChainsConfig,
     CircleBridge,
     Contracts,
-    UniversalAddress,
     UnsignedTransaction,
+    VAA,
 } from "@wormhole-foundation/sdk-definitions";
 import {
     AnySolanaAddress,
@@ -33,31 +29,36 @@ import {
     SolanaUnsignedTransaction,
 } from "@wormhole-foundation/sdk-solana";
 import { SolanaWormholeCore } from "@wormhole-foundation/sdk-solana-core";
-import { ProgramId, TokenRouterProgram } from "../tokenRouter";
+import { TokenRouterProgram } from "../tokenRouter";
+import { SolanaMatchingEngine } from "./matchingEngine";
 
 export interface SolanaTokenRouterContracts {
     tokenRouter: string;
     usdcMint: string;
+    coreBridge: string;
+    matchingEngine: string;
+    messageTransmitter: string;
+    tokenMessenger: string;
+    upgradeManager: string;
 }
 
 export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
     extends TokenRouterProgram
     implements TokenRouter<N, C>
 {
     coreBridge: SolanaWormholeCore<N, C>;
+    matchingEngine: SolanaMatchingEngine<N, C>;
 
     constructor(
         readonly _network: N,
         readonly _chain: C,
         readonly _connection: Connection,
         readonly _contracts: Contracts & SolanaTokenRouterContracts,
     ) {
-        super(_connection, _contracts.tokenRouter as ProgramId, new PublicKey(_contracts.usdcMint));
+        super(_connection, _contracts.tokenRouter, _contracts);
 
-        this.coreBridge = new SolanaWormholeCore(_network, _chain, _connection, {
-            coreBridge: this.coreBridgeProgramId().toBase58(),
-            ...this._contracts,
-        });
+        this.coreBridge = new SolanaWormholeCore(_network, _chain, _connection, _contracts);
+        this.matchingEngine = new SolanaMatchingEngine(_network, _chain, _connection, _contracts);
     }
 
     static async fromRpc<N extends Network>(
@@ -89,7 +90,7 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
         const ix = await this.initializeIx({
             owner: sender,
             ownerAssistant: new SolanaAddress(ownerAssistant).unwrap(),
-            mint: mint ? new SolanaAddress(mint).unwrap() : undefined,
+            mint: mint ? new SolanaAddress(mint).unwrap() : this.mint,
         });
 
         const transaction = this.createTx(sender, [ix]);
@@ -231,23 +232,42 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
         yield this.createUnsignedTx({ transaction, signers }, "TokenRouter.PlaceMarketOrder");
     }
 
-    placeFastMarketOrder<RC extends Chain>(
-        amount: bigint,
-        chain: RC,
-        redeemer: AccountAddress<RC>,
-        redeemerMessage: Uint8Array,
-        maxFee: bigint,
-        deadline: number,
-        minAmountOut?: bigint | undefined,
-        refundAddress?: string | undefined,
-    ): AsyncGenerator<UnsignedTransaction<N, C>, any, unknown> {
-        throw new Error("Method not implemented.");
-    }
-
-    redeemFill(
-        vaa: FastTransfer.VAA,
+    async *redeemFill(
+        sender: AnySolanaAddress,
+        vaa: VAA<"FastTransfer:CctpDeposit">,
         cctp: CircleBridge.Attestation,
     ): AsyncGenerator<UnsignedTransaction<N, C>, any, unknown> {
+        // const payer = new SolanaAddress(sender).unwrap();
+
+        // //
+        // const { payload: fill } = vaa.payload;
+        // if (!Payload.is(fill, "Fill")) {
+        //     throw new Error("Invalid VAA payload");
+        // }
+
+        // const postedVaaAddress = coreUtils.derivePostedVaaKey(
+        //     this.coreBridge.address,
+        //     Buffer.from(vaa.hash),
+        // );
+
+        // const ix = await this.redeemCctpFillIx(
+        //     {
+        //         payer: payer,
+        //         vaa: postedVaaAddress,
+        //         sourceRouterEndpoint: this.matchingEngine.routerEndpointAddress(
+        //             toChainId(fill.sourceChain),
+        //         ),
+        //     },
+        //     {
+        //         encodedCctpMessage,
+        //         cctpAttestation,
+        //     },
+        // );
+
+        // //const computeIx = ComputeBudgetProgram.setComputeUnitLimit({
+        // //    units: 300_000,
+        // //});
+
         throw new Error("Method not implemented.");
     }
 

solana/ts/src/testing/consts.ts

@@ -1,7 +1,8 @@
 import { PublicKey, Keypair } from "@solana/web3.js";
-import { Chain, contracts } from "@wormhole-foundation/sdk-base";
+import { Chain, Network, contracts } from "@wormhole-foundation/sdk-base";
 import { UniversalAddress } from "@wormhole-foundation/sdk-definitions";
 import { mocks } from "@wormhole-foundation/sdk-definitions/testing";
+import { TokenRouterAddresses } from "../tokenRouter";
 
 export const CORE_BRIDGE_PID = new PublicKey(contracts.coreBridge.get("Mainnet", "Solana")!);
 
@@ -73,3 +74,27 @@ export const REGISTERED_TOKEN_ROUTERS_V2: { [k in Chain]?: UniversalAddress } =
         new UniversalAddress(new Uint8Array(v)),
     ]),
 );
+
+export const DEFAULT_ADDRESSES: {
+    [network in Network]?: TokenRouterAddresses;
+} = {
+    // This is local development network, not Solana's 'devnet'
+    Devnet: {
+        coreBridge: "worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth",
+        matchingEngine: "MatchingEngine11111111111111111111111111111",
+        tokenRouter: "TokenRouter11111111111111111111111111111111",
+        tokenMessenger: "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3",
+        messageTransmitter: "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd",
+        upgradeManager: "UpgradeManager11111111111111111111111111111",
+        usdcMint: USDC_MINT_ADDRESS.toBase58(),
+    },
+    Testnet: {
+        coreBridge: "3u8hJUVTA4jH1wYAyUur7FFZVQ8H635K3tSHHF4ssjQ5",
+        matchingEngine: "mPydpGUWxzERTNpyvTKdvS7v8kvw5sgwfiP8WQFrXVS",
+        tokenRouter: "tD8RmtdcV7bzBeuFgyrFc8wvayj988ChccEzRQzo6md",
+        tokenMessenger: "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3",
+        messageTransmitter: "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd",
+        upgradeManager: "ucdP9ktgrXgEUnn6roqD2SfdGMR2JSiWHUKv23oXwxt",
+        usdcMint: "todo",
+    },
+};