@fogo/sessions-sdk 0.0.28 → 0.0.30

package/cjs/connection.d.ts

@@ -1,6 +1,6 @@
-import type { Transaction, Instruction, TransactionWithLifetime, Rpc, GetLatestBlockhashApi } from "@solana/kit";
+import type { GetLatestBlockhashApi, Instruction, Rpc, Transaction, TransactionWithLifetime } from "@solana/kit";
 import type { TransactionError } from "@solana/web3.js";
-import { Keypair, Connection as Web3Connection, TransactionInstruction, VersionedTransaction, PublicKey } from "@solana/web3.js";
+import { Keypair, PublicKey, TransactionInstruction, VersionedTransaction, Connection as Web3Connection } from "@solana/web3.js";
 export declare enum Network {
     Testnet = 0,
     Mainnet = 1

package/cjs/index.d.ts

@@ -1,17 +1,19 @@
-import type { BaseSignerWalletAdapter, MessageSignerWalletAdapterProps } from "@solana/wallet-adapter-base";
-import type { TransactionError } from "@solana/web3.js";
+import type { TransactionError, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
 import { Connection, PublicKey } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
 import { z } from "zod";
 import type { TransactionOrInstructions, TransactionResult } from "./connection.js";
 import type { SendTransactionOptions, SessionContext } from "./context.js";
-export { type SessionContext, type SendTransactionOptions, createSessionContext, } from "./context.js";
-export { type TransactionResult, type Connection, type TransactionOrInstructions, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
+export { type Connection, createSessionConnection, Network, type TransactionOrInstructions, type TransactionResult, TransactionResultType, } from "./connection.js";
+export { createSessionContext, type SendTransactionOptions, type SessionContext, } from "./context.js";
 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;
 } & ({
@@ -2223,6 +2228,9 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
+    getSystemProgramSessionWrapInstruction: (amount: bigint) => TransactionInstruction;
+    getSessionWrapInstructions: (amount: bigint) => TransactionInstruction[];
+    getSessionUnwrapInstructions: () => TransactionInstruction[];
     sendTransaction: (instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     sessionInfo: NonNullable<z.infer<typeof sessionInfoSchema>>;
 };
@@ -2243,19 +2251,37 @@ 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;
     feeConfig: Awaited<ReturnType<typeof getTransferFee>>;
 };
 export declare const sendTransfer: (options: SendTransferOptions) => Promise<TransactionResult>;
+type SendNativeTransferOptions = {
+    context: SessionContext;
+    walletPublicKey: PublicKey;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
+    amount: bigint;
+    recipient: PublicKey;
+    feeConfig: Awaited<ReturnType<typeof getTransferFee>>;
+};
+export declare const sendNativeTransfer: (options: SendNativeTransferOptions) => Promise<TransactionResult>;
 type SendBridgeOutOptions = {
     context: SessionContext;
     sessionKey: CryptoKeyPair;
     sessionPublicKey: PublicKey;
     walletPublicKey: PublicKey;
-    solanaWallet: MessageSignerWalletAdapterProps;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     amount: bigint;
     fromToken: WormholeToken & {
         chain: "Fogo";
@@ -2275,7 +2301,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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyLogInToken = exports.createLogInToken = exports.bridgeIn = exports.bridgeOut = exports.sendTransfer = exports.getBridgeOutFee = exports.getTransferFee = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.createSessionConnection = exports.TransactionResultType = exports.Network = exports.createSessionContext = void 0;
+exports.verifyLogInToken = exports.createLogInToken = exports.bridgeIn = exports.bridgeOut = exports.sendNativeTransfer = exports.sendTransfer = exports.getBridgeOutFee = exports.getTransferFee = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.createSessionContext = exports.TransactionResultType = exports.Network = exports.createSessionConnection = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
 const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
@@ -26,12 +26,13 @@ const zod_1 = require("zod");
 const connection_js_1 = require("./connection.js");
 const context_js_1 = require("./context.js");
 const crypto_js_1 = require("./crypto.js");
-var context_js_2 = require("./context.js");
-Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_2.createSessionContext; } });
+const instructions_js_1 = require("./instructions.js");
 var connection_js_2 = require("./connection.js");
+Object.defineProperty(exports, "createSessionConnection", { enumerable: true, get: function () { return connection_js_2.createSessionConnection; } });
 Object.defineProperty(exports, "Network", { enumerable: true, get: function () { return connection_js_2.Network; } });
 Object.defineProperty(exports, "TransactionResultType", { enumerable: true, get: function () { return connection_js_2.TransactionResultType; } });
-Object.defineProperty(exports, "createSessionConnection", { enumerable: true, get: function () { return connection_js_2.createSessionConnection; } });
+var context_js_2 = require("./context.js");
+Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_2.createSessionContext; } });
 const MESSAGE_HEADER = `Fogo Sessions:
 Signing this intent will allow this app to interact with your on-chain balances. Please make sure you trust this app and the domain in the message matches the domain of the current web application.
 `;
@@ -53,7 +54,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 +64,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);
@@ -130,6 +131,11 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
             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),
+            ],
             sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, extraConfig),
             sessionInfo,
         };
@@ -354,7 +360,7 @@ const SymbolOrMint = {
         mint,
     }),
 };
-const getTokenInfo = async (context, limits) => {
+const getTokenInfo = (context, limits) => {
     const umi = (0, umi_bundle_defaults_1.createUmi)(context.connection.rpcEndpoint);
     return Promise.all(limits.entries().map(async ([mint, amount]) => {
         const metaplexMint = (0, umi_1.publicKey)(mint.toBase58());
@@ -374,64 +380,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 +583,50 @@ 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 sendNativeTransfer = async (options) => {
+    const program = new sessions_idls_1.IntentTransferProgram(new anchor_1.AnchorProvider(options.context.connection, {}, {}));
+    return options.context.sendTransaction(undefined, [
+        await buildNativeTransferIntentInstruction(program, options, options.feeConfig.symbolOrMint, amountToString(options.feeConfig.fee, options.feeConfig.decimals)),
+        await program.methods
+            .sendNative()
+            .accounts({
+            feeMetadata: options.feeConfig.metadata,
+            feeMint: options.feeConfig.mint,
+            feeSource: (0, spl_token_1.getAssociatedTokenAddressSync)(options.feeConfig.mint, options.walletPublicKey),
+            source: options.walletPublicKey,
+            destination: options.recipient,
+            sponsor: options.context.internalPayer,
+        })
+            .instruction(),
+    ], {
+        variation: "Intent Transfer",
+        paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+    });
+};
+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, {
+        version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
+        chain_id: options.context.chainId,
+        token: "FOGO",
+        amount: amountToString(options.amount, FOGO_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 +729,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 +752,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/cjs/instructions.d.ts

@@ -0,0 +1,18 @@
+import { type PublicKey, TransactionInstruction } from "@solana/web3.js";
+/**
+ * Creates the system program instruction `SessionWrap`, only available on Fogo, which allows a session key to transfer native token from its user's wallet to its user's wrapped token associated token account.
+ * This instruction may be combined with the `CreateAssociatedTokenAccountIdempotent` and `SyncNative` instructions for a session to wrap tokens on behalf of its user.
+ */
+export declare function createSystemProgramSessionWrapInstruction(sessionKey: PublicKey, walletPublicKey: PublicKey, amount: bigint): TransactionInstruction;
+/**
+ * Creates the sequence of instructions required to wrap native tokens within a session.
+ *
+ * Note: This function sets the session key as the payer for the `CreateAssociatedTokenAccountIdempotent` instruction, which is unconventional since the session key can't spend funds.
+ * It works because at the time `CreateAssociatedTokenAccountIdempotent` is called, the `userTokenAccount` has already been funded by the `SessionWrap` instruction.
+ * The paymaster will reject the transaction if the payer of the `CreateAssociatedTokenAccountIdempotent` is set to the paymaster payer to avoid the paymaster's funds getting drained.
+ */
+export declare function createSessionWrapInstructions(sessionKey: PublicKey, walletPublicKey: PublicKey, amount: bigint): TransactionInstruction[];
+/**
+ * Creates the instruction required to unwrap native tokens within a session.
+ */
+export declare function createSessionUnwrapInstruction(sessionKey: PublicKey, walletPublicKey: PublicKey): TransactionInstruction;

package/cjs/instructions.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSystemProgramSessionWrapInstruction = createSystemProgramSessionWrapInstruction;
+exports.createSessionWrapInstructions = createSessionWrapInstructions;
+exports.createSessionUnwrapInstruction = createSessionUnwrapInstruction;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const SESSION_WRAP_DISCRIMINATOR = 4_000_000;
+function getNativeMintAssociatedTokenAddressSync(walletPublicKey) {
+    return (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, walletPublicKey);
+}
+/**
+ * Creates the system program instruction `SessionWrap`, only available on Fogo, which allows a session key to transfer native token from its user's wallet to its user's wrapped token associated token account.
+ * This instruction may be combined with the `CreateAssociatedTokenAccountIdempotent` and `SyncNative` instructions for a session to wrap tokens on behalf of its user.
+ */
+function createSystemProgramSessionWrapInstruction(sessionKey, walletPublicKey, amount) {
+    const data = new Uint8Array(12);
+    const view = new DataView(data.buffer);
+    view.setUint32(0, SESSION_WRAP_DISCRIMINATOR, true);
+    view.setBigUint64(4, amount, true);
+    return new web3_js_1.TransactionInstruction({
+        programId: web3_js_1.SystemProgram.programId,
+        keys: [
+            { pubkey: walletPublicKey, isSigner: false, isWritable: true },
+            {
+                pubkey: getNativeMintAssociatedTokenAddressSync(walletPublicKey),
+                isSigner: false,
+                isWritable: true,
+            },
+            { pubkey: sessionKey, isSigner: true, isWritable: false },
+        ],
+        data: Buffer.from(data),
+    });
+}
+/**
+ * Creates the sequence of instructions required to wrap native tokens within a session.
+ *
+ * Note: This function sets the session key as the payer for the `CreateAssociatedTokenAccountIdempotent` instruction, which is unconventional since the session key can't spend funds.
+ * It works because at the time `CreateAssociatedTokenAccountIdempotent` is called, the `userTokenAccount` has already been funded by the `SessionWrap` instruction.
+ * The paymaster will reject the transaction if the payer of the `CreateAssociatedTokenAccountIdempotent` is set to the paymaster payer to avoid the paymaster's funds getting drained.
+ */
+function createSessionWrapInstructions(sessionKey, walletPublicKey, amount) {
+    const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, walletPublicKey);
+    return [
+        createSystemProgramSessionWrapInstruction(sessionKey, walletPublicKey, amount),
+        (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(sessionKey, // This is unconventional! Read the note in the function's docs.
+        userTokenAccount, walletPublicKey, spl_token_1.NATIVE_MINT),
+        (0, spl_token_1.createSyncNativeInstruction)(userTokenAccount),
+    ];
+}
+/**
+ * Creates the instruction required to unwrap native tokens within a session.
+ */
+function createSessionUnwrapInstruction(sessionKey, walletPublicKey) {
+    return (0, spl_token_1.createCloseAccountInstruction)(getNativeMintAssociatedTokenAddressSync(walletPublicKey), walletPublicKey, sessionKey);
+}

package/esm/connection.d.ts

@@ -1,6 +1,6 @@
-import type { Transaction, Instruction, TransactionWithLifetime, Rpc, GetLatestBlockhashApi } from "@solana/kit";
+import type { GetLatestBlockhashApi, Instruction, Rpc, Transaction, TransactionWithLifetime } from "@solana/kit";
 import type { TransactionError } from "@solana/web3.js";
-import { Keypair, Connection as Web3Connection, TransactionInstruction, VersionedTransaction, PublicKey } from "@solana/web3.js";
+import { Keypair, PublicKey, TransactionInstruction, VersionedTransaction, Connection as Web3Connection } from "@solana/web3.js";
 export declare enum Network {
     Testnet = 0,
     Mainnet = 1

package/esm/connection.js

@@ -1,6 +1,6 @@
 import { fromLegacyKeypair, fromLegacyPublicKey, fromLegacyTransactionInstruction, fromVersionedTransaction, } from "@solana/compat";
-import { createSolanaRpc, getBase64EncodedWireTransaction, createTransactionMessage, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstructions, partiallySignTransactionMessageWithSigners, pipe, addSignersToTransactionMessage, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, partiallySignTransaction, } from "@solana/kit";
-import { Keypair, Connection as Web3Connection, TransactionInstruction, VersionedTransaction, PublicKey, } from "@solana/web3.js";
+import { addSignersToTransactionMessage, appendTransactionMessageInstructions, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, createSolanaRpc, createTransactionMessage, getBase64EncodedWireTransaction, partiallySignTransaction, partiallySignTransactionMessageWithSigners, pipe, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, } from "@solana/kit";
+import { Keypair, PublicKey, TransactionInstruction, VersionedTransaction, Connection as Web3Connection, } from "@solana/web3.js";
 import { z } from "zod";
 export var Network;
 (function (Network) {

package/esm/context.js

@@ -1,6 +1,6 @@
 import { AnchorProvider } from "@coral-xyz/anchor";
 import { ChainIdProgram } from "@fogo/sessions-idls";
-import { Connection as Web3Connection, Keypair } from "@solana/web3.js";
+import { Keypair, Connection as Web3Connection } from "@solana/web3.js";
 // eslint-disable-next-line unicorn/no-typeof-undefined
 const IS_BROWSER = typeof globalThis.window !== "undefined";
 export const SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";

package/esm/index.d.ts

@@ -1,17 +1,19 @@
-import type { BaseSignerWalletAdapter, MessageSignerWalletAdapterProps } from "@solana/wallet-adapter-base";
-import type { TransactionError } from "@solana/web3.js";
+import type { TransactionError, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
 import { Connection, PublicKey } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
 import { z } from "zod";
 import type { TransactionOrInstructions, TransactionResult } from "./connection.js";
 import type { SendTransactionOptions, SessionContext } from "./context.js";
-export { type SessionContext, type SendTransactionOptions, createSessionContext, } from "./context.js";
-export { type TransactionResult, type Connection, type TransactionOrInstructions, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
+export { type Connection, createSessionConnection, Network, type TransactionOrInstructions, type TransactionResult, TransactionResultType, } from "./connection.js";
+export { createSessionContext, type SendTransactionOptions, type SessionContext, } from "./context.js";
 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;
 } & ({
@@ -2223,6 +2228,9 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
+    getSystemProgramSessionWrapInstruction: (amount: bigint) => TransactionInstruction;
+    getSessionWrapInstructions: (amount: bigint) => TransactionInstruction[];
+    getSessionUnwrapInstructions: () => TransactionInstruction[];
     sendTransaction: (instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     sessionInfo: NonNullable<z.infer<typeof sessionInfoSchema>>;
 };
@@ -2243,19 +2251,37 @@ 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;
     feeConfig: Awaited<ReturnType<typeof getTransferFee>>;
 };
 export declare const sendTransfer: (options: SendTransferOptions) => Promise<TransactionResult>;
+type SendNativeTransferOptions = {
+    context: SessionContext;
+    walletPublicKey: PublicKey;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
+    amount: bigint;
+    recipient: PublicKey;
+    feeConfig: Awaited<ReturnType<typeof getTransferFee>>;
+};
+export declare const sendNativeTransfer: (options: SendNativeTransferOptions) => Promise<TransactionResult>;
 type SendBridgeOutOptions = {
     context: SessionContext;
     sessionKey: CryptoKeyPair;
     sessionPublicKey: PublicKey;
     walletPublicKey: PublicKey;
-    solanaWallet: MessageSignerWalletAdapterProps;
+    signMessage: (message: Uint8Array) => Promise<{
+        signedMessage: Uint8Array;
+        signature: Uint8Array;
+    }>;
     amount: bigint;
     fromToken: WormholeToken & {
         chain: "Fogo";
@@ -2275,7 +2301,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,10 +5,10 @@ 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";
+import { routes, Wormhole, wormhole } from "@wormhole-foundation/sdk";
 import solanaSdk from "@wormhole-foundation/sdk/solana";
 import { contracts } from "@wormhole-foundation/sdk-base";
 import { nttExecutorRoute } from "@wormhole-foundation/sdk-route-ntt";
@@ -20,8 +20,9 @@ import { z } from "zod";
 import { Network, TransactionResultType } from "./connection.js";
 import { SESSIONS_INTERNAL_PAYMASTER_DOMAIN } from "./context.js";
 import { importKey, signMessageWithKey, verifyMessageWithKey, } from "./crypto.js";
+import { createSessionUnwrapInstruction, createSessionWrapInstructions, createSystemProgramSessionWrapInstruction, } from "./instructions.js";
+export { createSessionConnection, Network, TransactionResultType, } from "./connection.js";
 export { createSessionContext, } from "./context.js";
-export { Network, TransactionResultType, createSessionConnection, } from "./connection.js";
 const MESSAGE_HEADER = `Fogo Sessions:
 Signing this intent will allow this app to interact with your on-chain balances. Please make sure you trust this app and the domain in the message matches the domain of the current web application.
 `;
@@ -43,7 +44,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 +54,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);
@@ -115,6 +116,11 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
             walletPublicKey,
             sessionKey,
             payer: context.payer,
+            getSystemProgramSessionWrapInstruction: (amount) => createSystemProgramSessionWrapInstruction(sessionPublicKey, walletPublicKey, amount),
+            getSessionWrapInstructions: (amount) => createSessionWrapInstructions(sessionPublicKey, walletPublicKey, amount),
+            getSessionUnwrapInstructions: () => [
+                createSessionUnwrapInstruction(sessionPublicKey, walletPublicKey),
+            ],
             sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, extraConfig),
             sessionInfo,
         };
@@ -339,7 +345,7 @@ const SymbolOrMint = {
         mint,
     }),
 };
-const getTokenInfo = async (context, limits) => {
+const getTokenInfo = (context, limits) => {
     const umi = createUmi(context.connection.rpcEndpoint);
     return Promise.all(limits.entries().map(async ([mint, amount]) => {
         const metaplexMint = metaplexPublicKey(mint.toBase58());
@@ -359,64 +365,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 +564,49 @@ 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(),
+    });
+};
+export const sendNativeTransfer = async (options) => {
+    const program = new IntentTransferProgram(new AnchorProvider(options.context.connection, {}, {}));
+    return options.context.sendTransaction(undefined, [
+        await buildNativeTransferIntentInstruction(program, options, options.feeConfig.symbolOrMint, amountToString(options.feeConfig.fee, options.feeConfig.decimals)),
+        await program.methods
+            .sendNative()
+            .accounts({
+            feeMetadata: options.feeConfig.metadata,
+            feeMint: options.feeConfig.mint,
+            feeSource: getAssociatedTokenAddressSync(options.feeConfig.mint, options.walletPublicKey),
+            source: options.walletPublicKey,
+            destination: options.recipient,
+            sponsor: options.context.internalPayer,
+        })
+            .instruction(),
+    ], {
+        variation: "Intent Transfer",
+        paymasterDomain: SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+    });
+};
+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, {
+        version: `${CURRENT_INTENT_TRANSFER_MAJOR}.${CURRENT_INTENT_TRANSFER_MINOR}`,
+        chain_id: options.context.chainId,
+        token: "FOGO",
+        amount: amountToString(options.amount, FOGO_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 +708,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 +731,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/esm/instructions.d.ts

@@ -0,0 +1,18 @@
+import { type PublicKey, TransactionInstruction } from "@solana/web3.js";
+/**
+ * Creates the system program instruction `SessionWrap`, only available on Fogo, which allows a session key to transfer native token from its user's wallet to its user's wrapped token associated token account.
+ * This instruction may be combined with the `CreateAssociatedTokenAccountIdempotent` and `SyncNative` instructions for a session to wrap tokens on behalf of its user.
+ */
+export declare function createSystemProgramSessionWrapInstruction(sessionKey: PublicKey, walletPublicKey: PublicKey, amount: bigint): TransactionInstruction;
+/**
+ * Creates the sequence of instructions required to wrap native tokens within a session.
+ *
+ * Note: This function sets the session key as the payer for the `CreateAssociatedTokenAccountIdempotent` instruction, which is unconventional since the session key can't spend funds.
+ * It works because at the time `CreateAssociatedTokenAccountIdempotent` is called, the `userTokenAccount` has already been funded by the `SessionWrap` instruction.
+ * The paymaster will reject the transaction if the payer of the `CreateAssociatedTokenAccountIdempotent` is set to the paymaster payer to avoid the paymaster's funds getting drained.
+ */
+export declare function createSessionWrapInstructions(sessionKey: PublicKey, walletPublicKey: PublicKey, amount: bigint): TransactionInstruction[];
+/**
+ * Creates the instruction required to unwrap native tokens within a session.
+ */
+export declare function createSessionUnwrapInstruction(sessionKey: PublicKey, walletPublicKey: PublicKey): TransactionInstruction;

package/esm/instructions.js

@@ -0,0 +1,51 @@
+import { createAssociatedTokenAccountIdempotentInstruction, createCloseAccountInstruction, createSyncNativeInstruction, getAssociatedTokenAddressSync, NATIVE_MINT, } from "@solana/spl-token";
+import { SystemProgram, TransactionInstruction, } from "@solana/web3.js";
+const SESSION_WRAP_DISCRIMINATOR = 4_000_000;
+function getNativeMintAssociatedTokenAddressSync(walletPublicKey) {
+    return getAssociatedTokenAddressSync(NATIVE_MINT, walletPublicKey);
+}
+/**
+ * Creates the system program instruction `SessionWrap`, only available on Fogo, which allows a session key to transfer native token from its user's wallet to its user's wrapped token associated token account.
+ * This instruction may be combined with the `CreateAssociatedTokenAccountIdempotent` and `SyncNative` instructions for a session to wrap tokens on behalf of its user.
+ */
+export function createSystemProgramSessionWrapInstruction(sessionKey, walletPublicKey, amount) {
+    const data = new Uint8Array(12);
+    const view = new DataView(data.buffer);
+    view.setUint32(0, SESSION_WRAP_DISCRIMINATOR, true);
+    view.setBigUint64(4, amount, true);
+    return new TransactionInstruction({
+        programId: SystemProgram.programId,
+        keys: [
+            { pubkey: walletPublicKey, isSigner: false, isWritable: true },
+            {
+                pubkey: getNativeMintAssociatedTokenAddressSync(walletPublicKey),
+                isSigner: false,
+                isWritable: true,
+            },
+            { pubkey: sessionKey, isSigner: true, isWritable: false },
+        ],
+        data: Buffer.from(data),
+    });
+}
+/**
+ * Creates the sequence of instructions required to wrap native tokens within a session.
+ *
+ * Note: This function sets the session key as the payer for the `CreateAssociatedTokenAccountIdempotent` instruction, which is unconventional since the session key can't spend funds.
+ * It works because at the time `CreateAssociatedTokenAccountIdempotent` is called, the `userTokenAccount` has already been funded by the `SessionWrap` instruction.
+ * The paymaster will reject the transaction if the payer of the `CreateAssociatedTokenAccountIdempotent` is set to the paymaster payer to avoid the paymaster's funds getting drained.
+ */
+export function createSessionWrapInstructions(sessionKey, walletPublicKey, amount) {
+    const userTokenAccount = getAssociatedTokenAddressSync(NATIVE_MINT, walletPublicKey);
+    return [
+        createSystemProgramSessionWrapInstruction(sessionKey, walletPublicKey, amount),
+        createAssociatedTokenAccountIdempotentInstruction(sessionKey, // This is unconventional! Read the note in the function's docs.
+        userTokenAccount, walletPublicKey, NATIVE_MINT),
+        createSyncNativeInstruction(userTokenAccount),
+    ];
+}
+/**
+ * Creates the instruction required to unwrap native tokens within a session.
+ */
+export function createSessionUnwrapInstruction(sessionKey, walletPublicKey) {
+    return createCloseAccountInstruction(getNativeMintAssociatedTokenAddressSync(walletPublicKey), walletPublicKey, sessionKey);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "A set of utilities for integrating with Fogo sessions",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
   "main": "./cjs/index.js",
   "types": "./cjs/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "exports": {
     ".": {
@@ -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",
-    "@fogo/sessions-idls": "^0.0.12"
+    "zod": "3.25.67",
+    "@fogo/sessions-idls": "^0.0.13"
   }
 }