Skip to content

Commit 6dd14ca

Browse files
barnjaminbarnjamin
committed
re-use existing CCTP serde, actually deserialize created VAA to correct type
1 parent f1bc1a7 commit 6dd14ca

File tree

10 files changed

+174
-185
lines changed

10 files changed

+174
-185
lines changed

‎solana/ts/src/cctp/messages.ts

+52-75
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ethers } from "ethers";
1+
import { CircleBridge, UniversalAddress } from "@wormhole-foundation/sdk-definitions";
22

33
export type Cctp = {
44
version: number;
@@ -13,9 +13,9 @@ export type Cctp = {
1313
// Taken from https://developers.circle.com/stablecoins/docs/message-format.
1414
export class CctpMessage {
1515
cctp: Cctp;
16-
message: Buffer;
16+
message: CctpTokenBurnMessage;
1717

18-
constructor(cctp: Cctp, message: Buffer) {
18+
constructor(cctp: Cctp, message: CctpTokenBurnMessage) {
1919
this.cctp = cctp;
2020
this.message = message;
2121
}
@@ -30,31 +30,60 @@ export class CctpMessage {
3030

3131
static decode(buf: Readonly<Buffer>): CctpMessage {
3232
const version = buf.readUInt32BE(0);
33-
const sourceDomain = buf.readUInt32BE(4);
34-
const destinationDomain = buf.readUInt32BE(8);
35-
const nonce = buf.readBigUInt64BE(12);
36-
const sender = Array.from(buf.slice(20, 52));
37-
const recipient = Array.from(buf.slice(52, 84));
38-
const targetCaller = Array.from(buf.slice(84, 116));
39-
const message = buf.subarray(116);
33+
34+
const [msg] = CircleBridge.deserialize(new Uint8Array(buf));
35+
const {
36+
sourceDomain,
37+
destinationDomain,
38+
nonce,
39+
sender,
40+
recipient,
41+
destinationCaller,
42+
payload,
43+
} = msg;
44+
45+
const { burnToken, mintRecipient, amount, messageSender } = payload;
46+
const header: Cctp = {
47+
version,
48+
sourceDomain,
49+
destinationDomain,
50+
nonce,
51+
sender: Array.from(sender.toUint8Array()),
52+
recipient: Array.from(recipient.toUint8Array()),
53+
targetCaller: Array.from(destinationCaller.toUint8Array()),
54+
};
4055

4156
return new CctpMessage(
42-
{
57+
header,
58+
new CctpTokenBurnMessage(
59+
header,
4360
version,
44-
sourceDomain,
45-
destinationDomain,
46-
nonce,
47-
sender,
48-
recipient,
49-
targetCaller,
50-
},
51-
message,
61+
Array.from(burnToken.toUint8Array()),
62+
Array.from(mintRecipient.toUint8Array()),
63+
amount,
64+
Array.from(messageSender.toUint8Array()),
65+
),
5266
);
5367
}
5468

5569
encode(): Buffer {
5670
const { cctp, message } = this;
57-
return Buffer.concat([encodeCctp(cctp), message]);
71+
return Buffer.from(
72+
CircleBridge.serialize({
73+
sourceDomain: cctp.sourceDomain,
74+
destinationDomain: cctp.destinationDomain,
75+
nonce: cctp.nonce,
76+
sender: new UniversalAddress(new Uint8Array(cctp.sender)),
77+
recipient: new UniversalAddress(new Uint8Array(cctp.recipient)),
78+
destinationCaller: new UniversalAddress(new Uint8Array(cctp.targetCaller)),
79+
payload: {
80+
burnToken: new UniversalAddress(new Uint8Array(message.burnTokenAddress)),
81+
mintRecipient: new UniversalAddress(new Uint8Array(message.mintRecipient)),
82+
amount: message.amount,
83+
messageSender: new UniversalAddress(new Uint8Array(message.sender)),
84+
},
85+
}),
86+
);
5887
}
5988
}
6089

@@ -91,63 +120,11 @@ export class CctpTokenBurnMessage {
91120
}
92121

93122
static decode(buf: Readonly<Buffer>): CctpTokenBurnMessage {
94-
const { cctp, message } = CctpMessage.decode(buf);
95-
const version = message.readUInt32BE(0);
96-
const burnTokenAddress = Array.from(message.subarray(4, 36));
97-
const mintRecipient = Array.from(message.subarray(36, 68));
98-
const amount = BigInt(ethers.BigNumber.from(message.subarray(68, 100)).toString());
99-
const sender = Array.from(message.subarray(100, 132));
100-
101-
return new CctpTokenBurnMessage(
102-
cctp,
103-
version,
104-
burnTokenAddress,
105-
mintRecipient,
106-
amount,
107-
sender,
108-
);
123+
const { message } = CctpMessage.decode(buf);
124+
return message;
109125
}
110126

111127
encode(): Buffer {
112-
const buf = Buffer.alloc(132);
113-
114-
const { cctp, version, burnTokenAddress, mintRecipient, amount, sender } = this;
115-
116-
let offset = 0;
117-
offset = buf.writeUInt32BE(version, offset);
118-
buf.set(burnTokenAddress, offset);
119-
offset += 32;
120-
buf.set(mintRecipient, offset);
121-
offset += 32;
122-
123-
// Special handling w/ uint256. This value will most likely encoded in < 32 bytes, so we
124-
// jump ahead by 32 and subtract the length of the encoded value.
125-
const encodedAmount = ethers.utils.arrayify(ethers.BigNumber.from(amount.toString()));
126-
buf.set(encodedAmount, (offset += 32) - encodedAmount.length);
127-
128-
buf.set(sender, offset);
129-
offset += 32;
130-
131-
return Buffer.concat([encodeCctp(cctp), buf]);
128+
return new CctpMessage(this.cctp, this).encode();
132129
}
133130
}
134-
135-
function encodeCctp(cctp: Cctp): Buffer {
136-
const buf = Buffer.alloc(116);
137-
138-
const { version, sourceDomain, destinationDomain, nonce, sender, recipient, targetCaller } =
139-
cctp;
140-
141-
let offset = 0;
142-
offset = buf.writeUInt32BE(version, offset);
143-
offset = buf.writeUInt32BE(sourceDomain, offset);
144-
offset = buf.writeUInt32BE(destinationDomain, offset);
145-
offset = buf.writeBigUInt64BE(nonce, offset);
146-
buf.set(sender, offset);
147-
offset += 32;
148-
buf.set(recipient, offset);
149-
offset += 32;
150-
buf.set(targetCaller, offset);
151-
152-
return buf;
153-
}

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

+8-18
Original file line numberDiff line numberDiff line change
@@ -68,39 +68,30 @@ import {
6868
ReserveFastFillSequenceCompositeOpts,
6969
} from "./types";
7070

71-
export const PROGRAM_IDS = [
72-
"MatchingEngine11111111111111111111111111111",
73-
"mPydpGUWxzERTNpyvTKdvS7v8kvw5sgwfiP8WQFrXVS",
74-
] as const;
75-
export type ProgramId = (typeof PROGRAM_IDS)[number] | string;
71+
export * from "./types";
7672

7773
export const FEE_PRECISION_MAX = 1_000_000n;
7874

7975
export const CPI_EVENT_IX_SELECTOR = Uint8Array.from([228, 69, 165, 46, 81, 203, 154, 29]);
8076

8177
export class MatchingEngineProgram {
82-
private _programId: ProgramId;
8378
private _mint: PublicKey;
8479
private _custodian?: Custodian;
8580

8681
pdas: ReturnType<typeof programDerivedAddresses>;
8782

8883
program: Program<MatchingEngineType>;
8984

90-
constructor(
91-
connection: Connection,
92-
programId: ProgramId,
93-
private _addresses: MatchingEngine.Addresses,
94-
) {
95-
this._programId = programId;
85+
constructor(connection: Connection, private _addresses: MatchingEngine.Addresses) {
86+
const programId = _addresses.matchingEngine;
9687
this._mint = new PublicKey(_addresses.cctp.usdcMint);
9788
this.pdas = programDerivedAddresses(
9889
new PublicKey(programId),
9990
this._mint,
10091
this.coreBridgeProgramId,
10192
);
10293
this.program = new Program(
103-
{ ...(IDL as any), address: this._programId },
94+
{ ...(IDL as any), address: programId },
10495
{
10596
connection,
10697
},
@@ -2237,11 +2228,10 @@ export class MatchingEngineProgram {
22372228
}
22382229

22392230
upgradeManagerProgram(): UpgradeManagerProgram {
2240-
return new UpgradeManagerProgram(
2241-
this.program.provider.connection,
2242-
this._addresses.upgradeManager!,
2243-
{ ...this._addresses, tokenRouter: this._addresses.tokenRouter! },
2244-
);
2231+
return new UpgradeManagerProgram(this.program.provider.connection, {
2232+
...this._addresses,
2233+
tokenRouter: this._addresses.tokenRouter!,
2234+
});
22452235
}
22462236

22472237
tokenMessengerMinterProgram(): TokenMessengerMinterProgram {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
SolanaUnsignedTransaction,
3030
} from "@wormhole-foundation/sdk-solana";
3131
import { vaaHash } from "../common";
32-
import { AuctionParameters, MatchingEngineProgram, ProgramId } from "../matchingEngine";
32+
import { AuctionParameters, MatchingEngineProgram } from "../matchingEngine";
3333
import { SolanaWormholeCore } from "@wormhole-foundation/sdk-solana-core";
3434

3535
export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
@@ -44,7 +44,7 @@ export class SolanaMatchingEngine<N extends Network, C extends SolanaChains>
4444
readonly _connection: Connection,
4545
readonly _contracts: Contracts & MatchingEngine.Addresses,
4646
) {
47-
super(_connection, _contracts.matchingEngine, _contracts);
47+
super(_connection, _contracts);
4848

4949
this.coreBridge = new SolanaWormholeCore(_network, _chain, _connection, {
5050
...this._contracts,

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

+15-38
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@ import {
99
TransactionMessage,
1010
VersionedTransaction,
1111
} from "@solana/web3.js";
12-
import {
13-
FastMarketOrder,
14-
Payload,
15-
TokenRouter,
16-
} from "@wormhole-foundation/example-liquidity-layer-definitions";
17-
import { ChainId, Network, Platform, encoding, toChainId } from "@wormhole-foundation/sdk-base";
12+
import { Payload, TokenRouter } from "@wormhole-foundation/example-liquidity-layer-definitions";
13+
import { ChainId, Network, Platform, toChainId } from "@wormhole-foundation/sdk-base";
1814
import {
1915
ChainsConfig,
2016
CircleBridge,
@@ -47,7 +43,7 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
4743
readonly _connection: Connection,
4844
readonly _contracts: Contracts & TokenRouter.Addresses,
4945
) {
50-
super(_connection, _contracts.tokenRouter, _contracts);
46+
super(_connection, _contracts);
5147

5248
this.coreBridge = new SolanaWormholeCore(_network, _chain, _connection, _contracts);
5349
this.matchingEngine = new SolanaMatchingEngine(_network, _chain, _connection, _contracts);
@@ -89,30 +85,6 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
8985
yield this.createUnsignedTx({ transaction }, "TokenRouter.Initialize");
9086
}
9187

92-
private makeFastMarketOrder(
93-
sender: AnySolanaAddress,
94-
order: Partial<FastMarketOrder>,
95-
): FastMarketOrder {
96-
const senderAddress = new SolanaAddress(sender).toUniversalAddress();
97-
const o: FastMarketOrder = {
98-
// TODO: from auction params? take as args?
99-
maxFee: order.maxFee ?? 0n,
100-
initAuctionFee: order.initAuctionFee ?? 0n,
101-
deadline: order.deadline ?? 0,
102-
// TODO: specify which params we need, not just partial
103-
amountIn: order.amountIn!,
104-
minAmountOut: order.minAmountOut!,
105-
targetChain: order.targetChain!,
106-
redeemer: order.redeemer!,
107-
// TODO: which of these can we assume? any
108-
sender: order.sender ?? senderAddress,
109-
refundAddress: order.refundAddress ?? senderAddress,
110-
redeemerMessage: order.redeemerMessage ?? new Uint8Array(),
111-
};
112-
113-
return o;
114-
}
115-
11688
private async _prepareMarketOrderIxs(
11789
sender: AnySolanaAddress,
11890
order: TokenRouter.OrderRequest,
@@ -209,14 +181,18 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
209181
preparedOrder = new SolanaAddress(order).unwrap();
210182
}
211183

184+
// TODO: devnet not happy with this
185+
// const destinationDomain = targetChain ? circle.toCircleChainId(this._network, toChain(targetChain)) : undefined;
186+
187+
const destinationDomain = undefined;
188+
212189
const ix = await this.placeMarketOrderCctpIx(
213190
{
214191
payer,
215192
preparedOrder,
216193
preparedBy: payer,
217194
},
218-
// TODO: add cctpDomain fn
219-
{ targetChain }, //,destinationDomain: 3 },
195+
{ targetChain, destinationDomain },
220196
);
221197
ixs.push(ix);
222198

@@ -228,15 +204,16 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
228204
sender: AnySolanaAddress,
229205
vaa: VAA<"FastTransfer:CctpDeposit">,
230206
cctp: CircleBridge.Attestation,
207+
lookupTables?: AddressLookupTableAccount[],
231208
): AsyncGenerator<UnsignedTransaction<N, C>, any, unknown> {
232209
const payer = new SolanaAddress(sender).unwrap();
233210

234211
const postedVaaAddress = this.matchingEngine.pdas.postedVaa(vaa);
235212

236-
const { payload: fill } = vaa.payload;
237-
if (!Payload.is(fill, "Fill")) {
238-
throw new Error("Invalid VAA payload");
239-
}
213+
const fill = vaa.payload.payload;
214+
215+
// Must be a fill payload
216+
if (!Payload.is(fill, "Fill")) throw new Error("Invalid VAA payload");
240217

241218
const ix = await this.redeemCctpFillIx(
242219
{
@@ -256,7 +233,7 @@ export class SolanaTokenRouter<N extends Network, C extends SolanaChains>
256233
units: 300_000,
257234
});
258235

259-
const transaction = this.createTx(payer, [ix, computeIx]);
236+
const transaction = this.createTx(payer, [ix, computeIx], lookupTables);
260237
yield this.createUnsignedTx({ transaction }, "TokenRouter.RedeemFill");
261238
}
262239

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Connection, Keypair } from "@solana/web3.js";
2-
import { FastTransfer } from "@wormhole-foundation/example-liquidity-layer-definitions";
2+
import { FastTransfer, Message } from "@wormhole-foundation/example-liquidity-layer-definitions";
33
import { Chain, Network } from "@wormhole-foundation/sdk-base";
44
import { signAndSendWait } from "@wormhole-foundation/sdk-connect";
5-
import { toUniversal } from "@wormhole-foundation/sdk-definitions";
5+
import { deserialize, serialize, toUniversal } from "@wormhole-foundation/sdk-definitions";
66
import { mocks } from "@wormhole-foundation/sdk-definitions/testing";
77
import { SolanaAddress, SolanaSendSigner } from "@wormhole-foundation/sdk-solana";
88
import { ethers } from "ethers";
@@ -58,8 +58,12 @@ export async function createLiquidityLayerVaa(
5858
const published = foreignEmitter.publishMessage(0, msg, 0, timestamp);
5959
const vaa = MOCK_GUARDIANS.addSignatures(published, [0]);
6060

61-
// @ts-ignore -- TODO: this is lie, need to define discriminator
62-
return vaa;
61+
try {
62+
return deserialize(FastTransfer.getPayloadDiscriminator(), serialize(vaa));
63+
} catch {
64+
// @ts-expect-error -- needed to allow testing of invalid payloads
65+
return vaa;
66+
}
6367
}
6468

6569
export async function postAndFetchVaa<N extends Network>(

0 commit comments

Comments
 (0)