@fogo/sessions-sdk 0.0.32 → 0.1.1

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

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSessionConnection = exports.TransactionResultType = exports.Network = void 0;
+exports.createSessionConnection = exports.TransactionResultType = void 0;
+const anchor_1 = require("@coral-xyz/anchor");
+const sessions_idls_1 = require("@fogo/sessions-idls");
+const sha2_1 = require("@noble/hashes/sha2");
 const compat_1 = require("@solana/compat");
 const kit_1 = require("@solana/kit");
+const spl_token_1 = require("@solana/spl-token");
 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 = {}));
+const mints_js_1 = require("./mints.js");
+const network_js_1 = require("./network.js");
 const DEFAULT_RPC = {
-    [Network.Testnet]: "https://testnet.fogo.io",
-    [Network.Mainnet]: "https://mainnet.fogo.io",
+    [network_js_1.Network.Testnet]: "https://testnet.fogo.io",
+    [network_js_1.Network.Mainnet]: "https://mainnet.fogo.io",
 };
 const DEFAULT_PAYMASTER = {
-    [Network.Testnet]: "https://fogo-testnet.dourolabs-paymaster.xyz",
-    [Network.Mainnet]: "https://fogo-mainnet.dourolabs-paymaster.xyz",
+    [network_js_1.Network.Testnet]: "https://fogo-testnet.dourolabs-paymaster.xyz",
+    [network_js_1.Network.Mainnet]: "https://fogo-mainnet.dourolabs-paymaster.xyz",
 };
 var TransactionResultType;
 (function (TransactionResultType) {
@@ -45,7 +46,7 @@ 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),
     };
 };
@@ -69,13 +70,13 @@ const createSolanaConnectionGetter = (network) => {
     };
 };
 const NETWORK_TO_QUERY_PARAM = {
-    [Network.Mainnet]: "mainnet",
-    [Network.Testnet]: "testnet",
+    [network_js_1.Network.Mainnet]: "mainnet",
+    [network_js_1.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]);
@@ -103,8 +104,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 web3_js_1.PublicKey(mints_js_1.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)
@@ -113,15 +115,51 @@ const buildTransaction = async (connection, domain, signerKeys, instructions, ex
             ? Promise.resolve(undefined)
             : getAddressLookupTable(connection.connection, connection.addressLookupTableCache, extraConfig.addressLookupTable),
         Promise.all(signerKeys.map((signer) => (0, kit_1.createSignerFromKeyPair)(signer))),
+        getFee(connection, domain, extraConfig?.variation, feeMint),
+        sessionKey === undefined
+            ? Promise.resolve(undefined)
+            : (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey),
     ]);
+    const tollboothInstruction = await buildTollboothInstructionIfNeeded({
+        sessionKeyAddress,
+        walletPublicKey,
+        domain,
+        feeMint,
+        feeAmount,
+    });
     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
+        : instruction), tx), (tx) => tollboothInstruction === undefined
+        ? tx
+        : (0, kit_1.appendTransactionMessageInstructions)([tollboothInstruction], 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 getDomainTollRecipientAddress = (domain) => {
+    const hash = (0, sha2_1.sha256)(domain);
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("toll_recipient"), Buffer.from([0]), hash], new web3_js_1.PublicKey(sessions_idls_1.TollboothIdl.address))[0];
+};
+const buildTollboothInstructionIfNeeded = async ({ sessionKeyAddress, walletPublicKey, domain, feeMint, feeAmount, }) => {
+    if (feeAmount.gt(new anchor_1.BN(0)) && sessionKeyAddress !== undefined) {
+        const userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(feeMint, walletPublicKey);
+        const recipient = getDomainTollRecipientAddress(domain);
+        const instruction = await new sessions_idls_1.TollboothProgram(new anchor_1.AnchorProvider({}, {})).methods
+            .payToll(feeAmount, 0)
+            .accounts({
+            session: new web3_js_1.PublicKey(sessionKeyAddress),
+            source: userTokenAccount,
+            destination: (0, spl_token_1.getAssociatedTokenAddressSync)(feeMint, recipient, true),
+            mint: feeMint,
+        })
+            .instruction();
+        return (0, compat_1.fromLegacyTransactionInstruction)(instruction);
+    }
+    else {
+        return undefined;
+    }
+};
 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);
@@ -173,6 +211,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 anchor_1.BN(await response.text());
+        }
+        else {
+            throw new PaymasterResponseError(response.status, await response.text());
+        }
+    }
+    else {
+        return new anchor_1.BN(0);
+    }
+};
 const getAddressLookupTable = async (connection, addressLookupTableCache, addressLookupTableAddress) => {
     const value = addressLookupTableCache.get(addressLookupTableAddress);
     if (value === undefined) {

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

@@ -22,7 +22,7 @@ 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,