@fogo/sessions-sdk 0.0.21 → 0.0.22

package/cjs/connection.d.ts

@@ -1,4 +1,4 @@
-import type { Transaction, Instruction, TransactionWithLifetime } from "@solana/kit";
+import type { Transaction, Instruction, TransactionWithLifetime, Rpc, GetLatestBlockhashApi } from "@solana/kit";
 import type { TransactionError } from "@solana/web3.js";
 import { Keypair, Connection as Web3Connection, TransactionInstruction, VersionedTransaction, PublicKey } from "@solana/web3.js";
 export declare enum Network {
@@ -33,15 +33,18 @@ export declare const createSessionConnection: (options: {
     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>;
+    rpc: 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 & 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;
     network: Network;
     getSolanaConnection: () => Promise<Web3Connection>;
-    sendToPaymaster: (domain: string, sponsor: PublicKey, sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime), extraConfig?: {
-        addressLookupTable?: string | undefined;
-        extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
-    }) => Promise<TransactionResult>;
+    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     getSponsor: (domain: string) => Promise<PublicKey>;
 };
+export type TransactionOrInstructions = (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime);
+export type SendTransactionOptions = {
+    variation?: string | undefined;
+    addressLookupTable?: string | undefined;
+    extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
+};
 export type Connection = ReturnType<typeof createSessionConnection>;
 export {};

package/cjs/connection.js

@@ -39,17 +39,14 @@ const createSessionConnection = (options) => {
     const rpc = (0, kit_1.createSolanaRpc)(rpcUrl);
     const connection = new web3_js_1.Connection(rpcUrl, "confirmed");
     const addressLookupTableCache = new Map();
+    const sponsorCache = new Map();
     return {
         rpc,
         connection,
         network: options.network,
         getSolanaConnection: createSolanaConnectionGetter(options.network),
-        sendToPaymaster: async (domain, sponsor, sessionKey, instructions, extraConfig) => {
-            const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
-            const transaction = await buildTransaction(connection, latestBlockhash, sessionKey, sponsor, instructions, addressLookupTableCache, extraConfig);
-            return sendToPaymaster(options, domain, transaction);
-        },
-        getSponsor: (domain) => getSponsor(options, domain),
+        sendToPaymaster: async (domain, sessionKey, instructions, extraConfig) => sendToPaymaster({ ...options, rpc, connection, addressLookupTableCache, sponsorCache }, domain, sessionKey, instructions, extraConfig),
+        getSponsor: (domain) => getSponsor(options, sponsorCache, domain),
     };
 };
 exports.createSessionConnection = createSessionConnection;
@@ -75,10 +72,17 @@ const NETWORK_TO_QUERY_PARAM = {
     [Network.Mainnet]: "mainnet",
     [Network.Testnet]: "testnet",
 };
-const sendToPaymaster = async (options, domain, transaction) => {
-    if (options.sendToPaymaster === undefined) {
-        const url = new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
+const sendToPaymaster = async (connection, domain, sessionKey, instructions, extraConfig) => {
+    const signerKeys = await getSignerKeys(sessionKey, extraConfig?.extraSigners);
+    const transaction = Array.isArray(instructions)
+        ? await buildTransaction(connection, domain, signerKeys, instructions, extraConfig)
+        : await addSignaturesToExistingTransaction(instructions, signerKeys);
+    if (connection.sendToPaymaster === undefined) {
+        const url = new URL("/api/sponsor_and_send", connection.paymaster ?? DEFAULT_PAYMASTER[connection.network]);
         url.searchParams.set("domain", domain);
+        if (extraConfig?.variation !== undefined) {
+            url.searchParams.set("variation", extraConfig.variation);
+        }
         const response = await fetch(url, {
             method: "POST",
             headers: {
@@ -96,33 +100,31 @@ const sendToPaymaster = async (options, domain, transaction) => {
         }
     }
     else {
-        return options.sendToPaymaster(transaction);
+        return connection.sendToPaymaster(transaction);
     }
 };
-const buildTransaction = async (connection, latestBlockhash, sessionKey, sponsor, instructions, addressLookupTableCache, extraConfig) => {
-    const [signerKeys, addressLookupTable] = await Promise.all([
-        getSignerKeys(sessionKey, extraConfig?.extraSigners),
+const buildTransaction = async (connection, domain, signerKeys, instructions, extraConfig) => {
+    const [{ value: latestBlockhash }, sponsor, addressLookupTable, signers] = await Promise.all([
+        connection.rpc.getLatestBlockhash().send(),
+        connection.sponsor === undefined
+            ? getSponsor(connection, connection.sponsorCache, domain)
+            : Promise.resolve(connection.sponsor),
         extraConfig?.addressLookupTable === undefined
             ? Promise.resolve(undefined)
-            : getAddressLookupTable(connection, addressLookupTableCache, extraConfig.addressLookupTable),
+            : getAddressLookupTable(connection.connection, connection.addressLookupTableCache, extraConfig.addressLookupTable),
+        Promise.all(signerKeys.map((signer) => (0, kit_1.createSignerFromKeyPair)(signer))),
     ]);
-    if (Array.isArray(instructions)) {
-        const signers = await Promise.all(signerKeys.map((signer) => (0, kit_1.createSignerFromKeyPair)(signer)));
-        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) => addressLookupTable === undefined
-            ? tx
-            : (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, {
-                [(0, compat_1.fromLegacyPublicKey)(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => (0, compat_1.fromLegacyPublicKey)(address)),
-            }), (tx) => (0, kit_1.addSignersToTransactionMessage)(signers, 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 (0, kit_1.partiallySignTransaction)(signerKeys, tx);
-    }
+    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) => addressLookupTable === undefined
+        ? tx
+        : (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, {
+            [(0, compat_1.fromLegacyPublicKey)(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => (0, compat_1.fromLegacyPublicKey)(address)),
+        }), (tx) => (0, kit_1.addSignersToTransactionMessage)(signers, tx)));
 };
+const addSignaturesToExistingTransaction = (transaction, signerKeys) => (0, kit_1.partiallySignTransaction)(signerKeys, transaction instanceof web3_js_1.VersionedTransaction
+    ? (0, compat_1.fromVersionedTransaction)(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
+    : transaction);
 const getSignerKeys = async (sessionKey, extraSigners) => {
     const extraSignerKeys = extraSigners === undefined
         ? []
@@ -151,20 +153,24 @@ const sponsorAndSendResponseSchema = zod_1.z
         ? TransactionResult.Success(data.signature)
         : TransactionResult.Failed(data.signature, data.error);
 });
-const getSponsor = async (options, domain) => {
-    if (options.sponsor === undefined) {
+const getSponsor = async (options, sponsorCache, domain) => {
+    const value = sponsorCache.get(domain);
+    if (value === undefined) {
         const url = new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
         url.searchParams.set("domain", domain);
+        url.searchParams.set("index", "autoassign");
         const response = await fetch(url);
         if (response.status === 200) {
-            return new web3_js_1.PublicKey(zod_1.z.string().parse(await response.text()));
+            const sponsor = new web3_js_1.PublicKey(zod_1.z.string().parse(await response.text()));
+            sponsorCache.set(domain, sponsor);
+            return sponsor;
         }
         else {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
     else {
-        return options.sponsor;
+        return value;
     }
 };
 const getAddressLookupTable = async (connection, addressLookupTableCache, addressLookupTableAddress) => {

package/cjs/context.d.ts

@@ -1,5 +1,6 @@
 import { Connection as Web3Connection } from "@solana/web3.js";
-import type { Connection } from "./connection.js";
+import type { Connection, SendTransactionOptions as SendTransactionBaseOptions, TransactionOrInstructions } from "./connection.js";
+export declare const SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 export declare const createSessionContext: (options: {
     connection: Connection;
     defaultAddressLookupTableAddress?: string | undefined;
@@ -8,10 +9,14 @@ export declare const createSessionContext: (options: {
     chainId: string;
     domain: string;
     payer: import("@solana/web3.js").PublicKey;
+    internalPayer: import("@solana/web3.js").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: Parameters<typeof options.connection.sendToPaymaster>[3], extraConfig?: Parameters<typeof options.connection.sendToPaymaster>[4]) => Promise<import("./connection.js").TransactionResult>;
+    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, sendTxOptions?: SendTransactionOptions) => Promise<import("./connection.js").TransactionResult>;
 }>;
+export type SendTransactionOptions = SendTransactionBaseOptions & {
+    paymasterDomain?: string | undefined;
+};
 export type SessionContext = Awaited<ReturnType<typeof createSessionContext>>;

package/cjs/context.js

@@ -1,26 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSessionContext = void 0;
+exports.createSessionContext = exports.SESSIONS_INTERNAL_PAYMASTER_DOMAIN = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
 const web3_js_1 = require("@solana/web3.js");
 // eslint-disable-next-line unicorn/no-typeof-undefined
 const IS_BROWSER = typeof globalThis.window !== "undefined";
+exports.SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 const createSessionContext = async (options) => {
     const domain = getDomain(options.domain);
-    const sponsor = await options.connection.getSponsor(domain);
+    const [sponsor, internalSponsor] = await Promise.all([
+        options.connection.getSponsor(domain),
+        options.connection.getSponsor(exports.SESSIONS_INTERNAL_PAYMASTER_DOMAIN),
+    ]);
     return {
         chainId: await fetchChainId(options.connection.connection),
         domain: getDomain(options.domain),
         payer: sponsor,
+        internalPayer: internalSponsor,
         getSolanaConnection: options.connection.getSolanaConnection,
         connection: options.connection.connection,
         rpc: options.connection.rpc,
         network: options.connection.network,
-        sendTransaction: (sessionKey, instructions, extraConfig) => options.connection.sendToPaymaster(domain, sponsor, sessionKey, instructions, {
-            addressLookupTable: extraConfig?.addressLookupTable ??
+        sendTransaction: (sessionKey, instructions, sendTxOptions) => options.connection.sendToPaymaster(sendTxOptions?.paymasterDomain ?? domain, sessionKey, instructions, {
+            ...sendTxOptions,
+            addressLookupTable: sendTxOptions?.addressLookupTable ??
                 options.defaultAddressLookupTableAddress,
-            extraSigners: extraConfig?.extraSigners,
         }),
     };
 };

package/cjs/index.d.ts

@@ -4,10 +4,10 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
 import { z } from "zod";
-import type { 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";
+import type { TransactionOrInstructions, TransactionResult } from "./connection.js";
+import type { SendTransactionOptions, SessionContext } from "./context.js";
+export { type SessionContext, type SendTransactionOptions, createSessionContext, } from "./context.js";
+export { type TransactionResult, type Connection, type TransactionOrInstructions, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
 type EstablishSessionOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
@@ -1307,7 +1307,7 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
-    sendTransaction: (instructions: Parameters<SessionContext["sendTransaction"]>[1]) => Promise<TransactionResult>;
+    sendTransaction: (instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     sessionInfo: NonNullable<z.infer<typeof sessionInfoSchema>>;
 };
 export declare const getTransferFee: (context: SessionContext) => Promise<{

package/cjs/index.js

@@ -24,9 +24,10 @@ const bn_js_1 = __importDefault(require("bn.js"));
 const bs58_1 = __importDefault(require("bs58"));
 const zod_1 = require("zod");
 const connection_js_1 = require("./connection.js");
+const context_js_1 = require("./context.js");
 const crypto_js_1 = require("./crypto.js");
-var context_js_1 = require("./context.js");
-Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_1.createSessionContext; } });
+var context_js_2 = require("./context.js");
+Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_2.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; } });
@@ -65,16 +66,13 @@ const establishSession = async (options) => {
             buildIntentInstruction(options, sessionKey, tokenInfo),
             buildStartSessionInstruction(options, sessionKey, tokenInfo),
         ]);
-        return sendSessionEstablishTransaction(options, sessionKey, [
-            ...buildCreateAssociatedTokenAccountInstructions(options, tokenInfo),
-            intentInstruction,
-            startSessionInstruction,
-        ], options.sessionEstablishmentLookupTable);
+        return sendSessionEstablishTransaction(options, sessionKey, [intentInstruction, startSessionInstruction], options.sessionEstablishmentLookupTable);
     }
 };
 exports.establishSession = establishSession;
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions, sessionEstablishmentLookupTable) => {
     const result = await options.context.sendTransaction(sessionKey, instructions, {
+        variation: "Session Establishment",
         addressLookupTable: sessionEstablishmentLookupTable ??
             SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS[options.context.network],
     });
@@ -104,9 +102,9 @@ 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], {
+            variation: "Session Revocation",
+        });
     }
     else {
         return;
@@ -132,7 +130,7 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
             walletPublicKey,
             sessionKey,
             payer: context.payer,
-            sendTransaction: (instructions) => context.sendTransaction(sessionKey, instructions),
+            sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, extraConfig),
             sessionInfo,
         };
 };
@@ -435,7 +433,6 @@ const amountToString = (amount, decimals) => {
         ...(decimalTruncated === "" ? [] : [".", decimalTruncated]),
     ].join("");
 };
-const buildCreateAssociatedTokenAccountInstructions = (options, tokens) => tokens.map(({ mint }) => (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(options.context.payer, (0, spl_token_1.getAssociatedTokenAddressSync)(mint, options.walletPublicKey), options.walletPublicKey, mint));
 const getDomainRecordAddress = (domain) => {
     const hash = (0, sha2_1.sha256)(domain);
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("domain-record"), hash], new web3_js_1.PublicKey(sessions_idls_1.DomainRegistryIdl.address))[0];
@@ -535,7 +532,7 @@ const getFee = async (context) => {
             mint: (0, umi_1.publicKey)(usdcMintAddress),
         })[0],
         mint: usdcMint,
-        symbolOrMint: context.network === connection_js_1.Network.Mainnet ? "USDC.s" : "USDC",
+        symbolOrMint: "USDC.s",
         decimals: USDC_DECIMALS,
         fee: {
             intrachainTransfer: BigInt(feeConfig.intrachainTransferFee.toString()),
@@ -565,12 +562,16 @@ const sendTransfer = async (options) => {
             feeSource: (0, spl_token_1.getAssociatedTokenAddressSync)(options.feeConfig.mint, options.walletPublicKey),
             mint: options.mint,
             source: sourceAta,
-            sponsor: options.context.payer,
+            sponsor: options.context.internalPayer,
+            metadata: 
             // eslint-disable-next-line unicorn/no-null
-            metadata: symbol === undefined ? null : new web3_js_1.PublicKey(metadataAddress),
+            symbol === undefined ? null : new web3_js_1.PublicKey(metadataAddress),
         })
             .instruction(),
-    ]);
+    ], {
+        variation: "Intent Transfer",
+        paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+    });
 };
 exports.sendTransfer = sendTransfer;
 const buildTransferIntentInstruction = async (program, options, symbol, feeToken, feeAmount) => {
@@ -622,10 +623,10 @@ const bridgeOut = async (options) => {
         program.methods
             .bridgeNttTokens({
             payDestinationAtaRent: !destinationAtaExists,
-            signedQuoteBytes: Buffer.from(quote.signedQuote),
+            signedQuoteBytes: [...quote.signedQuote],
         })
             .accounts({
-            sponsor: options.context.payer,
+            sponsor: options.context.internalPayer,
             mint: options.fromToken.mint,
             metadata: metadata?.symbol === undefined
                 ? // eslint-disable-next-line unicorn/no-null
@@ -643,6 +644,8 @@ const bridgeOut = async (options) => {
         web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: BRIDGE_OUT_CUS }),
         ...instructions,
     ], {
+        variation: "Intent NTT Bridge",
+        paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
         extraSigners: [outboxItem],
         addressLookupTable: BRIDGING_ADDRESS_LOOKUP_TABLE[options.context.network]?.[options.fromToken.mint.toBase58()],
     });

package/esm/connection.d.ts

@@ -1,4 +1,4 @@
-import type { Transaction, Instruction, TransactionWithLifetime } from "@solana/kit";
+import type { Transaction, Instruction, TransactionWithLifetime, Rpc, GetLatestBlockhashApi } from "@solana/kit";
 import type { TransactionError } from "@solana/web3.js";
 import { Keypair, Connection as Web3Connection, TransactionInstruction, VersionedTransaction, PublicKey } from "@solana/web3.js";
 export declare enum Network {
@@ -33,15 +33,18 @@ export declare const createSessionConnection: (options: {
     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>;
+    rpc: 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 & 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;
     network: Network;
     getSolanaConnection: () => Promise<Web3Connection>;
-    sendToPaymaster: (domain: string, sponsor: PublicKey, sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime), extraConfig?: {
-        addressLookupTable?: string | undefined;
-        extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
-    }) => Promise<TransactionResult>;
+    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     getSponsor: (domain: string) => Promise<PublicKey>;
 };
+export type TransactionOrInstructions = (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime);
+export type SendTransactionOptions = {
+    variation?: string | undefined;
+    addressLookupTable?: string | undefined;
+    extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
+};
 export type Connection = ReturnType<typeof createSessionConnection>;
 export {};

package/esm/connection.js

@@ -36,17 +36,14 @@ export const createSessionConnection = (options) => {
     const rpc = createSolanaRpc(rpcUrl);
     const connection = new Web3Connection(rpcUrl, "confirmed");
     const addressLookupTableCache = new Map();
+    const sponsorCache = new Map();
     return {
         rpc,
         connection,
         network: options.network,
         getSolanaConnection: createSolanaConnectionGetter(options.network),
-        sendToPaymaster: async (domain, sponsor, sessionKey, instructions, extraConfig) => {
-            const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
-            const transaction = await buildTransaction(connection, latestBlockhash, sessionKey, sponsor, instructions, addressLookupTableCache, extraConfig);
-            return sendToPaymaster(options, domain, transaction);
-        },
-        getSponsor: (domain) => getSponsor(options, domain),
+        sendToPaymaster: async (domain, sessionKey, instructions, extraConfig) => sendToPaymaster({ ...options, rpc, connection, addressLookupTableCache, sponsorCache }, domain, sessionKey, instructions, extraConfig),
+        getSponsor: (domain) => getSponsor(options, sponsorCache, domain),
     };
 };
 const createSolanaConnectionGetter = (network) => {
@@ -71,10 +68,17 @@ const NETWORK_TO_QUERY_PARAM = {
     [Network.Mainnet]: "mainnet",
     [Network.Testnet]: "testnet",
 };
-const sendToPaymaster = async (options, domain, transaction) => {
-    if (options.sendToPaymaster === undefined) {
-        const url = new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
+const sendToPaymaster = async (connection, domain, sessionKey, instructions, extraConfig) => {
+    const signerKeys = await getSignerKeys(sessionKey, extraConfig?.extraSigners);
+    const transaction = Array.isArray(instructions)
+        ? await buildTransaction(connection, domain, signerKeys, instructions, extraConfig)
+        : await addSignaturesToExistingTransaction(instructions, signerKeys);
+    if (connection.sendToPaymaster === undefined) {
+        const url = new URL("/api/sponsor_and_send", connection.paymaster ?? DEFAULT_PAYMASTER[connection.network]);
         url.searchParams.set("domain", domain);
+        if (extraConfig?.variation !== undefined) {
+            url.searchParams.set("variation", extraConfig.variation);
+        }
         const response = await fetch(url, {
             method: "POST",
             headers: {
@@ -92,33 +96,31 @@ const sendToPaymaster = async (options, domain, transaction) => {
         }
     }
     else {
-        return options.sendToPaymaster(transaction);
+        return connection.sendToPaymaster(transaction);
     }
 };
-const buildTransaction = async (connection, latestBlockhash, sessionKey, sponsor, instructions, addressLookupTableCache, extraConfig) => {
-    const [signerKeys, addressLookupTable] = await Promise.all([
-        getSignerKeys(sessionKey, extraConfig?.extraSigners),
+const buildTransaction = async (connection, domain, signerKeys, instructions, extraConfig) => {
+    const [{ value: latestBlockhash }, sponsor, addressLookupTable, signers] = await Promise.all([
+        connection.rpc.getLatestBlockhash().send(),
+        connection.sponsor === undefined
+            ? getSponsor(connection, connection.sponsorCache, domain)
+            : Promise.resolve(connection.sponsor),
         extraConfig?.addressLookupTable === undefined
             ? Promise.resolve(undefined)
-            : getAddressLookupTable(connection, addressLookupTableCache, extraConfig.addressLookupTable),
+            : getAddressLookupTable(connection.connection, connection.addressLookupTableCache, extraConfig.addressLookupTable),
+        Promise.all(signerKeys.map((signer) => createSignerFromKeyPair(signer))),
     ]);
-    if (Array.isArray(instructions)) {
-        const signers = await Promise.all(signerKeys.map((signer) => createSignerFromKeyPair(signer)));
-        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
-            ? tx
-            : compressTransactionMessageUsingAddressLookupTables(tx, {
-                [fromLegacyPublicKey(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => fromLegacyPublicKey(address)),
-            }), (tx) => addSignersToTransactionMessage(signers, 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 partiallySignTransaction(signerKeys, tx);
-    }
+    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
+        ? tx
+        : compressTransactionMessageUsingAddressLookupTables(tx, {
+            [fromLegacyPublicKey(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => fromLegacyPublicKey(address)),
+        }), (tx) => addSignersToTransactionMessage(signers, tx)));
 };
+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);
 const getSignerKeys = async (sessionKey, extraSigners) => {
     const extraSignerKeys = extraSigners === undefined
         ? []
@@ -147,20 +149,24 @@ const sponsorAndSendResponseSchema = z
         ? TransactionResult.Success(data.signature)
         : TransactionResult.Failed(data.signature, data.error);
 });
-const getSponsor = async (options, domain) => {
-    if (options.sponsor === undefined) {
+const getSponsor = async (options, sponsorCache, domain) => {
+    const value = sponsorCache.get(domain);
+    if (value === undefined) {
         const url = new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
         url.searchParams.set("domain", domain);
+        url.searchParams.set("index", "autoassign");
         const response = await fetch(url);
         if (response.status === 200) {
-            return new PublicKey(z.string().parse(await response.text()));
+            const sponsor = new PublicKey(z.string().parse(await response.text()));
+            sponsorCache.set(domain, sponsor);
+            return sponsor;
         }
         else {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
     else {
-        return options.sponsor;
+        return value;
     }
 };
 const getAddressLookupTable = async (connection, addressLookupTableCache, addressLookupTableAddress) => {

package/esm/context.d.ts

@@ -1,5 +1,6 @@
 import { Connection as Web3Connection } from "@solana/web3.js";
-import type { Connection } from "./connection.js";
+import type { Connection, SendTransactionOptions as SendTransactionBaseOptions, TransactionOrInstructions } from "./connection.js";
+export declare const SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 export declare const createSessionContext: (options: {
     connection: Connection;
     defaultAddressLookupTableAddress?: string | undefined;
@@ -8,10 +9,14 @@ export declare const createSessionContext: (options: {
     chainId: string;
     domain: string;
     payer: import("@solana/web3.js").PublicKey;
+    internalPayer: import("@solana/web3.js").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: Parameters<typeof options.connection.sendToPaymaster>[3], extraConfig?: Parameters<typeof options.connection.sendToPaymaster>[4]) => Promise<import("./connection.js").TransactionResult>;
+    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, sendTxOptions?: SendTransactionOptions) => Promise<import("./connection.js").TransactionResult>;
 }>;
+export type SendTransactionOptions = SendTransactionBaseOptions & {
+    paymasterDomain?: string | undefined;
+};
 export type SessionContext = Awaited<ReturnType<typeof createSessionContext>>;

package/esm/context.js

@@ -3,21 +3,26 @@ 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 SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 export const createSessionContext = async (options) => {
     const domain = getDomain(options.domain);
-    const sponsor = await options.connection.getSponsor(domain);
+    const [sponsor, internalSponsor] = await Promise.all([
+        options.connection.getSponsor(domain),
+        options.connection.getSponsor(SESSIONS_INTERNAL_PAYMASTER_DOMAIN),
+    ]);
     return {
         chainId: await fetchChainId(options.connection.connection),
         domain: getDomain(options.domain),
         payer: sponsor,
+        internalPayer: internalSponsor,
         getSolanaConnection: options.connection.getSolanaConnection,
         connection: options.connection.connection,
         rpc: options.connection.rpc,
         network: options.connection.network,
-        sendTransaction: (sessionKey, instructions, extraConfig) => options.connection.sendToPaymaster(domain, sponsor, sessionKey, instructions, {
-            addressLookupTable: extraConfig?.addressLookupTable ??
+        sendTransaction: (sessionKey, instructions, sendTxOptions) => options.connection.sendToPaymaster(sendTxOptions?.paymasterDomain ?? domain, sessionKey, instructions, {
+            ...sendTxOptions,
+            addressLookupTable: sendTxOptions?.addressLookupTable ??
                 options.defaultAddressLookupTableAddress,
-            extraSigners: extraConfig?.extraSigners,
         }),
     };
 };

package/esm/index.d.ts

@@ -4,10 +4,10 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
 import { z } from "zod";
-import type { 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";
+import type { TransactionOrInstructions, TransactionResult } from "./connection.js";
+import type { SendTransactionOptions, SessionContext } from "./context.js";
+export { type SessionContext, type SendTransactionOptions, createSessionContext, } from "./context.js";
+export { type TransactionResult, type Connection, type TransactionOrInstructions, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
 type EstablishSessionOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
@@ -1307,7 +1307,7 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
-    sendTransaction: (instructions: Parameters<SessionContext["sendTransaction"]>[1]) => Promise<TransactionResult>;
+    sendTransaction: (instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     sessionInfo: NonNullable<z.infer<typeof sessionInfoSchema>>;
 };
 export declare const getTransferFee: (context: SessionContext) => Promise<{

package/esm/index.js

@@ -6,7 +6,7 @@ import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import { sha256 } from "@noble/hashes/sha2";
 import { fromLegacyPublicKey } from "@solana/compat";
 import { generateKeyPair, getAddressFromPublicKey, getProgramDerivedAddress, signatureBytes, verifySignature, } from "@solana/kit";
-import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, getMint, } from "@solana/spl-token";
+import { getAssociatedTokenAddressSync, getMint } from "@solana/spl-token";
 import { ComputeBudgetProgram, Connection, Ed25519Program, Keypair, PublicKey, } from "@solana/web3.js";
 import { Wormhole, wormhole, routes } from "@wormhole-foundation/sdk";
 import solanaSdk from "@wormhole-foundation/sdk/solana";
@@ -18,8 +18,9 @@ import BN from "bn.js";
 import bs58 from "bs58";
 import { z } from "zod";
 import { Network, TransactionResultType } from "./connection.js";
+import { SESSIONS_INTERNAL_PAYMASTER_DOMAIN } from "./context.js";
 import { importKey, signMessageWithKey, verifyMessageWithKey, } from "./crypto.js";
-export { createSessionContext } 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.
@@ -55,15 +56,12 @@ export const establishSession = async (options) => {
             buildIntentInstruction(options, sessionKey, tokenInfo),
             buildStartSessionInstruction(options, sessionKey, tokenInfo),
         ]);
-        return sendSessionEstablishTransaction(options, sessionKey, [
-            ...buildCreateAssociatedTokenAccountInstructions(options, tokenInfo),
-            intentInstruction,
-            startSessionInstruction,
-        ], options.sessionEstablishmentLookupTable);
+        return sendSessionEstablishTransaction(options, sessionKey, [intentInstruction, startSessionInstruction], options.sessionEstablishmentLookupTable);
     }
 };
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions, sessionEstablishmentLookupTable) => {
     const result = await options.context.sendTransaction(sessionKey, instructions, {
+        variation: "Session Establishment",
         addressLookupTable: sessionEstablishmentLookupTable ??
             SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS[options.context.network],
     });
@@ -92,9 +90,9 @@ export 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], {
+            variation: "Session Revocation",
+        });
     }
     else {
         return;
@@ -117,7 +115,7 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
             walletPublicKey,
             sessionKey,
             payer: context.payer,
-            sendTransaction: (instructions) => context.sendTransaction(sessionKey, instructions),
+            sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, extraConfig),
             sessionInfo,
         };
 };
@@ -420,7 +418,6 @@ const amountToString = (amount, decimals) => {
         ...(decimalTruncated === "" ? [] : [".", decimalTruncated]),
     ].join("");
 };
-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];
@@ -517,7 +514,7 @@ const getFee = async (context) => {
             mint: metaplexPublicKey(usdcMintAddress),
         })[0],
         mint: usdcMint,
-        symbolOrMint: context.network === Network.Mainnet ? "USDC.s" : "USDC",
+        symbolOrMint: "USDC.s",
         decimals: USDC_DECIMALS,
         fee: {
             intrachainTransfer: BigInt(feeConfig.intrachainTransferFee.toString()),
@@ -547,12 +544,16 @@ export const sendTransfer = async (options) => {
             feeSource: getAssociatedTokenAddressSync(options.feeConfig.mint, options.walletPublicKey),
             mint: options.mint,
             source: sourceAta,
-            sponsor: options.context.payer,
+            sponsor: options.context.internalPayer,
+            metadata: 
             // eslint-disable-next-line unicorn/no-null
-            metadata: symbol === undefined ? null : new PublicKey(metadataAddress),
+            symbol === undefined ? null : new PublicKey(metadataAddress),
         })
             .instruction(),
-    ]);
+    ], {
+        variation: "Intent Transfer",
+        paymasterDomain: SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+    });
 };
 const buildTransferIntentInstruction = async (program, options, symbol, feeToken, feeAmount) => {
     const [nonce, { decimals }] = await Promise.all([
@@ -603,10 +604,10 @@ export const bridgeOut = async (options) => {
         program.methods
             .bridgeNttTokens({
             payDestinationAtaRent: !destinationAtaExists,
-            signedQuoteBytes: Buffer.from(quote.signedQuote),
+            signedQuoteBytes: [...quote.signedQuote],
         })
             .accounts({
-            sponsor: options.context.payer,
+            sponsor: options.context.internalPayer,
             mint: options.fromToken.mint,
             metadata: metadata?.symbol === undefined
                 ? // eslint-disable-next-line unicorn/no-null
@@ -624,6 +625,8 @@ export const bridgeOut = async (options) => {
         ComputeBudgetProgram.setComputeUnitLimit({ units: BRIDGE_OUT_CUS }),
         ...instructions,
     ], {
+        variation: "Intent NTT Bridge",
+        paymasterDomain: SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
         extraSigners: [outboxItem],
         addressLookupTable: BRIDGING_ADDRESS_LOOKUP_TABLE[options.context.network]?.[options.fromToken.mint.toBase58()],
     });

package/package.json

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