@fogo/sessions-sdk 0.1.0 → 0.1.1

package/cjs/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyLogInToken = exports.createLogInToken = exports.bridgeIn = exports.bridgeOut = exports.sendNativeTransfer = exports.sendTransfer = exports.getBridgeOutFee = exports.getTransferFee = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.createSessionContext = exports.TransactionResultType = exports.Network = exports.createSessionConnection = void 0;
+exports.verifyLogInToken = exports.createLogInToken = exports.bridgeIn = exports.bridgeOut = exports.sendNativeTransfer = exports.sendTransfer = exports.getBridgeOutFee = exports.getTransferFee = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.Network = exports.createSystemProgramSessionWrapInstruction = exports.createSessionWrapInstructions = exports.createSessionUnwrapInstruction = exports.createSessionContext = exports.TransactionResultType = exports.createSessionConnection = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
 const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
@@ -27,12 +27,19 @@ const connection_js_1 = require("./connection.js");
 const context_js_1 = require("./context.js");
 const crypto_js_1 = require("./crypto.js");
 const instructions_js_1 = require("./instructions.js");
+const mints_js_1 = require("./mints.js");
+const network_js_1 = require("./network.js");
 var connection_js_2 = require("./connection.js");
 Object.defineProperty(exports, "createSessionConnection", { enumerable: true, get: function () { return connection_js_2.createSessionConnection; } });
-Object.defineProperty(exports, "Network", { enumerable: true, get: function () { return connection_js_2.Network; } });
 Object.defineProperty(exports, "TransactionResultType", { enumerable: true, get: function () { return connection_js_2.TransactionResultType; } });
 var context_js_2 = require("./context.js");
 Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_2.createSessionContext; } });
+var instructions_js_2 = require("./instructions.js");
+Object.defineProperty(exports, "createSessionUnwrapInstruction", { enumerable: true, get: function () { return instructions_js_2.createSessionUnwrapInstruction; } });
+Object.defineProperty(exports, "createSessionWrapInstructions", { enumerable: true, get: function () { return instructions_js_2.createSessionWrapInstructions; } });
+Object.defineProperty(exports, "createSystemProgramSessionWrapInstruction", { enumerable: true, get: function () { return instructions_js_2.createSystemProgramSessionWrapInstruction; } });
+var network_js_2 = require("./network.js");
+Object.defineProperty(exports, "Network", { enumerable: true, get: function () { return network_js_2.Network; } });
 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.
 `;
@@ -45,8 +52,8 @@ const CURRENT_INTENT_TRANSFER_MINOR = "2";
 const CURRENT_BRIDGE_OUT_MAJOR = "0";
 const CURRENT_BRIDGE_OUT_MINOR = "2";
 const SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS = {
-    [connection_js_1.Network.Testnet]: "B8cUjJMqaWWTNNSTXBmeptjWswwCH1gTSCRYv4nu7kJW",
-    [connection_js_1.Network.Mainnet]: undefined,
+    [network_js_1.Network.Testnet]: "B8cUjJMqaWWTNNSTXBmeptjWswwCH1gTSCRYv4nu7kJW",
+    [network_js_1.Network.Mainnet]: undefined,
 };
 const establishSession = async (options) => {
     const sessionKey = options.createUnsafeExtractableSessionKey
@@ -72,7 +79,7 @@ const establishSession = async (options) => {
 };
 exports.establishSession = establishSession;
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions, sessionEstablishmentLookupTable) => {
-    const result = await options.context.sendTransaction(sessionKey, instructions, {
+    const result = await options.context.sendTransaction(sessionKey, instructions, options.walletPublicKey, {
         variation: "Session Establishment",
         addressLookupTable: sessionEstablishmentLookupTable ??
             SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS[options.context.network],
@@ -103,7 +110,7 @@ const revokeSession = async (options) => {
             session: options.session.sessionPublicKey,
         })
             .instruction();
-        return options.context.sendTransaction(options.session.sessionKey, [instruction], {
+        return options.context.sendTransaction(options.session.sessionKey, [instruction], options.session.walletPublicKey, {
             variation: "Session Revocation",
         });
     }
@@ -136,7 +143,7 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
             getSessionUnwrapInstructions: () => [
                 (0, instructions_js_1.createSessionUnwrapInstruction)(sessionPublicKey, walletPublicKey),
             ],
-            sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, extraConfig),
+            sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, walletPublicKey, extraConfig),
             sessionInfo,
         };
 };
@@ -443,11 +450,11 @@ const getDomainRecordAddress = (domain) => {
 };
 exports.getDomainRecordAddress = getDomainRecordAddress;
 const BRIDGING_ADDRESS_LOOKUP_TABLE = {
-    [connection_js_1.Network.Testnet]: {
+    [network_js_1.Network.Testnet]: {
         // USDC
         ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND: "4FCi6LptexBdZtaePsoCMeb1XpCijxnWu96g5LsSb6WP",
     },
-    [connection_js_1.Network.Mainnet]: {
+    [network_js_1.Network.Mainnet]: {
         // USDC
         uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG: "7hmMz3nZDnPJfksLuPotKmUBAFDneM2D9wWg3R1VcKSv",
     },
@@ -503,11 +510,6 @@ const EstablishSessionResult = {
         error,
     }),
 };
-const USDC_MINT = {
-    [connection_js_1.Network.Mainnet]: "uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG",
-    [connection_js_1.Network.Testnet]: "ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND",
-};
-const USDC_DECIMALS = 6;
 const getTransferFee = async (context) => {
     const { fee, ...config } = await getFee(context);
     return {
@@ -527,7 +529,7 @@ exports.getBridgeOutFee = getBridgeOutFee;
 const getFee = async (context) => {
     const program = new sessions_idls_1.IntentTransferProgram(new anchor_1.AnchorProvider(context.connection, {}, {}));
     const umi = (0, umi_bundle_defaults_1.createUmi)(context.connection.rpcEndpoint);
-    const usdcMintAddress = USDC_MINT[context.network];
+    const usdcMintAddress = mints_js_1.USDC_MINT[context.network];
     const usdcMint = new web3_js_1.PublicKey(usdcMintAddress);
     const [feeConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fee_config"), usdcMint.toBytes()], program.programId);
     const feeConfig = await program.account.feeConfig.fetch(feeConfigPda);
@@ -537,7 +539,7 @@ const getFee = async (context) => {
         })[0],
         mint: usdcMint,
         symbolOrMint: "USDC.s",
-        decimals: USDC_DECIMALS,
+        decimals: mints_js_1.USDC_DECIMALS,
         fee: {
             intrachainTransfer: BigInt(feeConfig.intrachainTransferFee.toString()),
             bridgeTransfer: BigInt(feeConfig.bridgeTransferFee.toString()),
@@ -572,7 +574,7 @@ const sendTransfer = async (options) => {
             symbol === undefined ? null : new web3_js_1.PublicKey(metadataAddress),
         })
             .instruction(),
-    ], {
+    ], options.walletPublicKey, {
         variation: "Intent Transfer",
         paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
     });
@@ -609,7 +611,7 @@ const sendNativeTransfer = async (options) => {
             sponsor: options.context.internalPayer,
         })
             .instruction(),
-    ], {
+    ], options.walletPublicKey, {
         variation: "Intent Transfer",
         paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
     });
@@ -673,7 +675,7 @@ const bridgeOut = async (options) => {
     return options.context.sendTransaction(options.sessionKey, [
         web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: BRIDGE_OUT_CUS }),
         ...instructions,
-    ], {
+    ], options.walletPublicKey, {
         variation: "Intent NTT Bridge",
         paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
         extraSigners: [outboxItem],
@@ -830,8 +832,8 @@ const buildWormholeTransfer = async (options, connection) => {
     }
 };
 const NETWORK_TO_WORMHOLE_NETWORK = {
-    [connection_js_1.Network.Mainnet]: "Mainnet",
-    [connection_js_1.Network.Testnet]: "Testnet",
+    [network_js_1.Network.Mainnet]: "Mainnet",
+    [network_js_1.Network.Testnet]: "Testnet",
 };
 const getNonce = async (program, walletPublicKey, nonceType) => {
     const [noncePda] = await (0, kit_1.getProgramDerivedAddress)({

package/cjs/mints.d.ts

@@ -0,0 +1,5 @@
+export declare const USDC_MINT: {
+    1: string;
+    0: string;
+};
+export declare const USDC_DECIMALS = 6;

package/cjs/mints.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USDC_DECIMALS = exports.USDC_MINT = void 0;
+const network_js_1 = require("./network.js");
+exports.USDC_MINT = {
+    [network_js_1.Network.Mainnet]: "uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG",
+    [network_js_1.Network.Testnet]: "ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND",
+};
+exports.USDC_DECIMALS = 6;

package/cjs/network.d.ts

@@ -0,0 +1,4 @@
+export declare enum Network {
+    Testnet = 0,
+    Mainnet = 1
+}

package/cjs/network.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Network = void 0;
+var Network;
+(function (Network) {
+    Network[Network["Testnet"] = 0] = "Testnet";
+    Network[Network["Mainnet"] = 1] = "Mainnet";
+})(Network || (exports.Network = Network = {}));

package/esm/connection.d.ts

@@ -1,10 +1,7 @@
 import type { GetLatestBlockhashApi, Instruction, Rpc, Transaction, TransactionWithLifetime } from "@solana/kit";
 import type { TransactionError } from "@solana/web3.js";
 import { Keypair, PublicKey, TransactionInstruction, VersionedTransaction, Connection as Web3Connection } from "@solana/web3.js";
-export declare enum Network {
-    Testnet = 0,
-    Mainnet = 1
-}
+import { Network } from "./network.js";
 export declare enum TransactionResultType {
     Success = 0,
     Failed = 1
@@ -37,7 +34,7 @@ export declare const createSessionConnection: (options: {
     connection: Web3Connection;
     network: Network;
     getSolanaConnection: () => Promise<Web3Connection>;
-    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
+    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, walletPublicKey: PublicKey, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     getSponsor: (domain: string) => Promise<PublicKey>;
 };
 export type TransactionOrInstructions = (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime);

package/esm/connection.js

@@ -1,12 +1,13 @@
+import { AnchorProvider, BN, Wallet } from "@coral-xyz/anchor";
+import { TollboothIdl, TollboothProgram } from "@fogo/sessions-idls";
+import { sha256 } from "@noble/hashes/sha2";
 import { fromLegacyKeypair, fromLegacyPublicKey, fromLegacyTransactionInstruction, fromVersionedTransaction, } from "@solana/compat";
-import { addSignersToTransactionMessage, appendTransactionMessageInstructions, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, createSolanaRpc, createTransactionMessage, getBase64EncodedWireTransaction, partiallySignTransaction, partiallySignTransactionMessageWithSigners, pipe, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, } from "@solana/kit";
+import { addSignersToTransactionMessage, appendTransactionMessageInstructions, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, createSolanaRpc, createTransactionMessage, getAddressFromPublicKey, getBase64EncodedWireTransaction, partiallySignTransaction, partiallySignTransactionMessageWithSigners, pipe, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, } from "@solana/kit";
+import { getAssociatedTokenAddressSync } from "@solana/spl-token";
 import { Keypair, PublicKey, TransactionInstruction, VersionedTransaction, Connection as Web3Connection, } 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 = {}));
+import { USDC_MINT } from "./mints.js";
+import { Network } from "./network.js";
 const DEFAULT_RPC = {
     [Network.Testnet]: "https://testnet.fogo.io",
     [Network.Mainnet]: "https://mainnet.fogo.io",
@@ -42,7 +43,7 @@ export const createSessionConnection = (options) => {
         connection,
         network: options.network,
         getSolanaConnection: createSolanaConnectionGetter(options.network),
-        sendToPaymaster: async (domain, sessionKey, instructions, extraConfig) => sendToPaymaster({ ...options, rpc, connection, addressLookupTableCache, sponsorCache }, domain, sessionKey, instructions, extraConfig),
+        sendToPaymaster: async (domain, sessionKey, instructions, walletPublicKey, extraConfig) => sendToPaymaster({ ...options, rpc, connection, addressLookupTableCache, sponsorCache }, domain, sessionKey, instructions, walletPublicKey, extraConfig),
         getSponsor: (domain) => getSponsor(options, sponsorCache, domain),
     };
 };
@@ -68,10 +69,10 @@ const NETWORK_TO_QUERY_PARAM = {
     [Network.Mainnet]: "mainnet",
     [Network.Testnet]: "testnet",
 };
-const sendToPaymaster = async (connection, domain, sessionKey, instructions, extraConfig) => {
+const sendToPaymaster = async (connection, domain, sessionKey, instructions, walletPublicKey, extraConfig) => {
     const signerKeys = await getSignerKeys(sessionKey, extraConfig?.extraSigners);
     const transaction = Array.isArray(instructions)
-        ? await buildTransaction(connection, domain, signerKeys, instructions, extraConfig)
+        ? await buildTransaction(connection, domain, sessionKey, signerKeys, instructions, walletPublicKey, extraConfig)
         : await addSignaturesToExistingTransaction(instructions, signerKeys);
     if (connection.sendToPaymaster === undefined) {
         const url = new URL("/api/sponsor_and_send", connection.paymaster ?? DEFAULT_PAYMASTER[connection.network]);
@@ -99,8 +100,9 @@ const sendToPaymaster = async (connection, domain, sessionKey, instructions, ext
         return connection.sendToPaymaster(transaction);
     }
 };
-const buildTransaction = async (connection, domain, signerKeys, instructions, extraConfig) => {
-    const [{ value: latestBlockhash }, sponsor, addressLookupTable, signers] = await Promise.all([
+const buildTransaction = async (connection, domain, sessionKey, signerKeys, instructions, walletPublicKey, extraConfig) => {
+    const feeMint = new PublicKey(USDC_MINT[connection.network]); // TODO: make this configurable
+    const [{ value: latestBlockhash }, sponsor, addressLookupTable, signers, feeAmount, sessionKeyAddress,] = await Promise.all([
         connection.rpc.getLatestBlockhash().send(),
         connection.sponsor === undefined
             ? getSponsor(connection, connection.sponsorCache, domain)
@@ -109,15 +111,51 @@ const buildTransaction = async (connection, domain, signerKeys, instructions, ex
             ? Promise.resolve(undefined)
             : getAddressLookupTable(connection.connection, connection.addressLookupTableCache, extraConfig.addressLookupTable),
         Promise.all(signerKeys.map((signer) => createSignerFromKeyPair(signer))),
+        getFee(connection, domain, extraConfig?.variation, feeMint),
+        sessionKey === undefined
+            ? Promise.resolve(undefined)
+            : getAddressFromPublicKey(sessionKey.publicKey),
     ]);
+    const tollboothInstruction = await buildTollboothInstructionIfNeeded({
+        sessionKeyAddress,
+        walletPublicKey,
+        domain,
+        feeMint,
+        feeAmount,
+    });
     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) => addressLookupTable === undefined
+        : instruction), tx), (tx) => tollboothInstruction === undefined
+        ? tx
+        : appendTransactionMessageInstructions([tollboothInstruction], tx), (tx) => addressLookupTable === undefined
         ? tx
         : compressTransactionMessageUsingAddressLookupTables(tx, {
             [fromLegacyPublicKey(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => fromLegacyPublicKey(address)),
         }), (tx) => addSignersToTransactionMessage(signers, tx)));
 };
+const getDomainTollRecipientAddress = (domain) => {
+    const hash = sha256(domain);
+    return PublicKey.findProgramAddressSync([Buffer.from("toll_recipient"), Buffer.from([0]), hash], new PublicKey(TollboothIdl.address))[0];
+};
+const buildTollboothInstructionIfNeeded = async ({ sessionKeyAddress, walletPublicKey, domain, feeMint, feeAmount, }) => {
+    if (feeAmount.gt(new BN(0)) && sessionKeyAddress !== undefined) {
+        const userTokenAccount = getAssociatedTokenAddressSync(feeMint, walletPublicKey);
+        const recipient = getDomainTollRecipientAddress(domain);
+        const instruction = await new TollboothProgram(new AnchorProvider({}, {})).methods
+            .payToll(feeAmount, 0)
+            .accounts({
+            session: new PublicKey(sessionKeyAddress),
+            source: userTokenAccount,
+            destination: getAssociatedTokenAddressSync(feeMint, recipient, true),
+            mint: feeMint,
+        })
+            .instruction();
+        return fromLegacyTransactionInstruction(instruction);
+    }
+    else {
+        return undefined;
+    }
+};
 const addSignaturesToExistingTransaction = (transaction, signerKeys) => partiallySignTransaction(signerKeys, transaction instanceof VersionedTransaction
     ? fromVersionedTransaction(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
     : transaction);
@@ -169,6 +207,24 @@ const getSponsor = async (options, sponsorCache, domain) => {
         return value;
     }
 };
+const getFee = async (options, domain, variation, mint) => {
+    if (variation) {
+        const url = new URL("/api/fee", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
+        url.searchParams.set("domain", domain);
+        url.searchParams.set("variation", variation);
+        url.searchParams.set("mint", mint.toBase58());
+        const response = await fetch(url);
+        if (response.status === 200) {
+            return new BN(await response.text());
+        }
+        else {
+            throw new PaymasterResponseError(response.status, await response.text());
+        }
+    }
+    else {
+        return new BN(0);
+    }
+};
 const getAddressLookupTable = async (connection, addressLookupTableCache, addressLookupTableAddress) => {
     const value = addressLookupTableCache.get(addressLookupTableAddress);
     if (value === undefined) {

package/esm/context.d.ts

@@ -1,4 +1,4 @@
-import { Connection as Web3Connection } from "@solana/web3.js";
+import { type PublicKey, Connection as Web3Connection } from "@solana/web3.js";
 import type { Connection, SendTransactionOptions as SendTransactionBaseOptions, TransactionOrInstructions } from "./connection.js";
 export declare const SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 export declare const createSessionContext: (options: {
@@ -8,13 +8,13 @@ export declare const createSessionContext: (options: {
 }) => Promise<{
     chainId: string;
     domain: string;
-    payer: import("@solana/web3.js").PublicKey;
-    internalPayer: import("@solana/web3.js").PublicKey;
+    payer: PublicKey;
+    internalPayer: PublicKey;
     getSolanaConnection: () => Promise<Web3Connection>;
     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>;
-    network: import("./connection.js").Network;
-    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, sendTxOptions?: SendTransactionOptions) => Promise<import("./connection.js").TransactionResult>;
+    network: import("./network.js").Network;
+    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, walletPublicKey: PublicKey, sendTxOptions?: SendTransactionOptions) => Promise<import("./connection.js").TransactionResult>;
 }>;
 export type SendTransactionOptions = SendTransactionBaseOptions & {
     paymasterDomain?: string | undefined;

package/esm/context.js

@@ -1,6 +1,6 @@
 import { AnchorProvider } from "@coral-xyz/anchor";
 import { ChainIdProgram } from "@fogo/sessions-idls";
-import { Keypair, Connection as Web3Connection } from "@solana/web3.js";
+import { Keypair, Connection as Web3Connection, } from "@solana/web3.js";
 // eslint-disable-next-line unicorn/no-typeof-undefined
 const IS_BROWSER = typeof globalThis.window !== "undefined";
 export const SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
@@ -19,7 +19,7 @@ export const createSessionContext = async (options) => {
         connection: options.connection.connection,
         rpc: options.connection.rpc,
         network: options.connection.network,
-        sendTransaction: (sessionKey, instructions, sendTxOptions) => options.connection.sendToPaymaster(sendTxOptions?.paymasterDomain ?? domain, sessionKey, instructions, {
+        sendTransaction: (sessionKey, instructions, walletPublicKey, sendTxOptions) => options.connection.sendToPaymaster(sendTxOptions?.paymasterDomain ?? domain, sessionKey, instructions, walletPublicKey, {
             ...sendTxOptions,
             addressLookupTable: sendTxOptions?.addressLookupTable ??
                 options.defaultAddressLookupTableAddress,