Skip to content

Commit b447009

Browse files
barnjaminbarnjamin
committed
update spots where we post the vaa to the newer style
1 parent 07ca3ba commit b447009

File tree

8 files changed

+117
-112
lines changed

8 files changed

+117
-112
lines changed

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -2373,7 +2373,11 @@ export class MatchingEngineProgram {
23732373
}
23742374

23752375
upgradeManagerProgram(): UpgradeManagerProgram {
2376-
return new UpgradeManagerProgram(this.program.provider.connection, this._addresses);
2376+
return new UpgradeManagerProgram(
2377+
this.program.provider.connection,
2378+
this._addresses.upgradeManager,
2379+
this._addresses,
2380+
);
23772381
}
23782382

23792383
tokenMessengerMinterProgram(): TokenMessengerMinterProgram {

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

+32-33
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as splToken from "@solana/spl-token";
22
import {
33
AddressLookupTableAccount,
4+
ComputeBudgetProgram,
45
Connection,
56
Keypair,
67
PublicKey,
@@ -10,9 +11,10 @@ import {
1011
} from "@solana/web3.js";
1112
import {
1213
FastMarketOrder,
14+
Payload,
1315
TokenRouter,
1416
} from "@wormhole-foundation/example-liquidity-layer-definitions";
15-
import { ChainId, Network, Platform, toChainId } from "@wormhole-foundation/sdk-base";
17+
import { ChainId, Network, Platform, encoding, toChainId } from "@wormhole-foundation/sdk-base";
1618
import {
1719
ChainsConfig,
1820
CircleBridge,
@@ -237,38 +239,35 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
237239
vaa: VAA<"FastTransfer:CctpDeposit">,
238240
cctp: CircleBridge.Attestation,
239241
): AsyncGenerator<UnsignedTransaction<N, C>, any, unknown> {
240-
// const payer = new SolanaAddress(sender).unwrap();
241-
242-
// //
243-
// const { payload: fill } = vaa.payload;
244-
// if (!Payload.is(fill, "Fill")) {
245-
// throw new Error("Invalid VAA payload");
246-
// }
247-
248-
// const postedVaaAddress = coreUtils.derivePostedVaaKey(
249-
// this.coreBridge.address,
250-
// Buffer.from(vaa.hash),
251-
// );
252-
253-
// const ix = await this.redeemCctpFillIx(
254-
// {
255-
// payer: payer,
256-
// vaa: postedVaaAddress,
257-
// sourceRouterEndpoint: this.matchingEngine.routerEndpointAddress(
258-
// toChainId(fill.sourceChain),
259-
// ),
260-
// },
261-
// {
262-
// encodedCctpMessage,
263-
// cctpAttestation,
264-
// },
265-
// );
266-
267-
// //const computeIx = ComputeBudgetProgram.setComputeUnitLimit({
268-
// // units: 300_000,
269-
// //});
270-
271-
throw new Error("Method not implemented.");
242+
const payer = new SolanaAddress(sender).unwrap();
243+
244+
const postedVaaAddress = this.matchingEngine.pdas.postedVaa(vaa);
245+
246+
const { payload: fill } = vaa.payload;
247+
if (!Payload.is(fill, "Fill")) {
248+
throw new Error("Invalid VAA payload");
249+
}
250+
251+
const ix = await this.redeemCctpFillIx(
252+
{
253+
payer: payer,
254+
vaa: postedVaaAddress,
255+
sourceRouterEndpoint: this.matchingEngine.routerEndpointAddress(
256+
toChainId(fill.sourceChain),
257+
),
258+
},
259+
{
260+
encodedCctpMessage: Buffer.from(CircleBridge.serialize(cctp.message)),
261+
cctpAttestation: Buffer.from(cctp.attestation!, "hex"),
262+
},
263+
);
264+
265+
const computeIx = ComputeBudgetProgram.setComputeUnitLimit({
266+
units: 300_000,
267+
});
268+
269+
const transaction = this.createTx(payer, [ix, computeIx]);
270+
yield this.createUnsignedTx({ transaction }, "TokenRouter.RedeemFill");
272271
}
273272

274273
private createTx(

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

-34
Original file line numberDiff line numberDiff line change
@@ -82,40 +82,6 @@ export async function postLiquidityLayerVaav2<N extends Network>(
8282
return { address, account };
8383
}
8484

85-
// TODO: Replace any invocations of this function with postLiquidityLayerVaav2
86-
// then rename back to postLiquidityLayerVaa
87-
export async function postLiquidityLayerVaa(
88-
connection: Connection,
89-
payer: Keypair,
90-
guardians: mocks.MockGuardians,
91-
foreignEmitterAddress: Array<number>,
92-
sequence: bigint,
93-
message: LiquidityLayerMessage | Buffer,
94-
args: { sourceChain?: Chain; timestamp?: number } = {},
95-
) {
96-
let { sourceChain, timestamp } = args;
97-
sourceChain ??= "Ethereum";
98-
timestamp ??= await getBlockTime(connection);
99-
100-
const foreignEmitter = new mocks.MockEmitter(
101-
toUniversal(sourceChain, new Uint8Array(foreignEmitterAddress)),
102-
sourceChain ?? "Ethereum",
103-
sequence - 1n,
104-
);
105-
106-
const published = foreignEmitter.publishMessage(
107-
0, // nonce,
108-
Buffer.isBuffer(message) ? message : message.encode(),
109-
0, // consistencyLevel
110-
timestamp,
111-
);
112-
const vaa = guardians.addSignatures(published, [0]);
113-
114-
await postVaa(connection, payer, vaa);
115-
116-
return coreUtils.derivePostedVaaKey(CORE_BRIDGE_PID, Buffer.from(vaa.hash));
117-
}
118-
11985
export class CircleAttester {
12086
attester: ethers.utils.SigningKey;
12187

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,11 @@ export class TokenRouterProgram {
929929
}
930930

931931
upgradeManagerProgram(): UpgradeManagerProgram {
932-
return new UpgradeManagerProgram(this.program.provider.connection, this._addresses);
932+
return new UpgradeManagerProgram(
933+
this.program.provider.connection,
934+
this.upgradeManager.toBase58(),
935+
this._addresses,
936+
);
933937
}
934938

935939
tokenMessengerMinterProgram(): TokenMessengerMinterProgram {

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

+7-4
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ export const PROGRAM_IDS = [
2424
export type ProgramId = (typeof PROGRAM_IDS)[number] | string;
2525

2626
export class UpgradeManagerProgram {
27-
private _programId: PublicKey;
28-
27+
private _programId: ProgramId;
2928
program: Program<UpgradeManager>;
3029

31-
constructor(connection: Connection, private _addresses: tokenRouterSdk.TokenRouterAddresses) {
32-
this._programId = new PublicKey(_addresses.upgradeManager);
30+
constructor(
31+
connection: Connection,
32+
programId: ProgramId,
33+
private _addresses: tokenRouterSdk.TokenRouterAddresses,
34+
) {
35+
this._programId = programId;
3336
this.program = new Program(
3437
{ ...(IDL as any), address: this._programId },
3538
{

‎solana/ts/tests/01__matchingEngine.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
SlowOrderResponse,
1818
} from "@wormhole-foundation/example-liquidity-layer-definitions";
1919
import { Chain, ChainId, encoding, toChain, toChainId } from "@wormhole-foundation/sdk-base";
20-
import { CircleBridge, VAA, create, toUniversal } from "@wormhole-foundation/sdk-definitions";
20+
import { CircleBridge, VAA, toUniversal } from "@wormhole-foundation/sdk-definitions";
2121
import { deserializePostMessage } from "@wormhole-foundation/sdk-solana-core";
2222
import { expect } from "chai";
2323
import { CctpTokenBurnMessage } from "../src/cctp";
@@ -37,7 +37,6 @@ import {
3737
PreparedOrderResponse,
3838
Proposal,
3939
RouterEndpoint,
40-
localnet,
4140
} from "../src/matchingEngine";
4241
import { SolanaMatchingEngine } from "../src/protocol/matchingEngine";
4342
import {

‎solana/ts/tests/02__tokenRouter.ts

+46-28
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,34 @@ import {
99
SystemProgram,
1010
TransactionInstruction,
1111
} from "@solana/web3.js";
12+
import { TokenRouter } from "@wormhole-foundation/example-liquidity-layer-definitions";
1213
import { ChainId, encoding, toChain, toChainId } from "@wormhole-foundation/sdk-base";
13-
import { UniversalAddress, toUniversal } from "@wormhole-foundation/sdk-definitions";
14+
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
1415
import { deserializePostMessage } from "@wormhole-foundation/sdk-solana-core";
1516
import { expect } from "chai";
1617
import { CctpTokenBurnMessage } from "../src/cctp";
1718
import { LiquidityLayerDeposit, LiquidityLayerMessage, uint64ToBN } from "../src/common";
19+
import { SolanaTokenRouter, SolanaTokenRouterContracts } from "../src/protocol";
1820
import {
1921
CircleAttester,
2022
DEFAULT_ADDRESSES,
2123
ETHEREUM_USDC_ADDRESS,
2224
LOCALHOST,
23-
MOCK_GUARDIANS,
2425
OWNER_ASSISTANT_KEYPAIR,
2526
OWNER_KEYPAIR,
2627
PAYER_KEYPAIR,
2728
REGISTERED_TOKEN_ROUTERS,
2829
USDC_MINT_ADDRESS,
30+
createLiquidityLayerVaa,
2931
expectIxErr,
3032
expectIxOk,
3133
expectTxsErr,
3234
expectTxsOk,
3335
getSdkSigner,
34-
postLiquidityLayerVaa,
36+
postLiquidityLayerVaav2,
3537
toUniversalAddress,
3638
} from "../src/testing";
3739
import { Custodian, PreparedOrder, TokenRouterProgram } from "../src/tokenRouter";
38-
import { SolanaTokenRouter, SolanaTokenRouterContracts } from "../src/protocol";
39-
import { TokenRouter } from "@wormhole-foundation/example-liquidity-layer-definitions";
4040

4141
const SOLANA_CHAIN_ID = toChainId("Solana");
4242

@@ -1176,15 +1176,20 @@ describe("Token Router", function () {
11761176
}),
11771177
});
11781178

1179-
const vaa = await postLiquidityLayerVaa(
1179+
const mockInvalidVaa = await createLiquidityLayerVaa(
11801180
connection,
1181-
payer,
1182-
MOCK_GUARDIANS,
11831181
foreignEndpointAddress,
11841182
wormholeSequence++,
11851183
message,
11861184
{ sourceChain: "Polygon" },
11871185
);
1186+
1187+
const { address: vaa } = await postLiquidityLayerVaav2(
1188+
payerSigner,
1189+
tokenRouter.matchingEngine,
1190+
mockInvalidVaa,
1191+
);
1192+
11881193
const ix = await tokenRouter.redeemCctpFillIx(
11891194
{
11901195
payer: payer.publicKey,
@@ -1250,14 +1255,19 @@ describe("Token Router", function () {
12501255
}),
12511256
});
12521257

1253-
const vaa = await postLiquidityLayerVaa(
1258+
const mockInvalidVaa = await createLiquidityLayerVaa(
12541259
connection,
1255-
payer,
1256-
MOCK_GUARDIANS,
12571260
new Array(32).fill(0), // emitter address
12581261
wormholeSequence++,
12591262
message,
12601263
);
1264+
1265+
const { address: vaa } = await postLiquidityLayerVaav2(
1266+
payerSigner,
1267+
tokenRouter.matchingEngine,
1268+
mockInvalidVaa,
1269+
);
1270+
12611271
const ix = await tokenRouter.redeemCctpFillIx(
12621272
{
12631273
payer: payer.publicKey,
@@ -1321,14 +1331,19 @@ describe("Token Router", function () {
13211331
const encodedMessage = message.encode();
13221332
encodedMessage[147] = 69;
13231333

1324-
const vaa = await postLiquidityLayerVaa(
1334+
const mockInvalidVaa = await createLiquidityLayerVaa(
13251335
connection,
1326-
payer,
1327-
MOCK_GUARDIANS,
13281336
foreignEndpointAddress,
13291337
wormholeSequence++,
13301338
encodedMessage,
13311339
);
1340+
1341+
const { address: vaa } = await postLiquidityLayerVaav2(
1342+
payerSigner,
1343+
tokenRouter.matchingEngine,
1344+
mockInvalidVaa,
1345+
);
1346+
13321347
const ix = await tokenRouter.redeemCctpFillIx(
13331348
{
13341349
payer: payer.publicKey,
@@ -1388,23 +1403,22 @@ describe("Token Router", function () {
13881403
}),
13891404
});
13901405

1391-
const vaa = await postLiquidityLayerVaa(
1406+
const mockInvalidVaa = await createLiquidityLayerVaa(
13921407
connection,
1393-
payer,
1394-
MOCK_GUARDIANS,
13951408
foreignEndpointAddress,
13961409
wormholeSequence++,
13971410
message,
13981411
);
1412+
1413+
const { address: vaa } = await postLiquidityLayerVaav2(
1414+
payerSigner,
1415+
tokenRouter.matchingEngine,
1416+
mockInvalidVaa,
1417+
);
1418+
13991419
const ix = await tokenRouter.redeemCctpFillIx(
1400-
{
1401-
payer: payer.publicKey,
1402-
vaa,
1403-
},
1404-
{
1405-
encodedCctpMessage,
1406-
cctpAttestation,
1407-
},
1420+
{ payer: payer.publicKey, vaa },
1421+
{ encodedCctpMessage, cctpAttestation },
14081422
);
14091423

14101424
const { value: lookupTableAccount } = await connection.getAddressLookupTable(
@@ -1465,14 +1479,18 @@ describe("Token Router", function () {
14651479
}),
14661480
});
14671481

1468-
const vaa = await postLiquidityLayerVaa(
1482+
const mockInvalidVaa = await createLiquidityLayerVaa(
14691483
connection,
1470-
payer,
1471-
MOCK_GUARDIANS,
14721484
foreignEndpointAddress,
14731485
wormholeSequence++,
14741486
message,
14751487
);
1488+
const { address: vaa } = await postLiquidityLayerVaav2(
1489+
payerSigner,
1490+
tokenRouter.matchingEngine,
1491+
mockInvalidVaa,
1492+
);
1493+
14761494
const ix = await tokenRouter.redeemCctpFillIx(
14771495
{
14781496
payer: payer.publicKey,

0 commit comments

Comments
 (0)