@fogo/sessions-sdk 0.1.8 → 0.1.10

package/cjs/index.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -9,7 +42,7 @@ const sessions_idls_1 = require("@fogo/sessions-idls");
 const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_bundle_defaults_1 = require("@metaplex-foundation/umi-bundle-defaults");
-const sha2_1 = require("@noble/hashes/sha2");
+const sha2_js_1 = require("@noble/hashes/sha2.js");
 const compat_1 = require("@solana/compat");
 const kit_1 = require("@solana/kit");
 const spl_token_1 = require("@solana/spl-token");
@@ -17,6 +50,7 @@ const web3_js_1 = require("@solana/web3.js");
 const sdk_1 = require("@wormhole-foundation/sdk");
 const solana_1 = __importDefault(require("@wormhole-foundation/sdk/solana"));
 const sdk_base_1 = require("@wormhole-foundation/sdk-base");
+const routes = __importStar(require("@wormhole-foundation/sdk-connect/routes"));
 const sdk_route_ntt_1 = require("@wormhole-foundation/sdk-route-ntt");
 const sdk_solana_core_1 = require("@wormhole-foundation/sdk-solana-core");
 const sdk_solana_ntt_1 = require("@wormhole-foundation/sdk-solana-ntt");
@@ -29,6 +63,7 @@ const crypto_js_1 = require("./crypto.js");
 const instructions_js_1 = require("./instructions.js");
 const mints_js_1 = require("./mints.js");
 const network_js_1 = require("./network.js");
+(0, sdk_solana_ntt_1.register)();
 var connection_js_2 = require("./connection.js");
 Object.defineProperty(exports, "createSessionConnection", { enumerable: true, get: function () { return connection_js_2.createSessionConnection; } });
 Object.defineProperty(exports, "TransactionResultType", { enumerable: true, get: function () { return connection_js_2.TransactionResultType; } });
@@ -83,9 +118,9 @@ const establishSession = async (options) => {
 exports.establishSession = establishSession;
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions, sessionEstablishmentLookupTable) => {
     const result = await options.context.sendTransaction(sessionKey, instructions, options.walletPublicKey, {
-        variation: "Session Establishment",
         addressLookupTable: sessionEstablishmentLookupTable ??
             SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS[options.context.network],
+        variation: "Session Establishment",
     });
     switch (result.type) {
         case connection_js_1.TransactionResultType.Success: {
@@ -109,8 +144,8 @@ const revokeSession = async (options) => {
         const instruction = await new sessions_idls_1.SessionManagerProgram(new anchor_1.AnchorProvider(options.context.connection, {}, {})).methods
             .revokeSession()
             .accounts({
-            sponsor: options.session.sessionInfo.sponsor,
             session: options.session.sessionPublicKey,
+            sponsor: options.session.sessionInfo.sponsor,
         })
             .instruction();
         return options.context.sendTransaction(options.session.sessionKey, [instruction], options.session.walletPublicKey, {
@@ -163,17 +198,17 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
         !authorizedProgramsMatchDomainRegistry(sessionInfo.authorizedPrograms, domainRegistryAuthorizedPrograms)
         ? undefined
         : {
-            sessionPublicKey,
-            walletPublicKey,
-            sessionKey,
-            payer: context.payer,
-            getSystemProgramSessionWrapInstruction: (amount) => (0, instructions_js_1.createSystemProgramSessionWrapInstruction)(sessionPublicKey, walletPublicKey, amount),
-            getSessionWrapInstructions: (amount) => (0, instructions_js_1.createSessionWrapInstructions)(sessionPublicKey, walletPublicKey, amount),
             getSessionUnwrapInstructions: () => [
                 (0, instructions_js_1.createSessionUnwrapInstruction)(sessionPublicKey, walletPublicKey),
             ],
+            getSessionWrapInstructions: (amount) => (0, instructions_js_1.createSessionWrapInstructions)(sessionPublicKey, walletPublicKey, amount),
+            getSystemProgramSessionWrapInstruction: (amount) => (0, instructions_js_1.createSystemProgramSessionWrapInstruction)(sessionPublicKey, walletPublicKey, amount),
+            payer: context.payer,
             sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, walletPublicKey, extraConfig),
             sessionInfo,
+            sessionKey,
+            sessionPublicKey,
+            walletPublicKey,
         };
 };
 const authorizedTokensSchema = zod_1.z.union([
@@ -185,9 +220,9 @@ const authorizedTokensSchema = zod_1.z.union([
     zod_1.z.object({ All: zod_1.z.object({}) }),
 ]);
 const revokedSessionInfoSchema = zod_1.z.object({
-    user: zod_1.z.instanceof(web3_js_1.PublicKey),
-    expiration: zod_1.z.instanceof(bn_js_1.default),
     authorized_tokens_with_mints: authorizedTokensSchema,
+    expiration: zod_1.z.instanceof(bn_js_1.default),
+    user: zod_1.z.instanceof(web3_js_1.PublicKey),
 });
 const activeSessionInfoSchema = zod_1.z.object({
     authorized_programs: zod_1.z.union([
@@ -219,6 +254,7 @@ const activeSessionInfoSchema = zod_1.z.object({
 });
 const sessionInfoSchema = zod_1.z
     .object({
+    major: zod_1.z.number(),
     session_info: zod_1.z.union([
         zod_1.z.object({
             V1: zod_1.z.object({
@@ -312,8 +348,8 @@ const sessionInfoSchema = zod_1.z
                     zod_1.z.object({
                         Active: zod_1.z.object({
                             "0": zod_1.z.object({
-                                domain_hash: zod_1.z.array(zod_1.z.number()).length(32),
                                 active_session_info: activeSessionInfoSchema,
+                                domain_hash: zod_1.z.array(zod_1.z.number()).length(32),
                             }),
                         }),
                     }),
@@ -321,7 +357,6 @@ const sessionInfoSchema = zod_1.z
             }),
         }),
     ]),
-    major: zod_1.z.number(),
     sponsor: zod_1.z.instanceof(web3_js_1.PublicKey),
 })
     .transform(({ session_info, major, sponsor }) => {
@@ -360,8 +395,8 @@ const sessionInfoSchema = zod_1.z
         extra: activeSessionInfo.extra[0],
         major: major,
         minor: minor,
-        user: activeSessionInfo.user,
         sponsor,
+        user: activeSessionInfo.user,
     };
 });
 var AuthorizedProgramsType;
@@ -372,8 +407,8 @@ var AuthorizedProgramsType;
 const AuthorizedPrograms = {
     All: () => ({ type: AuthorizedProgramsType.All }),
     Specific: (programs) => ({
-        type: AuthorizedProgramsType.Specific,
         programs,
+        type: AuthorizedProgramsType.Specific,
     }),
 };
 var AuthorizedTokens;
@@ -387,13 +422,13 @@ var SymbolOrMintType;
     SymbolOrMintType[SymbolOrMintType["Mint"] = 1] = "Mint";
 })(SymbolOrMintType || (SymbolOrMintType = {}));
 const SymbolOrMint = {
-    Symbol: (symbol) => ({
-        type: SymbolOrMintType.Symbol,
-        symbol,
-    }),
     Mint: (mint) => ({
-        type: SymbolOrMintType.Mint,
         mint,
+        type: SymbolOrMintType.Mint,
+    }),
+    Symbol: (symbol) => ({
+        symbol,
+        type: SymbolOrMintType.Symbol,
     }),
 };
 const getTokenInfo = (context, limits) => {
@@ -406,17 +441,19 @@ const getTokenInfo = (context, limits) => {
             (0, mpl_token_metadata_1.safeFetchMetadata)(umi, metadataAddress),
         ]);
         return {
+            amount,
+            decimals: mintInfo.decimals,
+            metadataAddress: new web3_js_1.PublicKey(metadataAddress),
+            mint,
             symbolOrMint: metadata?.symbol
                 ? SymbolOrMint.Symbol(metadata.symbol)
                 : SymbolOrMint.Mint(mint),
-            metadataAddress: new web3_js_1.PublicKey(metadataAddress),
-            amount,
-            mint,
-            decimals: mintInfo.decimals,
         };
     }));
 };
-const buildStartSessionIntentInstruction = async (options, sessionKey, tokens) => buildIntentInstruction(options, MESSAGE_HEADER, {
+const buildStartSessionIntentInstruction = async (options, sessionKey, tokens) => buildIntentInstruction(options, MESSAGE_HEADER, 
+// biome-ignore assist/source/useSortedKeys: The sort order is important here
+{
     version: `${CURRENT_MAJOR}.${CURRENT_MINOR}`,
     chain_id: options.context.chainId,
     domain: options.context.domain,
@@ -427,12 +464,80 @@ const buildStartSessionIntentInstruction = async (options, sessionKey, tokens) =
 const buildIntentInstruction = async (options, header, body, extra) => {
     const message = new TextEncoder().encode([header, serializeKV(body), extra && serializeExtra(extra)].join("\n"));
     const { signature, signedMessage } = await options.signMessage(message);
-    return web3_js_1.Ed25519Program.createInstructionWithPublicKey({
-        publicKey: options.walletPublicKey.toBytes(),
-        signature,
-        message: signedMessage,
+    const publicKey = options.walletPublicKey.toBytes();
+    const publicKeyOffsetInMessage = getOffchainMessagePublicKeyOffset(signedMessage, options.walletPublicKey);
+    if (publicKeyOffsetInMessage !== undefined) {
+        return buildEd25519InstructionWithOffsets({
+            message: signedMessage,
+            publicKeyOffsetInMessage,
+            signature,
+        });
+    }
+    else {
+        return web3_js_1.Ed25519Program.createInstructionWithPublicKey({
+            message: signedMessage,
+            publicKey,
+            signature,
+        });
+    }
+};
+const ED25519_HEADER_LEN = 16;
+const ED25519_PUBLIC_KEY_LEN = 32;
+const ED25519_SIGNATURE_LEN = 64;
+const ED25519_CURRENT_INSTRUCTION_INDEX = 0xff_ff;
+const buildEd25519InstructionWithOffsets = (params) => {
+    const { signature, message, publicKeyOffsetInMessage } = params;
+    if (signature.length !== ED25519_SIGNATURE_LEN) {
+        throw new Error(`Signature must be ${ED25519_SIGNATURE_LEN} bytes but received ${signature.length} bytes`);
+    }
+    if (publicKeyOffsetInMessage < 0 ||
+        publicKeyOffsetInMessage + ED25519_PUBLIC_KEY_LEN > message.length) {
+        throw new Error("Public key offset is out of bounds of signed message");
+    }
+    const signatureOffset = ED25519_HEADER_LEN;
+    const messageDataOffset = signatureOffset + signature.length;
+    const publicKeyOffsetInInstruction = messageDataOffset + publicKeyOffsetInMessage;
+    const instructionData = new Uint8Array(ED25519_HEADER_LEN + ED25519_SIGNATURE_LEN + message.length);
+    const view = new DataView(instructionData.buffer);
+    view.setUint8(0, 1); // num_signatures
+    view.setUint8(1, 0); // padding
+    view.setUint16(2, signatureOffset, true);
+    view.setUint16(4, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    view.setUint16(6, publicKeyOffsetInInstruction, true);
+    view.setUint16(8, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    view.setUint16(10, messageDataOffset, true);
+    view.setUint16(12, message.length, true);
+    view.setUint16(14, ED25519_CURRENT_INSTRUCTION_INDEX, true);
+    instructionData.set(signature, signatureOffset);
+    instructionData.set(message, messageDataOffset);
+    return new web3_js_1.TransactionInstruction({
+        data: Buffer.from(instructionData),
+        keys: [],
+        programId: web3_js_1.Ed25519Program.programId,
     });
 };
+const OFFCHAIN_SIGNING_DOMAIN_LEN = 16;
+const OFFCHAIN_V0_SIGNER_LIST_OFFSET = OFFCHAIN_SIGNING_DOMAIN_LEN + 1 + 32 + 1 + 1;
+const OFFCHAIN_V1_SIGNER_LIST_OFFSET = OFFCHAIN_SIGNING_DOMAIN_LEN + 1 + 1;
+const getOffchainMessagePublicKeyOffset = (signedMessage, publicKey) => {
+    const address = publicKey.toBase58();
+    try {
+        const message = (0, kit_1.getOffchainMessageDecoder)().decode(signedMessage);
+        const index = message.requiredSignatories.findIndex((signer) => signer.address === address);
+        if (index !== -1) {
+            const baseOffset = message.version === 1
+                ? OFFCHAIN_V1_SIGNER_LIST_OFFSET
+                : OFFCHAIN_V0_SIGNER_LIST_OFFSET;
+            return baseOffset + index * ED25519_PUBLIC_KEY_LEN;
+        }
+        else {
+            return undefined;
+        }
+    }
+    catch {
+        return undefined;
+    }
+};
 const serializeExtra = (extra) => {
     for (const [key, value] of Object.entries(extra)) {
         if (!/^[a-z]+(_[a-z0-9]+)*$/.test(key)) {
@@ -474,7 +579,7 @@ const amountToString = (amount, decimals) => {
     ].join("");
 };
 const getDomainRecordAddress = (domain) => {
-    const hash = (0, sha2_1.sha256)(domain);
+    const hash = (0, sha2_js_1.sha256)(new TextEncoder().encode(domain));
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("domain-record"), hash], new web3_js_1.PublicKey(sessions_idls_1.DomainRegistryIdl.address))[0];
 };
 exports.getDomainRecordAddress = getDomainRecordAddress;
@@ -492,30 +597,30 @@ const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
     const instruction = new sessions_idls_1.SessionManagerProgram(new anchor_1.AnchorProvider(options.context.connection, {}, {})).methods
         .startSession()
         .accounts({
-        sponsor: options.context.payer,
-        session: await (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey),
         domainRegistry: (0, exports.getDomainRecordAddress)(options.context.domain),
+        session: await (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey),
+        sponsor: options.context.payer,
     });
     return tokens === undefined
         ? instruction.instruction()
         : instruction
             .remainingAccounts(tokens.flatMap(({ symbolOrMint, mint, metadataAddress }) => [
             {
-                pubkey: (0, spl_token_1.getAssociatedTokenAddressSync)(mint, options.walletPublicKey),
-                isWritable: true,
                 isSigner: false,
+                isWritable: true,
+                pubkey: (0, spl_token_1.getAssociatedTokenAddressSync)(mint, options.walletPublicKey),
             },
             {
-                pubkey: mint,
-                isWritable: false,
                 isSigner: false,
+                isWritable: false,
+                pubkey: mint,
             },
             ...(symbolOrMint.type === SymbolOrMintType.Symbol
                 ? [
                     {
-                        pubkey: metadataAddress,
-                        isWritable: false,
                         isSigner: false,
+                        isWritable: false,
+                        pubkey: metadataAddress,
                     },
                 ]
                 : []),
@@ -528,15 +633,15 @@ var SessionResultType;
     SessionResultType[SessionResultType["Failed"] = 1] = "Failed";
 })(SessionResultType || (exports.SessionResultType = SessionResultType = {}));
 const EstablishSessionResult = {
-    Success: (signature, session) => ({
-        type: SessionResultType.Success,
-        signature,
-        session,
-    }),
     Failed: (signature, error) => ({
+        error,
+        signature,
         type: SessionResultType.Failed,
+    }),
+    Success: (signature, session) => ({
+        session,
         signature,
-        error,
+        type: SessionResultType.Success,
     }),
 };
 const getTransferFee = async (context) => {
@@ -563,16 +668,16 @@ const getFee = async (context) => {
     const [feeConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fee_config"), usdcMint.toBytes()], program.programId);
     const feeConfig = await program.account.feeConfig.fetch(feeConfigPda);
     return {
+        decimals: mints_js_1.USDC_DECIMALS,
+        fee: {
+            bridgeTransfer: BigInt(feeConfig.bridgeTransferFee.toString()),
+            intrachainTransfer: BigInt(feeConfig.intrachainTransferFee.toString()),
+        },
         metadata: (0, mpl_token_metadata_1.findMetadataPda)(umi, {
             mint: (0, umi_1.publicKey)(usdcMintAddress),
         })[0],
         mint: usdcMint,
         symbolOrMint: "USDC.s",
-        decimals: mints_js_1.USDC_DECIMALS,
-        fee: {
-            intrachainTransfer: BigInt(feeConfig.intrachainTransferFee.toString()),
-            bridgeTransfer: BigInt(feeConfig.bridgeTransferFee.toString()),
-        },
     };
 };
 const TRANSFER_MESSAGE_HEADER = `Fogo Transfer:
@@ -595,17 +700,17 @@ const sendTransfer = async (options) => {
             feeMetadata: options.feeConfig.metadata,
             feeMint: options.feeConfig.mint,
             feeSource: (0, spl_token_1.getAssociatedTokenAddressSync)(options.feeConfig.mint, options.walletPublicKey),
-            mint: options.mint,
-            source: sourceAta,
-            sponsor: options.context.internalPayer,
             metadata: 
             // eslint-disable-next-line unicorn/no-null
             symbol === undefined ? null : new web3_js_1.PublicKey(metadataAddress),
+            mint: options.mint,
+            source: sourceAta,
+            sponsor: options.context.internalPayer,
         })
             .instruction(),
     ], options.walletPublicKey, {
-        variation: "Intent Transfer",
         paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+        variation: "Intent Transfer",
     });
 };
 exports.sendTransfer = sendTransfer;
@@ -614,7 +719,9 @@ const buildTransferIntentInstruction = async (program, options, symbol, feeToken
         getNonce(program, options.walletPublicKey, NonceType.Transfer),
         (0, spl_token_1.getMint)(options.context.connection, options.mint),
     ]);
-    return buildIntentInstruction(options, TRANSFER_MESSAGE_HEADER, {
+    return buildIntentInstruction(options, TRANSFER_MESSAGE_HEADER, 
+    // biome-ignore assist/source/useSortedKeys: The sort order is important here
+    {
         version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
         chain_id: options.context.chainId,
         token: symbol ?? options.mint.toBase58(),
@@ -632,25 +739,27 @@ const sendNativeTransfer = async (options) => {
         await program.methods
             .sendNative()
             .accounts({
+            destination: options.recipient,
+            feeDestination: sessions_idls_1.IntentTransferIdl.address,
             feeMetadata: options.feeConfig.metadata,
             feeMint: options.feeConfig.mint,
             feeSource: (0, spl_token_1.getAssociatedTokenAddressSync)(options.feeConfig.mint, options.walletPublicKey),
-            feeDestination: sessions_idls_1.IntentTransferIdl.address,
             source: options.walletPublicKey,
-            destination: options.recipient,
             sponsor: options.context.internalPayer,
         })
             .instruction(),
     ], options.walletPublicKey, {
-        variation: "Intent Transfer",
         paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+        variation: "Intent Transfer",
     });
 };
 exports.sendNativeTransfer = sendNativeTransfer;
 const FOGO_DECIMALS = 9;
 const buildNativeTransferIntentInstruction = async (program, options, feeToken, feeAmount) => {
     const nonce = await getNonce(program, options.walletPublicKey, NonceType.Transfer);
-    return buildIntentInstruction(options, TRANSFER_MESSAGE_HEADER, {
+    return buildIntentInstruction(options, TRANSFER_MESSAGE_HEADER, 
+    // biome-ignore assist/source/useSortedKeys: The sort order is important here
+    {
         version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
         chain_id: options.context.chainId,
         token: "FOGO",
@@ -688,17 +797,17 @@ const bridgeOut = async (options) => {
             signedQuoteBytes: [...quote.signedQuote],
         })
             .accounts({
-            sponsor: options.context.internalPayer,
-            mint: options.fromToken.mint,
+            feeMetadata: options.feeConfig.metadata,
+            feeMint: options.feeConfig.mint,
+            feeSource: (0, spl_token_1.getAssociatedTokenAddressSync)(options.feeConfig.mint, options.walletPublicKey),
             metadata: metadata?.symbol === undefined
                 ? // eslint-disable-next-line unicorn/no-null
                     null
                 : new web3_js_1.PublicKey(metadataAddress),
-            source: (0, spl_token_1.getAssociatedTokenAddressSync)(options.fromToken.mint, options.walletPublicKey),
+            mint: options.fromToken.mint,
             ntt: nttPdas,
-            feeMetadata: options.feeConfig.metadata,
-            feeMint: options.feeConfig.mint,
-            feeSource: (0, spl_token_1.getAssociatedTokenAddressSync)(options.feeConfig.mint, options.walletPublicKey),
+            source: (0, spl_token_1.getAssociatedTokenAddressSync)(options.fromToken.mint, options.walletPublicKey),
+            sponsor: options.context.internalPayer,
         })
             .instruction(),
     ]);
@@ -706,10 +815,10 @@ const bridgeOut = async (options) => {
         web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: BRIDGE_OUT_CUS }),
         ...instructions,
     ], options.walletPublicKey, {
-        variation: "Intent NTT Bridge",
-        paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
-        extraSigners: [outboxItem],
         addressLookupTable: BRIDGING_ADDRESS_LOOKUP_TABLE[options.context.network]?.[options.fromToken.mint.toBase58()],
+        extraSigners: [outboxItem],
+        paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+        variation: "Intent NTT Bridge",
     });
 };
 exports.bridgeOut = bridgeOut;
@@ -752,16 +861,18 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
         nttTokenAuthority: pdas.tokenAuthority(),
         payeeNttWithExecutor: quotePayeeAddress,
         transceiver: registeredTransceiverPda,
-        wormholeProgram: coreBridgeContract,
         wormholeBridge: wormholePdas.wormholeBridge,
         wormholeFeeCollector: wormholePdas.wormholeFeeCollector,
         wormholeMessage: transceiverPdas.wormholeMessageAccount(outboxItemPublicKey),
+        wormholeProgram: coreBridgeContract,
         wormholeSequence: wormholePdas.wormholeSequence,
     };
 };
 const buildBridgeOutIntent = async (program, options, decimals, symbol, feeToken, feeAmount) => {
     const nonce = await getNonce(program, options.walletPublicKey, NonceType.Bridge);
-    return buildIntentInstruction(options, BRIDGE_OUT_MESSAGE_HEADER, {
+    return buildIntentInstruction(options, BRIDGE_OUT_MESSAGE_HEADER, 
+    // biome-ignore assist/source/useSortedKeys: The sort order is important here
+    {
         version: `${CURRENT_BRIDGE_OUT_MAJOR}.${CURRENT_BRIDGE_OUT_MINOR}`,
         from_chain_id: options.context.chainId,
         to_chain_id: "solana",
@@ -780,7 +891,7 @@ const bridgeIn = async (options) => {
     // properly represent the runtime representation.
     const quote = await route.quote(transferRequest, transferParams);
     if (quote.success) {
-        return await sdk_1.routes.checkAndCompleteTransfer(route, await route.initiate(transferRequest, {
+        return await routes.checkAndCompleteTransfer(route, await route.initiate(transferRequest, {
             address: () => options.walletPublicKey.toBase58(),
             chain: () => "Solana",
             sign: (transactions) => Promise.all(transactions.map(async ({ transaction }) => {
@@ -839,10 +950,10 @@ const buildWormholeTransfer = async (options, connection) => {
         },
     });
     const route = new Route(wh);
-    const transferRequest = await sdk_1.routes.RouteTransferRequest.create(wh, {
+    const transferRequest = await routes.RouteTransferRequest.create(wh, {
+        destination: sdk_1.Wormhole.tokenId(options.toToken.chain, options.toToken.mint.toBase58()),
         recipient: sdk_1.Wormhole.chainAddress(options.toToken.chain, options.walletPublicKey.toBase58()),
         source: sdk_1.Wormhole.tokenId(options.fromToken.chain, options.fromToken.mint.toBase58()),
-        destination: sdk_1.Wormhole.tokenId(options.toToken.chain, options.toToken.mint.toBase58()),
     });
     const validated = await route.validate(transferRequest, {
         amount: amountToString(options.amount, decimals),
@@ -850,11 +961,11 @@ const buildWormholeTransfer = async (options, connection) => {
     });
     if (validated.valid) {
         return {
-            wh,
+            decimals,
             route,
-            transferRequest,
             transferParams: validated.params,
-            decimals,
+            transferRequest,
+            wh,
         };
     }
     else {

package/cjs/instructions.js

@@ -6,7 +6,7 @@ exports.createSessionWrapInstructions = createSessionWrapInstructions;
 exports.createSessionUnwrapInstruction = createSessionUnwrapInstruction;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
-const sha2_1 = require("@noble/hashes/sha2");
+const sha2_js_1 = require("@noble/hashes/sha2.js");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const SESSION_WRAP_DISCRIMINATOR = 4_000_000;
@@ -23,17 +23,17 @@ function createSystemProgramSessionWrapInstruction(sessionKey, walletPublicKey,
     view.setUint32(0, SESSION_WRAP_DISCRIMINATOR, true);
     view.setBigUint64(4, amount, true);
     return new web3_js_1.TransactionInstruction({
-        programId: web3_js_1.SystemProgram.programId,
+        data: Buffer.from(data),
         keys: [
-            { pubkey: walletPublicKey, isSigner: false, isWritable: true },
+            { isSigner: false, isWritable: true, pubkey: walletPublicKey },
             {
-                pubkey: getNativeMintAssociatedTokenAddressSync(walletPublicKey),
                 isSigner: false,
                 isWritable: true,
+                pubkey: getNativeMintAssociatedTokenAddressSync(walletPublicKey),
             },
-            { pubkey: sessionKey, isSigner: true, isWritable: false },
+            { isSigner: true, isWritable: false, pubkey: sessionKey },
         ],
-        data: Buffer.from(data),
+        programId: web3_js_1.SystemProgram.programId,
     });
 }
 /**
@@ -59,7 +59,7 @@ function createSessionUnwrapInstruction(sessionKey, walletPublicKey) {
     return (0, spl_token_1.createCloseAccountInstruction)(getNativeMintAssociatedTokenAddressSync(walletPublicKey), walletPublicKey, sessionKey);
 }
 const getDomainTollRecipientAddress = (domain) => {
-    const hash = (0, sha2_1.sha256)(domain);
+    const hash = (0, sha2_js_1.sha256)(new TextEncoder().encode(domain));
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("toll_recipient"), Buffer.from([0]), hash], new web3_js_1.PublicKey(sessions_idls_1.TollboothIdl.address))[0];
 };
 /**
@@ -72,10 +72,10 @@ const createPaymasterFeeInstruction = ({ sessionKey, walletPublicKey, domain, fe
     return new sessions_idls_1.TollboothProgram(new anchor_1.AnchorProvider({}, {})).methods
         .payToll(feeAmount, 0)
         .accounts({
-        session: sessionKey,
-        source: (0, spl_token_1.getAssociatedTokenAddressSync)(feeMint, walletPublicKey),
         destination: (0, spl_token_1.getAssociatedTokenAddressSync)(feeMint, recipient, true),
         mint: feeMint,
+        session: sessionKey,
+        source: (0, spl_token_1.getAssociatedTokenAddressSync)(feeMint, walletPublicKey),
     })
         .instruction();
 };

package/esm/connection.d.ts

@@ -1,20 +1,20 @@
 import type { Address, GetLatestBlockhashApi, Instruction, Rpc, Transaction, TransactionWithLifetime } from "@solana/kit";
-import type { TransactionError } from "@solana/web3.js";
-import { Keypair, PublicKey, TransactionInstruction, VersionedTransaction, Connection as Web3Connection } from "@solana/web3.js";
+import type { TransactionError, TransactionInstruction } from "@solana/web3.js";
+import { Keypair, PublicKey, VersionedTransaction, Connection as Web3Connection } from "@solana/web3.js";
 import { Network } from "./network.js";
 export declare enum TransactionResultType {
     Success = 0,
     Failed = 1
 }
 declare const TransactionResult: {
-    Success: (signature: string) => {
-        type: TransactionResultType.Success;
-        signature: string;
-    };
     Failed: (signature: string, error: TransactionError) => {
+        error: TransactionError;
+        signature: string;
         type: TransactionResultType.Failed;
+    };
+    Success: (signature: string) => {
         signature: string;
-        error: TransactionError;
+        type: TransactionResultType.Success;
     };
 };
 export type TransactionResult = ReturnType<(typeof TransactionResult)[keyof typeof TransactionResult]>;
@@ -30,12 +30,12 @@ export declare const createSessionConnection: (options: {
     sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
     sponsor: PublicKey;
 })) => {
-    rpc: Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
     connection: Web3Connection;
-    network: Network;
     getSolanaConnection: () => Promise<Web3Connection>;
-    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, walletPublicKey: PublicKey, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     getSponsor: (domain: string) => Promise<PublicKey>;
+    network: Network;
+    rpc: Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
+    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, walletPublicKey: PublicKey, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
 };
 export type TransactionOrInstructions = (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime);
 export type SendTransactionOptions = {