Skip to content

Commit 11930ba

Browse files
barnjaminbarnjamin
committed
more address type consolidation
1 parent b447009 commit 11930ba

File tree

11 files changed

+58
-84
lines changed

11 files changed

+58
-84
lines changed

‎solana/ts/src/matchingEngine/index.ts

+6-13
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
uint64ToBigInt,
2828
} from "../common";
2929
import IDL from "../idl/json/matching_engine.json";
30-
import { MatchingEngine } from "../idl/ts/matching_engine";
30+
import { type MatchingEngine as MatchingEngineType } from "../idl/ts/matching_engine";
3131
import { UpgradeManagerProgram } from "../upgradeManager";
3232
import { BPF_LOADER_UPGRADEABLE_PROGRAM_ID, programDataAddress } from "../utils";
3333
import { VaaAccount } from "../wormhole";
@@ -53,7 +53,7 @@ import {
5353
ReservedFastFillSequence,
5454
RouterEndpoint,
5555
} from "./state";
56-
import { TokenRouterAddresses } from "../tokenRouter";
56+
import { MatchingEngine } from "@wormhole-foundation/example-liquidity-layer-definitions";
5757

5858
export const PROGRAM_IDS = [
5959
"MatchingEngine11111111111111111111111111111",
@@ -221,12 +221,12 @@ export class MatchingEngineProgram {
221221

222222
pdas: ReturnType<typeof programDerivedAddresses>;
223223

224-
program: Program<MatchingEngine>;
224+
program: Program<MatchingEngineType>;
225225

226226
constructor(
227227
connection: Connection,
228228
programId: ProgramId,
229-
private _addresses: TokenRouterAddresses,
229+
private _addresses: MatchingEngine.Addresses,
230230
) {
231231
this._programId = programId;
232232
this._mint = new PublicKey(_addresses.usdcMint);
@@ -2376,7 +2376,8 @@ export class MatchingEngineProgram {
23762376
return new UpgradeManagerProgram(
23772377
this.program.provider.connection,
23782378
this._addresses.upgradeManager,
2379-
this._addresses,
2379+
// TODO: matching engine does not require token router
2380+
{ ...this._addresses, tokenRouter: "" },
23802381
);
23812382
}
23822383

@@ -2485,11 +2486,3 @@ export class MatchingEngineProgram {
24852486
this.pdas.transferAuthority(auction, offerPrice);
24862487
auctionHistoryAddress = (id: Uint64): PublicKey => this.pdas.auctionHistory(id);
24872488
}
2488-
2489-
export function testnet(): ProgramId {
2490-
return "mPydpGUWxzERTNpyvTKdvS7v8kvw5sgwfiP8WQFrXVS";
2491-
}
2492-
2493-
export function localnet(): ProgramId {
2494-
return "MatchingEngine11111111111111111111111111111";
2495-
}

‎solana/ts/src/protocol/matchingEngine.ts

+2-12
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ import { vaaHash } from "../common";
3232
import { AuctionParameters, MatchingEngineProgram, ProgramId } from "../matchingEngine";
3333
import { SolanaWormholeCore } from "@wormhole-foundation/sdk-solana-core";
3434

35-
export interface SolanaMatchingEngineContracts {
36-
tokenRouter: string;
37-
matchingEngine: string;
38-
usdcMint: string;
39-
coreBridge: string;
40-
messageTransmitter: string;
41-
tokenMessenger: string;
42-
upgradeManager: string;
43-
}
44-
4535
export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
4636
extends MatchingEngineProgram
4737
implements MatchingEngine<N, C>
@@ -52,7 +42,7 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
5242
readonly _network: N,
5343
readonly _chain: C,
5444
readonly _connection: Connection,
55-
readonly _contracts: Contracts & SolanaMatchingEngineContracts,
45+
readonly _contracts: Contracts & MatchingEngine.Addresses,
5646
) {
5747
super(
5848
_connection,
@@ -69,7 +59,7 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
6959
static async fromRpc<N extends Network>(
7060
connection: Connection,
7161
config: ChainsConfig<N, Platform>,
72-
contracts: SolanaMatchingEngineContracts,
62+
contracts: MatchingEngine.Addresses,
7363
) {
7464
const [network, chain] = await SolanaPlatform.chainFromRpc(connection);
7565
const conf = config[chain]!;

‎solana/ts/src/protocol/tokenRouter.ts

+2-12
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ import { SolanaWormholeCore } from "@wormhole-foundation/sdk-solana-core";
3434
import { TokenRouterProgram } from "../tokenRouter";
3535
import { SolanaMatchingEngine } from "./matchingEngine";
3636

37-
export interface SolanaTokenRouterContracts {
38-
tokenRouter: string;
39-
usdcMint: string;
40-
coreBridge: string;
41-
matchingEngine: string;
42-
messageTransmitter: string;
43-
tokenMessenger: string;
44-
upgradeManager: string;
45-
}
46-
4737
export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
4838
extends TokenRouterProgram
4939
implements TokenRouter<N, C>
@@ -55,7 +45,7 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
5545
readonly _network: N,
5646
readonly _chain: C,
5747
readonly _connection: Connection,
58-
readonly _contracts: Contracts & SolanaTokenRouterContracts,
48+
readonly _contracts: Contracts & TokenRouter.Addresses,
5949
) {
6050
super(_connection, _contracts.tokenRouter, _contracts);
6151

@@ -66,7 +56,7 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
6656
static async fromRpc<N extends Network>(
6757
connection: Connection,
6858
config: ChainsConfig<N, Platform>,
69-
contracts: SolanaTokenRouterContracts,
59+
contracts: TokenRouter.Addresses,
7060
) {
7161
const [network, chain] = await SolanaPlatform.chainFromRpc(connection);
7262
const conf = config[chain]!;

‎solana/ts/src/testing/consts.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { PublicKey, Keypair } from "@solana/web3.js";
2+
import { TokenRouter } from "@wormhole-foundation/example-liquidity-layer-definitions";
23
import { Chain, Network, contracts } from "@wormhole-foundation/sdk-base";
34
import { UniversalAddress } from "@wormhole-foundation/sdk-definitions";
45
import { mocks } from "@wormhole-foundation/sdk-definitions/testing";
5-
import { TokenRouterAddresses } from "../tokenRouter";
66

77
export const CORE_BRIDGE_PID = new PublicKey(contracts.coreBridge.get("Mainnet", "Solana")!);
88

@@ -76,17 +76,17 @@ export const REGISTERED_TOKEN_ROUTERS_V2: { [k in Chain]?: UniversalAddress } =
7676
);
7777

7878
export const DEFAULT_ADDRESSES: {
79-
[network in Network]?: TokenRouterAddresses;
79+
[network in Network]?: TokenRouter.Addresses;
8080
} = {
8181
// This is local development network, not Solana's 'devnet'
8282
Devnet: {
8383
coreBridge: "worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth",
8484
matchingEngine: "MatchingEngine11111111111111111111111111111",
8585
tokenRouter: "TokenRouter11111111111111111111111111111111",
86+
usdcMint: USDC_MINT_ADDRESS.toBase58(),
8687
tokenMessenger: "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3",
8788
messageTransmitter: "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd",
8889
upgradeManager: "UpgradeManager11111111111111111111111111111",
89-
usdcMint: USDC_MINT_ADDRESS.toBase58(),
9090
},
9191
Testnet: {
9292
coreBridge: "3u8hJUVTA4jH1wYAyUur7FFZVQ8H635K3tSHHF4ssjQ5",

‎solana/ts/src/testing/mock.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,15 @@ export async function createLiquidityLayerVaa(
5555
sequence - 1n,
5656
);
5757

58-
const published = foreignEmitter.publishMessage(
59-
0, // nonce,
60-
Buffer.isBuffer(message) ? message : message.encode(),
61-
0, // consistencyLevel
62-
timestamp,
63-
);
64-
58+
const msg = Buffer.isBuffer(message) ? message : message.encode();
59+
const published = foreignEmitter.publishMessage(0, msg, 0, timestamp);
6560
const vaa = MOCK_GUARDIANS.addSignatures(published, [0]);
6661

6762
// @ts-ignore -- TODO: this is lie, need to define discriminator
6863
return vaa;
6964
}
7065

71-
export async function postLiquidityLayerVaav2<N extends Network>(
66+
export async function postAndFetchVaa<N extends Network>(
7267
signer: SDKSigner<N>,
7368
engine: SolanaMatchingEngine<N, "Solana">,
7469
vaa: FastTransfer.VAA,

‎solana/ts/src/tokenRouter/index.ts

+5-20
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from "@solana/web3.js";
1212
import { Keccak } from "sha3";
1313
import IDL from "../idl/json/token_router.json";
14-
import { TokenRouter } from "../idl/ts/token_router";
14+
import { type TokenRouter as TokenRouterType } from "../idl/ts/token_router";
1515
import {
1616
CctpTokenBurnMessage,
1717
MessageTransmitterProgram,
@@ -29,6 +29,7 @@ import { BPF_LOADER_UPGRADEABLE_PROGRAM_ID, programDataAddress } from "../utils"
2929
import { VaaAccount } from "../wormhole";
3030
import { Custodian, PreparedFill, PreparedOrder } from "./state";
3131
import { ChainId, Network, isChainId } from "@wormhole-foundation/sdk-base";
32+
import { TokenRouter } from "@wormhole-foundation/example-liquidity-layer-definitions";
3233

3334
export const PROGRAM_IDS = [
3435
"TokenRouter11111111111111111111111111111111",
@@ -37,19 +38,6 @@ export const PROGRAM_IDS = [
3738

3839
export type ProgramId = (typeof PROGRAM_IDS)[number] | string;
3940

40-
export type TokenRouterAddresses = {
41-
tokenRouter: string;
42-
// upstream wormhole
43-
matchingEngine: string;
44-
coreBridge: string;
45-
// cctp
46-
usdcMint: string;
47-
messageTransmitter: string;
48-
tokenMessenger: string;
49-
//
50-
upgradeManager: string;
51-
};
52-
5341
export type PrepareMarketOrderArgs = {
5442
amountIn: bigint;
5543
minAmountOut: bigint | null;
@@ -128,16 +116,13 @@ export type AddCctpRouterEndpointArgs = {
128116

129117
export class TokenRouterProgram {
130118
private _programId: ProgramId;
131-
private _addresses: TokenRouterAddresses;
119+
private _addresses: TokenRouter.Addresses;
132120

133-
program: Program<TokenRouter>;
121+
program: Program<TokenRouterType>;
134122

135-
// TODO: fix this
136-
constructor(connection: Connection, programId: ProgramId, addresses?: TokenRouterAddresses) {
123+
constructor(connection: Connection, programId: ProgramId, addresses?: TokenRouter.Addresses) {
137124
this._programId = programId;
138-
139125
this._addresses = addresses!;
140-
141126
this.program = new Program(
142127
{ ...(IDL as any), address: this._programId },
143128
{

‎solana/ts/src/upgradeManager/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import * as matchingEngineSdk from "../matchingEngine";
1515
import * as tokenRouterSdk from "../tokenRouter";
1616
import { BPF_LOADER_UPGRADEABLE_PROGRAM_ID, programDataAddress } from "../utils";
1717
import { UpgradeReceipt } from "./state";
18+
import { TokenRouter } from "@wormhole-foundation/example-liquidity-layer-definitions";
1819

1920
export const PROGRAM_IDS = [
2021
"UpgradeManager11111111111111111111111111111",
@@ -30,7 +31,7 @@ export class UpgradeManagerProgram {
3031
constructor(
3132
connection: Connection,
3233
programId: ProgramId,
33-
private _addresses: tokenRouterSdk.TokenRouterAddresses,
34+
private _addresses: TokenRouter.Addresses,
3435
) {
3536
this._programId = programId;
3637
this.program = new Program(

‎solana/ts/tests/01__matchingEngine.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import {
6363
getBlockTime,
6464
getSdkSigner,
6565
getUsdcAtaBalance,
66-
postLiquidityLayerVaav2,
66+
postAndFetchVaa,
6767
toUniversalAddress,
6868
unwrapSigners,
6969
waitUntilSlot,
@@ -1417,7 +1417,7 @@ describe("Matching Engine", function () {
14171417
Buffer.from("deadbeef", "hex"),
14181418
);
14191419

1420-
const { address: fastVaa, account: account } = await postLiquidityLayerVaav2(
1420+
const { address: fastVaa, account: account } = await postAndFetchVaa(
14211421
playerOneSigner,
14221422
engine,
14231423
mockInvalidVaa,
@@ -1549,7 +1549,7 @@ describe("Matching Engine", function () {
15491549
msg,
15501550
);
15511551

1552-
const { address: fastVaa, account } = await postLiquidityLayerVaav2(
1552+
const { address: fastVaa, account } = await postAndFetchVaa(
15531553
playerOneSigner,
15541554
engine,
15551555
mockInvalidVaa,
@@ -4878,7 +4878,7 @@ describe("Matching Engine", function () {
48784878
{ sourceChain, timestamp: vaaTimestamp },
48794879
);
48804880

4881-
const { address: fastVaa, account: fastVaaAccount } = await postLiquidityLayerVaav2(
4881+
const { address: fastVaa, account: fastVaaAccount } = await postAndFetchVaa(
48824882
payerSigner,
48834883
engine,
48844884
mockFastVaa,
@@ -4916,8 +4916,11 @@ describe("Matching Engine", function () {
49164916
{ sourceChain: finalizedSourceChain, timestamp: finalizedVaaTimestamp },
49174917
);
49184918

4919-
const { address: finalizedVaa, account: finalizedVaaAccount } =
4920-
await postLiquidityLayerVaav2(payerSigner, engine, mockFinalizedVaa);
4919+
const { address: finalizedVaa, account: finalizedVaaAccount } = await postAndFetchVaa(
4920+
payerSigner,
4921+
engine,
4922+
mockFinalizedVaa,
4923+
);
49214924

49224925
return {
49234926
fast,

‎solana/ts/tests/02__tokenRouter.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
expectTxsErr,
3434
expectTxsOk,
3535
getSdkSigner,
36-
postLiquidityLayerVaav2,
36+
postAndFetchVaa,
3737
toUniversalAddress,
3838
} from "../src/testing";
3939
import { Custodian, PreparedOrder, TokenRouterProgram } from "../src/tokenRouter";
@@ -1184,7 +1184,7 @@ describe("Token Router", function () {
11841184
{ sourceChain: "Polygon" },
11851185
);
11861186

1187-
const { address: vaa } = await postLiquidityLayerVaav2(
1187+
const { address: vaa } = await postAndFetchVaa(
11881188
payerSigner,
11891189
tokenRouter.matchingEngine,
11901190
mockInvalidVaa,
@@ -1262,7 +1262,7 @@ describe("Token Router", function () {
12621262
message,
12631263
);
12641264

1265-
const { address: vaa } = await postLiquidityLayerVaav2(
1265+
const { address: vaa } = await postAndFetchVaa(
12661266
payerSigner,
12671267
tokenRouter.matchingEngine,
12681268
mockInvalidVaa,
@@ -1338,7 +1338,7 @@ describe("Token Router", function () {
13381338
encodedMessage,
13391339
);
13401340

1341-
const { address: vaa } = await postLiquidityLayerVaav2(
1341+
const { address: vaa } = await postAndFetchVaa(
13421342
payerSigner,
13431343
tokenRouter.matchingEngine,
13441344
mockInvalidVaa,
@@ -1410,7 +1410,7 @@ describe("Token Router", function () {
14101410
message,
14111411
);
14121412

1413-
const { address: vaa } = await postLiquidityLayerVaav2(
1413+
const { address: vaa } = await postAndFetchVaa(
14141414
payerSigner,
14151415
tokenRouter.matchingEngine,
14161416
mockInvalidVaa,
@@ -1485,7 +1485,7 @@ describe("Token Router", function () {
14851485
wormholeSequence++,
14861486
message,
14871487
);
1488-
const { address: vaa } = await postLiquidityLayerVaav2(
1488+
const { address: vaa } = await postAndFetchVaa(
14891489
payerSigner,
14901490
tokenRouter.matchingEngine,
14911491
mockInvalidVaa,

‎solana/ts/tests/04__interaction.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import {
4848
expectIxOkDetails,
4949
getBlockTime,
5050
getSdkSigner,
51-
postLiquidityLayerVaav2,
51+
postAndFetchVaa,
5252
toUniversalAddress,
5353
waitUntilSlot,
5454
} from "../src/testing";
@@ -1818,7 +1818,7 @@ describe("Matching Engine <> Token Router", function () {
18181818
{ sourceChain, timestamp: vaaTimestamp },
18191819
);
18201820

1821-
const { address: fastVaa } = await postLiquidityLayerVaav2(
1821+
const { address: fastVaa } = await postAndFetchVaa(
18221822
payerSigner,
18231823
matchingEngine,
18241824
mockFastVaa,
@@ -1857,7 +1857,7 @@ describe("Matching Engine <> Token Router", function () {
18571857
{ sourceChain: finalizedSourceChain, timestamp: finalizedVaaTimestamp },
18581858
);
18591859

1860-
const { address: finalizedVaa } = await postLiquidityLayerVaav2(
1860+
const { address: finalizedVaa } = await postAndFetchVaa(
18611861
payerSigner,
18621862
matchingEngine,
18631863
mockFinalizedVaa,

0 commit comments

Comments
 (0)