Skip to content

Commit 7975b00

Browse files
barnjaminbarnjamin
committed
fix some solana tests
1 parent 1c2335c commit 7975b00

File tree

8 files changed

+90
-55
lines changed

8 files changed

+90
-55
lines changed

‎evm/ts/src/TokenRouter/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ export function encodeOrderResponse(response: FastTransfer.OrderResponse): Order
2929
}
3030
: {
3131
encodedWormholeMessage: serialize(response.vaa),
32-
circleAttestation: encoding.hex.decode(response.cctp.attestation!),
33-
circleBridgeMessage: CircleBridge.serialize(response.cctp.message),
32+
circleAttestation: encoding.hex.decode(response.cctp!.attestation!),
33+
circleBridgeMessage: CircleBridge.serialize(response.cctp!.message),
3434
};
3535
}
3636
export function decodedOrderResponse(response: OrderResponse): FastTransfer.OrderResponse {

‎evm/ts/src/protocol/matchingEngine.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ export class EvmMatchingEngine<N extends Network, C extends EvmChains>
143143
? this.executeFastOrderTx(fastVaaBytes)
144144
: this.executeSlowOrderAndRedeemTx(fastVaaBytes, {
145145
encodedWormholeMessage: serialize(response.vaa),
146-
circleBridgeMessage: CircleBridge.serialize(response.cctp.message),
147-
circleAttestation: response.cctp.attestation!,
146+
circleBridgeMessage: CircleBridge.serialize(response.cctp!.message),
147+
circleAttestation: response.cctp!.attestation!,
148148
}));
149149

150150
yield this.createUnsignedTx({ ...txReq, from }, "MatchingEngine.settleOrder");

‎evm/ts/tests/04__fastMarketOrder.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1090,15 +1090,14 @@ describe("Fast Market Order Business Logic -- CCTP to CCTP", function (this: Moc
10901090
expect(signedVaas.length).to.eql(2);
10911091

10921092
// The first message is the slow CCTP transfer.
1093-
const [slowOrderResponse, fastVaa] = signedVaas;
1094-
1093+
const [encodedWormholeMessage, fastVaa] = signedVaas;
10951094
const circleBridgeMessage = transactionResult.circleMessage!;
10961095
const circleAttestation = circleAttester.createAttestation(circleBridgeMessage);
10971096

10981097
localVariables.set(
10991098
"redeemParameters",
11001099
decodedOrderResponse({
1101-
encodedWormholeMessage: slowOrderResponse,
1100+
encodedWormholeMessage,
11021101
circleBridgeMessage,
11031102
circleAttestation,
11041103
}),

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

+39-22
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
import {
1111
FastTransfer,
1212
MatchingEngine,
13+
payloadIds,
1314
} from "@wormhole-foundation/example-liquidity-layer-definitions";
1415
import { Chain, Network, Platform, toChainId } from "@wormhole-foundation/sdk-base";
1516
import {
@@ -31,6 +32,7 @@ import {
3132
import { vaaHash } from "../common";
3233
import { AuctionParameters, MatchingEngineProgram } from "../matchingEngine";
3334
import { SolanaWormholeCore } from "@wormhole-foundation/sdk-solana-core";
35+
import { info } from "console";
3436

3537
export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
3638
extends MatchingEngineProgram
@@ -252,10 +254,8 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
252254
private async _prepareOrderResponseIx(
253255
sender: AnySolanaAddress,
254256
order: FastTransfer.Order,
255-
response: FastTransfer.OrderResponse,
257+
response: FastTransfer.Fill,
256258
) {
257-
if (FastTransfer.isFastFill(response)) throw "Invalid";
258-
259259
const payer = new SolanaAddress(sender).unwrap();
260260

261261
const fastVaa = this.pdas.postedVaa(order);
@@ -273,8 +273,8 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
273273
const ix = await this.prepareOrderResponseCctpIx(
274274
{ payer, fastVaa, finalizedVaa },
275275
{
276-
encodedCctpMessage: Buffer.from(CircleBridge.serialize(response.cctp.message)),
277-
cctpAttestation: Buffer.from(response.cctp.attestation!, "hex"),
276+
encodedCctpMessage: Buffer.from(CircleBridge.serialize(response.cctp!.message)),
277+
cctpAttestation: Buffer.from(response.cctp!.attestation!, "hex"),
278278
},
279279
);
280280

@@ -288,6 +288,9 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
288288
lookupTables?: AddressLookupTableAccount[],
289289
) {
290290
const payer = new SolanaAddress(sender).unwrap();
291+
292+
if (FastTransfer.isFastFill(response)) throw "Invalid response type in order prep";
293+
291294
const ix = await this._prepareOrderResponseIx(sender, order, response);
292295
if (ix === undefined) return;
293296

@@ -303,10 +306,12 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
303306
response: FastTransfer.OrderResponse,
304307
lookupTables?: AddressLookupTableAccount[],
305308
) {
309+
if (FastTransfer.isFastFill(response)) throw "Invalid response type in order settle";
310+
306311
const payer = new SolanaAddress(sender).unwrap();
307312

308313
const ixs = [];
309-
if (!FastTransfer.isFastFill(response)) {
314+
if (response.cctp) {
310315
const ix = await this._prepareOrderResponseIx(sender, order, response);
311316
if (ix !== undefined) {
312317
ixs.push(ix, ComputeBudgetProgram.setComputeUnitLimit({ units: 300_000 }));
@@ -319,28 +324,40 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
319324
const preparedOrderResponse = this.pdas.preparedOrderResponse(digest);
320325
const auction = this.pdas.auction(digest);
321326

327+
let bestOfferToken;
328+
let activeAuction = false;
329+
try {
330+
const { info } = await this.fetchAuction({ address: auction });
331+
if (!info) throw "No auction";
332+
activeAuction = true;
333+
bestOfferToken = info.bestOfferToken;
334+
} catch {}
335+
322336
const settleIx = await (async () => {
323-
if (FastTransfer.isFastFill(response)) {
324-
if (order.payload.targetChain === "Solana") {
325-
const reservedSequence = this.pdas.reservedFastFillSequence(digest);
326-
return await this.settleAuctionNoneLocalIx({
327-
payer,
328-
reservedSequence,
329-
preparedOrderResponse,
330-
auction,
331-
});
332-
} else {
333-
return await this.settleAuctionNoneCctpIx(
334-
{ payer, fastVaa, preparedOrderResponse },
335-
{ targetChain: toChainId(order.payload.targetChain) },
336-
);
337-
}
338-
} else {
337+
if (activeAuction) {
339338
return await this.settleAuctionCompleteIx({
340339
executor: payer,
341340
preparedOrderResponse,
342341
auction,
342+
bestOfferToken,
343+
});
344+
}
345+
346+
// no auction
347+
348+
if (order.payload.targetChain === "Solana") {
349+
const reservedSequence = this.pdas.reservedFastFillSequence(digest);
350+
return await this.settleAuctionNoneLocalIx({
351+
payer,
352+
reservedSequence,
353+
preparedOrderResponse,
354+
auction,
343355
});
356+
} else {
357+
return await this.settleAuctionNoneCctpIx(
358+
{ payer, fastVaa, preparedOrderResponse, auction },
359+
{ targetChain: toChainId(order.payload.targetChain) },
360+
);
344361
}
345362
})();
346363

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
229229
),
230230
},
231231
{
232-
encodedCctpMessage: Buffer.from(CircleBridge.serialize(cctp.message)),
233-
cctpAttestation: Buffer.from(cctp.attestation!, "hex"),
232+
encodedCctpMessage: Buffer.from(CircleBridge.serialize(cctp!.message)),
233+
cctpAttestation: Buffer.from(cctp!.attestation!, "hex"),
234234
},
235235
);
236236

‎solana/ts/tests/01__matchingEngine.ts

+36-19
Original file line numberDiff line numberDiff line change
@@ -3561,14 +3561,18 @@ describe("Matching Engine", function () {
35613561
const { value: lookupTableAccount } = await connection.getAddressLookupTable(
35623562
lookupTableAddress,
35633563
);
3564-
const tx2 = engine.settleOrder(
3565-
playerTwo.publicKey,
3566-
fast.vaaAccount.vaa("FastTransfer:FastMarketOrder"),
3567-
finalized!.vaaAccount.vaa("FastTransfer:CctpDeposit"),
3568-
{
3564+
3565+
const response = {
3566+
vaa: finalized!.vaaAccount.vaa("FastTransfer:CctpDeposit"),
3567+
cctp: {
35693568
message: cctpMessage,
35703569
attestation: cctpAttestation.toString("hex"),
35713570
},
3571+
};
3572+
const tx2 = engine.settleOrder(
3573+
playerTwo.publicKey,
3574+
fast.vaaAccount.vaa("FastTransfer:FastMarketOrder"),
3575+
response,
35723576
[lookupTableAccount!],
35733577
);
35743578

@@ -4406,8 +4410,10 @@ describe("Matching Engine", function () {
44064410
const txs = engine.prepareOrderResponse(
44074411
accounts.payer,
44084412
fastVaaAccount.vaa("FastTransfer:FastMarketOrder"),
4409-
finalizedVaaAccount.vaa("FastTransfer:CctpDeposit"),
4410-
{ message: cctpMessage, attestation: cctpAttestation },
4413+
{
4414+
vaa: finalizedVaaAccount.vaa("FastTransfer:CctpDeposit"),
4415+
cctp: { message: cctpMessage, attestation: cctpAttestation },
4416+
},
44114417
[lookupTableAccount!],
44124418
);
44134419

@@ -4524,12 +4530,13 @@ describe("Matching Engine", function () {
45244530
throw new Error("preparedInSameTransaction not implemented");
45254531
}
45264532

4527-
const { fastVaa, finalizedVaa, preparedOrderResponse } = await (async () => {
4533+
const { fastVaa, finalizedVaa, preparedOrderResponse, args } = await (async () => {
45284534
if (accounts.preparedOrderResponse !== undefined) {
45294535
return {
45304536
fastVaa: null,
45314537
finalizedVaa: null,
45324538
preparedOrderResponse: accounts.preparedOrderResponse,
4539+
args: opts.args,
45334540
};
45344541
} else {
45354542
const result = await prepareOrderResponseCctpForTest(
@@ -4550,13 +4557,12 @@ describe("Matching Engine", function () {
45504557

45514558
const executor = accounts.executor ?? playerOne.publicKey;
45524559

4553-
const ix = await engine.settleAuctionCompleteIx({
4554-
...accounts,
4555-
executor,
4556-
preparedOrderResponse,
4557-
});
4558-
45594560
if (errorMsg !== null) {
4561+
const ix = await engine.settleAuctionCompleteIx({
4562+
...accounts,
4563+
executor,
4564+
preparedOrderResponse,
4565+
});
45604566
return expectIxErr(connection, [ix], unwrapSigners(signers), errorMsg);
45614567
}
45624568

@@ -4607,9 +4613,12 @@ describe("Matching Engine", function () {
46074613
.getAccountInfo(preparedCustodyToken)
46084614
.then((info) => info!.lamports);
46094615

4616+
const finalizedVaaAccount = await VaaAccount.fetch(connection, finalizedVaa);
4617+
46104618
const txs = engine.settleOrder(
46114619
executor,
46124620
fastVaaAccount.vaa("FastTransfer:FastMarketOrder"),
4621+
{ vaa: finalizedVaaAccount.vaa("FastTransfer:CctpDeposit") },
46134622
);
46144623

46154624
const signer = executorIsPreparer ? prepareSigners[0] : payerSigner;
@@ -4629,7 +4638,6 @@ describe("Matching Engine", function () {
46294638
bestOfferToken,
46304639
);
46314640

4632-
const finalizedVaaAccount = await VaaAccount.fetch(connection, finalizedVaa);
46334641
const { deposit } = LiquidityLayerMessage.decode(finalizedVaaAccount.payload());
46344642
const { baseFee } = deposit!.message.payload! as SlowOrderResponse;
46354643

@@ -4692,12 +4700,13 @@ describe("Matching Engine", function () {
46924700
throw new Error("preparedInSameTransaction not implemented");
46934701
}
46944702

4695-
const { fastVaa, finalizedVaa, preparedOrderResponse } = await (async () => {
4703+
const { fastVaa, finalizedVaa, preparedOrderResponse, args } = await (async () => {
46964704
if (accounts.fastVaa !== undefined && accounts.preparedOrderResponse !== undefined) {
46974705
return {
46984706
fastVaa: accounts.fastVaa,
46994707
finalizedVaa: null,
47004708
preparedOrderResponse: accounts.preparedOrderResponse,
4709+
args: opts.args,
47014710
};
47024711
} else {
47034712
const result = await prepareOrderResponseCctpForTest(
@@ -4713,6 +4722,7 @@ describe("Matching Engine", function () {
47134722
finalizedVaa: result!.finalizedVaa,
47144723
preparedOrderResponse:
47154724
accounts.preparedOrderResponse ?? result!.preparedOrderResponse,
4725+
args: result!.args ?? opts.args,
47164726
};
47174727
}
47184728
})();
@@ -4721,14 +4731,21 @@ describe("Matching Engine", function () {
47214731
const { fastMarketOrder } = LiquidityLayerMessage.decode(fastVaaAccount.payload());
47224732
expect(fastMarketOrder).is.not.undefined;
47234733

4724-
let finalizedVaaAccount = finalizedVaa
4725-
? await VaaAccount.fetch(connection, finalizedVaa)
4734+
const cctp = args
4735+
? {
4736+
message: CircleBridge.deserialize(args!.encodedCctpMessage!)[0],
4737+
attestation: encoding.hex.encode(args!.cctpAttestation, true),
4738+
}
47264739
: undefined;
47274740

4741+
const finalizedVaaAccount = await VaaAccount.fetch(connection, finalizedVaa!);
47284742
const txs = engine.settleOrder(
47294743
accounts.payer,
47304744
fastVaaAccount.vaa("FastTransfer:FastMarketOrder"),
4731-
finalizedVaaAccount?.vaa("FastTransfer:CctpDeposit"),
4745+
{
4746+
vaa: finalizedVaaAccount.vaa("FastTransfer:CctpDeposit"),
4747+
cctp,
4748+
},
47324749
);
47334750

47344751
if (errorMsg !== null) {

‎solana/ts/tests/02__tokenRouter.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -1741,10 +1741,12 @@ describe("Token Router", function () {
17411741

17421742
const txs = tokenRouter.redeemFill(
17431743
payer.publicKey,
1744-
mockVaa,
17451744
{
1746-
message: cctpMessage,
1747-
attestation: cctpAttestation.toString("hex"),
1745+
vaa: mockVaa,
1746+
cctp: {
1747+
message: cctpMessage,
1748+
attestation: cctpAttestation.toString("hex"),
1749+
},
17481750
},
17491751
[lookupTableAccount!],
17501752
);

‎universal/ts/src/protocol.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ export namespace FastTransfer {
4040
export type Order = VAA<"FastMarketOrder">;
4141
export const auctionId = (vaa: Order) => keccak256(vaa.hash);
4242

43-
export type Fill = { vaa: FastTransfer.VAA<"CctpDeposit">; cctp: CircleBridge.Attestation };
43+
export type Fill = { vaa: FastTransfer.VAA<"CctpDeposit">; cctp?: CircleBridge.Attestation };
4444
export type FastFill = { vaa: FastTransfer.VAA<"FastFill"> };
4545

4646
export type OrderResponse = Fill | FastFill;
4747
export const isFastFill = (response: OrderResponse): response is FastFill =>
48-
!("cctp" in response);
48+
response.vaa.payloadName === "FastFill";
4949

5050
export const getPayloadDiscriminator = () => payloadDiscriminator([protocolName, messageNames]);
5151
}

0 commit comments

Comments
 (0)