@fogo/sessions-sdk 0.1.7 → 0.1.9

package/cjs/connection.d.ts

@@ -1,20 +1,20 @@
-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";
+import type { Address, GetLatestBlockhashApi, Instruction, Rpc, Transaction, TransactionWithLifetime } from "@solana/kit";
+import type { TransactionError, TransactionInstruction } from "@solana/web3.js";
+import { Keypair, PublicKey, VersionedTransaction, Connection as Web3Connection } from "@solana/web3.js";
 import { Network } from "./network.js";
 export declare enum TransactionResultType {
     Success = 0,
     Failed = 1
 }
 declare const TransactionResult: {
-    Success: (signature: string) => {
-        type: TransactionResultType.Success;
-        signature: string;
-    };
     Failed: (signature: string, error: TransactionError) => {
+        error: TransactionError;
+        signature: string;
         type: TransactionResultType.Failed;
+    };
+    Success: (signature: string) => {
         signature: string;
-        error: TransactionError;
+        type: TransactionResultType.Success;
     };
 };
 export type TransactionResult = ReturnType<(typeof TransactionResult)[keyof typeof TransactionResult]>;
@@ -30,18 +30,19 @@ export declare const createSessionConnection: (options: {
     sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
     sponsor: PublicKey;
 })) => {
-    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, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, walletPublicKey: PublicKey, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     getSponsor: (domain: string) => Promise<PublicKey>;
+    network: Network;
+    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>;
+    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, walletPublicKey: PublicKey, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
 };
 export type TransactionOrInstructions = (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime);
 export type SendTransactionOptions = {
     variation?: string | undefined;
     addressLookupTable?: string | undefined;
     extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
+    feeMint?: PublicKey | Address;
 };
 export type Connection = ReturnType<typeof createSessionConnection>;
 export {};

package/cjs/connection.js

@@ -11,7 +11,6 @@ const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const zod_1 = require("zod");
 const instructions_js_1 = require("./instructions.js");
-const mints_js_1 = require("./mints.js");
 const network_js_1 = require("./network.js");
 const paymaster_js_1 = require("./paymaster.js");
 const DEFAULT_RPC = {
@@ -28,14 +27,14 @@ var TransactionResultType;
     TransactionResultType[TransactionResultType["Failed"] = 1] = "Failed";
 })(TransactionResultType || (exports.TransactionResultType = TransactionResultType = {}));
 const TransactionResult = {
-    Success: (signature) => ({
-        type: TransactionResultType.Success,
-        signature,
-    }),
     Failed: (signature, error) => ({
+        error,
+        signature,
         type: TransactionResultType.Failed,
+    }),
+    Success: (signature) => ({
         signature,
-        error,
+        type: TransactionResultType.Success,
     }),
 };
 const createSessionConnection = (options) => {
@@ -45,12 +44,12 @@ const createSessionConnection = (options) => {
     const addressLookupTableCache = new Map();
     const sponsorCache = new Map();
     return {
-        rpc,
         connection,
-        network: options.network,
         getSolanaConnection: createSolanaConnectionGetter(options.network),
-        sendToPaymaster: async (domain, sessionKey, instructions, walletPublicKey, extraConfig) => sendToPaymaster({ ...options, rpc, connection, addressLookupTableCache, sponsorCache }, domain, sessionKey, instructions, walletPublicKey, extraConfig),
         getSponsor: (domain) => getSponsor(options, sponsorCache, domain),
+        network: options.network,
+        rpc,
+        sendToPaymaster: async (domain, sessionKey, instructions, walletPublicKey, extraConfig) => sendToPaymaster({ ...options, addressLookupTableCache, connection, rpc, sponsorCache }, domain, sessionKey, instructions, walletPublicKey, extraConfig),
     };
 };
 exports.createSessionConnection = createSessionConnection;
@@ -88,13 +87,13 @@ const sendToPaymaster = async (connection, domain, sessionKey, instructions, wal
             url.searchParams.set("variation", extraConfig.variation);
         }
         const response = await fetch(url, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
             body: JSON.stringify({
                 transaction: (0, kit_1.getBase64EncodedWireTransaction)(transaction),
             }),
+            headers: {
+                "Content-Type": "application/json",
+            },
+            method: "POST",
         });
         if (response.status === 200) {
             return sponsorAndSendResponseSchema.parse(await response.json());
@@ -108,7 +107,9 @@ const sendToPaymaster = async (connection, domain, sessionKey, instructions, wal
     }
 };
 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 feeMint = extraConfig?.feeMint === undefined
+        ? undefined
+        : new web3_js_1.PublicKey(extraConfig.feeMint);
     const [{ value: latestBlockhash }, sponsor, addressLookupTable, signers, feeAmount, sessionKeyAddress,] = await Promise.all([
         connection.rpc.getLatestBlockhash().send(),
         connection.sponsor === undefined
@@ -118,7 +119,7 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
             ? Promise.resolve(undefined)
             : getAddressLookupTable(connection.connection, connection.addressLookupTableCache, extraConfig.addressLookupTable),
         Promise.all(signerKeys.map((signer) => (0, kit_1.createSignerFromKeyPair)(signer))),
-        extraConfig?.variation === undefined
+        extraConfig?.variation === undefined || feeMint === undefined
             ? Promise.resolve(new bn_js_1.default(0))
             : (0, paymaster_js_1.getPaymasterFee)(connection.paymaster ?? DEFAULT_PAYMASTER[connection.network], domain, extraConfig.variation, feeMint),
         sessionKey === undefined
@@ -126,13 +127,13 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
             : (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey),
     ]);
     const tollboothInstruction = await buildTollboothInstructionIfNeeded({
-        sessionKeyAddress,
-        walletPublicKey,
         domain,
-        feeMint,
         feeAmount,
+        feeMint,
+        sessionKeyAddress,
+        walletPublicKey,
     });
-    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
+    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) => "programId" in instruction
         ? (0, compat_1.fromLegacyTransactionInstruction)(instruction)
         : instruction), tx), (tx) => tollboothInstruction === undefined ||
         tx.instructions.some((instruction) => instruction.programAddress == sessions_idls_1.TollboothIdl.address)
@@ -144,13 +145,15 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
         }), (tx) => (0, kit_1.addSignersToTransactionMessage)(signers, tx)));
 };
 const buildTollboothInstructionIfNeeded = ({ sessionKeyAddress, walletPublicKey, domain, feeMint, feeAmount, }) => {
-    if (feeAmount.gt(new bn_js_1.default(0)) && sessionKeyAddress !== undefined) {
+    if (feeAmount.gt(new bn_js_1.default(0)) &&
+        sessionKeyAddress !== undefined &&
+        feeMint !== undefined) {
         return (0, instructions_js_1.createPaymasterFeeInstruction)({
-            sessionKey: new web3_js_1.PublicKey(sessionKeyAddress),
-            walletPublicKey,
             domain,
-            feeMint,
             feeAmount,
+            feeMint,
+            sessionKey: new web3_js_1.PublicKey(sessionKeyAddress),
+            walletPublicKey,
         }).then(compat_1.fromLegacyTransactionInstruction);
     }
     else {
@@ -179,15 +182,15 @@ const getSignerKeys = async (sessionKey, extraSigners) => {
 const sponsorAndSendResponseSchema = zod_1.z
     .discriminatedUnion("type", [
     zod_1.z.object({
-        type: zod_1.z.literal("success"),
         signature: zod_1.z.string(),
+        type: zod_1.z.literal("success"),
     }),
     zod_1.z.object({
-        type: zod_1.z.literal("failed"),
-        signature: zod_1.z.string(),
         error: zod_1.z.object({
             InstructionError: zod_1.z.tuple([zod_1.z.number(), zod_1.z.unknown()]),
         }),
+        signature: zod_1.z.string(),
+        type: zod_1.z.literal("failed"),
     }),
 ])
     .transform((data) => {

package/cjs/context.d.ts

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

package/cjs/context.js

@@ -15,13 +15,13 @@ const createSessionContext = async (options) => {
     ]);
     return {
         chainId: await fetchChainId(options.connection.connection),
+        connection: options.connection.connection,
         domain: getDomain(options.domain),
-        payer: sponsor,
-        internalPayer: internalSponsor,
         getSolanaConnection: options.connection.getSolanaConnection,
-        connection: options.connection.connection,
-        rpc: options.connection.rpc,
+        internalPayer: internalSponsor,
         network: options.connection.network,
+        payer: sponsor,
+        rpc: options.connection.rpc,
         sendTransaction: (sessionKey, instructions, walletPublicKey, sendTxOptions) => options.connection.sendToPaymaster(sendTxOptions?.paymasterDomain ?? domain, sessionKey, instructions, walletPublicKey, {
             ...sendTxOptions,
             addressLookupTable: sendTxOptions?.addressLookupTable ??

package/cjs/crypto.js

@@ -24,7 +24,7 @@ exports.signMessageWithKey = signMessageWithKey;
  * @returns True if the message and signature are valid, false otherwise
  */
 const verifyMessageWithKey = async (publicKey, message, signature) => {
-    const isValid = await crypto.subtle.verify({ name: "Ed25519" }, publicKey, bs58_1.default.decode(signature), new TextEncoder().encode(message));
+    const isValid = await crypto.subtle.verify({ name: "Ed25519" }, publicKey, Buffer.from(bs58_1.default.decode(signature)), new TextEncoder().encode(message));
     return isValid;
 };
 exports.verifyMessageWithKey = verifyMessageWithKey;