more const changes, move types out of index file for matching engine and token router

Author: barnjamin

solana/ts/src/matchingEngine/index.ts

@@ -1,5 +1,4 @@
 export * from "./state";
-
 import { BN, Program, utils } from "@coral-xyz/anchor";
 import * as splToken from "@solana/spl-token";
 import {
@@ -15,6 +14,7 @@ import {
     SystemProgram,
     TransactionInstruction,
 } from "@solana/web3.js";
+import { MatchingEngine } from "@wormhole-foundation/example-liquidity-layer-definitions";
 import { ChainId, isChainId, toChainId } from "@wormhole-foundation/sdk-base";
 import { PreparedTransaction, PreparedTransactionOptions } from "..";
 import { MessageTransmitterProgram, TokenMessengerMinterProgram } from "../cctp";
@@ -43,177 +43,41 @@ import {
     Custodian,
     EndpointInfo,
     FastFill,
-    FastFillInfo,
-    FastFillSeeds,
     FastFillSequencer,
-    MessageProtocol,
     PreparedOrderResponse,
     Proposal,
-    ProposalAction,
     ReservedFastFillSequence,
     RouterEndpoint,
 } from "./state";
-import { MatchingEngine } from "@wormhole-foundation/example-liquidity-layer-definitions";
+import {
+    AddCctpRouterEndpointArgs,
+    AuctionSettled,
+    AuctionUpdated,
+    BurnAndPublishAccounts,
+    CctpMessageArgs,
+    Enacted,
+    FastFillRedeemed,
+    FastFillSequenceReserved,
+    FastOrderPathComposite,
+    LocalFastOrderFilled,
+    MatchingEngineCommonAccounts,
+    OrderExecuted,
+    Proposed,
+    PublishMessageAccounts,
+    RedeemFastFillAccounts,
+    ReserveFastFillSequenceCompositeOpts,
+} from "./types";
 
 export const PROGRAM_IDS = [
     "MatchingEngine11111111111111111111111111111",
     "mPydpGUWxzERTNpyvTKdvS7v8kvw5sgwfiP8WQFrXVS",
 ] as const;
+export type ProgramId = (typeof PROGRAM_IDS)[number] | string;
 
 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] | string;
-
-export type AddCctpRouterEndpointArgs = {
-    chain: ChainId;
-    cctpDomain: number;
-    address: Array<number>;
-    mintRecipient: Array<number> | null;
-};
-
-export type WormholeCoreBridgeAccounts = {
-    coreBridgeConfig: PublicKey;
-    coreEmitterSequence: PublicKey;
-    coreFeeCollector: PublicKey;
-    coreBridgeProgram: PublicKey;
-};
-
-export type PublishMessageAccounts = WormholeCoreBridgeAccounts & {
-    custodian: PublicKey;
-    coreMessage: PublicKey;
-};
-
-export type MatchingEngineCommonAccounts = WormholeCoreBridgeAccounts & {
-    matchingEngineProgram: PublicKey;
-    systemProgram: PublicKey;
-    rent: PublicKey;
-    clock: PublicKey;
-    custodian: PublicKey;
-    cctpMintRecipient: PublicKey;
-    tokenMessenger: PublicKey;
-    tokenMinter: PublicKey;
-    tokenMessengerMinterSenderAuthority: PublicKey;
-    tokenMessengerMinterProgram: PublicKey;
-    messageTransmitterAuthority: PublicKey;
-    messageTransmitterConfig: PublicKey;
-    messageTransmitterProgram: PublicKey;
-    tokenProgram: PublicKey;
-    mint: PublicKey;
-    localToken: PublicKey;
-    tokenMessengerMinterCustodyToken: PublicKey;
-};
-
-export type BurnAndPublishAccounts = {
-    custodian: PublicKey;
-    routerEndpoint: PublicKey;
-    coreMessage: PublicKey;
-    cctpMessage: PublicKey;
-    coreBridgeConfig: PublicKey;
-    coreEmitterSequence: PublicKey;
-    coreFeeCollector: PublicKey;
-    coreBridgeProgram: PublicKey;
-    tokenMessengerMinterSenderAuthority: PublicKey;
-    messageTransmitterConfig: PublicKey;
-    tokenMessenger: PublicKey;
-    remoteTokenMessenger: PublicKey;
-    tokenMinter: PublicKey;
-    localToken: PublicKey;
-    tokenMessengerMinterEventAuthority: PublicKey;
-    messageTransmitterProgram: PublicKey;
-    tokenMessengerMinterProgram: PublicKey;
-};
-
-export type RedeemFastFillAccounts = {
-    custodian: PublicKey;
-    fromRouterEndpoint: PublicKey;
-    toRouterEndpoint: PublicKey;
-    localCustodyToken: PublicKey;
-    matchingEngineProgram: PublicKey;
-};
-
-export type CctpMessageArgs = {
-    encodedCctpMessage: Buffer;
-    cctpAttestation: Buffer;
-};
-
-export type SettledTokenAccountInfo = {
-    key: PublicKey;
-    balanceAfter: BN;
-};
-
-export type AuctionSettled = {
-    auction: PublicKey;
-    bestOfferToken: SettledTokenAccountInfo | null;
-    executorToken: SettledTokenAccountInfo | null;
-    withExecute: MessageProtocol | null;
-};
-
-export type AuctionUpdated = {
-    configId: number;
-    auction: PublicKey;
-    vaa: PublicKey | null;
-    sourceChain: number;
-    targetProtocol: MessageProtocol;
-    redeemerMessageLen: number;
-    endSlot: BN;
-    bestOfferToken: PublicKey;
-    tokenBalanceBefore: BN;
-    amountIn: BN;
-    totalDeposit: BN;
-    maxOfferPriceAllowed: BN | null;
-};
-
-export type OrderExecuted = {
-    auction: PublicKey;
-    vaa: PublicKey;
-    targetProtocol: MessageProtocol;
-};
-
-export type Proposed = {
-    action: ProposalAction;
-};
-
-export type Enacted = {
-    action: ProposalAction;
-};
-
-export type LocalFastOrderFilled = {
-    seeds: FastFillSeeds;
-    info: FastFillInfo;
-    auction: PublicKey | null;
-};
-
-export type FastFillSequenceReserved = {
-    fastVaaHash: Array<number>;
-    fastFillSeeds: FastFillSeeds;
-};
-
-export type FastFillRedeemed = {
-    preparedBy: PublicKey;
-    fastFill: PublicKey;
-};
-
-export type FastOrderPathComposite = {
-    fastVaa: {
-        vaa: PublicKey;
-    };
-    path: {
-        fromEndpoint: {
-            endpoint: PublicKey;
-        };
-        toEndpoint: { endpoint: PublicKey };
-    };
-};
-
-export type ReserveFastFillSequenceCompositeOpts = {
-    fastVaaHash?: VaaHash;
-    sourceChain?: ChainId;
-    orderSender?: Array<number>;
-    targetChain?: ChainId;
-};
-
 export class MatchingEngineProgram {
     private _programId: ProgramId;
     private _mint: PublicKey;
@@ -229,7 +93,7 @@ export class MatchingEngineProgram {
         private _addresses: MatchingEngine.Addresses,
     ) {
         this._programId = programId;
-        this._mint = new PublicKey(_addresses.usdcMint);
+        this._mint = new PublicKey(_addresses.cctp.usdcMint);
         this.pdas = programDerivedAddresses(
             new PublicKey(programId),
             this._mint,
@@ -2375,23 +2239,22 @@ export class MatchingEngineProgram {
     upgradeManagerProgram(): UpgradeManagerProgram {
         return new UpgradeManagerProgram(
             this.program.provider.connection,
-            this._addresses.upgradeManager,
-            // TODO: matching engine does not require token router
-            { ...this._addresses, tokenRouter: "" },
+            this._addresses.upgradeManager!,
+            { ...this._addresses, tokenRouter: this._addresses.tokenRouter! },
         );
     }
 
     tokenMessengerMinterProgram(): TokenMessengerMinterProgram {
         return new TokenMessengerMinterProgram(
             this.program.provider.connection,
-            this._addresses.tokenMessenger,
+            this._addresses.cctp.tokenMessenger,
         );
     }
 
     messageTransmitterProgram(): MessageTransmitterProgram {
         return new MessageTransmitterProgram(
             this.program.provider.connection,
-            this._addresses.messageTransmitter,
+            this._addresses.cctp.messageTransmitter,
         );
     }