@fogo/sessions-sdk 0.0.6 → 0.0.8

package/cjs/adapter.d.ts

@@ -26,12 +26,12 @@ declare const TransactionResult: {
 export type TransactionResult = ReturnType<(typeof TransactionResult)[keyof typeof TransactionResult]>;
 export declare const createSolanaWalletAdapter: (options: {
     connection: Connection;
-    sponsor: PublicKey;
     addressLookupTableAddress?: string | undefined;
     domain?: string | undefined;
 } & ({
-    paymasterUrl: string;
+    paymaster?: string | URL | undefined;
 } | {
     sendToPaymaster: (transaction: Transaction) => Promise<string>;
+    sponsor: PublicKey;
 })) => Promise<SessionAdapter>;
 export {};

package/cjs/adapter.js

@@ -6,8 +6,11 @@ const sessions_idls_1 = require("@fogo/sessions-idls");
 const compat_1 = require("@solana/compat");
 const kit_1 = require("@solana/kit");
 const web3_js_1 = require("@solana/web3.js");
+const zod_1 = require("zod");
 // eslint-disable-next-line unicorn/no-typeof-undefined
 const IS_BROWSER = typeof globalThis.window !== "undefined";
+const DEFAULT_PAYMASTER = "https://paymaster.fogo.io";
+const DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS = "B8cUjJMqaWWTNNSTXBmeptjWswwCH1gTSCRYv4nu7kJW";
 var TransactionResultType;
 (function (TransactionResultType) {
     TransactionResultType[TransactionResultType["Success"] = 0] = "Success";
@@ -26,9 +29,10 @@ const TransactionResult = {
 };
 const createSolanaWalletAdapter = async (options) => {
     const addressLookupTables = await getAddressLookupTables(options.connection, options.addressLookupTableAddress);
+    const sponsor = await getSponsor(options);
     return {
         connection: options.connection,
-        payer: options.sponsor,
+        payer: sponsor,
         chainId: await fetchChainId(options.connection),
         domain: getDomain(options.domain),
         sendTransaction: async (sessionKey, instructions) => {
@@ -36,7 +40,7 @@ const createSolanaWalletAdapter = async (options) => {
             const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
             const sessionKeySigner = await (0, kit_1.createSignerFromKeyPair)(sessionKey);
             const transaction = Array.isArray(instructions)
-                ? await (0, kit_1.partiallySignTransactionMessageWithSigners)((0, kit_1.pipe)((0, kit_1.createTransactionMessage)({ version: 0 }), (tx) => (0, kit_1.setTransactionMessageFeePayer)((0, compat_1.fromLegacyPublicKey)(options.sponsor), tx), (tx) => (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, tx), (tx) => (0, kit_1.appendTransactionMessageInstructions)(instructions.map((instruction) => instruction instanceof web3_js_1.TransactionInstruction
+                ? await (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) => (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, Object.fromEntries(addressLookupTables?.map((table) => [
                     (0, compat_1.fromLegacyPublicKey)(table.key),
@@ -45,9 +49,7 @@ const createSolanaWalletAdapter = async (options) => {
                 : await (0, kit_1.partiallySignTransaction)([sessionKey], instructions instanceof web3_js_1.VersionedTransaction
                     ? (0, compat_1.fromVersionedTransaction)(instructions)
                     : instructions);
-            const signature = "sendToPaymaster" in options
-                ? await options.sendToPaymaster(transaction)
-                : await sendToPaymaster(options.paymasterUrl, transaction);
+            const signature = await sendToPaymaster(options, transaction);
             const lastValidBlockHeight = await rpc.getSlot().send();
             const confirmationResult = await options.connection.confirmTransaction({
                 signature,
@@ -61,34 +63,43 @@ const createSolanaWalletAdapter = async (options) => {
     };
 };
 exports.createSolanaWalletAdapter = createSolanaWalletAdapter;
-const sendToPaymaster = async (paymasterUrl, transaction) => {
-    const response = await fetch(paymasterUrl, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-            transaction: (0, kit_1.getBase64EncodedWireTransaction)(transaction),
-        }),
-    });
-    if (response.status === 200) {
-        return response.text();
+const getSponsor = async (options) => {
+    if ("sponsor" in options) {
+        return options.sponsor;
     }
     else {
-        throw new PaymasterResponseError(response.status, await response.text());
+        const response = await fetch(new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER));
+        return new web3_js_1.PublicKey(zod_1.z.string().parse(await response.text()));
     }
 };
-const getAddressLookupTables = async (connection, addressLookupTableAddress) => {
-    if (addressLookupTableAddress === undefined) {
-        return [];
+const sendToPaymaster = async (options, transaction) => {
+    if ("sendToPaymaster" in options) {
+        return options.sendToPaymaster(transaction);
     }
     else {
-        const addressLookupTableResult = await connection.getAddressLookupTable(new web3_js_1.PublicKey(addressLookupTableAddress));
-        return addressLookupTableResult.value
-            ? [addressLookupTableResult.value]
-            : undefined;
+        const response = await fetch(new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER), {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+                transaction: (0, kit_1.getBase64EncodedWireTransaction)(transaction),
+            }),
+        });
+        if (response.status === 200) {
+            return response.text();
+        }
+        else {
+            throw new PaymasterResponseError(response.status, await response.text());
+        }
     }
 };
+const getAddressLookupTables = async (connection, addressLookupTableAddress = DEFAULT_ADDRESS_LOOKUP_TABLE_ADDRESS) => {
+    const addressLookupTableResult = await connection.getAddressLookupTable(new web3_js_1.PublicKey(addressLookupTableAddress));
+    return addressLookupTableResult.value
+        ? [addressLookupTableResult.value]
+        : undefined;
+};
 const fetchChainId = async (connection) => {
     const chainIdProgram = new sessions_idls_1.ChainIdProgram(new anchor_1.AnchorProvider(connection, { publicKey: new web3_js_1.Keypair().publicKey }, {})); // We mock the wallet because we don't need to sign anything
     const { chainIdAccount: chainIdAddress } = await chainIdProgram.methods

package/cjs/index.d.ts

@@ -1,5 +1,7 @@
-import type { TransactionError } from "@solana/web3.js";
+import type { TransactionError, Connection } from "@solana/web3.js";
 import { PublicKey } from "@solana/web3.js";
+import BN from "bn.js";
+import { z } from "zod";
 import type { SessionAdapter, TransactionResult } from "./adapter.js";
 export { type SessionAdapter, type TransactionResult, TransactionResultType, createSolanaWalletAdapter, } from "./adapter.js";
 type EstablishSessionOptions = {
@@ -7,19 +9,261 @@ type EstablishSessionOptions = {
     walletPublicKey: PublicKey;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     expires: Date;
-    limits: Map<PublicKey, bigint>;
     extra?: string | undefined;
-};
+} & ({
+    limits?: Map<PublicKey, bigint>;
+    unlimited?: false;
+} | {
+    unlimited: true;
+});
 export declare const establishSession: (options: EstablishSessionOptions) => Promise<EstablishSessionResult>;
 export declare const replaceSession: (options: {
     adapter: SessionAdapter;
     session: Session;
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     expires: Date;
-    limits: Map<PublicKey, bigint>;
     extra?: string | undefined;
-}) => Promise<EstablishSessionResult>;
-export declare const reestablishSession: (adapter: SessionAdapter, walletPublicKey: PublicKey, sessionKey: CryptoKeyPair) => Promise<Session>;
+} & ({
+    limits?: Map<PublicKey, bigint>;
+    unlimited?: false;
+} | {
+    unlimited: true;
+})) => Promise<EstablishSessionResult>;
+export declare const reestablishSession: (adapter: SessionAdapter, walletPublicKey: PublicKey, sessionKey: CryptoKeyPair) => Promise<Session | undefined>;
+export declare const getSessionAccount: (connection: Connection, sessionPublicKey: PublicKey) => Promise<{
+    authorizedPrograms: {
+        type: AuthorizedProgramsType.All;
+    } | {
+        type: AuthorizedProgramsType.Specific;
+        programs: {
+            programId: PublicKey;
+            signerPda: PublicKey;
+        }[];
+    };
+    authorizedTokens: AuthorizedTokens;
+    expiration: Date;
+    extra: unknown;
+    major: number;
+    minor: number;
+    user: PublicKey;
+} | undefined>;
+declare const sessionInfoSchema: z.ZodEffects<z.ZodObject<{
+    session_info: z.ZodObject<{
+        authorized_programs: z.ZodUnion<[z.ZodObject<{
+            Specific: z.ZodObject<{
+                0: z.ZodArray<z.ZodObject<{
+                    program_id: z.ZodType<PublicKey, z.ZodTypeDef, PublicKey>;
+                    signer_pda: z.ZodType<PublicKey, z.ZodTypeDef, PublicKey>;
+                }, "strip", z.ZodTypeAny, {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }, {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }>, "many">;
+            }, "strip", z.ZodTypeAny, {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            }, {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            }>;
+        }, "strip", z.ZodTypeAny, {
+            Specific: {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            };
+        }, {
+            Specific: {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            };
+        }>, z.ZodObject<{
+            All: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
+        }, "strip", z.ZodTypeAny, {
+            All: {};
+        }, {
+            All: {};
+        }>]>;
+        authorized_tokens: z.ZodUnion<[z.ZodObject<{
+            Specific: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
+        }, "strip", z.ZodTypeAny, {
+            Specific: {};
+        }, {
+            Specific: {};
+        }>, z.ZodObject<{
+            All: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
+        }, "strip", z.ZodTypeAny, {
+            All: {};
+        }, {
+            All: {};
+        }>]>;
+        expiration: z.ZodType<BN, z.ZodTypeDef, BN>;
+        extra: z.ZodObject<{
+            0: z.ZodUnknown;
+        }, "strip", z.ZodTypeAny, {
+            0?: unknown;
+        }, {
+            0?: unknown;
+        }>;
+        major: z.ZodNumber;
+        minor: z.ZodNumber;
+        user: z.ZodType<PublicKey, z.ZodTypeDef, PublicKey>;
+    }, "strip", z.ZodTypeAny, {
+        authorized_programs: {
+            Specific: {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            };
+        } | {
+            All: {};
+        };
+        authorized_tokens: {
+            Specific: {};
+        } | {
+            All: {};
+        };
+        expiration: BN;
+        extra: {
+            0?: unknown;
+        };
+        major: number;
+        minor: number;
+        user: PublicKey;
+    }, {
+        authorized_programs: {
+            Specific: {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            };
+        } | {
+            All: {};
+        };
+        authorized_tokens: {
+            Specific: {};
+        } | {
+            All: {};
+        };
+        expiration: BN;
+        extra: {
+            0?: unknown;
+        };
+        major: number;
+        minor: number;
+        user: PublicKey;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    session_info: {
+        authorized_programs: {
+            Specific: {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            };
+        } | {
+            All: {};
+        };
+        authorized_tokens: {
+            Specific: {};
+        } | {
+            All: {};
+        };
+        expiration: BN;
+        extra: {
+            0?: unknown;
+        };
+        major: number;
+        minor: number;
+        user: PublicKey;
+    };
+}, {
+    session_info: {
+        authorized_programs: {
+            Specific: {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            };
+        } | {
+            All: {};
+        };
+        authorized_tokens: {
+            Specific: {};
+        } | {
+            All: {};
+        };
+        expiration: BN;
+        extra: {
+            0?: unknown;
+        };
+        major: number;
+        minor: number;
+        user: PublicKey;
+    };
+}>, {
+    authorizedPrograms: {
+        type: AuthorizedProgramsType.All;
+    } | {
+        type: AuthorizedProgramsType.Specific;
+        programs: {
+            programId: PublicKey;
+            signerPda: PublicKey;
+        }[];
+    };
+    authorizedTokens: AuthorizedTokens;
+    expiration: Date;
+    extra: unknown;
+    major: number;
+    minor: number;
+    user: PublicKey;
+}, {
+    session_info: {
+        authorized_programs: {
+            Specific: {
+                0: {
+                    program_id: PublicKey;
+                    signer_pda: PublicKey;
+                }[];
+            };
+        } | {
+            All: {};
+        };
+        authorized_tokens: {
+            Specific: {};
+        } | {
+            All: {};
+        };
+        expiration: BN;
+        extra: {
+            0?: unknown;
+        };
+        major: number;
+        minor: number;
+        user: PublicKey;
+    };
+}>;
+export declare enum AuthorizedProgramsType {
+    All = 0,
+    Specific = 1
+}
+export declare enum AuthorizedTokens {
+    All = 0,
+    Specific = 1
+}
 export declare const getDomainRecordAddress: (domain: string) => PublicKey;
 export declare enum SessionResultType {
     Success = 0,
@@ -44,4 +288,5 @@ export type Session = {
     walletPublicKey: PublicKey;
     payer: PublicKey;
     sendTransaction: (instructions: Parameters<SessionAdapter["sendTransaction"]>[1]) => Promise<TransactionResult>;
+    sessionInfo: z.infer<typeof sessionInfoSchema>;
 };