@fogo/sessions-sdk 0.0.28 → 0.0.29

package/cjs/index.d.ts

@@ -1,5 +1,4 @@
-import type { BaseSignerWalletAdapter, MessageSignerWalletAdapterProps } from "@solana/wallet-adapter-base";
-import type { TransactionError } from "@solana/web3.js";
+import type { TransactionError, VersionedTransaction } from "@solana/web3.js";
 import { Connection, PublicKey } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
@@ -11,7 +10,10 @@ export { type TransactionResult, type Connection, type TransactionOrInstructions
 type EstablishSessionOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
-    signMessage: (message: Uint8Array) => Promise<Uint8Array>;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     expires: Date;
     extra?: Record<string, string> | undefined;
     createUnsafeExtractableSessionKey?: boolean | undefined;
@@ -26,7 +28,10 @@ export declare const establishSession: (options: EstablishSessionOptions) => Pro
 export declare const replaceSession: (options: {
     context: SessionContext;
     session: Session;
-    signMessage: (message: Uint8Array) => Promise<Uint8Array>;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     expires: Date;
     extra?: Record<string, string> | undefined;
 } & ({
@@ -2243,7 +2248,10 @@ export declare const getBridgeOutFee: (context: SessionContext) => Promise<{
 type SendTransferOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
-    signMessage: (message: Uint8Array) => Promise<Uint8Array>;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     mint: PublicKey;
     amount: bigint;
     recipient: PublicKey;
@@ -2255,7 +2263,10 @@ type SendBridgeOutOptions = {
     sessionKey: CryptoKeyPair;
     sessionPublicKey: PublicKey;
     walletPublicKey: PublicKey;
-    solanaWallet: MessageSignerWalletAdapterProps;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     amount: bigint;
     fromToken: WormholeToken & {
         chain: "Fogo";
@@ -2275,7 +2286,7 @@ export declare const bridgeOut: (options: SendBridgeOutOptions) => Promise<Trans
 type SendBridgeInOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
-    solanaWallet: BaseSignerWalletAdapter;
+    signTransaction: (transaction: VersionedTransaction) => Promise<VersionedTransaction>;
     amount: bigint;
     fromToken: WormholeToken & {
         chain: "Solana";

package/cjs/index.js

@@ -53,7 +53,7 @@ const establishSession = async (options) => {
         : await (0, kit_1.generateKeyPair)();
     if (options.unlimited) {
         return sendSessionEstablishTransaction(options, sessionKey, await Promise.all([
-            buildIntentInstruction(options, sessionKey),
+            buildStartSessionIntentInstruction(options, sessionKey),
             buildStartSessionInstruction(options, sessionKey),
         ]), options.sessionEstablishmentLookupTable);
     }
@@ -63,7 +63,7 @@ const establishSession = async (options) => {
             ? await getTokenInfo(options.context, filteredLimits)
             : [];
         const [intentInstruction, startSessionInstruction] = await Promise.all([
-            buildIntentInstruction(options, sessionKey, tokenInfo),
+            buildStartSessionIntentInstruction(options, sessionKey, tokenInfo),
             buildStartSessionInstruction(options, sessionKey, tokenInfo),
         ]);
         return sendSessionEstablishTransaction(options, sessionKey, [intentInstruction, startSessionInstruction], options.sessionEstablishmentLookupTable);
@@ -374,64 +374,23 @@ const getTokenInfo = async (context, limits) => {
         };
     }));
 };
-const serializeU16LE = (value) => {
-    const result = new ArrayBuffer(2);
-    new DataView(result).setUint16(0, value, true); // littleEndian = true
-    return new Uint8Array(result);
-};
-// Some wallets add a prefix to the messag before signing, for example Ledger through Phantom
-const addOffchainMessagePrefixToMessageIfNeeded = async (walletPublicKey, signature, message) => {
-    const publicKey = await crypto.subtle.importKey("raw", walletPublicKey.toBytes(), { name: "Ed25519" }, true, ["verify"]);
-    if (await (0, kit_1.verifySignature)(publicKey, signature, message)) {
-        return message;
-    }
-    else {
-        // Source: https://github.com/anza-xyz/solana-sdk/blob/master/offchain-message/src/lib.rs#L162
-        const messageWithOffchainMessagePrefix = Uint8Array.from([
-            // eslint-disable-next-line unicorn/number-literal-case
-            0xff,
-            ...new TextEncoder().encode("solana offchain"),
-            0,
-            1,
-            ...serializeU16LE(message.length),
-            ...message,
-        ]);
-        if (await (0, kit_1.verifySignature)(publicKey, signature, messageWithOffchainMessagePrefix)) {
-            return messageWithOffchainMessagePrefix;
-        }
-        else {
-            throw new Error("The signature provided by the browser wallet is not valid");
-        }
-    }
-};
-const buildIntentInstruction = async (options, sessionKey, tokens) => {
-    const message = await buildMessage({
-        chainId: options.context.chainId,
-        domain: options.context.domain,
-        sessionKey,
-        expires: options.expires,
-        tokens,
-        extra: options.extra,
-    });
-    const intentSignature = (0, kit_1.signatureBytes)(await options.signMessage(message));
+const buildStartSessionIntentInstruction = async (options, sessionKey, tokens) => buildIntentInstruction(options, MESSAGE_HEADER, {
+    version: `${CURRENT_MAJOR}.${CURRENT_MINOR}`,
+    chain_id: options.context.chainId,
+    domain: options.context.domain,
+    expires: options.expires.toISOString(),
+    session_key: await (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey),
+    tokens: serializeTokenList(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: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+        signature,
+        message: signedMessage,
     });
 };
-const buildMessage = async (body) => new TextEncoder().encode([
-    MESSAGE_HEADER,
-    serializeKV({
-        version: `${CURRENT_MAJOR}.${CURRENT_MINOR}`,
-        chain_id: body.chainId,
-        domain: body.domain,
-        expires: body.expires.toISOString(),
-        session_key: await (0, kit_1.getAddressFromPublicKey)(body.sessionKey.publicKey),
-        tokens: serializeTokenList(body.tokens),
-    }),
-    body.extra && serializeExtra(body.extra),
-].join("\n"));
 const serializeExtra = (extra) => {
     for (const [key, value] of Object.entries(extra)) {
         if (!/^[a-z]+(_[a-z0-9]+)*$/.test(key)) {
@@ -618,24 +577,15 @@ const buildTransferIntentInstruction = async (program, options, symbol, feeToken
         getNonce(program, options.walletPublicKey, NonceType.Transfer),
         (0, spl_token_1.getMint)(options.context.connection, options.mint),
     ]);
-    const message = new TextEncoder().encode([
-        TRANSFER_MESSAGE_HEADER,
-        serializeKV({
-            version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
-            chain_id: options.context.chainId,
-            token: symbol ?? options.mint.toBase58(),
-            amount: amountToString(options.amount, decimals),
-            recipient: options.recipient.toBase58(),
-            fee_token: feeToken,
-            fee_amount: feeAmount,
-            nonce: nonce === null ? "1" : nonce.nonce.add(new bn_js_1.default(1)).toString(),
-        }),
-    ].join("\n"));
-    const intentSignature = (0, kit_1.signatureBytes)(await options.signMessage(message));
-    return web3_js_1.Ed25519Program.createInstructionWithPublicKey({
-        publicKey: options.walletPublicKey.toBytes(),
-        signature: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+    return buildIntentInstruction(options, TRANSFER_MESSAGE_HEADER, {
+        version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
+        chain_id: options.context.chainId,
+        token: symbol ?? options.mint.toBase58(),
+        amount: amountToString(options.amount, decimals),
+        recipient: options.recipient.toBase58(),
+        fee_token: feeToken,
+        fee_amount: feeAmount,
+        nonce: nonce === null ? "1" : nonce.nonce.add(new bn_js_1.default(1)).toString(),
     });
 };
 const BRIDGE_OUT_MESSAGE_HEADER = `Fogo Bridge Transfer:
@@ -738,25 +688,16 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
 };
 const buildBridgeOutIntent = async (program, options, decimals, symbol, feeToken, feeAmount) => {
     const nonce = await getNonce(program, options.walletPublicKey, NonceType.Bridge);
-    const message = new TextEncoder().encode([
-        BRIDGE_OUT_MESSAGE_HEADER,
-        serializeKV({
-            version: `${CURRENT_BRIDGE_OUT_MAJOR}.${CURRENT_BRIDGE_OUT_MINOR}`,
-            from_chain_id: options.context.chainId,
-            to_chain_id: "solana",
-            token: symbol ?? options.fromToken.mint.toBase58(),
-            amount: amountToString(options.amount, decimals),
-            recipient_address: options.walletPublicKey.toBase58(),
-            fee_token: feeToken,
-            fee_amount: feeAmount,
-            nonce: nonce === null ? "1" : nonce.nonce.add(new bn_js_1.default(1)).toString(),
-        }),
-    ].join("\n"));
-    const intentSignature = (0, kit_1.signatureBytes)(await options.solanaWallet.signMessage(message));
-    return web3_js_1.Ed25519Program.createInstructionWithPublicKey({
-        publicKey: options.walletPublicKey.toBytes(),
-        signature: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+    return buildIntentInstruction(options, BRIDGE_OUT_MESSAGE_HEADER, {
+        version: `${CURRENT_BRIDGE_OUT_MAJOR}.${CURRENT_BRIDGE_OUT_MINOR}`,
+        from_chain_id: options.context.chainId,
+        to_chain_id: "solana",
+        token: symbol ?? options.fromToken.mint.toBase58(),
+        amount: amountToString(options.amount, decimals),
+        recipient_address: options.walletPublicKey.toBase58(),
+        fee_token: feeToken,
+        fee_amount: feeAmount,
+        nonce: nonce === null ? "1" : nonce.nonce.add(new bn_js_1.default(1)).toString(),
     });
 };
 const bridgeIn = async (options) => {
@@ -770,10 +711,9 @@ const bridgeIn = async (options) => {
             address: () => options.walletPublicKey.toBase58(),
             chain: () => "Solana",
             sign: (transactions) => Promise.all(transactions.map(async ({ transaction }) => {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                const signedTx = await options.solanaWallet.signTransaction(
+                const signedTx = await options.signTransaction(
                 // Hooray for Wormhole's incomplete typing eh?
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
                 transaction.transaction);
                 // Hooray for Wormhole's incomplete typing eh?
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access

package/esm/index.d.ts

@@ -1,5 +1,4 @@
-import type { BaseSignerWalletAdapter, MessageSignerWalletAdapterProps } from "@solana/wallet-adapter-base";
-import type { TransactionError } from "@solana/web3.js";
+import type { TransactionError, VersionedTransaction } from "@solana/web3.js";
 import { Connection, PublicKey } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
@@ -11,7 +10,10 @@ export { type TransactionResult, type Connection, type TransactionOrInstructions
 type EstablishSessionOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
-    signMessage: (message: Uint8Array) => Promise<Uint8Array>;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     expires: Date;
     extra?: Record<string, string> | undefined;
     createUnsafeExtractableSessionKey?: boolean | undefined;
@@ -26,7 +28,10 @@ export declare const establishSession: (options: EstablishSessionOptions) => Pro
 export declare const replaceSession: (options: {
     context: SessionContext;
     session: Session;
-    signMessage: (message: Uint8Array) => Promise<Uint8Array>;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     expires: Date;
     extra?: Record<string, string> | undefined;
 } & ({
@@ -2243,7 +2248,10 @@ export declare const getBridgeOutFee: (context: SessionContext) => Promise<{
 type SendTransferOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
-    signMessage: (message: Uint8Array) => Promise<Uint8Array>;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     mint: PublicKey;
     amount: bigint;
     recipient: PublicKey;
@@ -2255,7 +2263,10 @@ type SendBridgeOutOptions = {
     sessionKey: CryptoKeyPair;
     sessionPublicKey: PublicKey;
     walletPublicKey: PublicKey;
-    solanaWallet: MessageSignerWalletAdapterProps;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     amount: bigint;
     fromToken: WormholeToken & {
         chain: "Fogo";
@@ -2275,7 +2286,7 @@ export declare const bridgeOut: (options: SendBridgeOutOptions) => Promise<Trans
 type SendBridgeInOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
-    solanaWallet: BaseSignerWalletAdapter;
+    signTransaction: (transaction: VersionedTransaction) => Promise<VersionedTransaction>;
     amount: bigint;
     fromToken: WormholeToken & {
         chain: "Solana";

package/esm/index.js

@@ -5,7 +5,7 @@ import { publicKey as metaplexPublicKey } from "@metaplex-foundation/umi";
 import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import { sha256 } from "@noble/hashes/sha2";
 import { fromLegacyPublicKey } from "@solana/compat";
-import { generateKeyPair, getAddressFromPublicKey, getProgramDerivedAddress, signatureBytes, verifySignature, } from "@solana/kit";
+import { generateKeyPair, getAddressFromPublicKey, getProgramDerivedAddress, } from "@solana/kit";
 import { getAssociatedTokenAddressSync, getMint } from "@solana/spl-token";
 import { ComputeBudgetProgram, Connection, Ed25519Program, Keypair, PublicKey, } from "@solana/web3.js";
 import { Wormhole, wormhole, routes } from "@wormhole-foundation/sdk";
@@ -43,7 +43,7 @@ export const establishSession = async (options) => {
         : await generateKeyPair();
     if (options.unlimited) {
         return sendSessionEstablishTransaction(options, sessionKey, await Promise.all([
-            buildIntentInstruction(options, sessionKey),
+            buildStartSessionIntentInstruction(options, sessionKey),
             buildStartSessionInstruction(options, sessionKey),
         ]), options.sessionEstablishmentLookupTable);
     }
@@ -53,7 +53,7 @@ export const establishSession = async (options) => {
             ? await getTokenInfo(options.context, filteredLimits)
             : [];
         const [intentInstruction, startSessionInstruction] = await Promise.all([
-            buildIntentInstruction(options, sessionKey, tokenInfo),
+            buildStartSessionIntentInstruction(options, sessionKey, tokenInfo),
             buildStartSessionInstruction(options, sessionKey, tokenInfo),
         ]);
         return sendSessionEstablishTransaction(options, sessionKey, [intentInstruction, startSessionInstruction], options.sessionEstablishmentLookupTable);
@@ -359,64 +359,23 @@ const getTokenInfo = async (context, limits) => {
         };
     }));
 };
-const serializeU16LE = (value) => {
-    const result = new ArrayBuffer(2);
-    new DataView(result).setUint16(0, value, true); // littleEndian = true
-    return new Uint8Array(result);
-};
-// Some wallets add a prefix to the messag before signing, for example Ledger through Phantom
-const addOffchainMessagePrefixToMessageIfNeeded = async (walletPublicKey, signature, message) => {
-    const publicKey = await crypto.subtle.importKey("raw", walletPublicKey.toBytes(), { name: "Ed25519" }, true, ["verify"]);
-    if (await verifySignature(publicKey, signature, message)) {
-        return message;
-    }
-    else {
-        // Source: https://github.com/anza-xyz/solana-sdk/blob/master/offchain-message/src/lib.rs#L162
-        const messageWithOffchainMessagePrefix = Uint8Array.from([
-            // eslint-disable-next-line unicorn/number-literal-case
-            0xff,
-            ...new TextEncoder().encode("solana offchain"),
-            0,
-            1,
-            ...serializeU16LE(message.length),
-            ...message,
-        ]);
-        if (await verifySignature(publicKey, signature, messageWithOffchainMessagePrefix)) {
-            return messageWithOffchainMessagePrefix;
-        }
-        else {
-            throw new Error("The signature provided by the browser wallet is not valid");
-        }
-    }
-};
-const buildIntentInstruction = async (options, sessionKey, tokens) => {
-    const message = await buildMessage({
-        chainId: options.context.chainId,
-        domain: options.context.domain,
-        sessionKey,
-        expires: options.expires,
-        tokens,
-        extra: options.extra,
-    });
-    const intentSignature = signatureBytes(await options.signMessage(message));
+const buildStartSessionIntentInstruction = async (options, sessionKey, tokens) => buildIntentInstruction(options, MESSAGE_HEADER, {
+    version: `${CURRENT_MAJOR}.${CURRENT_MINOR}`,
+    chain_id: options.context.chainId,
+    domain: options.context.domain,
+    expires: options.expires.toISOString(),
+    session_key: await getAddressFromPublicKey(sessionKey.publicKey),
+    tokens: serializeTokenList(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 Ed25519Program.createInstructionWithPublicKey({
         publicKey: options.walletPublicKey.toBytes(),
-        signature: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+        signature,
+        message: signedMessage,
     });
 };
-const buildMessage = async (body) => new TextEncoder().encode([
-    MESSAGE_HEADER,
-    serializeKV({
-        version: `${CURRENT_MAJOR}.${CURRENT_MINOR}`,
-        chain_id: body.chainId,
-        domain: body.domain,
-        expires: body.expires.toISOString(),
-        session_key: await getAddressFromPublicKey(body.sessionKey.publicKey),
-        tokens: serializeTokenList(body.tokens),
-    }),
-    body.extra && serializeExtra(body.extra),
-].join("\n"));
 const serializeExtra = (extra) => {
     for (const [key, value] of Object.entries(extra)) {
         if (!/^[a-z]+(_[a-z0-9]+)*$/.test(key)) {
@@ -599,24 +558,15 @@ const buildTransferIntentInstruction = async (program, options, symbol, feeToken
         getNonce(program, options.walletPublicKey, NonceType.Transfer),
         getMint(options.context.connection, options.mint),
     ]);
-    const message = new TextEncoder().encode([
-        TRANSFER_MESSAGE_HEADER,
-        serializeKV({
-            version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
-            chain_id: options.context.chainId,
-            token: symbol ?? options.mint.toBase58(),
-            amount: amountToString(options.amount, decimals),
-            recipient: options.recipient.toBase58(),
-            fee_token: feeToken,
-            fee_amount: feeAmount,
-            nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
-        }),
-    ].join("\n"));
-    const intentSignature = signatureBytes(await options.signMessage(message));
-    return Ed25519Program.createInstructionWithPublicKey({
-        publicKey: options.walletPublicKey.toBytes(),
-        signature: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+    return buildIntentInstruction(options, TRANSFER_MESSAGE_HEADER, {
+        version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
+        chain_id: options.context.chainId,
+        token: symbol ?? options.mint.toBase58(),
+        amount: amountToString(options.amount, decimals),
+        recipient: options.recipient.toBase58(),
+        fee_token: feeToken,
+        fee_amount: feeAmount,
+        nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
     });
 };
 const BRIDGE_OUT_MESSAGE_HEADER = `Fogo Bridge Transfer:
@@ -718,25 +668,16 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
 };
 const buildBridgeOutIntent = async (program, options, decimals, symbol, feeToken, feeAmount) => {
     const nonce = await getNonce(program, options.walletPublicKey, NonceType.Bridge);
-    const message = new TextEncoder().encode([
-        BRIDGE_OUT_MESSAGE_HEADER,
-        serializeKV({
-            version: `${CURRENT_BRIDGE_OUT_MAJOR}.${CURRENT_BRIDGE_OUT_MINOR}`,
-            from_chain_id: options.context.chainId,
-            to_chain_id: "solana",
-            token: symbol ?? options.fromToken.mint.toBase58(),
-            amount: amountToString(options.amount, decimals),
-            recipient_address: options.walletPublicKey.toBase58(),
-            fee_token: feeToken,
-            fee_amount: feeAmount,
-            nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
-        }),
-    ].join("\n"));
-    const intentSignature = signatureBytes(await options.solanaWallet.signMessage(message));
-    return Ed25519Program.createInstructionWithPublicKey({
-        publicKey: options.walletPublicKey.toBytes(),
-        signature: intentSignature,
-        message: await addOffchainMessagePrefixToMessageIfNeeded(options.walletPublicKey, intentSignature, message),
+    return buildIntentInstruction(options, BRIDGE_OUT_MESSAGE_HEADER, {
+        version: `${CURRENT_BRIDGE_OUT_MAJOR}.${CURRENT_BRIDGE_OUT_MINOR}`,
+        from_chain_id: options.context.chainId,
+        to_chain_id: "solana",
+        token: symbol ?? options.fromToken.mint.toBase58(),
+        amount: amountToString(options.amount, decimals),
+        recipient_address: options.walletPublicKey.toBase58(),
+        fee_token: feeToken,
+        fee_amount: feeAmount,
+        nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
     });
 };
 export const bridgeIn = async (options) => {
@@ -750,10 +691,9 @@ export const bridgeIn = async (options) => {
             address: () => options.walletPublicKey.toBase58(),
             chain: () => "Solana",
             sign: (transactions) => Promise.all(transactions.map(async ({ transaction }) => {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                const signedTx = await options.solanaWallet.signTransaction(
+                const signedTx = await options.signTransaction(
                 // Hooray for Wormhole's incomplete typing eh?
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
                 transaction.transaction);
                 // Hooray for Wormhole's incomplete typing eh?
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "A set of utilities for integrating with Fogo sessions",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "@wormhole-foundation/sdk-solana-ntt": "^4.0.1",
     "bn.js": "^5.1.2",
     "bs58": "^6.0.0",
-    "zod": "^3.25.62",
+    "zod": "3.25.67",
     "@fogo/sessions-idls": "^0.0.12"
   }
 }