@fogo/sessions-sdk 0.0.17 → 0.0.18

package/cjs/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/cjs/connection.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSessionConnection = exports.TransactionResultType = exports.DEFAULT_PAYMASTER = exports.DEFAULT_RPC = exports.Network = void 0;
+const compat_1 = require("@solana/compat");
+const kit_1 = require("@solana/kit");
+const web3_js_1 = require("@solana/web3.js");
+const zod_1 = require("zod");
+var Network;
+(function (Network) {
+    Network[Network["Testnet"] = 0] = "Testnet";
+    Network[Network["Mainnet"] = 1] = "Mainnet";
+})(Network || (exports.Network = Network = {}));
+exports.DEFAULT_RPC = {
+    [Network.Testnet]: "https://testnet.fogo.io",
+    [Network.Mainnet]: "https://mainnet.fogo.io",
+};
+exports.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,
+};
+var TransactionResultType;
+(function (TransactionResultType) {
+    TransactionResultType[TransactionResultType["Success"] = 0] = "Success";
+    TransactionResultType[TransactionResultType["Failed"] = 1] = "Failed";
+})(TransactionResultType || (exports.TransactionResultType = TransactionResultType = {}));
+const TransactionResult = {
+    Success: (signature) => ({
+        type: TransactionResultType.Success,
+        signature,
+    }),
+    Failed: (signature, error) => ({
+        type: TransactionResultType.Failed,
+        signature,
+        error,
+    }),
+};
+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 ?? exports.DEFAULT_RPC[options.network]).toString();
+    const rpc = (0, kit_1.createSolanaRpc)(rpcUrl);
+    const connection = new web3_js_1.Connection(rpcUrl, "confirmed");
+    return {
+        rpc,
+        connection,
+        sendToPaymaster: async (domain, sponsor, addressLookupTables, sessionKey, instructions) => {
+            const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
+            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),
+    };
+};
+exports.createSessionConnection = createSessionConnection;
+const sendToPaymaster = async (options, domain, transaction) => {
+    if (options.sendToPaymaster === undefined) {
+        const url = new URL("/api/sponsor_and_send", options.paymaster ?? exports.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: (0, kit_1.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 (0, kit_1.createSignerFromKeyPair)(sessionKey)
+        : undefined;
+    if (Array.isArray(instructions)) {
+        return (0, kit_1.partiallySignTransactionMessageWithSigners)((0, kit_1.pipe)((0, kit_1.createTransactionMessage)({ version: 0 }), (tx) => (0, kit_1.setTransactionMessageFeePayer)((0, compat_1.fromLegacyPublicKey)(sponsor), tx), (tx) => (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, tx), (tx) => (0, kit_1.appendTransactionMessageInstructions)(instructions.map((instruction) => instruction instanceof web3_js_1.TransactionInstruction
+            ? (0, compat_1.fromLegacyTransactionInstruction)(instruction)
+            : instruction), tx), (tx) => (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, Object.fromEntries(addressLookupTables?.map((table) => [
+            (0, compat_1.fromLegacyPublicKey)(table.key),
+            table.state.addresses.map((address) => (0, compat_1.fromLegacyPublicKey)(address)),
+        ]) ?? [])), (tx) => sessionKeySigner === undefined
+            ? tx
+            : (0, kit_1.addSignersToTransactionMessage)([sessionKeySigner], tx)));
+    }
+    else {
+        const tx = instructions instanceof web3_js_1.VersionedTransaction
+            ? (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
+            : (0, kit_1.partiallySignTransaction)([sessionKey], tx);
+    }
+};
+const sponsorAndSendResponseSchema = zod_1.z
+    .discriminatedUnion("type", [
+    zod_1.z.object({
+        type: zod_1.z.literal("success"),
+        signature: zod_1.z.string(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal("failed"),
+        signature: zod_1.z.string(),
+        error: zod_1.z.object({
+            InstructionError: zod_1.z.tuple([zod_1.z.number(), zod_1.z.unknown()]),
+        }),
+    }),
+])
+    .transform((data) => {
+    return data.type === "success"
+        ? TransactionResult.Success(data.signature)
+        : TransactionResult.Failed(data.signature, data.error);
+});
+const getSponsor = async (options, domain) => {
+    if (options.sponsor === undefined) {
+        const url = new URL("/api/sponsor_pubkey", options.paymaster ?? exports.DEFAULT_PAYMASTER[options.network]);
+        url.searchParams.set("domain", domain);
+        const response = await fetch(url);
+        if (response.status === 200) {
+            return new web3_js_1.PublicKey(zod_1.z.string().parse(await response.text()));
+        }
+        else {
+            throw new PaymasterResponseError(response.status, await response.text());
+        }
+    }
+    else {
+        return options.sponsor;
+    }
+};
+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 web3_js_1.PublicKey(altAddress));
+        return addressLookupTableResult.value
+            ? [addressLookupTableResult.value]
+            : undefined;
+    }
+    else {
+        return;
+    }
+};
+class PaymasterResponseError extends Error {
+    constructor(statusCode, message) {
+        super(`Paymaster sent a ${statusCode.toString()} response: ${message}`);
+        this.name = "PaymasterResponseError";
+    }
+}

package/cjs/context.d.ts

@@ -1,40 +1,15 @@
-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 SessionContext = {
-    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]>;
+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;
-} & ({
-    paymaster?: string | URL | undefined;
-    sendToPaymaster?: undefined;
-    sponsor?: undefined;
-} | {
-    paymaster?: undefined;
-    sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
-    sponsor: PublicKey;
-})) => Promise<SessionContext>;
-export {};
+}) => 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/cjs/context.js

@@ -1,137 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSessionContext = exports.TransactionResultType = void 0;
+exports.createSessionContext = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
-const compat_1 = require("@solana/compat");
-const kit_1 = require("@solana/kit");
 const web3_js_1 = require("@solana/web3.js");
-const zod_1 = require("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";
-var TransactionResultType;
-(function (TransactionResultType) {
-    TransactionResultType[TransactionResultType["Success"] = 0] = "Success";
-    TransactionResultType[TransactionResultType["Failed"] = 1] = "Failed";
-})(TransactionResultType || (exports.TransactionResultType = TransactionResultType = {}));
-const TransactionResult = {
-    Success: (signature) => ({
-        type: TransactionResultType.Success,
-        signature,
-    }),
-    Failed: (signature, error) => ({
-        type: TransactionResultType.Failed,
-        signature,
-        error,
-    }),
-};
 const createSessionContext = async (options) => {
-    const addressLookupTables = await getAddressLookupTables(options.connection, options.addressLookupTableAddress);
+    const addressLookupTables = await options.connection.getAddressLookupTables(options.addressLookupTableAddress);
     const domain = getDomain(options.domain);
-    const sponsor = await getSponsor(options, domain);
+    const sponsor = await options.connection.getSponsor(domain);
     return {
-        connection: options.connection,
-        payer: sponsor,
-        chainId: await fetchChainId(options.connection),
+        chainId: await fetchChainId(options.connection.connection),
         domain: getDomain(options.domain),
-        sendTransaction: async (sessionKey, instructions) => {
-            const rpc = (0, kit_1.createSolanaRpc)(options.connection.rpcEndpoint);
-            const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
-            return await sendToPaymaster(options, await buildTransaction(latestBlockhash, sessionKey, sponsor, instructions, addressLookupTables), domain);
-        },
+        payer: sponsor,
+        connection: options.connection.connection,
+        rpc: options.connection.rpc,
+        sendTransaction: (sessionKey, instructions) => options.connection.sendToPaymaster(domain, sponsor, addressLookupTables, sessionKey, instructions),
     };
 };
 exports.createSessionContext = createSessionContext;
-const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructions, addressLookupTables) => {
-    const sessionKeySigner = sessionKey
-        ? await (0, kit_1.createSignerFromKeyPair)(sessionKey)
-        : undefined;
-    if (Array.isArray(instructions)) {
-        return (0, kit_1.partiallySignTransactionMessageWithSigners)((0, kit_1.pipe)((0, kit_1.createTransactionMessage)({ version: 0 }), (tx) => (0, kit_1.setTransactionMessageFeePayer)((0, compat_1.fromLegacyPublicKey)(sponsor), tx), (tx) => (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, tx), (tx) => (0, kit_1.appendTransactionMessageInstructions)(instructions.map((instruction) => instruction instanceof web3_js_1.TransactionInstruction
-            ? (0, compat_1.fromLegacyTransactionInstruction)(instruction)
-            : instruction), tx), (tx) => (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, Object.fromEntries(addressLookupTables?.map((table) => [
-            (0, compat_1.fromLegacyPublicKey)(table.key),
-            table.state.addresses.map((address) => (0, compat_1.fromLegacyPublicKey)(address)),
-        ]) ?? [])), (tx) => sessionKeySigner === undefined
-            ? tx
-            : (0, kit_1.addSignersToTransactionMessage)([sessionKeySigner], tx)));
-    }
-    else {
-        const tx = instructions instanceof web3_js_1.VersionedTransaction
-            ? (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
-            : (0, kit_1.partiallySignTransaction)([sessionKey], tx);
-    }
-};
-const getSponsor = async (options, domain) => {
-    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);
-        if (response.status === 200) {
-            return new web3_js_1.PublicKey(zod_1.z.string().parse(await response.text()));
-        }
-        else {
-            throw new PaymasterResponseError(response.status, await response.text());
-        }
-    }
-    else {
-        return options.sponsor;
-    }
-};
-const sponsorAndSendResponseSchema = zod_1.z
-    .discriminatedUnion("type", [
-    zod_1.z.object({
-        type: zod_1.z.literal("success"),
-        signature: zod_1.z.string(),
-    }),
-    zod_1.z.object({
-        type: zod_1.z.literal("failed"),
-        signature: zod_1.z.string(),
-        error: zod_1.z.object({
-            InstructionError: zod_1.z.tuple([zod_1.z.number(), zod_1.z.unknown()]),
-        }),
-    }),
-])
-    .transform((data) => {
-    return data.type === "success"
-        ? TransactionResult.Success(data.signature)
-        : TransactionResult.Failed(data.signature, data.error);
-});
-const sendToPaymaster = async (options, transaction, domain) => {
-    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, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                transaction: (0, kit_1.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 getAddressLookupTables = async (connection, addressLookupTableAddress = DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS) => {
-    const addressLookupTableResult = await connection.getAddressLookupTable(new web3_js_1.PublicKey(addressLookupTableAddress));
-    return addressLookupTableResult.value
-        ? [addressLookupTableResult.value]
-        : undefined;
-};
 const fetchChainId = async (connection) => {
     const chainIdProgram = new sessions_idls_1.ChainIdProgram(new anchor_1.AnchorProvider(connection, { publicKey: new web3_js_1.Keypair().publicKey }, {})); // We mock the wallet because we don't need to sign anything
     const { chainIdAccount: chainIdAddress } = await chainIdProgram.methods
@@ -157,12 +45,6 @@ const getDomain = (requestedDomain) => {
         return requestedDomain;
     }
 };
-class PaymasterResponseError extends Error {
-    constructor(statusCode, message) {
-        super(`Paymaster sent a ${statusCode.toString()} response: ${message}`);
-        this.name = "PaymasterResponseError";
-    }
-}
 class NoChainIdAddressError extends Error {
     constructor() {
         super("Failed to derive chain ID address");

package/cjs/index.d.ts

@@ -2,8 +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 { SessionContext, TransactionResult } from "./context.js";
-export { createSessionContext, TransactionResultType, type SessionContext, type TransactionResult, } from "./context.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 = {
     context: SessionContext;
     walletPublicKey: 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.createSessionContext = 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.createSessionConnection = exports.TransactionResultType = exports.Network = 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,14 @@ 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 context_js_1 = require("./context.js");
+const connection_js_1 = require("./connection.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; } });
-Object.defineProperty(exports, "TransactionResultType", { enumerable: true, get: function () { return context_js_2.TransactionResultType; } });
+var context_js_1 = require("./context.js");
+Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_1.createSessionContext; } });
+var connection_js_2 = require("./connection.js");
+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; } });
 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.
 `;
@@ -61,13 +64,13 @@ exports.establishSession = establishSession;
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions) => {
     const result = await options.context.sendTransaction(sessionKey, instructions);
     switch (result.type) {
-        case context_js_1.TransactionResultType.Success: {
+        case connection_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 context_js_1.TransactionResultType.Failed: {
+        case connection_js_1.TransactionResultType.Failed: {
             return EstablishSessionResult.Failed(result.signature, result.error);
         }
     }

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/connection.js

@@ -0,0 +1,161 @@
+import { fromLegacyPublicKey, fromLegacyTransactionInstruction, fromVersionedTransaction, } from "@solana/compat";
+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";
+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";
+    TransactionResultType[TransactionResultType["Failed"] = 1] = "Failed";
+})(TransactionResultType || (TransactionResultType = {}));
+const TransactionResult = {
+    Success: (signature) => ({
+        type: TransactionResultType.Success,
+        signature,
+    }),
+    Failed: (signature, error) => ({
+        type: TransactionResultType.Failed,
+        signature,
+        error,
+    }),
+};
+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 {
+        rpc,
+        connection,
+        sendToPaymaster: async (domain, sponsor, addressLookupTables, sessionKey, instructions) => {
+            const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
+            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)
+        : undefined;
+    if (Array.isArray(instructions)) {
+        return partiallySignTransactionMessageWithSigners(pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayer(fromLegacyPublicKey(sponsor), tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructions.map((instruction) => instruction instanceof TransactionInstruction
+            ? fromLegacyTransactionInstruction(instruction)
+            : instruction), tx), (tx) => compressTransactionMessageUsingAddressLookupTables(tx, Object.fromEntries(addressLookupTables?.map((table) => [
+            fromLegacyPublicKey(table.key),
+            table.state.addresses.map((address) => fromLegacyPublicKey(address)),
+        ]) ?? [])), (tx) => sessionKeySigner === undefined
+            ? tx
+            : addSignersToTransactionMessage([sessionKeySigner], tx)));
+    }
+    else {
+        const tx = instructions instanceof VersionedTransaction
+            ? fromVersionedTransaction(instructions) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
+            : instructions;
+        return sessionKey === undefined
+            ? tx
+            : partiallySignTransaction([sessionKey], tx);
+    }
+};
+const sponsorAndSendResponseSchema = z
+    .discriminatedUnion("type", [
+    z.object({
+        type: z.literal("success"),
+        signature: z.string(),
+    }),
+    z.object({
+        type: z.literal("failed"),
+        signature: z.string(),
+        error: z.object({
+            InstructionError: z.tuple([z.number(), z.unknown()]),
+        }),
+    }),
+])
+    .transform((data) => {
+    return data.type === "success"
+        ? TransactionResult.Success(data.signature)
+        : TransactionResult.Failed(data.signature, data.error);
+});
+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);
+        if (response.status === 200) {
+            return new PublicKey(z.string().parse(await response.text()));
+        }
+        else {
+            throw new PaymasterResponseError(response.status, await response.text());
+        }
+    }
+    else {
+        return options.sponsor;
+    }
+};
+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;
+    }
+};
+class PaymasterResponseError extends Error {
+    constructor(statusCode, message) {
+        super(`Paymaster sent a ${statusCode.toString()} response: ${message}`);
+        this.name = "PaymasterResponseError";
+    }
+}

package/esm/context.d.ts

@@ -1,40 +1,15 @@
-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 SessionContext = {
-    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]>;
+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;
-} & ({
-    paymaster?: string | URL | undefined;
-    sendToPaymaster?: undefined;
-    sponsor?: undefined;
-} | {
-    paymaster?: undefined;
-    sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
-    sponsor: PublicKey;
-})) => Promise<SessionContext>;
-export {};
+}) => 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

@@ -1,133 +1,21 @@
 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 { z } from "zod";
+import { Connection as Web3Connection, Keypair } from "@solana/web3.js";
 // 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 TransactionResultType;
-(function (TransactionResultType) {
-    TransactionResultType[TransactionResultType["Success"] = 0] = "Success";
-    TransactionResultType[TransactionResultType["Failed"] = 1] = "Failed";
-})(TransactionResultType || (TransactionResultType = {}));
-const TransactionResult = {
-    Success: (signature) => ({
-        type: TransactionResultType.Success,
-        signature,
-    }),
-    Failed: (signature, error) => ({
-        type: TransactionResultType.Failed,
-        signature,
-        error,
-    }),
-};
 export const createSessionContext = async (options) => {
-    const addressLookupTables = await getAddressLookupTables(options.connection, options.addressLookupTableAddress);
+    const addressLookupTables = await options.connection.getAddressLookupTables(options.addressLookupTableAddress);
     const domain = getDomain(options.domain);
-    const sponsor = await getSponsor(options, domain);
+    const sponsor = await options.connection.getSponsor(domain);
     return {
-        connection: options.connection,
-        payer: sponsor,
-        chainId: await fetchChainId(options.connection),
+        chainId: await fetchChainId(options.connection.connection),
         domain: getDomain(options.domain),
-        sendTransaction: async (sessionKey, instructions) => {
-            const rpc = createSolanaRpc(options.connection.rpcEndpoint);
-            const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
-            return await sendToPaymaster(options, await buildTransaction(latestBlockhash, sessionKey, sponsor, instructions, addressLookupTables), domain);
-        },
+        payer: sponsor,
+        connection: options.connection.connection,
+        rpc: options.connection.rpc,
+        sendTransaction: (sessionKey, instructions) => options.connection.sendToPaymaster(domain, sponsor, addressLookupTables, sessionKey, instructions),
     };
 };
-const buildTransaction = async (latestBlockhash, sessionKey, sponsor, instructions, addressLookupTables) => {
-    const sessionKeySigner = sessionKey
-        ? await createSignerFromKeyPair(sessionKey)
-        : undefined;
-    if (Array.isArray(instructions)) {
-        return partiallySignTransactionMessageWithSigners(pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayer(fromLegacyPublicKey(sponsor), tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructions.map((instruction) => instruction instanceof TransactionInstruction
-            ? fromLegacyTransactionInstruction(instruction)
-            : instruction), tx), (tx) => compressTransactionMessageUsingAddressLookupTables(tx, Object.fromEntries(addressLookupTables?.map((table) => [
-            fromLegacyPublicKey(table.key),
-            table.state.addresses.map((address) => fromLegacyPublicKey(address)),
-        ]) ?? [])), (tx) => sessionKeySigner === undefined
-            ? tx
-            : addSignersToTransactionMessage([sessionKeySigner], tx)));
-    }
-    else {
-        const tx = instructions instanceof VersionedTransaction
-            ? fromVersionedTransaction(instructions) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
-            : instructions;
-        return sessionKey === undefined
-            ? tx
-            : partiallySignTransaction([sessionKey], tx);
-    }
-};
-const getSponsor = async (options, domain) => {
-    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);
-        if (response.status === 200) {
-            return new PublicKey(z.string().parse(await response.text()));
-        }
-        else {
-            throw new PaymasterResponseError(response.status, await response.text());
-        }
-    }
-    else {
-        return options.sponsor;
-    }
-};
-const sponsorAndSendResponseSchema = z
-    .discriminatedUnion("type", [
-    z.object({
-        type: z.literal("success"),
-        signature: z.string(),
-    }),
-    z.object({
-        type: z.literal("failed"),
-        signature: z.string(),
-        error: z.object({
-            InstructionError: z.tuple([z.number(), z.unknown()]),
-        }),
-    }),
-])
-    .transform((data) => {
-    return data.type === "success"
-        ? TransactionResult.Success(data.signature)
-        : TransactionResult.Failed(data.signature, data.error);
-});
-const sendToPaymaster = async (options, transaction, domain) => {
-    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, {
-            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 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
@@ -153,12 +41,6 @@ const getDomain = (requestedDomain) => {
         return requestedDomain;
     }
 };
-class PaymasterResponseError extends Error {
-    constructor(statusCode, message) {
-        super(`Paymaster sent a ${statusCode.toString()} response: ${message}`);
-        this.name = "PaymasterResponseError";
-    }
-}
 class NoChainIdAddressError extends Error {
     constructor() {
         super("Failed to derive chain ID address");

package/esm/index.d.ts

@@ -2,8 +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 { SessionContext, TransactionResult } from "./context.js";
-export { createSessionContext, TransactionResultType, type SessionContext, type TransactionResult, } from "./context.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 = {
     context: SessionContext;
     walletPublicKey: 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 "./context.js";
+import { TransactionResultType } from "./connection.js";
 import { importKey, signMessageWithKey, verifyMessageWithKey, } from "./crypto.js";
-export { createSessionContext, TransactionResultType, } from "./context.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.
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "A set of utilities for integrating with Fogo sessions",
   "keywords": [
     "fogo",