@fogo/sessions-sdk 0.1.4 → 0.1.6

package/cjs/connection.js

@@ -4,17 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 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 = {
     [network_js_1.Network.Testnet]: "https://testnet.fogo.io",
     [network_js_1.Network.Mainnet]: "https://mainnet.fogo.io",
@@ -101,7 +100,7 @@ const sendToPaymaster = async (connection, domain, sessionKey, instructions, wal
             return sponsorAndSendResponseSchema.parse(await response.json());
         }
         else {
-            throw new PaymasterResponseError(response.status, await response.text());
+            throw new paymaster_js_1.PaymasterResponseError(response.status, await response.text());
         }
     }
     else {
@@ -119,7 +118,9 @@ 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))),
-        getFee(connection, domain, extraConfig?.variation, feeMint),
+        extraConfig?.variation === 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
             ? Promise.resolve(undefined)
             : (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey),
@@ -133,7 +134,8 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
     });
     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) => tollboothInstruction === undefined
+        : instruction), tx), (tx) => tollboothInstruction === undefined ||
+        tx.instructions.some((instruction) => instruction.programAddress == sessions_idls_1.TollboothIdl.address)
         ? tx
         : (0, kit_1.appendTransactionMessageInstructions)([tollboothInstruction], tx), (tx) => addressLookupTable === undefined
         ? tx
@@ -141,24 +143,15 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
             [(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, }) => {
+const buildTollboothInstructionIfNeeded = ({ sessionKeyAddress, walletPublicKey, domain, feeMint, feeAmount, }) => {
     if (feeAmount.gt(new bn_js_1.default(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);
+        return (0, instructions_js_1.createPaymasterFeeInstruction)({
+            sessionKey: new web3_js_1.PublicKey(sessionKeyAddress),
+            walletPublicKey,
+            domain,
+            feeMint,
+            feeAmount,
+        }).then(compat_1.fromLegacyTransactionInstruction);
     }
     else {
         return undefined;
@@ -208,31 +201,13 @@ const getSponsor = async (options, sponsorCache, domain) => {
             return sponsor;
         }
         else {
-            throw new PaymasterResponseError(response.status, await response.text());
+            throw new paymaster_js_1.PaymasterResponseError(response.status, await response.text());
         }
     }
     else {
         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 bn_js_1.default(await response.text());
-        }
-        else {
-            throw new PaymasterResponseError(response.status, await response.text());
-        }
-    }
-    else {
-        return new bn_js_1.default(0);
-    }
-};
 const getAddressLookupTable = async (connection, addressLookupTableCache, addressLookupTableAddress) => {
     const value = addressLookupTableCache.get(addressLookupTableAddress);
     if (value === undefined) {
@@ -249,9 +224,3 @@ const getAddressLookupTable = async (connection, addressLookupTableCache, addres
         return value;
     }
 };
-class PaymasterResponseError extends Error {
-    constructor(statusCode, message) {
-        super(`Paymaster sent a ${statusCode.toString()} response: ${message}`);
-        this.name = "PaymasterResponseError";
-    }
-}

package/cjs/index.d.ts

@@ -7,8 +7,9 @@ import type { TransactionOrInstructions, TransactionResult } from "./connection.
 import type { SendTransactionOptions, SessionContext } from "./context.js";
 export { type Connection, createSessionConnection, type TransactionOrInstructions, type TransactionResult, TransactionResultType, } from "./connection.js";
 export { createSessionContext, type SendTransactionOptions, type SessionContext, } from "./context.js";
-export { createSessionUnwrapInstruction, createSessionWrapInstructions, createSystemProgramSessionWrapInstruction, } from "./instructions.js";
+export { createPaymasterFeeInstruction, createSessionUnwrapInstruction, createSessionWrapInstructions, createSystemProgramSessionWrapInstruction, } from "./instructions.js";
 export { Network } from "./network.js";
+export { getPaymasterFee } from "./paymaster.js";
 type EstablishSessionOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
@@ -61,7 +62,7 @@ export declare const getSessionAccount: (connection: Connection, sessionPublicKe
     expiration: Date;
     extra: unknown;
     major: number;
-    minor: 1 | 2 | 3 | 4;
+    minor: 4 | 1 | 2 | 3;
     user: PublicKey;
     sponsor: PublicKey;
 } | undefined>;
@@ -2042,7 +2043,7 @@ declare const sessionInfoSchema: z.ZodEffects<z.ZodObject<{
     expiration: Date;
     extra: unknown;
     major: number;
-    minor: 1 | 2 | 3 | 4;
+    minor: 4 | 1 | 2 | 3;
     user: PublicKey;
     sponsor: PublicKey;
 } | undefined, {
@@ -2339,7 +2340,7 @@ export declare const verifyLogInToken: (token: string, connection: Connection) =
     expiration: Date;
     extra: unknown;
     major: number;
-    minor: 1 | 2 | 3 | 4;
+    minor: 4 | 1 | 2 | 3;
     user: PublicKey;
     sponsor: PublicKey;
 } | undefined>;

package/cjs/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyLogInToken = exports.createLogInToken = exports.bridgeIn = exports.bridgeOut = exports.sendNativeTransfer = exports.sendTransfer = exports.getBridgeOutFee = exports.getTransferFee = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.Network = exports.createSystemProgramSessionWrapInstruction = exports.createSessionWrapInstructions = exports.createSessionUnwrapInstruction = exports.createSessionContext = exports.TransactionResultType = exports.createSessionConnection = void 0;
+exports.verifyLogInToken = exports.createLogInToken = exports.bridgeIn = exports.bridgeOut = exports.sendNativeTransfer = exports.sendTransfer = exports.getBridgeOutFee = exports.getTransferFee = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.getPaymasterFee = exports.Network = exports.createSystemProgramSessionWrapInstruction = exports.createSessionWrapInstructions = exports.createSessionUnwrapInstruction = exports.createPaymasterFeeInstruction = exports.createSessionContext = exports.TransactionResultType = exports.createSessionConnection = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
 const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
@@ -35,11 +35,14 @@ Object.defineProperty(exports, "TransactionResultType", { enumerable: true, get:
 var context_js_2 = require("./context.js");
 Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_2.createSessionContext; } });
 var instructions_js_2 = require("./instructions.js");
+Object.defineProperty(exports, "createPaymasterFeeInstruction", { enumerable: true, get: function () { return instructions_js_2.createPaymasterFeeInstruction; } });
 Object.defineProperty(exports, "createSessionUnwrapInstruction", { enumerable: true, get: function () { return instructions_js_2.createSessionUnwrapInstruction; } });
 Object.defineProperty(exports, "createSessionWrapInstructions", { enumerable: true, get: function () { return instructions_js_2.createSessionWrapInstructions; } });
 Object.defineProperty(exports, "createSystemProgramSessionWrapInstruction", { enumerable: true, get: function () { return instructions_js_2.createSystemProgramSessionWrapInstruction; } });
 var network_js_2 = require("./network.js");
 Object.defineProperty(exports, "Network", { enumerable: true, get: function () { return network_js_2.Network; } });
+var paymaster_js_1 = require("./paymaster.js");
+Object.defineProperty(exports, "getPaymasterFee", { enumerable: true, get: function () { return paymaster_js_1.getPaymasterFee; } });
 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.
 `;
@@ -128,10 +131,36 @@ const getSessionAccount = async (connection, sessionPublicKey) => {
         : sessionInfoSchema.parse(new anchor_1.BorshAccountsCoder(sessions_idls_1.SessionManagerIdl).decode("Session", result.data));
 };
 exports.getSessionAccount = getSessionAccount;
+const getDomainRegistryAuthorizedPrograms = async (connection, domain) => {
+    const result = await connection.getAccountInfo((0, exports.getDomainRecordAddress)(domain), "confirmed");
+    if (result === null) {
+        return [];
+    }
+    else {
+        const programs = [];
+        for (let i = 0; i < result.data.length; i += 64) {
+            programs.push({
+                programId: new web3_js_1.PublicKey(result.data.subarray(i, i + 32)),
+                signerPda: new web3_js_1.PublicKey(result.data.subarray(i + 32, i + 64)),
+            });
+        }
+        return programs;
+    }
+};
+const authorizedProgramsMatchDomainRegistry = (sessionAuthorizedPrograms, domainAuthorizedPrograms) => {
+    if (sessionAuthorizedPrograms.type === AuthorizedProgramsType.All) {
+        return true;
+    }
+    return domainAuthorizedPrograms.every(({ programId: programIdFromRegistry }) => sessionAuthorizedPrograms.programs.some(({ programId }) => programId.equals(programIdFromRegistry)));
+};
 const createSession = async (context, walletPublicKey, sessionKey) => {
     const sessionPublicKey = new web3_js_1.PublicKey(await (0, kit_1.getAddressFromPublicKey)(sessionKey.publicKey));
-    const sessionInfo = await (0, exports.getSessionAccount)(context.connection, sessionPublicKey);
-    return sessionInfo === undefined
+    const [sessionInfo, domainRegistryAuthorizedPrograms] = await Promise.all([
+        (0, exports.getSessionAccount)(context.connection, sessionPublicKey),
+        getDomainRegistryAuthorizedPrograms(context.connection, context.domain),
+    ]);
+    return sessionInfo === undefined ||
+        !authorizedProgramsMatchDomainRegistry(sessionInfo.authorizedPrograms, domainRegistryAuthorizedPrograms)
         ? undefined
         : {
             sessionPublicKey,

package/cjs/instructions.d.ts

@@ -1,5 +1,5 @@
-import type { PublicKey } from "@solana/web3.js";
-import { TransactionInstruction } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import type BN from "bn.js";
 /**
  * Creates the system program instruction `SessionWrap`, only available on Fogo, which allows a session key to transfer native token from its user's wallet to its user's wrapped token associated token account.
  * This instruction may be combined with the `CreateAssociatedTokenAccountIdempotent` and `SyncNative` instructions for a session to wrap tokens on behalf of its user.
@@ -17,3 +17,15 @@ export declare function createSessionWrapInstructions(sessionKey: PublicKey, wal
  * Creates the instruction required to unwrap native tokens within a session.
  */
 export declare function createSessionUnwrapInstruction(sessionKey: PublicKey, walletPublicKey: PublicKey): TransactionInstruction;
+/**
+ * Creates the instruction required to pay the paymaster fee for a transaction.
+ * This instruction is only required if the transaction variation has a fee and may be placed anywhere in the instruction list.
+ * The fee amount for a variation in a given token can be retrieved using the `getPaymasterFee` function.
+ */
+export declare const createPaymasterFeeInstruction: ({ sessionKey, walletPublicKey, domain, feeMint, feeAmount, }: {
+    sessionKey: PublicKey;
+    walletPublicKey: PublicKey;
+    domain: string;
+    feeMint: PublicKey;
+    feeAmount: BN;
+}) => Promise<TransactionInstruction>;

package/cjs/instructions.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPaymasterFeeInstruction = void 0;
 exports.createSystemProgramSessionWrapInstruction = createSystemProgramSessionWrapInstruction;
 exports.createSessionWrapInstructions = createSessionWrapInstructions;
 exports.createSessionUnwrapInstruction = createSessionUnwrapInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
+const sessions_idls_1 = require("@fogo/sessions-idls");
+const sha2_1 = require("@noble/hashes/sha2");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const SESSION_WRAP_DISCRIMINATOR = 4_000_000;
@@ -54,3 +58,25 @@ function createSessionWrapInstructions(sessionKey, walletPublicKey, amount) {
 function createSessionUnwrapInstruction(sessionKey, walletPublicKey) {
     return (0, spl_token_1.createCloseAccountInstruction)(getNativeMintAssociatedTokenAddressSync(walletPublicKey), walletPublicKey, sessionKey);
 }
+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];
+};
+/**
+ * Creates the instruction required to pay the paymaster fee for a transaction.
+ * This instruction is only required if the transaction variation has a fee and may be placed anywhere in the instruction list.
+ * The fee amount for a variation in a given token can be retrieved using the `getPaymasterFee` function.
+ */
+const createPaymasterFeeInstruction = ({ sessionKey, walletPublicKey, domain, feeMint, feeAmount, }) => {
+    const recipient = getDomainTollRecipientAddress(domain);
+    return new sessions_idls_1.TollboothProgram(new anchor_1.AnchorProvider({}, {})).methods
+        .payToll(feeAmount, 0)
+        .accounts({
+        session: sessionKey,
+        source: (0, spl_token_1.getAssociatedTokenAddressSync)(feeMint, walletPublicKey),
+        destination: (0, spl_token_1.getAssociatedTokenAddressSync)(feeMint, recipient, true),
+        mint: feeMint,
+    })
+        .instruction();
+};
+exports.createPaymasterFeeInstruction = createPaymasterFeeInstruction;

package/cjs/paymaster.d.ts

@@ -0,0 +1,9 @@
+import type { PublicKey } from "@solana/web3.js";
+import BN from "bn.js";
+export declare class PaymasterResponseError extends Error {
+    constructor(statusCode: number, message: string);
+}
+/**
+ * Retrieves the paymaster fee amount from the paymaster server for a given transaction variation when paid in a given mint.
+ */
+export declare const getPaymasterFee: (paymaster: string | URL, domain: string, variation: string, mint: PublicKey) => Promise<BN>;

package/cjs/paymaster.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPaymasterFee = exports.PaymasterResponseError = void 0;
+const bn_js_1 = __importDefault(require("bn.js"));
+class PaymasterResponseError extends Error {
+    constructor(statusCode, message) {
+        super(`Paymaster sent a ${statusCode.toString()} response: ${message}`);
+        this.name = "PaymasterResponseError";
+    }
+}
+exports.PaymasterResponseError = PaymasterResponseError;
+/**
+ * Retrieves the paymaster fee amount from the paymaster server for a given transaction variation when paid in a given mint.
+ */
+const getPaymasterFee = async (paymaster, domain, variation, mint) => {
+    const url = new URL("/api/fee", paymaster);
+    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 bn_js_1.default(await response.text());
+    }
+    else {
+        throw new PaymasterResponseError(response.status, await response.text());
+    }
+};
+exports.getPaymasterFee = getPaymasterFee;

package/esm/connection.js

@@ -1,14 +1,13 @@
-import { AnchorProvider } from "@coral-xyz/anchor";
-import { TollboothIdl, TollboothProgram } from "@fogo/sessions-idls";
-import { sha256 } from "@noble/hashes/sha2";
+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 { getAssociatedTokenAddressSync } from "@solana/spl-token";
 import { Keypair, PublicKey, TransactionInstruction, 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 = {
     [Network.Testnet]: "https://testnet.fogo.io",
     [Network.Mainnet]: "https://mainnet.fogo.io",
@@ -112,7 +111,9 @@ 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))),
-        getFee(connection, domain, extraConfig?.variation, feeMint),
+        extraConfig?.variation === undefined
+            ? Promise.resolve(new BN(0))
+            : getPaymasterFee(connection.paymaster ?? DEFAULT_PAYMASTER[connection.network], domain, extraConfig.variation, feeMint),
         sessionKey === undefined
             ? Promise.resolve(undefined)
             : getAddressFromPublicKey(sessionKey.publicKey),
@@ -126,7 +127,8 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
     });
     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) => tollboothInstruction === undefined
+        : instruction), tx), (tx) => tollboothInstruction === undefined ||
+        tx.instructions.some((instruction) => instruction.programAddress == TollboothIdl.address)
         ? tx
         : appendTransactionMessageInstructions([tollboothInstruction], tx), (tx) => addressLookupTable === undefined
         ? tx
@@ -134,24 +136,15 @@ const buildTransaction = async (connection, domain, sessionKey, signerKeys, inst
             [fromLegacyPublicKey(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => fromLegacyPublicKey(address)),
         }), (tx) => addSignersToTransactionMessage(signers, tx)));
 };
-const getDomainTollRecipientAddress = (domain) => {
-    const hash = sha256(domain);
-    return PublicKey.findProgramAddressSync([Buffer.from("toll_recipient"), Buffer.from([0]), hash], new PublicKey(TollboothIdl.address))[0];
-};
-const buildTollboothInstructionIfNeeded = async ({ sessionKeyAddress, walletPublicKey, domain, feeMint, feeAmount, }) => {
+const buildTollboothInstructionIfNeeded = ({ sessionKeyAddress, walletPublicKey, domain, feeMint, feeAmount, }) => {
     if (feeAmount.gt(new BN(0)) && sessionKeyAddress !== undefined) {
-        const userTokenAccount = getAssociatedTokenAddressSync(feeMint, walletPublicKey);
-        const recipient = getDomainTollRecipientAddress(domain);
-        const instruction = await new TollboothProgram(new AnchorProvider({}, {})).methods
-            .payToll(feeAmount, 0)
-            .accounts({
-            session: new PublicKey(sessionKeyAddress),
-            source: userTokenAccount,
-            destination: getAssociatedTokenAddressSync(feeMint, recipient, true),
-            mint: feeMint,
-        })
-            .instruction();
-        return fromLegacyTransactionInstruction(instruction);
+        return createPaymasterFeeInstruction({
+            sessionKey: new PublicKey(sessionKeyAddress),
+            walletPublicKey,
+            domain,
+            feeMint,
+            feeAmount,
+        }).then(fromLegacyTransactionInstruction);
     }
     else {
         return undefined;
@@ -208,24 +201,6 @@ 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 BN(await response.text());
-        }
-        else {
-            throw new PaymasterResponseError(response.status, await response.text());
-        }
-    }
-    else {
-        return new BN(0);
-    }
-};
 const getAddressLookupTable = async (connection, addressLookupTableCache, addressLookupTableAddress) => {
     const value = addressLookupTableCache.get(addressLookupTableAddress);
     if (value === undefined) {
@@ -242,9 +217,3 @@ const getAddressLookupTable = async (connection, addressLookupTableCache, addres
         return value;
     }
 };
-class PaymasterResponseError extends Error {
-    constructor(statusCode, message) {
-        super(`Paymaster sent a ${statusCode.toString()} response: ${message}`);
-        this.name = "PaymasterResponseError";
-    }
-}

package/esm/index.d.ts

@@ -7,8 +7,9 @@ import type { TransactionOrInstructions, TransactionResult } from "./connection.
 import type { SendTransactionOptions, SessionContext } from "./context.js";
 export { type Connection, createSessionConnection, type TransactionOrInstructions, type TransactionResult, TransactionResultType, } from "./connection.js";
 export { createSessionContext, type SendTransactionOptions, type SessionContext, } from "./context.js";
-export { createSessionUnwrapInstruction, createSessionWrapInstructions, createSystemProgramSessionWrapInstruction, } from "./instructions.js";
+export { createPaymasterFeeInstruction, createSessionUnwrapInstruction, createSessionWrapInstructions, createSystemProgramSessionWrapInstruction, } from "./instructions.js";
 export { Network } from "./network.js";
+export { getPaymasterFee } from "./paymaster.js";
 type EstablishSessionOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
@@ -61,7 +62,7 @@ export declare const getSessionAccount: (connection: Connection, sessionPublicKe
     expiration: Date;
     extra: unknown;
     major: number;
-    minor: 1 | 2 | 3 | 4;
+    minor: 4 | 1 | 2 | 3;
     user: PublicKey;
     sponsor: PublicKey;
 } | undefined>;
@@ -2042,7 +2043,7 @@ declare const sessionInfoSchema: z.ZodEffects<z.ZodObject<{
     expiration: Date;
     extra: unknown;
     major: number;
-    minor: 1 | 2 | 3 | 4;
+    minor: 4 | 1 | 2 | 3;
     user: PublicKey;
     sponsor: PublicKey;
 } | undefined, {
@@ -2339,7 +2340,7 @@ export declare const verifyLogInToken: (token: string, connection: Connection) =
     expiration: Date;
     extra: unknown;
     major: number;
-    minor: 1 | 2 | 3 | 4;
+    minor: 4 | 1 | 2 | 3;
     user: PublicKey;
     sponsor: PublicKey;
 } | undefined>;

package/esm/index.js

@@ -25,8 +25,9 @@ import { USDC_DECIMALS, USDC_MINT } from "./mints.js";
 import { Network } from "./network.js";
 export { createSessionConnection, TransactionResultType, } from "./connection.js";
 export { createSessionContext, } from "./context.js";
-export { createSessionUnwrapInstruction, createSessionWrapInstructions, createSystemProgramSessionWrapInstruction, } from "./instructions.js";
+export { createPaymasterFeeInstruction, createSessionUnwrapInstruction, createSessionWrapInstructions, createSystemProgramSessionWrapInstruction, } from "./instructions.js";
 export { Network } from "./network.js";
+export { getPaymasterFee } from "./paymaster.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.
 `;
@@ -110,10 +111,36 @@ export const getSessionAccount = async (connection, sessionPublicKey) => {
         ? undefined
         : sessionInfoSchema.parse(new BorshAccountsCoder(SessionManagerIdl).decode("Session", result.data));
 };
+const getDomainRegistryAuthorizedPrograms = async (connection, domain) => {
+    const result = await connection.getAccountInfo(getDomainRecordAddress(domain), "confirmed");
+    if (result === null) {
+        return [];
+    }
+    else {
+        const programs = [];
+        for (let i = 0; i < result.data.length; i += 64) {
+            programs.push({
+                programId: new PublicKey(result.data.subarray(i, i + 32)),
+                signerPda: new PublicKey(result.data.subarray(i + 32, i + 64)),
+            });
+        }
+        return programs;
+    }
+};
+const authorizedProgramsMatchDomainRegistry = (sessionAuthorizedPrograms, domainAuthorizedPrograms) => {
+    if (sessionAuthorizedPrograms.type === AuthorizedProgramsType.All) {
+        return true;
+    }
+    return domainAuthorizedPrograms.every(({ programId: programIdFromRegistry }) => sessionAuthorizedPrograms.programs.some(({ programId }) => programId.equals(programIdFromRegistry)));
+};
 const createSession = async (context, walletPublicKey, sessionKey) => {
     const sessionPublicKey = new PublicKey(await getAddressFromPublicKey(sessionKey.publicKey));
-    const sessionInfo = await getSessionAccount(context.connection, sessionPublicKey);
-    return sessionInfo === undefined
+    const [sessionInfo, domainRegistryAuthorizedPrograms] = await Promise.all([
+        getSessionAccount(context.connection, sessionPublicKey),
+        getDomainRegistryAuthorizedPrograms(context.connection, context.domain),
+    ]);
+    return sessionInfo === undefined ||
+        !authorizedProgramsMatchDomainRegistry(sessionInfo.authorizedPrograms, domainRegistryAuthorizedPrograms)
         ? undefined
         : {
             sessionPublicKey,

package/esm/instructions.d.ts

@@ -1,5 +1,5 @@
-import type { PublicKey } from "@solana/web3.js";
-import { TransactionInstruction } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import type BN from "bn.js";
 /**
  * Creates the system program instruction `SessionWrap`, only available on Fogo, which allows a session key to transfer native token from its user's wallet to its user's wrapped token associated token account.
  * This instruction may be combined with the `CreateAssociatedTokenAccountIdempotent` and `SyncNative` instructions for a session to wrap tokens on behalf of its user.
@@ -17,3 +17,15 @@ export declare function createSessionWrapInstructions(sessionKey: PublicKey, wal
  * Creates the instruction required to unwrap native tokens within a session.
  */
 export declare function createSessionUnwrapInstruction(sessionKey: PublicKey, walletPublicKey: PublicKey): TransactionInstruction;
+/**
+ * Creates the instruction required to pay the paymaster fee for a transaction.
+ * This instruction is only required if the transaction variation has a fee and may be placed anywhere in the instruction list.
+ * The fee amount for a variation in a given token can be retrieved using the `getPaymasterFee` function.
+ */
+export declare const createPaymasterFeeInstruction: ({ sessionKey, walletPublicKey, domain, feeMint, feeAmount, }: {
+    sessionKey: PublicKey;
+    walletPublicKey: PublicKey;
+    domain: string;
+    feeMint: PublicKey;
+    feeAmount: BN;
+}) => Promise<TransactionInstruction>;

package/esm/instructions.js

@@ -1,5 +1,8 @@
+import { AnchorProvider } from "@coral-xyz/anchor";
+import { TollboothIdl, TollboothProgram } from "@fogo/sessions-idls";
+import { sha256 } from "@noble/hashes/sha2";
 import { createAssociatedTokenAccountIdempotentInstruction, createCloseAccountInstruction, createSyncNativeInstruction, getAssociatedTokenAddressSync, NATIVE_MINT, } from "@solana/spl-token";
-import { SystemProgram, TransactionInstruction } from "@solana/web3.js";
+import { PublicKey, SystemProgram, TransactionInstruction, } from "@solana/web3.js";
 const SESSION_WRAP_DISCRIMINATOR = 4_000_000;
 function getNativeMintAssociatedTokenAddressSync(walletPublicKey) {
     return getAssociatedTokenAddressSync(NATIVE_MINT, walletPublicKey);
@@ -49,3 +52,24 @@ export function createSessionWrapInstructions(sessionKey, walletPublicKey, amoun
 export function createSessionUnwrapInstruction(sessionKey, walletPublicKey) {
     return createCloseAccountInstruction(getNativeMintAssociatedTokenAddressSync(walletPublicKey), walletPublicKey, sessionKey);
 }
+const getDomainTollRecipientAddress = (domain) => {
+    const hash = sha256(domain);
+    return PublicKey.findProgramAddressSync([Buffer.from("toll_recipient"), Buffer.from([0]), hash], new PublicKey(TollboothIdl.address))[0];
+};
+/**
+ * Creates the instruction required to pay the paymaster fee for a transaction.
+ * This instruction is only required if the transaction variation has a fee and may be placed anywhere in the instruction list.
+ * The fee amount for a variation in a given token can be retrieved using the `getPaymasterFee` function.
+ */
+export const createPaymasterFeeInstruction = ({ sessionKey, walletPublicKey, domain, feeMint, feeAmount, }) => {
+    const recipient = getDomainTollRecipientAddress(domain);
+    return new TollboothProgram(new AnchorProvider({}, {})).methods
+        .payToll(feeAmount, 0)
+        .accounts({
+        session: sessionKey,
+        source: getAssociatedTokenAddressSync(feeMint, walletPublicKey),
+        destination: getAssociatedTokenAddressSync(feeMint, recipient, true),
+        mint: feeMint,
+    })
+        .instruction();
+};

package/esm/paymaster.d.ts

@@ -0,0 +1,9 @@
+import type { PublicKey } from "@solana/web3.js";
+import BN from "bn.js";
+export declare class PaymasterResponseError extends Error {
+    constructor(statusCode: number, message: string);
+}
+/**
+ * Retrieves the paymaster fee amount from the paymaster server for a given transaction variation when paid in a given mint.
+ */
+export declare const getPaymasterFee: (paymaster: string | URL, domain: string, variation: string, mint: PublicKey) => Promise<BN>;

package/esm/paymaster.js

@@ -0,0 +1,23 @@
+import BN from "bn.js";
+export class PaymasterResponseError extends Error {
+    constructor(statusCode, message) {
+        super(`Paymaster sent a ${statusCode.toString()} response: ${message}`);
+        this.name = "PaymasterResponseError";
+    }
+}
+/**
+ * Retrieves the paymaster fee amount from the paymaster server for a given transaction variation when paid in a given mint.
+ */
+export const getPaymasterFee = async (paymaster, domain, variation, mint) => {
+    const url = new URL("/api/fee", paymaster);
+    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 BN(await response.text());
+    }
+    else {
+        throw new PaymasterResponseError(response.status, await response.text());
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "A set of utilities for integrating with Fogo sessions",
   "repository": {
     "type": "git",