@fogo/sessions-sdk 0.1.6 → 0.1.8

package/cjs/connection.d.ts

@@ -1,4 +1,4 @@
-import type { GetLatestBlockhashApi, Instruction, Rpc, Transaction, TransactionWithLifetime } from "@solana/kit";
+import type { Address, 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 { Network } from "./network.js";
@@ -42,6 +42,7 @@ 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 = {
@@ -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
@@ -144,7 +145,9 @@ 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,
@@ -157,9 +160,16 @@ const buildTollboothInstructionIfNeeded = ({ sessionKeyAddress, walletPublicKey,
         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);
+const addSignaturesToExistingTransaction = async (transaction, signerKeys) => {
+    const kitTransaction = 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;
+    const signerAddresses = await Promise.all(signerKeys.map(async (signer) => [signer, await (0, kit_1.getAddressFromPublicKey)(signer.publicKey)]));
+    const filteredSignerKeys = signerAddresses
+        .filter(([, address]) => kitTransaction.signatures[address] !== undefined)
+        .map(([signer]) => signer);
+    return (0, kit_1.partiallySignTransaction)(filteredSignerKeys, kitTransaction);
+};
 const getSignerKeys = async (sessionKey, extraSigners) => {
     const extraSignerKeys = extraSigners === undefined
         ? []

package/esm/connection.d.ts

@@ -1,4 +1,4 @@
-import type { GetLatestBlockhashApi, Instruction, Rpc, Transaction, TransactionWithLifetime } from "@solana/kit";
+import type { Address, 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 { Network } from "./network.js";
@@ -42,6 +42,7 @@ export type SendTransactionOptions = {
     variation?: string | undefined;
     addressLookupTable?: string | undefined;
     extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
+    feeMint?: PublicKey | Address;
 };
 export type Connection = ReturnType<typeof createSessionConnection>;
 export {};

package/esm/connection.js

@@ -5,7 +5,6 @@ import { Keypair, PublicKey, TransactionInstruction, VersionedTransaction, Conne
 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 = {
@@ -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
@@ -137,7 +138,9 @@ 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,
@@ -150,9 +153,16 @@ const buildTollboothInstructionIfNeeded = ({ sessionKeyAddress, walletPublicKey,
         return undefined;
     }
 };
-const addSignaturesToExistingTransaction = (transaction, signerKeys) => partiallySignTransaction(signerKeys, transaction instanceof VersionedTransaction
-    ? fromVersionedTransaction(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
-    : transaction);
+const addSignaturesToExistingTransaction = async (transaction, signerKeys) => {
+    const kitTransaction = transaction instanceof VersionedTransaction
+        ? fromVersionedTransaction(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
+        : transaction;
+    const signerAddresses = await Promise.all(signerKeys.map(async (signer) => [signer, await getAddressFromPublicKey(signer.publicKey)]));
+    const filteredSignerKeys = signerAddresses
+        .filter(([, address]) => kitTransaction.signatures[address] !== undefined)
+        .map(([signer]) => signer);
+    return partiallySignTransaction(filteredSignerKeys, kitTransaction);
+};
 const getSignerKeys = async (sessionKey, extraSigners) => {
     const extraSignerKeys = extraSigners === undefined
         ? []

package/package.json

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