@fogo/sessions-sdk 0.0.15 → 0.0.17

package/cjs/{adapter.d.ts → context.d.ts}

@@ -1,12 +1,12 @@
-import type { Transaction, IInstruction } from "@solana/kit";
+import type { Transaction, Instruction, TransactionWithLifetime } from "@solana/kit";
 import type { Connection, TransactionError } from "@solana/web3.js";
 import { PublicKey, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
-export type SessionAdapter = {
+export type SessionContext = {
     chainId: string;
     connection: Connection;
     payer: PublicKey;
     domain: string;
-    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | IInstruction)[] | VersionedTransaction | Transaction) => Promise<TransactionResult>;
+    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime)) => Promise<TransactionResult>;
 };
 export declare enum TransactionResultType {
     Success = 0,
@@ -24,14 +24,17 @@ declare const TransactionResult: {
     };
 };
 export type TransactionResult = ReturnType<(typeof TransactionResult)[keyof typeof TransactionResult]>;
-export declare const createSolanaWalletAdapter: (options: {
+export declare const createSessionContext: (options: {
     connection: Connection;
     addressLookupTableAddress?: string | undefined;
     domain?: string | undefined;
 } & ({
     paymaster?: string | URL | undefined;
+    sendToPaymaster?: undefined;
+    sponsor?: undefined;
 } | {
+    paymaster?: undefined;
     sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
     sponsor: PublicKey;
-})) => Promise<SessionAdapter>;
+})) => Promise<SessionContext>;
 export {};

package/cjs/{adapter.js → context.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSolanaWalletAdapter = exports.TransactionResultType = void 0;
+exports.createSessionContext = exports.TransactionResultType = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
 const compat_1 = require("@solana/compat");
@@ -27,7 +27,7 @@ const TransactionResult = {
         error,
     }),
 };
-const createSolanaWalletAdapter = async (options) => {
+const createSessionContext = async (options) => {
     const addressLookupTables = await getAddressLookupTables(options.connection, options.addressLookupTableAddress);
     const domain = getDomain(options.domain);
     const sponsor = await getSponsor(options, domain);
@@ -43,7 +43,7 @@ const createSolanaWalletAdapter = async (options) => {
         },
     };
 };
-exports.createSolanaWalletAdapter = createSolanaWalletAdapter;
+exports.createSessionContext = createSessionContext;
 const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructions, addressLookupTables) => {
     const sessionKeySigner = sessionKey
         ? await (0, kit_1.createSignerFromKeyPair)(sessionKey)
@@ -60,7 +60,7 @@ const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructio
     }
     else {
         const tx = instructions instanceof web3_js_1.VersionedTransaction
-            ? (0, compat_1.fromVersionedTransaction)(instructions)
+            ? (0, compat_1.fromVersionedTransaction)(instructions) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
             : instructions;
         return sessionKey === undefined
             ? tx
@@ -68,10 +68,7 @@ const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructio
     }
 };
 const getSponsor = async (options, domain) => {
-    if ("sponsor" in options) {
-        return options.sponsor;
-    }
-    else {
+    if (options.sponsor === undefined) {
         const url = new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER);
         url.searchParams.set("domain", domain);
         const response = await fetch(url);
@@ -82,6 +79,9 @@ const getSponsor = async (options, domain) => {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
+    else {
+        return options.sponsor;
+    }
 };
 const sponsorAndSendResponseSchema = zod_1.z
     .discriminatedUnion("type", [
@@ -103,10 +103,7 @@ const sponsorAndSendResponseSchema = zod_1.z
         : TransactionResult.Failed(data.signature, data.error);
 });
 const sendToPaymaster = async (options, transaction, domain) => {
-    if ("sendToPaymaster" in options) {
-        return options.sendToPaymaster(transaction);
-    }
-    else {
+    if (options.sendToPaymaster === undefined) {
         const url = new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER);
         url.searchParams.set("domain", domain);
         const response = await fetch(url, {
@@ -125,6 +122,9 @@ const sendToPaymaster = async (options, transaction, domain) => {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
+    else {
+        return options.sendToPaymaster(transaction);
+    }
 };
 const getAddressLookupTables = async (connection, addressLookupTableAddress = DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS) => {
     const addressLookupTableResult = await connection.getAddressLookupTable(new web3_js_1.PublicKey(addressLookupTableAddress));

package/cjs/index.d.ts

@@ -2,10 +2,10 @@ import type { Connection, TransactionError } from "@solana/web3.js";
 import { PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
 import { z } from "zod";
-import type { SessionAdapter, TransactionResult } from "./adapter.js";
-export { createSolanaWalletAdapter, TransactionResultType, type SessionAdapter, type TransactionResult, } from "./adapter.js";
+import type { SessionContext, TransactionResult } from "./context.js";
+export { createSessionContext, TransactionResultType, type SessionContext, type TransactionResult, } from "./context.js";
 type EstablishSessionOptions = {
-    adapter: SessionAdapter;
+    context: SessionContext;
     walletPublicKey: PublicKey;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     expires: Date;
@@ -19,7 +19,7 @@ type EstablishSessionOptions = {
 });
 export declare const establishSession: (options: EstablishSessionOptions) => Promise<EstablishSessionResult>;
 export declare const replaceSession: (options: {
-    adapter: SessionAdapter;
+    context: SessionContext;
     session: Session;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     expires: Date;
@@ -31,10 +31,10 @@ export declare const replaceSession: (options: {
     unlimited: true;
 })) => Promise<EstablishSessionResult>;
 export declare const revokeSession: (options: {
-    adapter: SessionAdapter;
+    context: SessionContext;
     session: Session;
 }) => Promise<TransactionResult | undefined>;
-export declare const reestablishSession: (adapter: SessionAdapter, walletPublicKey: PublicKey, sessionKey: CryptoKeyPair) => Promise<Session | undefined>;
+export declare const reestablishSession: (context: SessionContext, walletPublicKey: PublicKey, sessionKey: CryptoKeyPair) => Promise<Session | undefined>;
 export declare const getSessionAccount: (connection: Connection, sessionPublicKey: PublicKey) => Promise<{
     authorizedPrograms: {
         type: AuthorizedProgramsType.All;
@@ -1302,11 +1302,11 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
-    sendTransaction: (instructions: Parameters<SessionAdapter["sendTransaction"]>[1]) => Promise<TransactionResult>;
+    sendTransaction: (instructions: Parameters<SessionContext["sendTransaction"]>[1]) => Promise<TransactionResult>;
     sessionInfo: NonNullable<z.infer<typeof sessionInfoSchema>>;
 };
 type SendTransferOptions = {
-    adapter: SessionAdapter;
+    context: SessionContext;
     walletPublicKey: PublicKey;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     mint: PublicKey;

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.sendTransfer = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.TransactionResultType = exports.createSolanaWalletAdapter = void 0;
+exports.verifyLogInToken = exports.createLogInToken = exports.sendTransfer = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.TransactionResultType = exports.createSessionContext = 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");
@@ -17,11 +17,11 @@ const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const bs58_1 = __importDefault(require("bs58"));
 const zod_1 = require("zod");
-const adapter_js_1 = require("./adapter.js");
+const context_js_1 = require("./context.js");
 const crypto_js_1 = require("./crypto.js");
-var adapter_js_2 = require("./adapter.js");
-Object.defineProperty(exports, "createSolanaWalletAdapter", { enumerable: true, get: function () { return adapter_js_2.createSolanaWalletAdapter; } });
-Object.defineProperty(exports, "TransactionResultType", { enumerable: true, get: function () { return adapter_js_2.TransactionResultType; } });
+var context_js_2 = require("./context.js");
+Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_2.createSessionContext; } });
+Object.defineProperty(exports, "TransactionResultType", { enumerable: true, get: function () { return context_js_2.TransactionResultType; } });
 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.
 `;
@@ -44,7 +44,7 @@ const establishSession = async (options) => {
     else {
         const filteredLimits = new Map(options.limits?.entries().filter(([, amount]) => amount > 0n));
         const tokenInfo = filteredLimits.size > 0
-            ? await getTokenInfo(options.adapter, filteredLimits)
+            ? await getTokenInfo(options.context, filteredLimits)
             : [];
         const [intentInstruction, startSessionInstruction] = await Promise.all([
             buildIntentInstruction(options, sessionKey, tokenInfo),
@@ -59,15 +59,15 @@ const establishSession = async (options) => {
 };
 exports.establishSession = establishSession;
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions) => {
-    const result = await options.adapter.sendTransaction(sessionKey, instructions);
+    const result = await options.context.sendTransaction(sessionKey, instructions);
     switch (result.type) {
-        case adapter_js_1.TransactionResultType.Success: {
-            const session = await createSession(options.adapter, options.walletPublicKey, sessionKey);
+        case context_js_1.TransactionResultType.Success: {
+            const session = await createSession(options.context, options.walletPublicKey, sessionKey);
             return session
                 ? EstablishSessionResult.Success(result.signature, session)
                 : EstablishSessionResult.Failed(result.signature, new Error("Transaction succeeded, but the session was not created"));
         }
-        case adapter_js_1.TransactionResultType.Failed: {
+        case context_js_1.TransactionResultType.Failed: {
             return EstablishSessionResult.Failed(result.signature, result.error);
         }
     }
@@ -79,14 +79,14 @@ const replaceSession = async (options) => (0, exports.establishSession)({
 exports.replaceSession = replaceSession;
 const revokeSession = async (options) => {
     if (options.session.sessionInfo.minor >= 2) {
-        const instruction = await new sessions_idls_1.SessionManagerProgram(new anchor_1.AnchorProvider(options.adapter.connection, {}, {})).methods
+        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,
         })
             .instruction();
-        return options.adapter.sendTransaction(options.session.sessionKey, [
+        return options.context.sendTransaction(options.session.sessionKey, [
             instruction,
         ]);
     }
@@ -95,7 +95,7 @@ const revokeSession = async (options) => {
     }
 };
 exports.revokeSession = revokeSession;
-const reestablishSession = async (adapter, walletPublicKey, sessionKey) => createSession(adapter, walletPublicKey, sessionKey);
+const reestablishSession = async (context, walletPublicKey, sessionKey) => createSession(context, walletPublicKey, sessionKey);
 exports.reestablishSession = reestablishSession;
 const getSessionAccount = async (connection, sessionPublicKey) => {
     const result = await connection.getAccountInfo(sessionPublicKey, "confirmed");
@@ -104,17 +104,17 @@ const getSessionAccount = async (connection, sessionPublicKey) => {
         : sessionInfoSchema.parse(new anchor_1.BorshAccountsCoder(sessions_idls_1.SessionManagerIdl).decode("Session", result.data));
 };
 exports.getSessionAccount = getSessionAccount;
-const createSession = async (adapter, walletPublicKey, sessionKey) => {
+const createSession = async (context, walletPublicKey, sessionKey) => {
     const sessionPublicKey = new web3_js_1.PublicKey(await (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey));
-    const sessionInfo = await (0, exports.getSessionAccount)(adapter.connection, sessionPublicKey);
+    const sessionInfo = await (0, exports.getSessionAccount)(context.connection, sessionPublicKey);
     return sessionInfo === undefined
         ? undefined
         : {
             sessionPublicKey,
             walletPublicKey,
             sessionKey,
-            payer: adapter.payer,
-            sendTransaction: (instructions) => adapter.sendTransaction(sessionKey, instructions),
+            payer: context.payer,
+            sendTransaction: (instructions) => context.sendTransaction(sessionKey, instructions),
             sessionInfo,
         };
 };
@@ -299,13 +299,13 @@ const SymbolOrMint = {
         mint,
     }),
 };
-const getTokenInfo = async (adapter, limits) => {
-    const umi = (0, umi_bundle_defaults_1.createUmi)(adapter.connection.rpcEndpoint);
+const getTokenInfo = async (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());
         const metadataAddress = (0, mpl_token_metadata_1.findMetadataPda)(umi, { mint: metaplexMint })[0];
         const [mintInfo, metadata] = await Promise.all([
-            (0, spl_token_1.getMint)(adapter.connection, mint),
+            (0, spl_token_1.getMint)(context.connection, mint),
             (0, mpl_token_metadata_1.safeFetchMetadata)(umi, metadataAddress),
         ]);
         return {
@@ -351,14 +351,14 @@ const addOffchainMessagePrefixToMessageIfNeeded = async (walletPublicKey, signat
 };
 const buildIntentInstruction = async (options, sessionKey, tokens) => {
     const message = await buildMessage({
-        chainId: options.adapter.chainId,
-        domain: options.adapter.domain,
+        chainId: options.context.chainId,
+        domain: options.context.domain,
         sessionKey,
         expires: options.expires,
         tokens,
         extra: options.extra,
     });
-    const intentSignature = await options.signMessage(message);
+    const intentSignature = (0, kit_1.signatureBytes)(await options.signMessage(message));
     return web3_js_1.Ed25519Program.createInstructionWithPublicKey({
         publicKey: options.walletPublicKey.toBytes(),
         signature: intentSignature,
@@ -417,19 +417,19 @@ const amountToString = (amount, decimals) => {
         ...(decimalTruncated === "" ? [] : [".", decimalTruncated]),
     ].join("");
 };
-const buildCreateAssociatedTokenAccountInstructions = (options, tokens) => tokens.map(({ mint }) => (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(options.adapter.payer, (0, spl_token_1.getAssociatedTokenAddressSync)(mint, options.walletPublicKey), options.walletPublicKey, mint));
+const buildCreateAssociatedTokenAccountInstructions = (options, tokens) => tokens.map(({ mint }) => (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(options.context.payer, (0, spl_token_1.getAssociatedTokenAddressSync)(mint, options.walletPublicKey), options.walletPublicKey, mint));
 const getDomainRecordAddress = (domain) => {
     const hash = (0, sha2_1.sha256)(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;
 const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
-    const instruction = new sessions_idls_1.SessionManagerProgram(new anchor_1.AnchorProvider(options.adapter.connection, {}, {})).methods
+    const instruction = new sessions_idls_1.SessionManagerProgram(new anchor_1.AnchorProvider(options.context.connection, {}, {})).methods
         .startSession()
         .accounts({
-        sponsor: options.adapter.payer,
+        sponsor: options.context.payer,
         session: await (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey),
-        domainRegistry: (0, exports.getDomainRecordAddress)(options.adapter.domain),
+        domainRegistry: (0, exports.getDomainRecordAddress)(options.context.domain),
     });
     return tokens === undefined
         ? instruction.instruction()
@@ -480,14 +480,14 @@ Signing this intent will transfer the tokens as described below.
 const sendTransfer = async (options) => {
     const sourceAta = (0, spl_token_1.getAssociatedTokenAddressSync)(options.mint, options.walletPublicKey);
     const destinationAta = (0, spl_token_1.getAssociatedTokenAddressSync)(options.mint, options.recipient);
-    const program = new sessions_idls_1.IntentTransferProgram(new anchor_1.AnchorProvider(options.adapter.connection, {}, {}));
-    const umi = (0, umi_bundle_defaults_1.createUmi)(options.adapter.connection.rpcEndpoint);
+    const program = new sessions_idls_1.IntentTransferProgram(new anchor_1.AnchorProvider(options.context.connection, {}, {}));
+    const umi = (0, umi_bundle_defaults_1.createUmi)(options.context.connection.rpcEndpoint);
     const metaplexMint = (0, umi_1.publicKey)(options.mint.toBase58());
     const metadataAddress = (0, mpl_token_metadata_1.findMetadataPda)(umi, { mint: metaplexMint })[0];
     const metadata = await (0, mpl_token_metadata_1.safeFetchMetadata)(umi, metadataAddress);
     const symbol = metadata?.symbol ?? undefined;
-    return options.adapter.sendTransaction(undefined, [
-        (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(options.adapter.payer, destinationAta, options.recipient, options.mint),
+    return options.context.sendTransaction(undefined, [
+        (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(options.context.payer, destinationAta, options.recipient, options.mint),
         await buildTransferIntentInstruction(program, options, symbol),
         await program.methods
             .sendTokens()
@@ -495,7 +495,7 @@ const sendTransfer = async (options) => {
             destination: destinationAta,
             mint: options.mint,
             source: sourceAta,
-            sponsor: options.adapter.payer,
+            sponsor: options.context.payer,
             // eslint-disable-next-line unicorn/no-null
             metadata: symbol === undefined ? null : new web3_js_1.PublicKey(metadataAddress),
         })
@@ -506,20 +506,20 @@ exports.sendTransfer = sendTransfer;
 const buildTransferIntentInstruction = async (program, options, symbol) => {
     const [nonce, { decimals }] = await Promise.all([
         getNonce(program, options.walletPublicKey),
-        (0, spl_token_1.getMint)(options.adapter.connection, options.mint),
+        (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.adapter.chainId,
+            chain_id: options.context.chainId,
             token: symbol ?? options.mint.toBase58(),
             amount: amountToString(options.amount, decimals),
             recipient: options.recipient.toBase58(),
             nonce: nonce === null ? "1" : nonce.nonce.add(new bn_js_1.default(1)).toString(),
         }),
     ].join("\n"));
-    const intentSignature = await options.signMessage(message);
+    const intentSignature = (0, kit_1.signatureBytes)(await options.signMessage(message));
     return web3_js_1.Ed25519Program.createInstructionWithPublicKey({
         publicKey: options.walletPublicKey.toBytes(),
         signature: intentSignature,

package/esm/{adapter.d.ts → context.d.ts}

@@ -1,12 +1,12 @@
-import type { Transaction, IInstruction } from "@solana/kit";
+import type { Transaction, Instruction, TransactionWithLifetime } from "@solana/kit";
 import type { Connection, TransactionError } from "@solana/web3.js";
 import { PublicKey, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
-export type SessionAdapter = {
+export type SessionContext = {
     chainId: string;
     connection: Connection;
     payer: PublicKey;
     domain: string;
-    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | IInstruction)[] | VersionedTransaction | Transaction) => Promise<TransactionResult>;
+    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime)) => Promise<TransactionResult>;
 };
 export declare enum TransactionResultType {
     Success = 0,
@@ -24,14 +24,17 @@ declare const TransactionResult: {
     };
 };
 export type TransactionResult = ReturnType<(typeof TransactionResult)[keyof typeof TransactionResult]>;
-export declare const createSolanaWalletAdapter: (options: {
+export declare const createSessionContext: (options: {
     connection: Connection;
     addressLookupTableAddress?: string | undefined;
     domain?: string | undefined;
 } & ({
     paymaster?: string | URL | undefined;
+    sendToPaymaster?: undefined;
+    sponsor?: undefined;
 } | {
+    paymaster?: undefined;
     sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
     sponsor: PublicKey;
-})) => Promise<SessionAdapter>;
+})) => Promise<SessionContext>;
 export {};

package/esm/{adapter.js → context.js}

@@ -24,7 +24,7 @@ const TransactionResult = {
         error,
     }),
 };
-export const createSolanaWalletAdapter = async (options) => {
+export const createSessionContext = async (options) => {
     const addressLookupTables = await getAddressLookupTables(options.connection, options.addressLookupTableAddress);
     const domain = getDomain(options.domain);
     const sponsor = await getSponsor(options, domain);
@@ -56,7 +56,7 @@ const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructio
     }
     else {
         const tx = instructions instanceof VersionedTransaction
-            ? fromVersionedTransaction(instructions)
+            ? fromVersionedTransaction(instructions) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
             : instructions;
         return sessionKey === undefined
             ? tx
@@ -64,10 +64,7 @@ const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructio
     }
 };
 const getSponsor = async (options, domain) => {
-    if ("sponsor" in options) {
-        return options.sponsor;
-    }
-    else {
+    if (options.sponsor === undefined) {
         const url = new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER);
         url.searchParams.set("domain", domain);
         const response = await fetch(url);
@@ -78,6 +75,9 @@ const getSponsor = async (options, domain) => {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
+    else {
+        return options.sponsor;
+    }
 };
 const sponsorAndSendResponseSchema = z
     .discriminatedUnion("type", [
@@ -99,10 +99,7 @@ const sponsorAndSendResponseSchema = z
         : TransactionResult.Failed(data.signature, data.error);
 });
 const sendToPaymaster = async (options, transaction, domain) => {
-    if ("sendToPaymaster" in options) {
-        return options.sendToPaymaster(transaction);
-    }
-    else {
+    if (options.sendToPaymaster === undefined) {
         const url = new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER);
         url.searchParams.set("domain", domain);
         const response = await fetch(url, {
@@ -121,6 +118,9 @@ const sendToPaymaster = async (options, transaction, domain) => {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
+    else {
+        return options.sendToPaymaster(transaction);
+    }
 };
 const getAddressLookupTables = async (connection, addressLookupTableAddress = DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS) => {
     const addressLookupTableResult = await connection.getAddressLookupTable(new PublicKey(addressLookupTableAddress));

package/esm/index.d.ts

@@ -2,10 +2,10 @@ import type { Connection, TransactionError } from "@solana/web3.js";
 import { PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
 import { z } from "zod";
-import type { SessionAdapter, TransactionResult } from "./adapter.js";
-export { createSolanaWalletAdapter, TransactionResultType, type SessionAdapter, type TransactionResult, } from "./adapter.js";
+import type { SessionContext, TransactionResult } from "./context.js";
+export { createSessionContext, TransactionResultType, type SessionContext, type TransactionResult, } from "./context.js";
 type EstablishSessionOptions = {
-    adapter: SessionAdapter;
+    context: SessionContext;
     walletPublicKey: PublicKey;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     expires: Date;
@@ -19,7 +19,7 @@ type EstablishSessionOptions = {
 });
 export declare const establishSession: (options: EstablishSessionOptions) => Promise<EstablishSessionResult>;
 export declare const replaceSession: (options: {
-    adapter: SessionAdapter;
+    context: SessionContext;
     session: Session;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     expires: Date;
@@ -31,10 +31,10 @@ export declare const replaceSession: (options: {
     unlimited: true;
 })) => Promise<EstablishSessionResult>;
 export declare const revokeSession: (options: {
-    adapter: SessionAdapter;
+    context: SessionContext;
     session: Session;
 }) => Promise<TransactionResult | undefined>;
-export declare const reestablishSession: (adapter: SessionAdapter, walletPublicKey: PublicKey, sessionKey: CryptoKeyPair) => Promise<Session | undefined>;
+export declare const reestablishSession: (context: SessionContext, walletPublicKey: PublicKey, sessionKey: CryptoKeyPair) => Promise<Session | undefined>;
 export declare const getSessionAccount: (connection: Connection, sessionPublicKey: PublicKey) => Promise<{
     authorizedPrograms: {
         type: AuthorizedProgramsType.All;
@@ -1302,11 +1302,11 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
-    sendTransaction: (instructions: Parameters<SessionAdapter["sendTransaction"]>[1]) => Promise<TransactionResult>;
+    sendTransaction: (instructions: Parameters<SessionContext["sendTransaction"]>[1]) => Promise<TransactionResult>;
     sessionInfo: NonNullable<z.infer<typeof sessionInfoSchema>>;
 };
 type SendTransferOptions = {
-    adapter: SessionAdapter;
+    context: SessionContext;
     walletPublicKey: PublicKey;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     mint: PublicKey;

package/esm/index.js

@@ -5,15 +5,15 @@ 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, verifySignature, } from "@solana/kit";
+import { generateKeyPair, getAddressFromPublicKey, getProgramDerivedAddress, signatureBytes, verifySignature, } from "@solana/kit";
 import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, getMint, } from "@solana/spl-token";
 import { Ed25519Program, PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
 import bs58 from "bs58";
 import { z } from "zod";
-import { TransactionResultType } from "./adapter.js";
+import { TransactionResultType } from "./context.js";
 import { importKey, signMessageWithKey, verifyMessageWithKey, } from "./crypto.js";
-export { createSolanaWalletAdapter, TransactionResultType, } from "./adapter.js";
+export { createSessionContext, TransactionResultType, } from "./context.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.
 `;
@@ -36,7 +36,7 @@ export const establishSession = async (options) => {
     else {
         const filteredLimits = new Map(options.limits?.entries().filter(([, amount]) => amount > 0n));
         const tokenInfo = filteredLimits.size > 0
-            ? await getTokenInfo(options.adapter, filteredLimits)
+            ? await getTokenInfo(options.context, filteredLimits)
             : [];
         const [intentInstruction, startSessionInstruction] = await Promise.all([
             buildIntentInstruction(options, sessionKey, tokenInfo),
@@ -50,10 +50,10 @@ export const establishSession = async (options) => {
     }
 };
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions) => {
-    const result = await options.adapter.sendTransaction(sessionKey, instructions);
+    const result = await options.context.sendTransaction(sessionKey, instructions);
     switch (result.type) {
         case TransactionResultType.Success: {
-            const session = await createSession(options.adapter, options.walletPublicKey, sessionKey);
+            const session = await createSession(options.context, options.walletPublicKey, sessionKey);
             return session
                 ? EstablishSessionResult.Success(result.signature, session)
                 : EstablishSessionResult.Failed(result.signature, new Error("Transaction succeeded, but the session was not created"));
@@ -69,14 +69,14 @@ export const replaceSession = async (options) => establishSession({
 });
 export const revokeSession = async (options) => {
     if (options.session.sessionInfo.minor >= 2) {
-        const instruction = await new SessionManagerProgram(new AnchorProvider(options.adapter.connection, {}, {})).methods
+        const instruction = await new SessionManagerProgram(new AnchorProvider(options.context.connection, {}, {})).methods
             .revokeSession()
             .accounts({
             sponsor: options.session.sessionInfo.sponsor,
             session: options.session.sessionPublicKey,
         })
             .instruction();
-        return options.adapter.sendTransaction(options.session.sessionKey, [
+        return options.context.sendTransaction(options.session.sessionKey, [
             instruction,
         ]);
     }
@@ -84,24 +84,24 @@ export const revokeSession = async (options) => {
         return;
     }
 };
-export const reestablishSession = async (adapter, walletPublicKey, sessionKey) => createSession(adapter, walletPublicKey, sessionKey);
+export const reestablishSession = async (context, walletPublicKey, sessionKey) => createSession(context, walletPublicKey, sessionKey);
 export const getSessionAccount = async (connection, sessionPublicKey) => {
     const result = await connection.getAccountInfo(sessionPublicKey, "confirmed");
     return result === null
         ? undefined
         : sessionInfoSchema.parse(new BorshAccountsCoder(SessionManagerIdl).decode("Session", result.data));
 };
-const createSession = async (adapter, walletPublicKey, sessionKey) => {
+const createSession = async (context, walletPublicKey, sessionKey) => {
     const sessionPublicKey = new PublicKey(await getAddressFromPublicKey(sessionKey.publicKey));
-    const sessionInfo = await getSessionAccount(adapter.connection, sessionPublicKey);
+    const sessionInfo = await getSessionAccount(context.connection, sessionPublicKey);
     return sessionInfo === undefined
         ? undefined
         : {
             sessionPublicKey,
             walletPublicKey,
             sessionKey,
-            payer: adapter.payer,
-            sendTransaction: (instructions) => adapter.sendTransaction(sessionKey, instructions),
+            payer: context.payer,
+            sendTransaction: (instructions) => context.sendTransaction(sessionKey, instructions),
             sessionInfo,
         };
 };
@@ -286,13 +286,13 @@ const SymbolOrMint = {
         mint,
     }),
 };
-const getTokenInfo = async (adapter, limits) => {
-    const umi = createUmi(adapter.connection.rpcEndpoint);
+const getTokenInfo = async (context, limits) => {
+    const umi = createUmi(context.connection.rpcEndpoint);
     return Promise.all(limits.entries().map(async ([mint, amount]) => {
         const metaplexMint = metaplexPublicKey(mint.toBase58());
         const metadataAddress = findMetadataPda(umi, { mint: metaplexMint })[0];
         const [mintInfo, metadata] = await Promise.all([
-            getMint(adapter.connection, mint),
+            getMint(context.connection, mint),
             safeFetchMetadata(umi, metadataAddress),
         ]);
         return {
@@ -338,14 +338,14 @@ const addOffchainMessagePrefixToMessageIfNeeded = async (walletPublicKey, signat
 };
 const buildIntentInstruction = async (options, sessionKey, tokens) => {
     const message = await buildMessage({
-        chainId: options.adapter.chainId,
-        domain: options.adapter.domain,
+        chainId: options.context.chainId,
+        domain: options.context.domain,
         sessionKey,
         expires: options.expires,
         tokens,
         extra: options.extra,
     });
-    const intentSignature = await options.signMessage(message);
+    const intentSignature = signatureBytes(await options.signMessage(message));
     return Ed25519Program.createInstructionWithPublicKey({
         publicKey: options.walletPublicKey.toBytes(),
         signature: intentSignature,
@@ -404,18 +404,18 @@ const amountToString = (amount, decimals) => {
         ...(decimalTruncated === "" ? [] : [".", decimalTruncated]),
     ].join("");
 };
-const buildCreateAssociatedTokenAccountInstructions = (options, tokens) => tokens.map(({ mint }) => createAssociatedTokenAccountIdempotentInstruction(options.adapter.payer, getAssociatedTokenAddressSync(mint, options.walletPublicKey), options.walletPublicKey, mint));
+const buildCreateAssociatedTokenAccountInstructions = (options, tokens) => tokens.map(({ mint }) => createAssociatedTokenAccountIdempotentInstruction(options.context.payer, getAssociatedTokenAddressSync(mint, options.walletPublicKey), options.walletPublicKey, mint));
 export const getDomainRecordAddress = (domain) => {
     const hash = sha256(domain);
     return PublicKey.findProgramAddressSync([Buffer.from("domain-record"), hash], new PublicKey(DomainRegistryIdl.address))[0];
 };
 const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
-    const instruction = new SessionManagerProgram(new AnchorProvider(options.adapter.connection, {}, {})).methods
+    const instruction = new SessionManagerProgram(new AnchorProvider(options.context.connection, {}, {})).methods
         .startSession()
         .accounts({
-        sponsor: options.adapter.payer,
+        sponsor: options.context.payer,
         session: await getAddressFromPublicKey(sessionKey.publicKey),
-        domainRegistry: getDomainRecordAddress(options.adapter.domain),
+        domainRegistry: getDomainRecordAddress(options.context.domain),
     });
     return tokens === undefined
         ? instruction.instruction()
@@ -466,14 +466,14 @@ Signing this intent will transfer the tokens as described below.
 export const sendTransfer = async (options) => {
     const sourceAta = getAssociatedTokenAddressSync(options.mint, options.walletPublicKey);
     const destinationAta = getAssociatedTokenAddressSync(options.mint, options.recipient);
-    const program = new IntentTransferProgram(new AnchorProvider(options.adapter.connection, {}, {}));
-    const umi = createUmi(options.adapter.connection.rpcEndpoint);
+    const program = new IntentTransferProgram(new AnchorProvider(options.context.connection, {}, {}));
+    const umi = createUmi(options.context.connection.rpcEndpoint);
     const metaplexMint = metaplexPublicKey(options.mint.toBase58());
     const metadataAddress = findMetadataPda(umi, { mint: metaplexMint })[0];
     const metadata = await safeFetchMetadata(umi, metadataAddress);
     const symbol = metadata?.symbol ?? undefined;
-    return options.adapter.sendTransaction(undefined, [
-        createAssociatedTokenAccountIdempotentInstruction(options.adapter.payer, destinationAta, options.recipient, options.mint),
+    return options.context.sendTransaction(undefined, [
+        createAssociatedTokenAccountIdempotentInstruction(options.context.payer, destinationAta, options.recipient, options.mint),
         await buildTransferIntentInstruction(program, options, symbol),
         await program.methods
             .sendTokens()
@@ -481,7 +481,7 @@ export const sendTransfer = async (options) => {
             destination: destinationAta,
             mint: options.mint,
             source: sourceAta,
-            sponsor: options.adapter.payer,
+            sponsor: options.context.payer,
             // eslint-disable-next-line unicorn/no-null
             metadata: symbol === undefined ? null : new PublicKey(metadataAddress),
         })
@@ -491,20 +491,20 @@ export const sendTransfer = async (options) => {
 const buildTransferIntentInstruction = async (program, options, symbol) => {
     const [nonce, { decimals }] = await Promise.all([
         getNonce(program, options.walletPublicKey),
-        getMint(options.adapter.connection, options.mint),
+        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.adapter.chainId,
+            chain_id: options.context.chainId,
             token: symbol ?? options.mint.toBase58(),
             amount: amountToString(options.amount, decimals),
             recipient: options.recipient.toBase58(),
             nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
         }),
     ].join("\n"));
-    const intentSignature = await options.signMessage(message);
+    const intentSignature = signatureBytes(await options.signMessage(message));
     return Ed25519Program.createInstructionWithPublicKey({
         publicKey: options.walletPublicKey.toBytes(),
         signature: intentSignature,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "A set of utilities for integrating with Fogo sessions",
   "keywords": [
     "fogo",
@@ -32,13 +32,13 @@
     "@metaplex-foundation/umi": "^1.2.0",
     "@metaplex-foundation/umi-bundle-defaults": "^1.2.0",
     "@noble/hashes": "^1.8.0",
-    "@solana/compat": "^2.1.1",
-    "@solana/kit": "^2.1.1",
+    "@solana/compat": "^4.0.0",
+    "@solana/kit": "^4.0.0",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.92.3",
     "bn.js": "^5.1.2",
     "bs58": "^6.0.0",
     "zod": "^3.25.62",
-    "@fogo/sessions-idls": "^0.0.6"
+    "@fogo/sessions-idls": "^0.0.7"
   }
 }