npm - @wormhole-labs/base-bridge-executor-route - Versions diffs - 0.0.1-beta.0 → 0.0.1-beta.2 - Mend

@wormhole-labs/base-bridge-executor-route 0.0.1-beta.0 → 0.0.1-beta.2

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.

Files changed (81) hide show

package/dist/cjs/svm/baseBridgeExecutor.js CHANGED Viewed

@@ -187,8 +187,7 @@ class SvmBaseBridgeExecutor {
         });
         return this.messageRelayer.isTransferCompleted(proofData.messageHash, this.baseBridgeProgramId);
     }
-    // TODO: this does not work when the token is SOL
-    async *redeem(sender, proof) {
+    async *redeem(sender, proof, baseTxHash) {
         if (!this.messageRelayer) {
             throw new Error("MessageRelayer not configured - required for redeem");
         }
@@ -200,13 +199,78 @@ class SvmBaseBridgeExecutor {
         });
         const senderPk = new sdk_solana_1.SolanaAddress(sender).unwrap();
         const bridgeBlockNumber = await this.messageRelayer.getBridgeBlockNumber(this.baseBridgeProgramId);
-        const transaction = await this.instructionBuilder.buildRedeemTransaction(proofData, senderPk, this.baseBridgeProgramId, bridgeBlockNumber, this.connection);
+        let relayInstructions;
+        if (baseTxHash) {
+            try {
+                relayInstructions = await this.fetchRelayInstructionsFromBaseTx(baseTxHash);
+            }
+            catch (e) {
+            }
+        }
+        const transaction = await this.instructionBuilder.buildRedeemTransaction(proofData, senderPk, this.baseBridgeProgramId, bridgeBlockNumber, this.connection, relayInstructions);
         yield this.createUnsignedTx({ transaction }, "SvmBaseBridgeExecutor.redeem");
     }
     async getCurrentBlock() {
         const slot = await this.connection.getSlot();
         return BigInt(slot);
     }
+    async fetchRelayInstructionsFromBaseTx(baseTxHash) {
+        const { createPublicClient, http, decodeEventLog } = require("viem");
+        const { baseSepolia, base } = require("viem/chains");
+        const sourceChain = this.network === "Testnet" ? "BaseSepolia" : "Base";
+        const executorAddress = consts_1.baseExecutorContracts[this.network]?.[sourceChain];
+        if (!executorAddress) {
+            throw new Error(`Executor contract for ${sourceChain} on ${this.network} not found`);
+        }
+        const chain = this.network === "Testnet" ? baseSepolia : base;
+        const client = createPublicClient({
+            chain,
+            transport: http(),
+        });
+        const receipt = await client.getTransactionReceipt({
+            hash: baseTxHash,
+        });
+        if (!receipt) {
+            throw new Error("Base transaction receipt not found");
+        }
+        const requestForExecutionAbi = [
+            {
+                type: "event",
+                name: "RequestForExecution",
+                inputs: [
+                    { name: "quoterAddress", type: "address", indexed: true },
+                    { name: "amtPaid", type: "uint256", indexed: false },
+                    { name: "dstChain", type: "uint16", indexed: false },
+                    { name: "dstAddr", type: "bytes32", indexed: false },
+                    { name: "refundAddr", type: "address", indexed: false },
+                    { name: "signedQuote", type: "bytes", indexed: false },
+                    { name: "requestBytes", type: "bytes", indexed: false },
+                    { name: "relayInstructions", type: "bytes", indexed: false },
+                ],
+            },
+        ];
+        for (const log of receipt.logs) {
+            if (log.address.toLowerCase() !== executorAddress.toLowerCase()) {
+                continue;
+            }
+            try {
+                const decodedLog = decodeEventLog({
+                    abi: requestForExecutionAbi,
+                    data: log.data,
+                    topics: log.topics,
+                });
+                if (decodedLog.eventName === "RequestForExecution") {
+                    const relayInstructionsHex = decodedLog.args
+                        .relayInstructions;
+                    return Buffer.from(relayInstructionsHex.slice(2), "hex");
+                }
+            }
+            catch (e) {
+                continue;
+            }
+        }
+        throw new Error("RequestForExecution event not found in executor contract logs");
+    }
     createUnsignedTx(txReq, description, parallelizable = false) {
         return new sdk_solana_1.SolanaUnsignedTransaction(txReq, this.network, this.chain, description, parallelizable);
     }

package/dist/cjs/svm/baseBridgeExecutor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baseBridgeExecutor.js","sourceRoot":"","sources":["../../../src/svm/baseBridgeExecutor.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"baseBridgeExecutor.js","sourceRoot":"","sources":["../../../src/svm/baseBridgeExecutor.ts"],"names":[],"mappings":"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"}

package/dist/cjs/types.d.ts CHANGED Viewed

@@ -1,9 +1,10 @@
 import { Chain, AccountAddress, ChainAddress, UnsignedTransaction, Network } from "@wormhole-foundation/sdk-connect";
 import { BaseBridgeQuoteDetails } from "./routes/baseBridgeBase";
+export type TokenType = "sol" | "spl" | "wrapped";
 export interface BaseBridgeExecutor<N extends Network = Network, C extends Chain = Chain> {
     transfer(sender: AccountAddress<C>, recipient: ChainAddress, details: BaseBridgeQuoteDetails): AsyncGenerator<UnsignedTransaction<N, C>>;
     isTransferCompleted(proof: string): Promise<boolean>;
-    redeem(sender: AccountAddress<C>, proof: string): AsyncGenerator<UnsignedTransaction<N, C>>;
+    redeem(sender: AccountAddress<C>, proof: string, baseTxHash?: string): AsyncGenerator<UnsignedTransaction<N, C>>;
     getCurrentBlock(): Promise<bigint>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/cjs/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,OAAO,EACR,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,KAAK,GAAG,KAAK;IAEvB,QAAQ,CACN,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,sBAAsB,GAC9B,cAAc,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,CACJ,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,KAAK,EAAE,MAAM,~~GACZ~~,cAAc,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7C,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACpC"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,OAAO,EACR,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC;AAElD,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,KAAK,GAAG,KAAK;IAEvB,QAAQ,CACN,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,sBAAsB,GAC9B,cAAc,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,CACJ,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7C,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACpC"}

package/dist/esm/consts.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ export declare const apiBaseUrl: Partial<Record<Network, string>>;
 export declare const baseBridgeContracts: Partial<Record<Network, Partial<Record<Chain, string>>>>;
 export declare const baseBridgeWithExecutorContracts: Partial<Record<Network, Partial<Record<Chain, string>>>>;
 export declare const baseRelayerContracts: Partial<Record<Network, Partial<Record<"Solana", string>>>>;
+export declare const baseExecutorContracts: Partial<Record<Network, Partial<Record<Chain, string>>>>;
 export declare const gasLimits: Partial<Record<Network, Partial<Record<Chain, bigint>>>>;
 export declare const SOLANA_MSG_VALUE_BASE_FEE = 5001n;
 export declare const SOLANA_BASE_RELAY_GAS_LIMIT = 1000000n;

package/dist/esm/consts.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAElE,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAIvD,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,OAAO,CACvC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAUhD,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,OAAO,CACnD,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQhD,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,OAAO,CACxC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAQnD,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,OAAO,CAC7B,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAUhD,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAEhD,eAAO,MAAM,2BAA2B,WAAa,CAAC"}
1	+ {"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAElE,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAIvD,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,OAAO,CACvC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAUhD,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,OAAO,CACnD,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQhD,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,OAAO,CACxC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAQnD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,OAAO,CACzC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQhD,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,OAAO,CAC7B,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAUhD,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAEhD,eAAO,MAAM,2BAA2B,WAAa,CAAC"}

package/dist/esm/consts.js CHANGED Viewed

@@ -28,6 +28,14 @@ export const baseRelayerContracts = {
         Solana: "g1et5VenhfJHJwsdJsDbxWZuotD5H4iELNG61kS4fb9",
     },
 };
+export const baseExecutorContracts = {
+    Testnet: {
+        BaseSepolia: "0x51B47D493CBA7aB97e3F8F163D6Ce07592CE4482",
+    },
+    Mainnet: {
+        Base: "0x9E1936E91A4a5AE5A5F75fFc472D6cb8e93597ea",
+    },
+};
 export const gasLimits = {
     Testnet: {
         BaseSepolia: 250000n,

package/dist/esm/consts.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/consts.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAAqC;IAC1D,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,uCAAuC;IAC5E,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,+BAA+B;CAC5E,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAE5B;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;QACzD,MAAM,EAAE,8CAA8C;KACvD;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;QAClD,MAAM,EAAE,8CAA8C;KACvD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAExC;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;KAC1D;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;KACnD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAE7B;IACF,OAAO,EAAE;QACP,MAAM,EAAE,8CAA8C;KACvD;IACD,OAAO,EAAE;QACP,MAAM,EAAE,6CAA6C;KACtD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAElB;IACF,OAAO,EAAE;QACP,WAAW,EAAE,OAAQ;QACrB,MAAM,EAAE,OAAQ;KACjB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,OAAQ;QACd,MAAM,EAAE,OAAQ;KACjB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,2BAA2B,GAAG,QAAU,CAAC"}
1	+ {"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/consts.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAAqC;IAC1D,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,uCAAuC;IAC5E,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,+BAA+B;CAC5E,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAE5B;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;QACzD,MAAM,EAAE,8CAA8C;KACvD;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;QAClD,MAAM,EAAE,8CAA8C;KACvD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAExC;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;KAC1D;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;KACnD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAE7B;IACF,OAAO,EAAE;QACP,MAAM,EAAE,8CAA8C;KACvD;IACD,OAAO,EAAE;QACP,MAAM,EAAE,6CAA6C;KACtD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAE9B;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;KAC1D;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;KACnD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAElB;IACF,OAAO,EAAE;QACP,WAAW,EAAE,OAAQ;QACrB,MAAM,EAAE,OAAQ;KACjB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,OAAQ;QACd,MAAM,EAAE,OAAQ;KACjB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,2BAA2B,GAAG,QAAU,CAAC"}

package/dist/esm/domain/messageProver/solanaProver.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"solanaProver.d.ts","sourceRoot":"","sources":["../../../../src/domain/messageProver/solanaProver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,OAAO,EACP,aAAa,EACd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAgB,MAAM,cAAc,CAAC;AAE3E,qBAAa,YAAa,YAAW,aAAa;IAE9C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,EACnC,eAAe,EAAE,SAAS;IAGvC,KAAK,CACT,QAAQ,EAAE,aAAa,EACvB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,CAAC;~~YA+OP~~,sBAAsB;CAuCrC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,GAAG,CASxD"}
1	+ {"version":3,"file":"solanaProver.d.ts","sourceRoot":"","sources":["../../../../src/domain/messageProver/solanaProver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,OAAO,EACP,aAAa,EACd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAgB,MAAM,cAAc,CAAC;AAE3E,qBAAa,YAAa,YAAW,aAAa;IAE9C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,EACnC,eAAe,EAAE,SAAS;IAGvC,KAAK,CACT,QAAQ,EAAE,aAAa,EACvB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,CAAC;YA4NP,sBAAsB;CAuCrC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,GAAG,CASxD"}

package/dist/esm/domain/messageProver/solanaProver.js CHANGED Viewed

@@ -28,8 +28,6 @@ export class SolanaProver {
             throw new Error(`OutgoingMessage account not found: ${outgoingMessagePda.toBase58()}`);
         }
         const data = accountInfo.data;
-        console.log(`   [SolanaProver] Account data length: ${data.length} bytes`);
-        console.log(`   [SolanaProver] First 100 bytes (hex): ${Buffer.from(data.subarray(0, Math.min(100, data.length))).toString("hex")}`);
         // OutgoingMessage account structure:
         // [8 bytes] Anchor discriminator
         // [8 bytes] nonce (u64)
@@ -122,11 +120,6 @@ export class SolanaProver {
                     .readUInt32LE(0);
                 dataOffset += 4;
                 const callData = messageData.subarray(dataOffset, dataOffset + callDataLen);
-                console.log(`   [SolanaProver] Call parsed:`);
-                console.log(`      callType: ${callType}`);
-                console.log(`      callTo: 0x${Buffer.from(callTo).toString("hex")}`);
-                console.log(`      callValue: ${callValueBigInt}`);
-                console.log(`      callData length: ${callDataLen}`);
                 const callTuple = {
                     ty: callType,
                     to: padHex(`0x${Buffer.from(callTo).toString("hex")}`, {
@@ -161,8 +154,6 @@ export class SolanaProver {
                 messageDataHex = encodedTransferAndCall;
                 finalMessageType = 2; // TransferAndCall
             }
-            console.log(`   [SolanaProver] Final encoded data: ${messageDataHex.slice(0, 66)}...`);
-            console.log(`   [SolanaProver] Final messageType: ${finalMessageType}`);
         }
         else {
             throw new Error("Only Transfer messages are supported");

package/dist/esm/domain/messageProver/solanaProver.js.map CHANGED Viewed

	@@ -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;~~QAC9B~~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~~OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;gBAC9C,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,EAAE,CAAC,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,~~MAAM,~~CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACtE,OAAO,CAAC,GAAG,CAAC,oBAAoB,eAAe,EAAE,CAAC,CAAC;gBACnD,OAAO,CAAC,GAAG,CAAC,0BAA0B,WAAW,EAAE,CAAC,CAAC;gBAErD,MAAM,~~SAAS,GAAG;oBAChB,EAAE,EAAE,QAAQ;oBACZ,EAAE,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE;wBACrD,IAAI,EAAE,EAAE;wBACR,GAAG,EAAE,OAAO;qBACb,CAAC;oBACF,KAAK,EAAE,eAAe;oBACtB,IAAI,EAAE,KAAK,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;iBACnD,CAAC;gBAEF,iDAAiD;gBACjD,MAAM,sBAAsB,GAAG,mBAAmB,CAChD;oBACE;wBACE,IAAI,EAAE,OAAO;wBACb,UAAU,EAAE;4BACV,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;4BACvC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;4BACxC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;4BAC/B,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE;4BACxC;gCACE,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,OAAO;gCACb,UAAU,EAAE;oCACV,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oCAC7B,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;oCAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;oCAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;iCAChC;6BACF;yBACF;qBACF;iBACF,EACD,CAAC,EAAE,GAAG,aAAa,EAAE,IAAI,EAAE,SAAS,EAAS,CAAC,CAC/C,CAAC;gBACF,cAAc,GAAG,sBAA6B,CAAC;gBAC/C,gBAAgB,GAAG,CAAC,CAAC,CAAC,kBAAkB;YAC1C,CAAC;~~YAED~~,~~OAAO,~~CAAC~~,GAAG,CACT,yCAAyC,cAAc,CAAC,KAAK,CAC3D,CAAC,EACD,EAAE,CACH,KAAK,CACP,CAAC~~;~~YACF,OAAO,CAAC,GAAG,CAAC,wCAAwC,gBAAgB,EAAE,CAAC,CAAC;QAC1E,CAAC;~~aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAS,CAAC;QACjD,MAAM,OAAO,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAS,CAAC;QAE7C,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,MAAM,wBAAwB,GAAG,KAAK,kBAAkB;aACrD,QAAQ,EAAE;aACV,QAAQ,CAAC,KAAK,CAAC,EAAS,CAAC;QAE5B,OAAO;YACL,WAAW;YACX,OAAO;YACP,KAAK;YACL,MAAM;YACN,IAAI,EAAE,cAAc;YACpB,KAAK;YACL,qBAAqB,EAAE,wBAAwB;YAC/C,WAAW,EAAE,gBAAgB;YAC7B,YAAY;SACb,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,UAAsB,EACtB,EAAO;QAEP,MAAM,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC,iBAAiB,CAAC;QAE/C,MAAM,8BAA8B,GAAG,MAAM,CAAC,IAAI,CAAC;YACjD,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE;SACrC,CAAC,CAAC;QAEH,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO;gBAAE,SAAS;YAEvB,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBAE7D,IAAI,CAAC,WAAW;oBAAE,SAAS;gBAE3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;oBACpD,SAAS;gBACX,CAAC;gBAED,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;gBAE9B,0CAA0C;gBAC1C,IACE,IAAI,CAAC,MAAM,IAAI,EAAE;oBACjB,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,8BAA8B,CAAC,EAC1D,CAAC;oBACD,OAAO,OAAO,CAAC;gBACjB,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,SAAS;YACX,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAiB;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;IAC/B,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IAEvB,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QACtB,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
1	+ {"version":3,"file":"solanaProver.js","sourceRoot":"","sources":["../../../../src/domain/messageProver/solanaProver.ts"],"names":[],"mappings":"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"}

package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts CHANGED Viewed

@@ -57,7 +57,7 @@ export interface SolanaInstructionBuilder {
     buildBridgeSolInstruction(programId: PublicKey, params: BridgeSolInstructionParams): TransactionInstruction;
     buildBridgeSplInstruction(programId: PublicKey, params: BridgeSplInstructionParams): TransactionInstruction;
     buildPayForRelayInstruction(relayerProgramId: PublicKey, params: PayForRelayInstructionParams): TransactionInstruction;
-    buildRedeemTransaction(proofData: ProofData, payer: PublicKey, bridgeProgramId: PublicKey, bridgeBlockNumber: bigint, connection: Connection): Promise<Transaction>;
+    buildRedeemTransaction(proofData: ProofData, payer: PublicKey, bridgeProgramId: PublicKey, bridgeBlockNumber: bigint, connection: Connection, relayInstructions?: Uint8Array): Promise<Transaction>;
     deriveAssociatedTokenAddress(mint: PublicKey, owner: PublicKey, tokenProgram: PublicKey): PublicKey;
     deriveBridgePda(programId: PublicKey): [PublicKey, number];
     deriveOutgoingMessagePda(programId: PublicKey, salt: Uint8Array): [PublicKey, number];
@@ -78,7 +78,8 @@ export declare class BaseBridgeInstructionBuilder implements SolanaInstructionBu
     deriveMessageToRelayPda(relayerProgramId: PublicKey, salt: Uint8Array): [PublicKey, number];
     deriveSolVaultPda(programId: PublicKey): [PublicKey, number];
     deriveTokenVaultPda(programId: PublicKey, mint: PublicKey, remoteToken: Uint8Array): [PublicKey, number];
-    buildRedeemTransaction(proofData: ProofData, payer: PublicKey, bridgeProgramId: PublicKey, bridgeBlockNumber: bigint, connection: Connection): Promise<Transaction>;
+    buildRedeemTransaction(proofData: ProofData, payer: PublicKey, bridgeProgramId: PublicKey, bridgeBlockNumber: bigint, connection: Connection, relayInstructions?: Uint8Array): Promise<Transaction>;
+    private decodeMessageAndPrepareAccounts;
     private serializeU64;
 }
 //# sourceMappingURL=solanaInstructionBuilder.d.ts.map

package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts.map CHANGED Viewed

	@@ -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;~~AAclD~~,MAAM,WAAW,mCAAmC;IAClD,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,cAAc,EAAE,SAAS,CAAC;IAC1B,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,eAAe,EAAE,SAAS,CAAC;IAC3B,YAAY,EAAE,SAAS,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,mBAAmB,EAAE,UAAU,CAAC;IAChC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,cAAc,EAAE,SAAS,CAAC;IAC1B,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,SAAS,CAAC;IACzB,mBAAmB,EAAE,UAAU,CAAC;IAChC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,cAAc,EAAE,SAAS,CAAC;IAC1B,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,SAAS,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,YAAY,EAAE,SAAS,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,mBAAmB,EAAE,UAAU,CAAC;IAChC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,WAAW,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,SAAS,CAAC;IACjB,GAAG,EAAE,SAAS,CAAC;IACf,cAAc,EAAE,SAAS,CAAC;IAC1B,cAAc,EAAE,SAAS,CAAC;IAC1B,aAAa,EAAE,SAAS,CAAC;IACzB,OAAO,EAAE,UAAU,CAAC;IACpB,eAAe,EAAE,SAAS,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,wBAAwB;IACvC,kCAAkC,CAChC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mCAAmC,GAC1C,sBAAsB,CAAC;IAE1B,yBAAyB,CACvB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,0BAA0B,GACjC,sBAAsB,CAAC;IAE1B,yBAAyB,CACvB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,0BAA0B,GACjC,sBAAsB,CAAC;IAE1B,2BAA2B,CACzB,gBAAgB,EAAE,SAAS,EAC3B,MAAM,EAAE,4BAA4B,GACnC,sBAAsB,CAAC;IAE1B,sBAAsB,CACpB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,SAAS,EAC1B,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,UAAU,~~GACrB~~,OAAO,CAAC,WAAW,CAAC,CAAC;IAExB,4BAA4B,CAC1B,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,EAChB,YAAY,EAAE,SAAS,GACtB,SAAS,CAAC;IAEb,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAE3D,wBAAwB,CACtB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,UAAU,GACf,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAEvB,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAEtE,uBAAuB,CACrB,gBAAgB,EAAE,SAAS,EAC3B,IAAI,EAAE,UAAU,GACf,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAEvB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAE7D,mBAAmB,CACjB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,UAAU,GACtB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;CACxB;AAED,qBAAa,4BAA6B,YAAW,wBAAwB;IAC3E,kCAAkC,CAChC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mCAAmC,GAC1C,sBAAsB;IA4BzB,yBAAyB,CACvB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,0BAA0B,GACjC,sBAAsB;IA0BzB,yBAAyB,CACvB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,0BAA0B,GACjC,sBAAsB;IA8BzB,4BAA4B,CAC1B,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,EAChB,YAAY,EAAE,SAAS,GACtB,SAAS;IAIZ,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;IAOtB,2BAA2B,CACzB,gBAAgB,EAAE,SAAS,EAC3B,MAAM,EAAE,4BAA4B,GACnC,sBAAsB;IAuBzB,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;IAOrE,uBAAuB,CACrB,gBAAgB,EAAE,SAAS,EAC3B,IAAI,EAAE,UAAU,GACf,CAAC,SAAS,EAAE,MAAM,CAAC;IAOtB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;IAO5D,mBAAmB,CACjB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,UAAU,GACtB,CAAC,SAAS,EAAE,MAAM,CAAC;IAOhB,sBAAsB,CAC1B,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,SAAS,EAC1B,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,UAAU,~~GACrB~~,OAAO,CAAC,WAAW,CAAC;IA+~~HvB~~,OAAO,CAAC,YAAY;CAKrB"}
1	+ {"version":3,"file":"solanaInstructionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/domain/solanaInstructionBuilder/solanaInstructionBuilder.ts"],"names":[],"mappings":"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"}

package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.js CHANGED Viewed

@@ -1,4 +1,6 @@
 import { PublicKey, TransactionInstruction, Transaction, SystemProgram, } from "@solana/web3.js";
+import { deserializeLayout } from "@wormhole-foundation/sdk-connect";
+import { relayInstructionsLayout } from "../../layouts/relayInstruction";
 import { toBytes } from "viem";
 import { createProveMessageInstruction, createRelayMessageInstruction, } from "../../svm/instructionBuilders";
 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 {
     deriveTokenVaultPda(programId, mint, remoteToken) {
         return PublicKey.findProgramAddressSync([Buffer.from("token_vault"), mint.toBuffer(), Buffer.from(remoteToken)], programId);
     }
-    async buildRedeemTransaction(proofData, payer, bridgeProgramId, bridgeBlockNumber, connection) {
+    async buildRedeemTransaction(proofData, payer, bridgeProgramId, bridgeBlockNumber, connection, relayInstructions) {
         const messageHashBytes = toBytes(proofData.messageHash);
         const senderBytes = toBytes(proofData.sender);
         const dataBytes = toBytes(proofData.data);
@@ -143,28 +145,118 @@ export class BaseBridgeInstructionBuilder {
             messageHash: messageHashBytes,
         });
         transaction.add(proveIx);
-        // Get mint and recipient ATA from proofData.transferInitializedData
-        const mint = new PublicKey(proofData.transferInfo.remoteToken);
-        const recipientAta = new PublicKey(proofData.transferInfo.to);
-        const mintAccountInfo = await connection.getAccountInfo(mint);
-        if (!mintAccountInfo) {
-            throw new Error(`Mint account ${mint.toBase58()} not found`);
+        const { tokenType, mint, toAddress, baseTokenAddress } = this.decodeMessageAndPrepareAccounts(Buffer.from(dataBytes));
+        let finalRemainingAccounts = [];
+        // Handle native SOL transfers
+        if (tokenType === "sol") {
+            const [solVaultPda] = this.deriveSolVaultPda(bridgeProgramId);
+            const receiverPk = toAddress;
+            const receiverAccountInfo = await connection.getAccountInfo(receiverPk);
+            if (!receiverAccountInfo && relayInstructions) {
+                try {
+                    const instructions = deserializeLayout(relayInstructionsLayout, relayInstructions);
+                    for (const req of instructions.requests) {
+                        if (req.request.type === "GasInstruction" &&
+                            req.request.msgValue > 0n) {
+                            const minRentExemption = await connection.getMinimumBalanceForRentExemption(0);
+                            const accountFundingIx = SystemProgram.transfer({
+                                fromPubkey: payer,
+                                toPubkey: receiverPk,
+                                lamports: Number(minRentExemption),
+                            });
+                            transaction.add(accountFundingIx);
+                            break;
+                        }
+                    }
+                }
+                catch (e) { }
+            }
+            finalRemainingAccounts = [
+                { pubkey: solVaultPda, isSigner: false, isWritable: true },
+                { pubkey: receiverPk, isSigner: false, isWritable: true },
+                { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
+            ];
         }
-        const tokenProgramId = mintAccountInfo.owner.equals(TOKEN_2022_PROGRAM_ID)
-            ? TOKEN_2022_PROGRAM_ID
-            : TOKEN_PROGRAM_ID;
-        // Check if recipient ATA exists, create it if not
-        const ataAccountInfo = await connection.getAccountInfo(recipientAta);
-        if (!ataAccountInfo) {
-            const createAtaIx = createAssociatedTokenAccountIdempotentInstruction(payer, recipientAta, payer, // owner - payer must be the recipient
-            mint, tokenProgramId, ASSOCIATED_TOKEN_PROGRAM_ID);
-            transaction.add(createAtaIx);
+        // Handle SPL and wrapped token transfers
+        else if (mint && toAddress) {
+            const mintAccountInfo = await connection.getAccountInfo(mint);
+            if (!mintAccountInfo) {
+                throw new Error(`Mint account ${mint.toBase58()} not found`);
+            }
+            const tokenProgramId = mintAccountInfo.owner.equals(TOKEN_2022_PROGRAM_ID)
+                ? TOKEN_2022_PROGRAM_ID
+                : TOKEN_PROGRAM_ID;
+            const accountInfo = await connection.getAccountInfo(toAddress);
+            if (!accountInfo || !accountInfo.owner.equals(tokenProgramId)) {
+                let walletAddress = null;
+                if (relayInstructions) {
+                    try {
+                        const instructions = deserializeLayout(relayInstructionsLayout, relayInstructions);
+                        for (const req of instructions.requests) {
+                            if (req.request.type === "GasDropOffInstruction") {
+                                const recipientBytes = req.request.recipient.toUint8Array();
+                                walletAddress = new PublicKey(recipientBytes);
+                                break;
+                            }
+                        }
+                    }
+                    catch (e) { }
+                }
+                if (walletAddress) {
+                    const ataAccountInfo = await connection.getAccountInfo(toAddress);
+                    if (!ataAccountInfo) {
+                        const derivedAta = getAssociatedTokenAddressSync(mint, walletAddress, true, // allowOwnerOffCurve
+                        tokenProgramId);
+                        if (!derivedAta.equals(toAddress)) {
+                            throw new Error(`ATA mismatch: message expects ${toAddress.toBase58()}, but wallet ${walletAddress.toBase58()} derives to ${derivedAta.toBase58()}`);
+                        }
+                        const createAtaIx = createAssociatedTokenAccountIdempotentInstruction(payer, toAddress, walletAddress, mint, tokenProgramId, ASSOCIATED_TOKEN_PROGRAM_ID);
+                        transaction.add(createAtaIx);
+                    }
+                }
+                // Build remaining accounts based on token type
+                if (tokenType === "spl") {
+                    const fullRemoteTokenBytes = Buffer.from(baseTokenAddress.slice(2), "hex");
+                    const remoteToken = fullRemoteTokenBytes.subarray(12, 32);
+                    const [tokenVault] = this.deriveTokenVaultPda(bridgeProgramId, mint, remoteToken);
+                    finalRemainingAccounts = [
+                        { pubkey: mint, isSigner: false, isWritable: true },
+                        { pubkey: tokenVault, isSigner: false, isWritable: true },
+                        { pubkey: toAddress, isSigner: false, isWritable: true },
+                        { pubkey: tokenProgramId, isSigner: false, isWritable: false },
+                    ];
+                }
+                else {
+                    // wrapped
+                    finalRemainingAccounts = [
+                        { pubkey: mint, isSigner: false, isWritable: true },
+                        { pubkey: toAddress, isSigner: false, isWritable: true },
+                        { pubkey: tokenProgramId, isSigner: false, isWritable: false },
+                    ];
+                }
+            }
+            else {
+                if (tokenType === "spl") {
+                    const fullRemoteTokenBytes = Buffer.from(baseTokenAddress.slice(2), "hex");
+                    const remoteToken = fullRemoteTokenBytes.subarray(12, 32);
+                    const [tokenVault] = this.deriveTokenVaultPda(bridgeProgramId, mint, remoteToken);
+                    finalRemainingAccounts = [
+                        { pubkey: mint, isSigner: false, isWritable: true },
+                        { pubkey: tokenVault, isSigner: false, isWritable: true },
+                        { pubkey: toAddress, isSigner: false, isWritable: true },
+                        { pubkey: tokenProgramId, isSigner: false, isWritable: false },
+                    ];
+                }
+                else {
+                    // wrapped
+                    finalRemainingAccounts = [
+                        { pubkey: mint, isSigner: false, isWritable: true },
+                        { pubkey: toAddress, isSigner: false, isWritable: true },
+                        { pubkey: tokenProgramId, isSigner: false, isWritable: false },
+                    ];
+                }
+            }
         }
-        const finalRemainingAccounts = [
-            { pubkey: mint, isSigner: false, isWritable: true },
-            { pubkey: recipientAta, isSigner: false, isWritable: true },
-            { pubkey: tokenProgramId, isSigner: false, isWritable: false },
-        ];
         const relayIx = createRelayMessageInstruction({
             programId: bridgeProgramId,
             message: messageAddress,
@@ -174,38 +266,93 @@ export class BaseBridgeInstructionBuilder {
         transaction.add(relayIx);
         return transaction;
     }
-    // private async _decodeMessageAndPrepareAccounts(
-    //   data: Buffer,
-    //   connection: Connection
-    // ): Promise<{
-    //   mint: PublicKey | null;
-    //   toAddress: PublicKey | null;
-    // }> {
-    //   if (data.length < 1) {
-    //     return { mint: null, toAddress: null };
-    //   }
-    //   let offset = 0;
-    //   const messageType = data[offset++];
-    //   if (messageType === 1) {
-    //     if (data.length < offset + 1) {
-    //       return { mint: null, toAddress: null };
-    //     }
-    //     const transferType = data[offset++];
-    //     if (transferType === 2) {
-    //       if (data.length < offset + 72) {
-    //         return { mint: null, toAddress: null };
-    //       }
-    //       const localToken = new PublicKey(Buffer.from(data.subarray(offset, offset + 32)));
-    //       offset += 32;
-    //       const to = new PublicKey(Buffer.from(data.subarray(offset, offset + 32)));
-    //       return {
-    //         mint: localToken,
-    //         toAddress: to,
-    //       };
-    //     }
-    //   }
-    //   return { mint: null, toAddress: null };
-    // }
+    decodeMessageAndPrepareAccounts(data) {
+        if (data.length < 2) {
+            return {
+                tokenType: null,
+                mint: null,
+                toAddress: null,
+                baseTokenAddress: null,
+            };
+        }
+        let offset = 0;
+        const messageType = data[offset++];
+        if (messageType !== 1) {
+            return {
+                tokenType: null,
+                mint: null,
+                toAddress: null,
+                baseTokenAddress: null,
+            };
+        }
+        const transferType = data[offset++];
+        if (transferType === 0) {
+            if (data.length < offset + 32) {
+                return {
+                    tokenType: null,
+                    mint: null,
+                    toAddress: null,
+                    baseTokenAddress: null,
+                };
+            }
+            const recipient = new PublicKey(data.subarray(offset, offset + 32));
+            return {
+                tokenType: "sol",
+                mint: null,
+                toAddress: recipient,
+                baseTokenAddress: null,
+            };
+        }
+        if (transferType === 1) {
+            if (data.length < offset + 20 + 32 + 32) {
+                return {
+                    tokenType: null,
+                    mint: null,
+                    toAddress: null,
+                    baseTokenAddress: null,
+                };
+            }
+            const remoteToken20 = data.subarray(offset, offset + 20);
+            offset += 20;
+            const remoteTokenPadded = Buffer.alloc(32);
+            remoteTokenPadded.set(remoteToken20, 12);
+            const baseTokenAddress = `0x${remoteTokenPadded.toString("hex")}`;
+            const localToken = new PublicKey(data.subarray(offset, offset + 32));
+            offset += 32;
+            const to = new PublicKey(data.subarray(offset, offset + 32));
+            return {
+                tokenType: "spl",
+                mint: localToken,
+                toAddress: to,
+                baseTokenAddress,
+            };
+        }
+        if (transferType === 2) {
+            if (data.length < offset + 32 + 32) {
+                return {
+                    tokenType: null,
+                    mint: null,
+                    toAddress: null,
+                    baseTokenAddress: null,
+                };
+            }
+            const localToken = new PublicKey(data.subarray(offset, offset + 32));
+            offset += 32;
+            const to = new PublicKey(data.subarray(offset, offset + 32));
+            return {
+                tokenType: "wrapped",
+                mint: localToken,
+                toAddress: to,
+                baseTokenAddress: null,
+            };
+        }
+        return {
+            tokenType: null,
+            mint: null,
+            toAddress: null,
+            baseTokenAddress: null,
+        };
+    }
     serializeU64(value) {
         const buf = Buffer.alloc(8);
         buf.writeBigUInt64LE(value);