@fogo/sessions-sdk 0.0.16 → 0.0.18

package/esm/connection.d.ts

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

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

@@ -1,13 +1,24 @@
-import { AnchorProvider } from "@coral-xyz/anchor";
-import { ChainIdProgram } from "@fogo/sessions-idls";
 import { fromLegacyPublicKey, fromLegacyTransactionInstruction, fromVersionedTransaction, } from "@solana/compat";
-import { createTransactionMessage, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstructions, getBase64EncodedWireTransaction, partiallySignTransactionMessageWithSigners, pipe, createSolanaRpc, addSignersToTransactionMessage, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, partiallySignTransaction, } from "@solana/kit";
-import { PublicKey, Keypair, TransactionInstruction, VersionedTransaction, } from "@solana/web3.js";
+import { createSolanaRpc, getBase64EncodedWireTransaction, createTransactionMessage, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstructions, partiallySignTransactionMessageWithSigners, pipe, addSignersToTransactionMessage, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, partiallySignTransaction, } from "@solana/kit";
+import { Connection as Web3Connection, TransactionInstruction, VersionedTransaction, PublicKey, } from "@solana/web3.js";
 import { z } from "zod";
-// eslint-disable-next-line unicorn/no-typeof-undefined
-const IS_BROWSER = typeof globalThis.window !== "undefined";
-const DEFAULT_PAYMASTER = "https://paymaster.fogo.io";
-const DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS = "B8cUjJMqaWWTNNSTXBmeptjWswwCH1gTSCRYv4nu7kJW";
+export var Network;
+(function (Network) {
+    Network[Network["Testnet"] = 0] = "Testnet";
+    Network[Network["Mainnet"] = 1] = "Mainnet";
+})(Network || (Network = {}));
+export const DEFAULT_RPC = {
+    [Network.Testnet]: "https://testnet.fogo.io",
+    [Network.Mainnet]: "https://mainnet.fogo.io",
+};
+export const DEFAULT_PAYMASTER = {
+    [Network.Testnet]: "https://paymaster.fogo.io",
+    [Network.Mainnet]: "https://paymaster.dourolabs.app",
+};
+const DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS = {
+    [Network.Testnet]: "B8cUjJMqaWWTNNSTXBmeptjWswwCH1gTSCRYv4nu7kJW",
+    [Network.Mainnet]: undefined,
+};
 export var TransactionResultType;
 (function (TransactionResultType) {
     TransactionResultType[TransactionResultType["Success"] = 0] = "Success";
@@ -24,22 +35,51 @@ const TransactionResult = {
         error,
     }),
 };
-export const createSolanaWalletAdapter = async (options) => {
-    const addressLookupTables = await getAddressLookupTables(options.connection, options.addressLookupTableAddress);
-    const domain = getDomain(options.domain);
-    const sponsor = await getSponsor(options, domain);
+export const createSessionConnection = (options) => {
+    // For some reason, typescript is unable to narrow this type even though it's
+    // obvious that `rpc` can only be `undefined` if `network` is defined.  I
+    // don't like the non-null assertion, but here we can guarantee it's safe (and
+    // typescript really should be able to narrow this...)
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const rpcUrl = (options.rpc ?? DEFAULT_RPC[options.network]).toString();
+    const rpc = createSolanaRpc(rpcUrl);
+    const connection = new Web3Connection(rpcUrl, "confirmed");
     return {
-        connection: options.connection,
-        payer: sponsor,
-        chainId: await fetchChainId(options.connection),
-        domain: getDomain(options.domain),
-        sendTransaction: async (sessionKey, instructions) => {
-            const rpc = createSolanaRpc(options.connection.rpcEndpoint);
+        rpc,
+        connection,
+        sendToPaymaster: async (domain, sponsor, addressLookupTables, sessionKey, instructions) => {
             const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
-            return await sendToPaymaster(options, await buildTransaction(latestBlockhash, sessionKey, sponsor, instructions, addressLookupTables), domain);
+            const transaction = await buildTransaction(latestBlockhash, sessionKey, sponsor, instructions, addressLookupTables);
+            return sendToPaymaster(options, domain, transaction);
         },
+        getSponsor: (domain) => getSponsor(options, domain),
+        getAddressLookupTables: (addressLookupTableAddress) => getAddressLookupTables(options, connection, addressLookupTableAddress),
     };
 };
+const sendToPaymaster = async (options, domain, transaction) => {
+    if (options.sendToPaymaster === undefined) {
+        const url = new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
+        url.searchParams.set("domain", domain);
+        const response = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+                transaction: getBase64EncodedWireTransaction(transaction),
+            }),
+        });
+        if (response.status === 200) {
+            return sponsorAndSendResponseSchema.parse(await response.json());
+        }
+        else {
+            throw new PaymasterResponseError(response.status, await response.text());
+        }
+    }
+    else {
+        return options.sendToPaymaster(transaction);
+    }
+};
 const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructions, addressLookupTables) => {
     const sessionKeySigner = sessionKey
         ? await createSignerFromKeyPair(sessionKey)
@@ -63,22 +103,6 @@ const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructio
             : partiallySignTransaction([sessionKey], tx);
     }
 };
-const getSponsor = async (options, domain) => {
-    if ("sponsor" in options) {
-        return options.sponsor;
-    }
-    else {
-        const url = new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER);
-        url.searchParams.set("domain", domain);
-        const response = await fetch(url);
-        if (response.status === 200) {
-            return new PublicKey(z.string().parse(await response.text()));
-        }
-        else {
-            throw new PaymasterResponseError(response.status, await response.text());
-        }
-    }
-};
 const sponsorAndSendResponseSchema = z
     .discriminatedUnion("type", [
     z.object({
@@ -98,59 +122,35 @@ const sponsorAndSendResponseSchema = z
         ? TransactionResult.Success(data.signature)
         : TransactionResult.Failed(data.signature, data.error);
 });
-const sendToPaymaster = async (options, transaction, domain) => {
-    if ("sendToPaymaster" in options) {
-        return options.sendToPaymaster(transaction);
-    }
-    else {
-        const url = new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER);
+const getSponsor = async (options, domain) => {
+    if (options.sponsor === undefined) {
+        const url = new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
         url.searchParams.set("domain", domain);
-        const response = await fetch(url, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                transaction: getBase64EncodedWireTransaction(transaction),
-            }),
-        });
+        const response = await fetch(url);
         if (response.status === 200) {
-            return sponsorAndSendResponseSchema.parse(await response.json());
+            return new PublicKey(z.string().parse(await response.text()));
         }
         else {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
-};
-const getAddressLookupTables = async (connection, addressLookupTableAddress = DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS) => {
-    const addressLookupTableResult = await connection.getAddressLookupTable(new PublicKey(addressLookupTableAddress));
-    return addressLookupTableResult.value
-        ? [addressLookupTableResult.value]
-        : undefined;
-};
-const fetchChainId = async (connection) => {
-    const chainIdProgram = new ChainIdProgram(new AnchorProvider(connection, { publicKey: new Keypair().publicKey }, {})); // We mock the wallet because we don't need to sign anything
-    const { chainIdAccount: chainIdAddress } = await chainIdProgram.methods
-        .set("")
-        .pubkeys(); // We use Anchor to derive the chain ID address, not caring about the actual argument of `set`
-    if (chainIdAddress === undefined) {
-        throw new NoChainIdAddressError();
+    else {
+        return options.sponsor;
     }
-    const chainId = await chainIdProgram.account.chainId.fetch(chainIdAddress);
-    return chainId.chainId;
 };
-const getDomain = (requestedDomain) => {
-    const detectedDomain = IS_BROWSER ? globalThis.location.origin : undefined;
-    if (requestedDomain === undefined) {
-        if (detectedDomain === undefined) {
-            throw new DomainRequiredError();
-        }
-        else {
-            return detectedDomain;
-        }
+const getAddressLookupTables = async (options, connection, addressLookupTableAddress) => {
+    const altAddress = addressLookupTableAddress ??
+        (options.network === undefined
+            ? undefined
+            : DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS[options.network]);
+    if (altAddress) {
+        const addressLookupTableResult = await connection.getAddressLookupTable(new PublicKey(altAddress));
+        return addressLookupTableResult.value
+            ? [addressLookupTableResult.value]
+            : undefined;
     }
     else {
-        return requestedDomain;
+        return;
     }
 };
 class PaymasterResponseError extends Error {
@@ -159,15 +159,3 @@ class PaymasterResponseError extends Error {
         this.name = "PaymasterResponseError";
     }
 }
-class NoChainIdAddressError extends Error {
-    constructor() {
-        super("Failed to derive chain ID address");
-        this.name = "NoChainIdAddressError";
-    }
-}
-class DomainRequiredError extends Error {
-    constructor() {
-        super("On platforms where the origin cannot be determined, you must pass a domain to create a session.");
-        this.name = "DomainRequiredError";
-    }
-}

package/esm/context.d.ts

@@ -0,0 +1,15 @@
+import { Connection as Web3Connection } from "@solana/web3.js";
+import type { Connection } from "./connection.js";
+export declare const createSessionContext: (options: {
+    connection: Connection;
+    addressLookupTableAddress?: string | undefined;
+    domain?: string | undefined;
+}) => Promise<{
+    chainId: string;
+    domain: string;
+    payer: import("@solana/web3.js").PublicKey;
+    connection: Web3Connection;
+    rpc: import("@solana/kit").Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & import("@solana/kit").GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
+    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: Parameters<typeof options.connection.sendToPaymaster>[4]) => Promise<import("./connection.js").TransactionResult>;
+}>;
+export type SessionContext = Awaited<ReturnType<typeof createSessionContext>>;

package/esm/context.js

@@ -0,0 +1,55 @@
+import { AnchorProvider } from "@coral-xyz/anchor";
+import { ChainIdProgram } from "@fogo/sessions-idls";
+import { Connection as Web3Connection, Keypair } from "@solana/web3.js";
+// eslint-disable-next-line unicorn/no-typeof-undefined
+const IS_BROWSER = typeof globalThis.window !== "undefined";
+export const createSessionContext = async (options) => {
+    const addressLookupTables = await options.connection.getAddressLookupTables(options.addressLookupTableAddress);
+    const domain = getDomain(options.domain);
+    const sponsor = await options.connection.getSponsor(domain);
+    return {
+        chainId: await fetchChainId(options.connection.connection),
+        domain: getDomain(options.domain),
+        payer: sponsor,
+        connection: options.connection.connection,
+        rpc: options.connection.rpc,
+        sendTransaction: (sessionKey, instructions) => options.connection.sendToPaymaster(domain, sponsor, addressLookupTables, sessionKey, instructions),
+    };
+};
+const fetchChainId = async (connection) => {
+    const chainIdProgram = new ChainIdProgram(new AnchorProvider(connection, { publicKey: new Keypair().publicKey }, {})); // We mock the wallet because we don't need to sign anything
+    const { chainIdAccount: chainIdAddress } = await chainIdProgram.methods
+        .set("")
+        .pubkeys(); // We use Anchor to derive the chain ID address, not caring about the actual argument of `set`
+    if (chainIdAddress === undefined) {
+        throw new NoChainIdAddressError();
+    }
+    const chainId = await chainIdProgram.account.chainId.fetch(chainIdAddress);
+    return chainId.chainId;
+};
+const getDomain = (requestedDomain) => {
+    const detectedDomain = IS_BROWSER ? globalThis.location.origin : undefined;
+    if (requestedDomain === undefined) {
+        if (detectedDomain === undefined) {
+            throw new DomainRequiredError();
+        }
+        else {
+            return detectedDomain;
+        }
+    }
+    else {
+        return requestedDomain;
+    }
+};
+class NoChainIdAddressError extends Error {
+    constructor() {
+        super("Failed to derive chain ID address");
+        this.name = "NoChainIdAddressError";
+    }
+}
+class DomainRequiredError extends Error {
+    constructor() {
+        super("On platforms where the origin cannot be determined, you must pass a domain to create a session.");
+        this.name = "DomainRequiredError";
+    }
+}

package/esm/index.d.ts

@@ -2,10 +2,12 @@ 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 { TransactionResult } from "./connection.js";
+import type { SessionContext } from "./context.js";
+export { type SessionContext, createSessionContext } from "./context.js";
+export { type TransactionResult, type Connection, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
 type EstablishSessionOptions = {
-    adapter: SessionAdapter;
+    context: SessionContext;
     walletPublicKey: PublicKey;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     expires: Date;
@@ -19,7 +21,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 +33,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 +1304,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

@@ -11,9 +11,10 @@ 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 "./connection.js";
 import { importKey, signMessageWithKey, verifyMessageWithKey, } from "./crypto.js";
-export { createSolanaWalletAdapter, TransactionResultType, } from "./adapter.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.
 `;
@@ -36,7 +37,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 +51,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 +70,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 +85,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 +287,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,8 +339,8 @@ 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,
@@ -404,18 +405,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 +467,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 +482,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,13 +492,13 @@ 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(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "A set of utilities for integrating with Fogo sessions",
   "keywords": [
     "fogo",
@@ -39,6 +39,6 @@
     "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"
   }
 }

package/cjs/adapter.d.ts

@@ -1,37 +0,0 @@
-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 = {
-    chainId: string;
-    connection: Connection;
-    payer: PublicKey;
-    domain: string;
-    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime)) => Promise<TransactionResult>;
-};
-export declare enum TransactionResultType {
-    Success = 0,
-    Failed = 1
-}
-declare const TransactionResult: {
-    Success: (signature: string) => {
-        type: TransactionResultType.Success;
-        signature: string;
-    };
-    Failed: (signature: string, error: TransactionError) => {
-        type: TransactionResultType.Failed;
-        signature: string;
-        error: TransactionError;
-    };
-};
-export type TransactionResult = ReturnType<(typeof TransactionResult)[keyof typeof TransactionResult]>;
-export declare const createSolanaWalletAdapter: (options: {
-    connection: Connection;
-    addressLookupTableAddress?: string | undefined;
-    domain?: string | undefined;
-} & ({
-    paymaster?: string | URL | undefined;
-} | {
-    sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
-    sponsor: PublicKey;
-})) => Promise<SessionAdapter>;
-export {};