@fogo/sessions-sdk 0.0.4 → 0.0.6

package/cjs/adapter.d.ts

@@ -1,12 +1,12 @@
-import type { Transaction } from "@solana/kit";
-import type { Connection, TransactionError, TransactionInstruction } from "@solana/web3.js";
-import { PublicKey } from "@solana/web3.js";
+import type { Transaction, IInstruction } from "@solana/kit";
+import type { Connection, TransactionError } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
 export type SessionAdapter = {
     chainId: string;
     connection: Connection;
     payer: PublicKey;
     domain: string;
-    sendTransaction: (sessionKey: CryptoKeyPair, instructions: TransactionInstruction[]) => Promise<TransactionResult>;
+    sendTransaction: (sessionKey: CryptoKeyPair, instructions: (TransactionInstruction | IInstruction)[] | VersionedTransaction | Transaction) => Promise<TransactionResult>;
 };
 export declare enum TransactionResultType {
     Success = 0,

package/cjs/adapter.js

@@ -6,8 +6,8 @@ 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");
-// eslint-disable-next-line no-constant-binary-expression, @typescript-eslint/no-unnecessary-condition, valid-typeof
-const IS_BROWSER = typeof globalThis.window !== undefined;
+// eslint-disable-next-line unicorn/no-typeof-undefined
+const IS_BROWSER = typeof globalThis.window !== "undefined";
 var TransactionResultType;
 (function (TransactionResultType) {
     TransactionResultType[TransactionResultType["Success"] = 0] = "Success";
@@ -35,10 +35,16 @@ const createSolanaWalletAdapter = async (options) => {
             const rpc = (0, kit_1.createSolanaRpc)(options.connection.rpcEndpoint);
             const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
             const sessionKeySigner = await (0, kit_1.createSignerFromKeyPair)(sessionKey);
-            const transaction = 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) => (0, compat_1.fromLegacyTransactionInstruction)(instruction)), tx), (tx) => (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, Object.fromEntries(addressLookupTables?.map((table) => [
-                (0, compat_1.fromLegacyPublicKey)(table.key),
-                table.state.addresses.map((address) => (0, compat_1.fromLegacyPublicKey)(address)),
-            ]) ?? [])), (tx) => (0, kit_1.addSignersToTransactionMessage)([sessionKeySigner], tx)));
+            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
+                    ? (0, compat_1.fromLegacyTransactionInstruction)(instruction)
+                    : instruction), tx), (tx) => (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, Object.fromEntries(addressLookupTables?.map((table) => [
+                    (0, compat_1.fromLegacyPublicKey)(table.key),
+                    table.state.addresses.map((address) => (0, compat_1.fromLegacyPublicKey)(address)),
+                ]) ?? [])), (tx) => (0, kit_1.addSignersToTransactionMessage)([sessionKeySigner], tx)))
+                : 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);

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
-import type { TransactionInstruction, TransactionError } from "@solana/web3.js";
+import type { TransactionError } from "@solana/web3.js";
 import { PublicKey } from "@solana/web3.js";
 import type { SessionAdapter, TransactionResult } from "./adapter.js";
 export { type SessionAdapter, type TransactionResult, TransactionResultType, createSolanaWalletAdapter, } from "./adapter.js";
@@ -43,5 +43,5 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
-    sendTransaction: (instructions: TransactionInstruction[]) => Promise<TransactionResult>;
+    sendTransaction: (instructions: Parameters<SessionAdapter["sendTransaction"]>[1]) => Promise<TransactionResult>;
 };

package/esm/adapter.d.ts

@@ -1,12 +1,12 @@
-import type { Transaction } from "@solana/kit";
-import type { Connection, TransactionError, TransactionInstruction } from "@solana/web3.js";
-import { PublicKey } from "@solana/web3.js";
+import type { Transaction, IInstruction } from "@solana/kit";
+import type { Connection, TransactionError } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
 export type SessionAdapter = {
     chainId: string;
     connection: Connection;
     payer: PublicKey;
     domain: string;
-    sendTransaction: (sessionKey: CryptoKeyPair, instructions: TransactionInstruction[]) => Promise<TransactionResult>;
+    sendTransaction: (sessionKey: CryptoKeyPair, instructions: (TransactionInstruction | IInstruction)[] | VersionedTransaction | Transaction) => Promise<TransactionResult>;
 };
 export declare enum TransactionResultType {
     Success = 0,

package/esm/adapter.js

@@ -1,10 +1,10 @@
 import { AnchorProvider } from "@coral-xyz/anchor";
 import { ChainIdProgram } from "@fogo/sessions-idls";
-import { fromLegacyPublicKey, fromLegacyTransactionInstruction, } from "@solana/compat";
-import { createTransactionMessage, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstructions, getBase64EncodedWireTransaction, partiallySignTransactionMessageWithSigners, pipe, createSolanaRpc, addSignersToTransactionMessage, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, } from "@solana/kit";
-import { PublicKey, Keypair } from "@solana/web3.js";
-// eslint-disable-next-line no-constant-binary-expression, @typescript-eslint/no-unnecessary-condition, valid-typeof
-const IS_BROWSER = typeof globalThis.window !== undefined;
+import { fromLegacyPublicKey, fromLegacyTransactionInstruction, fromVersionedTransaction, } from "@solana/compat";
+import { createTransactionMessage, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstructions, getBase64EncodedWireTransaction, partiallySignTransactionMessageWithSigners, pipe, createSolanaRpc, addSignersToTransactionMessage, compressTransactionMessageUsingAddressLookupTables, createSignerFromKeyPair, partiallySignTransaction, } from "@solana/kit";
+import { PublicKey, Keypair, TransactionInstruction, VersionedTransaction, } from "@solana/web3.js";
+// eslint-disable-next-line unicorn/no-typeof-undefined
+const IS_BROWSER = typeof globalThis.window !== "undefined";
 export var TransactionResultType;
 (function (TransactionResultType) {
     TransactionResultType[TransactionResultType["Success"] = 0] = "Success";
@@ -32,10 +32,16 @@ export const createSolanaWalletAdapter = async (options) => {
             const rpc = createSolanaRpc(options.connection.rpcEndpoint);
             const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
             const sessionKeySigner = await createSignerFromKeyPair(sessionKey);
-            const transaction = await partiallySignTransactionMessageWithSigners(pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayer(fromLegacyPublicKey(options.sponsor), tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructions.map((instruction) => fromLegacyTransactionInstruction(instruction)), tx), (tx) => compressTransactionMessageUsingAddressLookupTables(tx, Object.fromEntries(addressLookupTables?.map((table) => [
-                fromLegacyPublicKey(table.key),
-                table.state.addresses.map((address) => fromLegacyPublicKey(address)),
-            ]) ?? [])), (tx) => addSignersToTransactionMessage([sessionKeySigner], tx)));
+            const transaction = Array.isArray(instructions)
+                ? await partiallySignTransactionMessageWithSigners(pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayer(fromLegacyPublicKey(options.sponsor), tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructions.map((instruction) => instruction instanceof TransactionInstruction
+                    ? fromLegacyTransactionInstruction(instruction)
+                    : instruction), tx), (tx) => compressTransactionMessageUsingAddressLookupTables(tx, Object.fromEntries(addressLookupTables?.map((table) => [
+                    fromLegacyPublicKey(table.key),
+                    table.state.addresses.map((address) => fromLegacyPublicKey(address)),
+                ]) ?? [])), (tx) => addSignersToTransactionMessage([sessionKeySigner], tx)))
+                : await partiallySignTransaction([sessionKey], instructions instanceof VersionedTransaction
+                    ? fromVersionedTransaction(instructions)
+                    : instructions);
             const signature = "sendToPaymaster" in options
                 ? await options.sendToPaymaster(transaction)
                 : await sendToPaymaster(options.paymasterUrl, transaction);

package/esm/index.d.ts

@@ -1,4 +1,4 @@
-import type { TransactionInstruction, TransactionError } from "@solana/web3.js";
+import type { TransactionError } from "@solana/web3.js";
 import { PublicKey } from "@solana/web3.js";
 import type { SessionAdapter, TransactionResult } from "./adapter.js";
 export { type SessionAdapter, type TransactionResult, TransactionResultType, createSolanaWalletAdapter, } from "./adapter.js";
@@ -43,5 +43,5 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
-    sendTransaction: (instructions: TransactionInstruction[]) => Promise<TransactionResult>;
+    sendTransaction: (instructions: Parameters<SessionAdapter["sendTransaction"]>[1]) => Promise<TransactionResult>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "A set of utilities for integrating with Fogo sessions",
   "keywords": [
     "fogo",
@@ -47,6 +47,6 @@
     "@solana/web3.js": "^1.92.3",
     "bs58": "^6.0.0",
     "zod": "^3.25.62",
-    "@fogo/sessions-idls": "0.0.2"
+    "@fogo/sessions-idls": "^0.0.2"
   }
 }