update testnet fork test

Author: barnjamin

solana/ts/src/testing/consts.ts

@@ -92,9 +92,9 @@ export const DEFAULT_ADDRESSES: {
         coreBridge: "3u8hJUVTA4jH1wYAyUur7FFZVQ8H635K3tSHHF4ssjQ5",
         matchingEngine: "mPydpGUWxzERTNpyvTKdvS7v8kvw5sgwfiP8WQFrXVS",
         tokenRouter: "tD8RmtdcV7bzBeuFgyrFc8wvayj988ChccEzRQzo6md",
+        usdcMint: USDC_MINT_ADDRESS.toBase58(),
         tokenMessenger: "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3",
         messageTransmitter: "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd",
         upgradeManager: "ucdP9ktgrXgEUnn6roqD2SfdGMR2JSiWHUKv23oXwxt",
-        usdcMint: "todo",
     },
 };

solana/ts/tests/12__testnetFork.ts

@@ -1,18 +1,17 @@
 import { Connection, Keypair, PublicKey, Signer, TransactionInstruction } from "@solana/web3.js";
 import { expect } from "chai";
 import { uint64ToBN } from "../src/common";
-import * as matchingEngineSdk from "../src/matchingEngine";
+import { SolanaMatchingEngine, SolanaTokenRouter } from "../src/protocol";
 import {
+    DEFAULT_ADDRESSES,
     LOCALHOST,
     PAYER_KEYPAIR,
-    USDC_MINT_ADDRESS,
     expectIxErr,
     expectIxOk,
     expectIxOkDetails,
     loadProgramBpf,
 } from "../src/testing";
-import * as tokenRouterSdk from "../src/tokenRouter";
-import { UpgradeManagerProgram, UpgradeReceipt, testnet } from "../src/upgradeManager";
+import { UpgradeManagerProgram, UpgradeReceipt } from "../src/upgradeManager";
 import { BPF_LOADER_UPGRADEABLE_PROGRAM_ID, programDataAddress } from "../src/utils";
 
 const KEYPATH = `${__dirname}/keys/pFCBP4bhqdSsrWUVTgqhPsLrfEdChBK17vgFM7TxjxQ.json`;
@@ -24,17 +23,15 @@ describe("Upgrade Manager", function () {
     const connection = new Connection(LOCALHOST, "processed");
     const payer = PAYER_KEYPAIR;
 
-    const matchingEngine = new matchingEngineSdk.MatchingEngineProgram(
+    const network = "Testnet";
+    const contracts = DEFAULT_ADDRESSES[network]!;
+    const matchingEngine = new SolanaMatchingEngine(network, "Solana", connection, contracts);
+    const tokenRouter = new SolanaTokenRouter(network, "Solana", connection, contracts);
+    const upgradeManager = new UpgradeManagerProgram(
         connection,
-        matchingEngineSdk.testnet(),
-        USDC_MINT_ADDRESS,
+        contracts.upgradeManager,
+        contracts,
     );
-    const tokenRouter = new tokenRouterSdk.TokenRouterProgram(
-        connection,
-        tokenRouterSdk.testnet(),
-        matchingEngine.mint,
-    );
-    const upgradeManager = new UpgradeManagerProgram(connection, testnet());
 
     describe("Upgrade Matching Engine", function () {
         it("Cannot Execute without Owner", async function () {