@fogo/sessions-sdk 0.1.7 → 0.1.9

package/esm/connection.js

@@ -1,11 +1,10 @@
 import { TollboothIdl } from "@fogo/sessions-idls";
 import { fromLegacyKeypair, fromLegacyPublicKey, fromLegacyTransactionInstruction, fromVersionedTransaction, } from "@solana/compat";
 import { addSignersToTransactionMessage, appendTransactionMessageInstructions, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, createSolanaRpc, createTransactionMessage, getAddressFromPublicKey, getBase64EncodedWireTransaction, partiallySignTransaction, partiallySignTransactionMessageWithSigners, pipe, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, } from "@solana/kit";
-import { Keypair, PublicKey, TransactionInstruction, VersionedTransaction, Connection as Web3Connection, } from "@solana/web3.js";
+import { Keypair, PublicKey, VersionedTransaction, Connection as Web3Connection, } from "@solana/web3.js";
 import BN from "bn.js";
 import { z } from "zod";
 import { createPaymasterFeeInstruction } from "./instructions.js";
-import { USDC_MINT } from "./mints.js";
 import { Network } from "./network.js";
 import { getPaymasterFee, PaymasterResponseError } from "./paymaster.js";
 const DEFAULT_RPC = {
@@ -22,14 +21,14 @@ export var TransactionResultType;
     TransactionResultType[TransactionResultType["Failed"] = 1] = "Failed";
 })(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,
     }),
 };
 export const createSessionConnection = (options) => {
@@ -39,12 +38,12 @@ export 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),
     };
 };
 const createSolanaConnectionGetter = (network) => {
@@ -81,13 +80,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: getBase64EncodedWireTransaction(transaction),
             }),
+            headers: {
+                "Content-Type": "application/json",
+            },
+            method: "POST",
         });
         if (response.status === 200) {
             return sponsorAndSendResponseSchema.parse(await response.json());
@@ -101,7 +100,9 @@ const sendToPaymaster = async (connection, domain, sessionKey, instructions, wal
     }
 };
 const buildTransaction = async (connection, domain, sessionKey, signerKeys, instructions, walletPublicKey, extraConfig) => {
-    const feeMint = new PublicKey(USDC_MINT[connection.network]); // TODO: make this configurable
+    const feeMint = extraConfig?.feeMint === undefined
+        ? undefined
+        : new PublicKey(extraConfig.feeMint);
     const [{ value: latestBlockhash }, sponsor, addressLookupTable, signers, feeAmount, sessionKeyAddress,] = await Promise.all([
         connection.rpc.getLatestBlockhash().send(),
         connection.sponsor === undefined
@@ -111,7 +112,7 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
             ? Promise.resolve(undefined)
             : getAddressLookupTable(connection.connection, connection.addressLookupTableCache, extraConfig.addressLookupTable),
         Promise.all(signerKeys.map((signer) => createSignerFromKeyPair(signer))),
-        extraConfig?.variation === undefined
+        extraConfig?.variation === undefined || feeMint === undefined
             ? Promise.resolve(new BN(0))
             : getPaymasterFee(connection.paymaster ?? DEFAULT_PAYMASTER[connection.network], domain, extraConfig.variation, feeMint),
         sessionKey === undefined
@@ -119,13 +120,13 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
             : getAddressFromPublicKey(sessionKey.publicKey),
     ]);
     const tollboothInstruction = await buildTollboothInstructionIfNeeded({
-        sessionKeyAddress,
-        walletPublicKey,
         domain,
-        feeMint,
         feeAmount,
+        feeMint,
+        sessionKeyAddress,
+        walletPublicKey,
     });
-    return partiallySignTransactionMessageWithSigners(pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayer(fromLegacyPublicKey(sponsor), tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructions.map((instruction) => instruction instanceof TransactionInstruction
+    return partiallySignTransactionMessageWithSigners(pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayer(fromLegacyPublicKey(sponsor), tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructions.map((instruction) => "programId" in instruction
         ? fromLegacyTransactionInstruction(instruction)
         : instruction), tx), (tx) => tollboothInstruction === undefined ||
         tx.instructions.some((instruction) => instruction.programAddress == TollboothIdl.address)
@@ -137,13 +138,15 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
         }), (tx) => addSignersToTransactionMessage(signers, tx)));
 };
 const buildTollboothInstructionIfNeeded = ({ sessionKeyAddress, walletPublicKey, domain, feeMint, feeAmount, }) => {
-    if (feeAmount.gt(new BN(0)) && sessionKeyAddress !== undefined) {
+    if (feeAmount.gt(new BN(0)) &&
+        sessionKeyAddress !== undefined &&
+        feeMint !== undefined) {
         return createPaymasterFeeInstruction({
-            sessionKey: new PublicKey(sessionKeyAddress),
-            walletPublicKey,
             domain,
-            feeMint,
             feeAmount,
+            feeMint,
+            sessionKey: new PublicKey(sessionKeyAddress),
+            walletPublicKey,
         }).then(fromLegacyTransactionInstruction);
     }
     else {
@@ -172,15 +175,15 @@ const getSignerKeys = async (sessionKey, extraSigners) => {
 const sponsorAndSendResponseSchema = z
     .discriminatedUnion("type", [
     z.object({
-        type: z.literal("success"),
         signature: z.string(),
+        type: z.literal("success"),
     }),
     z.object({
-        type: z.literal("failed"),
-        signature: z.string(),
         error: z.object({
             InstructionError: z.tuple([z.number(), z.unknown()]),
         }),
+        signature: z.string(),
+        type: z.literal("failed"),
     }),
 ])
     .transform((data) => {

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

@@ -12,13 +12,13 @@ export 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/esm/crypto.js

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