@wormhole-labs/base-bridge-executor-route 0.0.1-beta.1 → 0.0.1-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/consts.d.ts +1 -0
- package/dist/cjs/consts.d.ts.map +1 -1
- package/dist/cjs/consts.js +9 -1
- package/dist/cjs/consts.js.map +1 -1
- package/dist/cjs/domain/messageProver/solanaProver.d.ts.map +1 -1
- package/dist/cjs/domain/messageProver/solanaProver.js +0 -9
- package/dist/cjs/domain/messageProver/solanaProver.js.map +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts +3 -2
- package/dist/cjs/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts.map +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/solanaInstructionBuilder.js +210 -53
- package/dist/cjs/domain/solanaInstructionBuilder/solanaInstructionBuilder.js.map +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts.map +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js.map +1 -1
- package/dist/cjs/evm/baseBridgeExecutor.d.ts.map +1 -1
- package/dist/cjs/evm/baseBridgeExecutor.js +7 -7
- package/dist/cjs/evm/baseBridgeExecutor.js.map +1 -1
- package/dist/cjs/routes/baseBridgeBase.d.ts +5 -0
- package/dist/cjs/routes/baseBridgeBase.d.ts.map +1 -1
- package/dist/cjs/routes/baseBridgeBase.js +4 -1
- package/dist/cjs/routes/baseBridgeBase.js.map +1 -1
- package/dist/cjs/routes/baseBridgeRoute.d.ts.map +1 -1
- package/dist/cjs/routes/baseBridgeRoute.js +10 -2
- package/dist/cjs/routes/baseBridgeRoute.js.map +1 -1
- package/dist/cjs/routes/helpers.d.ts +4 -0
- package/dist/cjs/routes/helpers.d.ts.map +1 -1
- package/dist/cjs/routes/helpers.js +8 -1
- package/dist/cjs/routes/helpers.js.map +1 -1
- package/dist/cjs/svm/baseBridgeExecutor.d.ts +2 -1
- package/dist/cjs/svm/baseBridgeExecutor.d.ts.map +1 -1
- package/dist/cjs/svm/baseBridgeExecutor.js +100 -3
- package/dist/cjs/svm/baseBridgeExecutor.js.map +1 -1
- package/dist/cjs/types.d.ts +2 -1
- package/dist/cjs/types.d.ts.map +1 -1
- package/dist/esm/consts.d.ts +1 -0
- package/dist/esm/consts.d.ts.map +1 -1
- package/dist/esm/consts.js +8 -0
- package/dist/esm/consts.js.map +1 -1
- package/dist/esm/domain/messageProver/solanaProver.d.ts.map +1 -1
- package/dist/esm/domain/messageProver/solanaProver.js +0 -9
- package/dist/esm/domain/messageProver/solanaProver.js.map +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts +3 -2
- package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts.map +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.js +210 -53
- package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.js.map +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts.map +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js.map +1 -1
- package/dist/esm/evm/baseBridgeExecutor.d.ts.map +1 -1
- package/dist/esm/evm/baseBridgeExecutor.js +8 -8
- package/dist/esm/evm/baseBridgeExecutor.js.map +1 -1
- package/dist/esm/routes/baseBridgeBase.d.ts +5 -0
- package/dist/esm/routes/baseBridgeBase.d.ts.map +1 -1
- package/dist/esm/routes/baseBridgeBase.js +4 -1
- package/dist/esm/routes/baseBridgeBase.js.map +1 -1
- package/dist/esm/routes/baseBridgeRoute.d.ts.map +1 -1
- package/dist/esm/routes/baseBridgeRoute.js +10 -2
- package/dist/esm/routes/baseBridgeRoute.js.map +1 -1
- package/dist/esm/routes/helpers.d.ts +4 -0
- package/dist/esm/routes/helpers.d.ts.map +1 -1
- package/dist/esm/routes/helpers.js +8 -1
- package/dist/esm/routes/helpers.js.map +1 -1
- package/dist/esm/svm/baseBridgeExecutor.d.ts +2 -1
- package/dist/esm/svm/baseBridgeExecutor.d.ts.map +1 -1
- package/dist/esm/svm/baseBridgeExecutor.js +102 -5
- package/dist/esm/svm/baseBridgeExecutor.js.map +1 -1
- package/dist/esm/types.d.ts +2 -1
- package/dist/esm/types.d.ts.map +1 -1
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -28,8 +28,6 @@ export class SolanaProver {
|
|
|
28
28
|
throw new Error(`OutgoingMessage account not found: ${outgoingMessagePda.toBase58()}`);
|
|
29
29
|
}
|
|
30
30
|
const data = accountInfo.data;
|
|
31
|
-
console.log(` [SolanaProver] Account data length: ${data.length} bytes`);
|
|
32
|
-
console.log(` [SolanaProver] First 100 bytes (hex): ${Buffer.from(data.subarray(0, Math.min(100, data.length))).toString("hex")}`);
|
|
33
31
|
// OutgoingMessage account structure:
|
|
34
32
|
// [8 bytes] Anchor discriminator
|
|
35
33
|
// [8 bytes] nonce (u64)
|
|
@@ -122,11 +120,6 @@ export class SolanaProver {
|
|
|
122
120
|
.readUInt32LE(0);
|
|
123
121
|
dataOffset += 4;
|
|
124
122
|
const callData = messageData.subarray(dataOffset, dataOffset + callDataLen);
|
|
125
|
-
console.log(` [SolanaProver] Call parsed:`);
|
|
126
|
-
console.log(` callType: ${callType}`);
|
|
127
|
-
console.log(` callTo: 0x${Buffer.from(callTo).toString("hex")}`);
|
|
128
|
-
console.log(` callValue: ${callValueBigInt}`);
|
|
129
|
-
console.log(` callData length: ${callDataLen}`);
|
|
130
123
|
const callTuple = {
|
|
131
124
|
ty: callType,
|
|
132
125
|
to: padHex(`0x${Buffer.from(callTo).toString("hex")}`, {
|
|
@@ -161,8 +154,6 @@ export class SolanaProver {
|
|
|
161
154
|
messageDataHex = encodedTransferAndCall;
|
|
162
155
|
finalMessageType = 2; // TransferAndCall
|
|
163
156
|
}
|
|
164
|
-
console.log(` [SolanaProver] Final encoded data: ${messageDataHex.slice(0, 66)}...`);
|
|
165
|
-
console.log(` [SolanaProver] Final messageType: ${finalMessageType}`);
|
|
166
157
|
}
|
|
167
158
|
else {
|
|
168
159
|
throw new Error("Only Transfer messages are supported");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solanaProver.js","sourceRoot":"","sources":["../../../../src/domain/messageProver/solanaProver.ts"],"names":[],"mappings":"AAKA,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAI1D,MAAM,OAAO,YAAY;IAEJ;IACA;IAFnB,YACmB,YAAmC,EACnC,eAA0B;QAD1B,iBAAY,GAAZ,YAAY,CAAuB;QACnC,oBAAe,GAAf,eAAe,CAAW;IAC1C,CAAC;IAEJ,KAAK,CAAC,KAAK,CACT,QAAuB,EACvB,kBAA0B;QAE1B,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAe,CAAC;QACpE,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE;YACxD,8BAA8B,EAAE,CAAC;YACjC,UAAU,EAAE,WAAW;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,8BAA8B,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC5D,CAAC;QACJ,CAAC;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAC1D,UAAU,EACV,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;QAExE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,sCAAsC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,CACtE,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"solanaProver.js","sourceRoot":"","sources":["../../../../src/domain/messageProver/solanaProver.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@ export interface SolanaInstructionBuilder {
|
|
|
57
57
|
buildBridgeSolInstruction(programId: PublicKey, params: BridgeSolInstructionParams): TransactionInstruction;
|
|
58
58
|
buildBridgeSplInstruction(programId: PublicKey, params: BridgeSplInstructionParams): TransactionInstruction;
|
|
59
59
|
buildPayForRelayInstruction(relayerProgramId: PublicKey, params: PayForRelayInstructionParams): TransactionInstruction;
|
|
60
|
-
buildRedeemTransaction(proofData: ProofData, payer: PublicKey, bridgeProgramId: PublicKey, bridgeBlockNumber: bigint, connection: Connection): Promise<Transaction>;
|
|
60
|
+
buildRedeemTransaction(proofData: ProofData, payer: PublicKey, bridgeProgramId: PublicKey, bridgeBlockNumber: bigint, connection: Connection, relayInstructions?: Uint8Array): Promise<Transaction>;
|
|
61
61
|
deriveAssociatedTokenAddress(mint: PublicKey, owner: PublicKey, tokenProgram: PublicKey): PublicKey;
|
|
62
62
|
deriveBridgePda(programId: PublicKey): [PublicKey, number];
|
|
63
63
|
deriveOutgoingMessagePda(programId: PublicKey, salt: Uint8Array): [PublicKey, number];
|
|
@@ -78,7 +78,8 @@ export declare class BaseBridgeInstructionBuilder implements SolanaInstructionBu
|
|
|
78
78
|
deriveMessageToRelayPda(relayerProgramId: PublicKey, salt: Uint8Array): [PublicKey, number];
|
|
79
79
|
deriveSolVaultPda(programId: PublicKey): [PublicKey, number];
|
|
80
80
|
deriveTokenVaultPda(programId: PublicKey, mint: PublicKey, remoteToken: Uint8Array): [PublicKey, number];
|
|
81
|
-
buildRedeemTransaction(proofData: ProofData, payer: PublicKey, bridgeProgramId: PublicKey, bridgeBlockNumber: bigint, connection: Connection): Promise<Transaction>;
|
|
81
|
+
buildRedeemTransaction(proofData: ProofData, payer: PublicKey, bridgeProgramId: PublicKey, bridgeBlockNumber: bigint, connection: Connection, relayInstructions?: Uint8Array): Promise<Transaction>;
|
|
82
|
+
private decodeMessageAndPrepareAccounts;
|
|
82
83
|
private serializeU64;
|
|
83
84
|
}
|
|
84
85
|
//# sourceMappingURL=solanaInstructionBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solanaInstructionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/domain/solanaInstructionBuilder/solanaInstructionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,WAAW,EACX,UAAU,EAEX,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"solanaInstructionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/domain/solanaInstructionBuilder/solanaInstructionBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { PublicKey, TransactionInstruction, Transaction, SystemProgram, } from "@solana/web3.js";
|
|
2
|
+
import { deserializeLayout } from "@wormhole-foundation/sdk-connect";
|
|
3
|
+
import { relayInstructionsLayout } from "../../layouts/relayInstruction";
|
|
2
4
|
import { toBytes } from "viem";
|
|
3
5
|
import { createProveMessageInstruction, createRelayMessageInstruction, } from "../../svm/instructionBuilders";
|
|
4
6
|
import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, createAssociatedTokenAccountIdempotentInstruction, ASSOCIATED_TOKEN_PROGRAM_ID, } from "@solana/spl-token";
|
|
@@ -119,7 +121,7 @@ export class BaseBridgeInstructionBuilder {
|
|
|
119
121
|
deriveTokenVaultPda(programId, mint, remoteToken) {
|
|
120
122
|
return PublicKey.findProgramAddressSync([Buffer.from("token_vault"), mint.toBuffer(), Buffer.from(remoteToken)], programId);
|
|
121
123
|
}
|
|
122
|
-
async buildRedeemTransaction(proofData, payer, bridgeProgramId, bridgeBlockNumber, connection) {
|
|
124
|
+
async buildRedeemTransaction(proofData, payer, bridgeProgramId, bridgeBlockNumber, connection, relayInstructions) {
|
|
123
125
|
const messageHashBytes = toBytes(proofData.messageHash);
|
|
124
126
|
const senderBytes = toBytes(proofData.sender);
|
|
125
127
|
const dataBytes = toBytes(proofData.data);
|
|
@@ -143,28 +145,128 @@ export class BaseBridgeInstructionBuilder {
|
|
|
143
145
|
messageHash: messageHashBytes,
|
|
144
146
|
});
|
|
145
147
|
transaction.add(proveIx);
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
148
|
+
const { tokenType, mint, toAddress, baseTokenAddress } = this.decodeMessageAndPrepareAccounts(Buffer.from(dataBytes));
|
|
149
|
+
let finalRemainingAccounts = [];
|
|
150
|
+
// Handle native SOL transfers
|
|
151
|
+
if (tokenType === "sol") {
|
|
152
|
+
const [solVaultPda] = this.deriveSolVaultPda(bridgeProgramId);
|
|
153
|
+
const receiverPk = toAddress;
|
|
154
|
+
const receiverAccountInfo = await connection.getAccountInfo(receiverPk);
|
|
155
|
+
if (!receiverAccountInfo && relayInstructions) {
|
|
156
|
+
try {
|
|
157
|
+
const instructions = deserializeLayout(relayInstructionsLayout, relayInstructions);
|
|
158
|
+
for (const req of instructions.requests) {
|
|
159
|
+
if (req.request.type === "GasInstruction" &&
|
|
160
|
+
req.request.msgValue > 0n) {
|
|
161
|
+
const minRentExemption = await connection.getMinimumBalanceForRentExemption(0);
|
|
162
|
+
const accountFundingIx = SystemProgram.transfer({
|
|
163
|
+
fromPubkey: payer,
|
|
164
|
+
toPubkey: receiverPk,
|
|
165
|
+
lamports: Number(minRentExemption),
|
|
166
|
+
});
|
|
167
|
+
transaction.add(accountFundingIx);
|
|
168
|
+
break;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
catch (e) { }
|
|
173
|
+
}
|
|
174
|
+
finalRemainingAccounts = [
|
|
175
|
+
{ pubkey: solVaultPda, isSigner: false, isWritable: true },
|
|
176
|
+
{ pubkey: receiverPk, isSigner: false, isWritable: true },
|
|
177
|
+
{ pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
|
|
178
|
+
];
|
|
152
179
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
const
|
|
160
|
-
|
|
161
|
-
|
|
180
|
+
// Handle SPL and wrapped token transfers
|
|
181
|
+
else if (mint && toAddress) {
|
|
182
|
+
const mintAccountInfo = await connection.getAccountInfo(mint);
|
|
183
|
+
if (!mintAccountInfo) {
|
|
184
|
+
throw new Error(`Mint account ${mint.toBase58()} not found`);
|
|
185
|
+
}
|
|
186
|
+
const tokenProgramId = mintAccountInfo.owner.equals(TOKEN_2022_PROGRAM_ID)
|
|
187
|
+
? TOKEN_2022_PROGRAM_ID
|
|
188
|
+
: TOKEN_PROGRAM_ID;
|
|
189
|
+
const accountInfo = await connection.getAccountInfo(toAddress);
|
|
190
|
+
if (!accountInfo || !accountInfo.owner.equals(tokenProgramId)) {
|
|
191
|
+
let walletAddress = null;
|
|
192
|
+
if (relayInstructions) {
|
|
193
|
+
try {
|
|
194
|
+
const instructions = deserializeLayout(relayInstructionsLayout, relayInstructions);
|
|
195
|
+
for (const req of instructions.requests) {
|
|
196
|
+
if (req.request.type === "GasDropOffInstruction") {
|
|
197
|
+
const recipientBytes = req.request.recipient.toUint8Array();
|
|
198
|
+
walletAddress = new PublicKey(recipientBytes);
|
|
199
|
+
break;
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
catch (e) { }
|
|
204
|
+
}
|
|
205
|
+
// Fallback: if we couldn't extract wallet address from relay instructions,
|
|
206
|
+
// try to use the payer as the wallet owner. This handles the common case
|
|
207
|
+
// where the recipient is redeeming their own transfer.
|
|
208
|
+
if (!walletAddress) {
|
|
209
|
+
const payerDerivedAta = getAssociatedTokenAddressSync(mint, payer, true, // allowOwnerOffCurve
|
|
210
|
+
tokenProgramId);
|
|
211
|
+
if (payerDerivedAta.equals(toAddress)) {
|
|
212
|
+
walletAddress = payer;
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
if (walletAddress) {
|
|
216
|
+
const ataAccountInfo = await connection.getAccountInfo(toAddress);
|
|
217
|
+
if (!ataAccountInfo) {
|
|
218
|
+
const derivedAta = getAssociatedTokenAddressSync(mint, walletAddress, true, // allowOwnerOffCurve
|
|
219
|
+
tokenProgramId);
|
|
220
|
+
if (!derivedAta.equals(toAddress)) {
|
|
221
|
+
throw new Error(`ATA mismatch: message expects ${toAddress.toBase58()}, but wallet ${walletAddress.toBase58()} derives to ${derivedAta.toBase58()}`);
|
|
222
|
+
}
|
|
223
|
+
const createAtaIx = createAssociatedTokenAccountIdempotentInstruction(payer, toAddress, walletAddress, mint, tokenProgramId, ASSOCIATED_TOKEN_PROGRAM_ID);
|
|
224
|
+
transaction.add(createAtaIx);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
// Build remaining accounts based on token type
|
|
228
|
+
if (tokenType === "spl") {
|
|
229
|
+
const fullRemoteTokenBytes = Buffer.from(baseTokenAddress.slice(2), "hex");
|
|
230
|
+
const remoteToken = fullRemoteTokenBytes.subarray(12, 32);
|
|
231
|
+
const [tokenVault] = this.deriveTokenVaultPda(bridgeProgramId, mint, remoteToken);
|
|
232
|
+
finalRemainingAccounts = [
|
|
233
|
+
{ pubkey: mint, isSigner: false, isWritable: true },
|
|
234
|
+
{ pubkey: tokenVault, isSigner: false, isWritable: true },
|
|
235
|
+
{ pubkey: toAddress, isSigner: false, isWritable: true },
|
|
236
|
+
{ pubkey: tokenProgramId, isSigner: false, isWritable: false },
|
|
237
|
+
];
|
|
238
|
+
}
|
|
239
|
+
else {
|
|
240
|
+
// wrapped
|
|
241
|
+
finalRemainingAccounts = [
|
|
242
|
+
{ pubkey: mint, isSigner: false, isWritable: true },
|
|
243
|
+
{ pubkey: toAddress, isSigner: false, isWritable: true },
|
|
244
|
+
{ pubkey: tokenProgramId, isSigner: false, isWritable: false },
|
|
245
|
+
];
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
else {
|
|
249
|
+
if (tokenType === "spl") {
|
|
250
|
+
const fullRemoteTokenBytes = Buffer.from(baseTokenAddress.slice(2), "hex");
|
|
251
|
+
const remoteToken = fullRemoteTokenBytes.subarray(12, 32);
|
|
252
|
+
const [tokenVault] = this.deriveTokenVaultPda(bridgeProgramId, mint, remoteToken);
|
|
253
|
+
finalRemainingAccounts = [
|
|
254
|
+
{ pubkey: mint, isSigner: false, isWritable: true },
|
|
255
|
+
{ pubkey: tokenVault, isSigner: false, isWritable: true },
|
|
256
|
+
{ pubkey: toAddress, isSigner: false, isWritable: true },
|
|
257
|
+
{ pubkey: tokenProgramId, isSigner: false, isWritable: false },
|
|
258
|
+
];
|
|
259
|
+
}
|
|
260
|
+
else {
|
|
261
|
+
// wrapped
|
|
262
|
+
finalRemainingAccounts = [
|
|
263
|
+
{ pubkey: mint, isSigner: false, isWritable: true },
|
|
264
|
+
{ pubkey: toAddress, isSigner: false, isWritable: true },
|
|
265
|
+
{ pubkey: tokenProgramId, isSigner: false, isWritable: false },
|
|
266
|
+
];
|
|
267
|
+
}
|
|
268
|
+
}
|
|
162
269
|
}
|
|
163
|
-
const finalRemainingAccounts = [
|
|
164
|
-
{ pubkey: mint, isSigner: false, isWritable: true },
|
|
165
|
-
{ pubkey: recipientAta, isSigner: false, isWritable: true },
|
|
166
|
-
{ pubkey: tokenProgramId, isSigner: false, isWritable: false },
|
|
167
|
-
];
|
|
168
270
|
const relayIx = createRelayMessageInstruction({
|
|
169
271
|
programId: bridgeProgramId,
|
|
170
272
|
message: messageAddress,
|
|
@@ -174,38 +276,93 @@ export class BaseBridgeInstructionBuilder {
|
|
|
174
276
|
transaction.add(relayIx);
|
|
175
277
|
return transaction;
|
|
176
278
|
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
279
|
+
decodeMessageAndPrepareAccounts(data) {
|
|
280
|
+
if (data.length < 2) {
|
|
281
|
+
return {
|
|
282
|
+
tokenType: null,
|
|
283
|
+
mint: null,
|
|
284
|
+
toAddress: null,
|
|
285
|
+
baseTokenAddress: null,
|
|
286
|
+
};
|
|
287
|
+
}
|
|
288
|
+
let offset = 0;
|
|
289
|
+
const messageType = data[offset++];
|
|
290
|
+
if (messageType !== 1) {
|
|
291
|
+
return {
|
|
292
|
+
tokenType: null,
|
|
293
|
+
mint: null,
|
|
294
|
+
toAddress: null,
|
|
295
|
+
baseTokenAddress: null,
|
|
296
|
+
};
|
|
297
|
+
}
|
|
298
|
+
const transferType = data[offset++];
|
|
299
|
+
if (transferType === 0) {
|
|
300
|
+
if (data.length < offset + 32) {
|
|
301
|
+
return {
|
|
302
|
+
tokenType: null,
|
|
303
|
+
mint: null,
|
|
304
|
+
toAddress: null,
|
|
305
|
+
baseTokenAddress: null,
|
|
306
|
+
};
|
|
307
|
+
}
|
|
308
|
+
const recipient = new PublicKey(data.subarray(offset, offset + 32));
|
|
309
|
+
return {
|
|
310
|
+
tokenType: "sol",
|
|
311
|
+
mint: null,
|
|
312
|
+
toAddress: recipient,
|
|
313
|
+
baseTokenAddress: null,
|
|
314
|
+
};
|
|
315
|
+
}
|
|
316
|
+
if (transferType === 1) {
|
|
317
|
+
if (data.length < offset + 20 + 32 + 32) {
|
|
318
|
+
return {
|
|
319
|
+
tokenType: null,
|
|
320
|
+
mint: null,
|
|
321
|
+
toAddress: null,
|
|
322
|
+
baseTokenAddress: null,
|
|
323
|
+
};
|
|
324
|
+
}
|
|
325
|
+
const remoteToken20 = data.subarray(offset, offset + 20);
|
|
326
|
+
offset += 20;
|
|
327
|
+
const remoteTokenPadded = Buffer.alloc(32);
|
|
328
|
+
remoteTokenPadded.set(remoteToken20, 12);
|
|
329
|
+
const baseTokenAddress = `0x${remoteTokenPadded.toString("hex")}`;
|
|
330
|
+
const localToken = new PublicKey(data.subarray(offset, offset + 32));
|
|
331
|
+
offset += 32;
|
|
332
|
+
const to = new PublicKey(data.subarray(offset, offset + 32));
|
|
333
|
+
return {
|
|
334
|
+
tokenType: "spl",
|
|
335
|
+
mint: localToken,
|
|
336
|
+
toAddress: to,
|
|
337
|
+
baseTokenAddress,
|
|
338
|
+
};
|
|
339
|
+
}
|
|
340
|
+
if (transferType === 2) {
|
|
341
|
+
if (data.length < offset + 32 + 32) {
|
|
342
|
+
return {
|
|
343
|
+
tokenType: null,
|
|
344
|
+
mint: null,
|
|
345
|
+
toAddress: null,
|
|
346
|
+
baseTokenAddress: null,
|
|
347
|
+
};
|
|
348
|
+
}
|
|
349
|
+
const localToken = new PublicKey(data.subarray(offset, offset + 32));
|
|
350
|
+
offset += 32;
|
|
351
|
+
const to = new PublicKey(data.subarray(offset, offset + 32));
|
|
352
|
+
return {
|
|
353
|
+
tokenType: "wrapped",
|
|
354
|
+
mint: localToken,
|
|
355
|
+
toAddress: to,
|
|
356
|
+
baseTokenAddress: null,
|
|
357
|
+
};
|
|
358
|
+
}
|
|
359
|
+
return {
|
|
360
|
+
tokenType: null,
|
|
361
|
+
mint: null,
|
|
362
|
+
toAddress: null,
|
|
363
|
+
baseTokenAddress: null,
|
|
364
|
+
};
|
|
365
|
+
}
|
|
209
366
|
serializeU64(value) {
|
|
210
367
|
const buf = Buffer.alloc(8);
|
|
211
368
|
buf.writeBigUInt64LE(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solanaInstructionBuilder.js","sourceRoot":"","sources":["../../../../src/domain/solanaInstructionBuilder/solanaInstructionBuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"solanaInstructionBuilder.js","sourceRoot":"","sources":["../../../../src/domain/solanaInstructionBuilder/solanaInstructionBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export declare class FakeSolanaInstructionBuilder implements SolanaInstructionBu
|
|
|
11
11
|
buildPayForRelayInstruction(relayerProgramId: PublicKey, params: PayForRelayInstructionParams): TransactionInstruction;
|
|
12
12
|
deriveRelayerCfgPda(relayerProgramId: PublicKey): [PublicKey, number];
|
|
13
13
|
deriveMessageToRelayPda(relayerProgramId: PublicKey, salt: Uint8Array): [PublicKey, number];
|
|
14
|
-
buildRedeemTransaction(_proofData: ProofData, _payer: PublicKey, _bridgeProgramId: PublicKey, _bridgeBlockNumber: bigint, _connection: Connection): Promise<Transaction>;
|
|
14
|
+
buildRedeemTransaction(_proofData: ProofData, _payer: PublicKey, _bridgeProgramId: PublicKey, _bridgeBlockNumber: bigint, _connection: Connection, _relayInstructions?: Uint8Array): Promise<Transaction>;
|
|
15
15
|
buildBridgeSolInstruction(programId: PublicKey, params: BridgeSolInstructionParams): TransactionInstruction;
|
|
16
16
|
buildBridgeSplInstruction(programId: PublicKey, params: BridgeSplInstructionParams): TransactionInstruction;
|
|
17
17
|
deriveSolVaultPda(programId: PublicKey): [PublicKey, number];
|
package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fakeSolanaInstructionBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EACV,mCAAmC,EACnC,0BAA0B,EAC1B,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AAExC,qBAAa,4BAA6B,YAAW,wBAAwB;IAC3E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAC7D,OAAO,CAAC,SAAS,CAAK;IAEtB,kCAAkC,CAChC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mCAAmC,GAC1C,sBAAsB;IAsBzB,4BAA4B,CAC1B,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,SAAS,GACvB,SAAS;IAMZ,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;IAI1D,wBAAwB,CACtB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,UAAU,GACf,CAAC,SAAS,EAAE,MAAM,CAAC;IAMtB,2BAA2B,CACzB,gBAAgB,EAAE,SAAS,EAC3B,MAAM,EAAE,4BAA4B,GACnC,sBAAsB;IAsBzB,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;IAIrE,uBAAuB,CACrB,gBAAgB,EAAE,SAAS,EAC3B,IAAI,EAAE,UAAU,GACf,CAAC,SAAS,EAAE,MAAM,CAAC;IAMhB,sBAAsB,CAC1B,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,SAAS,EACjB,gBAAgB,EAAE,SAAS,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,WAAW,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"fakeSolanaInstructionBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EACV,mCAAmC,EACnC,0BAA0B,EAC1B,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AAExC,qBAAa,4BAA6B,YAAW,wBAAwB;IAC3E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAC7D,OAAO,CAAC,SAAS,CAAK;IAEtB,kCAAkC,CAChC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mCAAmC,GAC1C,sBAAsB;IAsBzB,4BAA4B,CAC1B,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,SAAS,GACvB,SAAS;IAMZ,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;IAI1D,wBAAwB,CACtB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,UAAU,GACf,CAAC,SAAS,EAAE,MAAM,CAAC;IAMtB,2BAA2B,CACzB,gBAAgB,EAAE,SAAS,EAC3B,MAAM,EAAE,4BAA4B,GACnC,sBAAsB;IAsBzB,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;IAIrE,uBAAuB,CACrB,gBAAgB,EAAE,SAAS,EAC3B,IAAI,EAAE,UAAU,GACf,CAAC,SAAS,EAAE,MAAM,CAAC;IAMhB,sBAAsB,CAC1B,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,SAAS,EACjB,gBAAgB,EAAE,SAAS,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,WAAW,EAAE,UAAU,EACvB,kBAAkB,CAAC,EAAE,UAAU,GAC9B,OAAO,CAAC,WAAW,CAAC;IAavB,yBAAyB,CACvB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,0BAA0B,GACjC,sBAAsB;IAuBzB,yBAAyB,CACvB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,0BAA0B,GACjC,sBAAsB;IAuBzB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;IAO5D,mBAAmB,CACjB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,UAAU,GACvB,CAAC,SAAS,EAAE,MAAM,CAAC;IAOtB,eAAe,IAAI,sBAAsB,EAAE;IAI3C,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,IAAI;CAId"}
|
package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js
CHANGED
|
@@ -61,7 +61,7 @@ export class FakeSolanaInstructionBuilder {
|
|
|
61
61
|
const combined = Buffer.concat(seeds);
|
|
62
62
|
return [new PublicKey(combined.subarray(0, 32)), 252];
|
|
63
63
|
}
|
|
64
|
-
async buildRedeemTransaction(_proofData, _payer, _bridgeProgramId, _bridgeBlockNumber, _connection) {
|
|
64
|
+
async buildRedeemTransaction(_proofData, _payer, _bridgeProgramId, _bridgeBlockNumber, _connection, _relayInstructions) {
|
|
65
65
|
this.callCount++;
|
|
66
66
|
const fakeTransaction = new Transaction();
|
|
67
67
|
const fakeInstruction = new TransactionInstruction({
|
package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fakeSolanaInstructionBuilder.js","sourceRoot":"","sources":["../../../../../../src/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fakeSolanaInstructionBuilder.js","sourceRoot":"","sources":["../../../../../../src/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeExecutor.d.ts","sourceRoot":"","sources":["../../../src/evm/baseBridgeExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,QAAQ,EACT,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,sBAAsB,EAGvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAsB,MAAM,QAAQ,CAAC;AAG3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,SAAS,CACvE,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAOjC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS;IAR/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,8BAA8B,EAAE,MAAM,CAAC;gBAGrC,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS;WAsBlB,OAAO,CAAC,CAAC,SAAS,OAAO,EACpC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAChC,OAAO,CAAC,qBAAqB,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAaxC,QAAQ,CACb,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,sBAAsB,GAC9B,cAAc,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"baseBridgeExecutor.d.ts","sourceRoot":"","sources":["../../../src/evm/baseBridgeExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,QAAQ,EACT,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,sBAAsB,EAGvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAsB,MAAM,QAAQ,CAAC;AAG3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,SAAS,CACvE,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAOjC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS;IAR/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,8BAA8B,EAAE,MAAM,CAAC;gBAGrC,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS;WAsBlB,OAAO,CAAC,CAAC,SAAS,OAAO,EACpC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAChC,OAAO,CAAC,qBAAqB,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAaxC,QAAQ,CACb,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,sBAAsB,GAC9B,cAAc,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IA2GzC,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA8DnD,MAAM,CACX,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAC1B,MAAM,EAAE,MAAM,GACb,cAAc,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAQzC,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAKxC,OAAO,CAAC,gBAAgB;CAazB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { nativeChainIds } from "@wormhole-foundation/sdk-connect";
|
|
2
2
|
import { EvmAddress, EvmPlatform, EvmUnsignedTransaction, addChainId, addFrom, } from "@wormhole-foundation/sdk-evm";
|
|
3
|
-
import { Contract, keccak256, AbiCoder } from "ethers";
|
|
3
|
+
import { Contract, keccak256, AbiCoder, ZeroAddress } from "ethers";
|
|
4
4
|
import { PublicKey } from "@solana/web3.js";
|
|
5
5
|
import { baseBridgeContracts, baseBridgeWithExecutorContracts, } from "../consts";
|
|
6
6
|
import { BASE_BRIDGE_WITH_EXECUTOR_ABI } from "../abis/baseBridgeWithExecutor";
|
|
@@ -38,7 +38,7 @@ export class EvmBaseBridgeExecutor {
|
|
|
38
38
|
}
|
|
39
39
|
async *transfer(sender, recipient, details) {
|
|
40
40
|
const senderAddress = new EvmAddress(sender).toString();
|
|
41
|
-
const { tokenConfig, remainingAmount, remoteAmount, signedQuote, estimatedCost, relayInstructions, } = details;
|
|
41
|
+
const { tokenConfig, remainingAmount, remoteAmount, signedQuote, estimatedCost, relayInstructions, referrerFee, } = details;
|
|
42
42
|
if (!signedQuote) {
|
|
43
43
|
throw new Error("Missing signedQuote in details - required for executor");
|
|
44
44
|
}
|
|
@@ -48,8 +48,9 @@ export class EvmBaseBridgeExecutor {
|
|
|
48
48
|
const tokenAddr = tokenConfig.baseAddress;
|
|
49
49
|
const tokenContract = EvmPlatform.getTokenImplementation(this.provider, tokenAddr);
|
|
50
50
|
const allowance = await tokenContract.allowance(senderAddress, this.baseBridgeWithExecutorContract);
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
const totalAmount = remainingAmount + (referrerFee?.feeAmount ?? 0n);
|
|
52
|
+
if (allowance < totalAmount) {
|
|
53
|
+
const txReq = await tokenContract.approve.populateTransaction(this.baseBridgeWithExecutorContract, totalAmount);
|
|
53
54
|
yield this.createUnsignedTx(addFrom(txReq, senderAddress), "ERC20.approve for BaseBridgeWithExecutor", false);
|
|
54
55
|
}
|
|
55
56
|
const shimContract = new Contract(this.baseBridgeWithExecutorContract, BASE_BRIDGE_WITH_EXECUTOR_ABI, this.provider);
|
|
@@ -83,9 +84,9 @@ export class EvmBaseBridgeExecutor {
|
|
|
83
84
|
signedQuote: signedQuote,
|
|
84
85
|
instructions: `0x${Buffer.from(relayInstructions).toString("hex")}`,
|
|
85
86
|
}, {
|
|
86
|
-
transferTokenFee:
|
|
87
|
-
nativeTokenFee:
|
|
88
|
-
payee:
|
|
87
|
+
transferTokenFee: referrerFee?.feeAmount ?? 0n,
|
|
88
|
+
nativeTokenFee: 0n,
|
|
89
|
+
payee: referrerFee?.referrerAddress ?? ZeroAddress,
|
|
89
90
|
});
|
|
90
91
|
txReq.value = estimatedCost;
|
|
91
92
|
yield this.createUnsignedTx(addFrom(txReq, senderAddress), "BaseBridgeWithExecutor.bridgeToken", false);
|
|
@@ -117,7 +118,6 @@ export class EvmBaseBridgeExecutor {
|
|
|
117
118
|
},
|
|
118
119
|
], this.provider);
|
|
119
120
|
const isCompleted = await bridgeContract.getFunction("successes")(messageHashToCheck);
|
|
120
|
-
console.log(` [Completion Check] messageHash: ${messageHashToCheck}, completed: ${isCompleted}`);
|
|
121
121
|
return isCompleted;
|
|
122
122
|
}
|
|
123
123
|
async *redeem(_sender, _proof) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeExecutor.js","sourceRoot":"","sources":["../../../src/evm/baseBridgeExecutor.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EACL,UAAU,EACV,WAAW,EACX,sBAAsB,EACtB,UAAU,EACV,OAAO,GACR,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"baseBridgeExecutor.js","sourceRoot":"","sources":["../../../src/evm/baseBridgeExecutor.ts"],"names":[],"mappings":"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"}
|