@nosana/kit 1.0.10 → 2.0.9

package/dist/index.d.ts

@@ -1,38 +1,19 @@
-import { ClientConfig, NosanaNetwork, PartialClientConfig, WalletConfig } from './config/index.js';
-import { Logger } from './logger/Logger.js';
-import { JobsProgram } from './programs/JobsProgram.js';
-import { StakeProgram } from './programs/StakeProgram.js';
-import { MerkleDistributorProgram } from './programs/MerkleDistributorProgram.js';
-import { SolanaService } from './services/SolanaService.js';
-import { NosService } from './services/NosService.js';
-import { IPFS } from './ipfs/IPFS.js';
-import { KeyPairSigner } from 'gill';
-export declare class NosanaClient {
-    readonly config: ClientConfig;
-    readonly jobs: JobsProgram;
-    readonly stake: StakeProgram;
-    readonly merkleDistributor: MerkleDistributorProgram;
-    readonly solana: SolanaService;
-    readonly nos: NosService;
-    readonly ipfs: IPFS;
-    readonly logger: Logger;
-    wallet: KeyPairSigner | undefined;
-    constructor(network?: NosanaNetwork, customConfig?: PartialClientConfig);
-    setWallet(wallet: WalletConfig): Promise<KeyPairSigner | undefined>;
-}
+export { createNosanaClient, type NosanaClient } from './NosanaClient.js';
+export * from '@nosana/types';
+export type { Wallet } from './types.js';
 export * from './config/index.js';
 export * from './errors/NosanaError.js';
 export * from './logger/Logger.js';
-export { JobsProgram, JobState, MarketQueueType } from './programs/JobsProgram.js';
-export type { Job, Market, Run } from './programs/JobsProgram.js';
-export { StakeProgram } from './programs/StakeProgram.js';
-export type { Stake } from './programs/StakeProgram.js';
-export { MerkleDistributorProgram, ClaimTarget } from './programs/MerkleDistributorProgram.js';
-export type { MerkleDistributor, ClaimStatus } from './programs/MerkleDistributorProgram.js';
-export * from './ipfs/IPFS.js';
-export { NosService } from './services/NosService.js';
-export type { TokenAccount, TokenAccountWithBalance } from './services/NosService.js';
+export { createJobsProgram, type JobsProgram, JobState, MarketQueueType, } from './services/programs/JobsProgram.js';
+export type { Job, Market, Run } from './services/programs/JobsProgram.js';
+export { createStakeProgram, type StakeProgram } from './services/programs/StakeProgram.js';
+export type { Stake } from './services/programs/StakeProgram.js';
+export { createMerkleDistributorProgram, type MerkleDistributorProgram, ClaimTarget, } from './services/programs/MerkleDistributorProgram.js';
+export type { MerkleDistributor, ClaimStatus, } from './services/programs/MerkleDistributorProgram.js';
+export { ClaimStatusNotFoundError } from './services/programs/MerkleDistributorProgram.js';
+export { solBytesArrayToIpfsHash, ipfsHashToSolBytesArray } from '@nosana/ipfs';
+export { createTokenService, type TokenService } from './services/TokenService.js';
+export type { TokenAccount, TokenAccountWithBalance } from './services/TokenService.js';
 export * as JobsClient from './generated_clients/jobs/index.js';
 export * as StakingClient from './generated_clients/staking/index.js';
 export * as MerkleDistributorClient from './generated_clients/merkle_distributor/index.js';
-export * from 'gill';

package/dist/index.js

@@ -1,48 +1,24 @@
-import { getNosanaConfig, NosanaNetwork, } from './config/index.js';
-import { Logger } from './logger/Logger.js';
-import { JobsProgram } from './programs/JobsProgram.js';
-import { StakeProgram } from './programs/StakeProgram.js';
-import { MerkleDistributorProgram } from './programs/MerkleDistributorProgram.js';
-import { SolanaService } from './services/SolanaService.js';
-import { NosService } from './services/NosService.js';
-import { IPFS } from './ipfs/IPFS.js';
-import { convertWalletConfigToKeyPairSigner } from './utils/walletConverter.js';
-export class NosanaClient {
-    constructor(network = NosanaNetwork.MAINNET, customConfig) {
-        this.config = getNosanaConfig(network, customConfig);
-        if (this.config.wallet) {
-            this.setWallet(this.config.wallet);
-        }
-        this.jobs = new JobsProgram(this);
-        this.stake = new StakeProgram(this);
-        this.merkleDistributor = new MerkleDistributorProgram(this);
-        this.logger = Logger.getInstance();
-        this.solana = new SolanaService(this);
-        this.nos = new NosService(this);
-        this.ipfs = new IPFS(this.config.ipfs);
-    }
-    async setWallet(wallet) {
-        this.wallet = await convertWalletConfigToKeyPairSigner(wallet);
-        return this.wallet;
-    }
-}
+// Export the main client
+export { createNosanaClient } from './NosanaClient.js';
+// Export types
+export * from '@nosana/types';
 // Export types and configuration
 export * from './config/index.js';
 export * from './errors/NosanaError.js';
 export * from './logger/Logger.js';
 // Export JobsProgram and related types
-export { JobsProgram, JobState, MarketQueueType } from './programs/JobsProgram.js';
+export { createJobsProgram, JobState, MarketQueueType, } from './services/programs/JobsProgram.js';
 // Export StakeProgram and related types
-export { StakeProgram } from './programs/StakeProgram.js';
+export { createStakeProgram } from './services/programs/StakeProgram.js';
 // Export MerkleDistributorProgram and related types
-export { MerkleDistributorProgram, ClaimTarget } from './programs/MerkleDistributorProgram.js';
-// Export IPFS utilities
-export * from './ipfs/IPFS.js';
-// Export NOS token service
-export { NosService } from './services/NosService.js';
+export { createMerkleDistributorProgram, ClaimTarget, } from './services/programs/MerkleDistributorProgram.js';
+export { ClaimStatusNotFoundError } from './services/programs/MerkleDistributorProgram.js';
+// Export IPFS utilities from @nosana/ipfs
+export { solBytesArrayToIpfsHash, ipfsHashToSolBytesArray } from '@nosana/ipfs';
+// Export token service
+export { createTokenService } from './services/TokenService.js';
 // Export generated clients under namespaces to avoid naming conflicts
 export * as JobsClient from './generated_clients/jobs/index.js';
 export * as StakingClient from './generated_clients/staking/index.js';
 export * as MerkleDistributorClient from './generated_clients/merkle_distributor/index.js';
-// Export dependencies
-export * from 'gill';
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,OAAO,EAAE,kBAAkB,EAAqB,MAAM,mBAAmB,CAAC;AAE1E,eAAe;AACf,cAAc,eAAe,CAAC;AAG9B,iCAAiC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AAEnC,uCAAuC;AACvC,OAAO,EACL,iBAAiB,EAEjB,QAAQ,EACR,eAAe,GAChB,MAAM,oCAAoC,CAAC;AAG5C,wCAAwC;AACxC,OAAO,EAAE,kBAAkB,EAAqB,MAAM,qCAAqC,CAAC;AAG5F,oDAAoD;AACpD,OAAO,EACL,8BAA8B,EAE9B,WAAW,GACZ,MAAM,iDAAiD,CAAC;AAKzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,0CAA0C;AAC1C,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAEhF,uBAAuB;AACvB,OAAO,EAAE,kBAAkB,EAAqB,MAAM,4BAA4B,CAAC;AAGnF,sEAAsE;AACtE,OAAO,KAAK,UAAU,MAAM,mCAAmC,CAAC;AAChE,OAAO,KAAK,aAAa,MAAM,sCAAsC,CAAC;AACtE,OAAO,KAAK,uBAAuB,MAAM,iDAAiD,CAAC"}

package/dist/logger/Logger.d.ts

@@ -1,4 +1,4 @@
-export type LogLevel = 'debug' | 'info' | 'warn' | 'error';
+export type LogLevel = 'none' | 'error' | 'warn' | 'info' | 'debug';
 export interface LoggerOptions {
     level?: LogLevel;
     prefix?: string;
@@ -6,9 +6,9 @@ export interface LoggerOptions {
 }
 export declare class Logger {
     private static instance;
-    private level;
-    private prefix;
-    private enabled;
+    level: LogLevel;
+    prefix: string;
+    enabled: boolean;
     private constructor();
     static getInstance(options?: LoggerOptions): Logger;
     private shouldLog;

package/dist/logger/Logger.js

@@ -16,10 +16,14 @@ export class Logger {
         return Logger.instance;
     }
     shouldLog(messageLevel) {
-        if (!this.enabled)
+        if (!this.enabled || this.level === 'none')
             return false;
+        // Levels ordered from most verbose (debug) to least verbose (error)
+        // If level is 'info', we log 'info', 'warn', 'error' (index >= 2)
         const levels = ['debug', 'info', 'warn', 'error'];
-        return levels.indexOf(messageLevel) >= levels.indexOf(this.level);
+        const currentLevelIndex = levels.indexOf(this.level);
+        const messageLevelIndex = levels.indexOf(messageLevel);
+        return messageLevelIndex >= currentLevelIndex;
     }
     formatMessage(level, message) {
         return `${this.prefix} [${level.toUpperCase()}] ${message}`;
@@ -57,3 +61,4 @@ export class Logger {
         this.enabled = false;
     }
 }
+//# sourceMappingURL=Logger.js.map

package/dist/logger/Logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/logger/Logger.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,MAAM;IAMjB,YAAoB,OAAuB;QAJpC,UAAK,GAAa,MAAM,CAAC;QACzB,WAAM,GAAW,UAAU,CAAC;QAC5B,YAAO,GAAY,IAAI,CAAC;QAG7B,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC;YACzC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;YAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QACjD,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,OAAuB;QAC/C,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEO,SAAS,CAAC,YAAuC;QACvD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM;YAAE,OAAO,KAAK,CAAC;QACzD,oEAAoE;QACpE,kEAAkE;QAClE,MAAM,MAAM,GAAgC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/E,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAkC,CAAC,CAAC;QAClF,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACvD,OAAO,iBAAiB,IAAI,iBAAiB,CAAC;IAChD,CAAC;IAEO,aAAa,CAAC,KAAe,EAAE,OAAe;QACpD,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,OAAe;QAC1B,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAEM,IAAI,CAAC,OAAe;QACzB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAEM,IAAI,CAAC,OAAe;QACzB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,OAAe;QAC1B,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAEM,QAAQ,CAAC,KAAe;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,MAAM;QACX,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;CACF"}

package/dist/services/SolanaService.d.ts

@@ -1,29 +1,52 @@
-import { Address, SolanaClient, Signature, IInstruction, TransactionMessageWithBlockhashLifetime, CompilableTransactionMessage, FullySignedTransaction, TransactionWithBlockhashLifetime } from 'gill';
-import { NosanaClient } from '../index.js';
-export declare class SolanaService {
-    private readonly sdk;
-    readonly rpc: SolanaClient['rpc'];
-    readonly rpcSubscriptions: SolanaClient['rpcSubscriptions'];
-    readonly sendAndConfirmTransaction: SolanaClient['sendAndConfirmTransaction'];
-    constructor(sdk: NosanaClient);
-    pda(seeds: Array<Address | string>, programId: Address): Promise<Address>;
-    getBalance(addressStr: string | Address): Promise<bigint>;
-    getLatestBlockhash(): Promise<Readonly<{
-        blockhash: import("gill").Blockhash;
-        lastValidBlockHeight: bigint;
-    }>>;
-    /**
-     * Type guard to check if the input is a transaction
-     */
-    private isTransaction;
-    /**
-     * Type guard to check if the input is a signed transaction
-     */
-    private isSignedTransaction;
+import { createSolanaRpc, createSolanaRpcSubscriptions, Address, Signature, Instruction, TransactionMessageWithBlockhashLifetime, sendAndConfirmTransactionFactory, TransactionMessageWithFeePayer, TransactionMessage, SendableTransaction, Transaction, BaseTransactionMessage, TransactionSigner, TransactionWithBlockhashLifetime } from '@solana/kit';
+import { estimateComputeUnitLimitFactory } from '@solana-program/compute-budget';
+import { Logger } from '../logger/Logger.js';
+import { Wallet } from '../types.js';
+import { SolanaConfig } from '../config/types.js';
+/**
+ * Factory function to create an estimateAndSetComputeUnitLimit function
+ * that estimates compute units and adds the set compute unit limit instruction
+ */
+declare function estimateAndSetComputeUnitLimitFactory(...params: Parameters<typeof estimateComputeUnitLimitFactory>): <T extends BaseTransactionMessage & TransactionMessageWithFeePayer>(transactionMessage: T) => Promise<Omit<import("@solana/transaction-messages").ExcludeTransactionMessageWithinSizeLimit<T>, "instructions"> & {
+    readonly instructions: readonly [...T["instructions"], import("@solana-program/compute-budget").SetComputeUnitLimitInstruction<Address, []>];
+}>;
+/**
+ * Dependencies for SolanaService
+ */
+export interface SolanaServiceDeps {
+    logger: Logger;
+    getWallet: () => Wallet | undefined;
+}
+/**
+ * Solana service interface
+ */
+export interface SolanaService {
+    readonly config: SolanaConfig;
+    readonly rpc: ReturnType<typeof createSolanaRpc>;
+    readonly rpcSubscriptions: ReturnType<typeof createSolanaRpcSubscriptions>;
+    readonly sendAndConfirmTransaction: ReturnType<typeof sendAndConfirmTransactionFactory>;
+    readonly estimateAndSetComputeUnitLimit: ReturnType<typeof estimateAndSetComputeUnitLimitFactory>;
     /**
-     * Create, sign, and send a transaction with proper logging and error handling
-     * @param instructionsOrTransaction Single instruction, array of instructions, or pre-built transaction
-     * @returns The transaction signature
+     * Optional fee payer for transactions. If set, will be used as fallback when no feePayer is provided in options.
+     * Set this property directly to configure the fee payer.
      */
-    send(instructionsOrTransaction: IInstruction | IInstruction[] | (CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime) | (FullySignedTransaction & TransactionWithBlockhashLifetime)): Promise<Signature>;
+    feePayer: TransactionSigner | undefined;
+    pda(seeds: Array<Address | string>, programId: Address): Promise<Address>;
+    getBalance(addressStr?: string | Address): Promise<bigint>;
+    buildTransaction(instructions: Instruction | Instruction[], options?: {
+        feePayer?: TransactionSigner;
+    }): Promise<TransactionMessage & TransactionMessageWithFeePayer & TransactionMessageWithBlockhashLifetime>;
+    signTransaction(transactionMessage: TransactionMessage & TransactionMessageWithFeePayer & TransactionMessageWithBlockhashLifetime): Promise<SendableTransaction & Transaction & TransactionWithBlockhashLifetime>;
+    sendTransaction(transaction: SendableTransaction & Transaction & TransactionWithBlockhashLifetime, options?: {
+        commitment?: 'processed' | 'confirmed' | 'finalized';
+    }): Promise<Signature>;
+    buildSignAndSend(instructions: Instruction | Instruction[], options?: {
+        feePayer?: TransactionSigner;
+        commitment?: 'processed' | 'confirmed' | 'finalized';
+    }): Promise<Signature>;
 }
+/**
+ * Creates a Solana service instance.
+ */
+export declare function createSolanaService(deps: SolanaServiceDeps, config: SolanaConfig): SolanaService;
+export {};

package/dist/services/SolanaService.js

@@ -1,144 +1,202 @@
-import { createSolanaClient, address, getProgramDerivedAddress, getAddressEncoder, createTransaction, signTransactionMessageWithSigners, getExplorerLink, getSignatureFromTransaction, } from 'gill';
+import { createSolanaRpc, createSolanaRpcSubscriptions, address, getProgramDerivedAddress, getAddressEncoder, createTransactionMessage, signTransactionMessageWithSigners, getSignatureFromTransaction, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, sendAndConfirmTransactionFactory, appendTransactionMessageInstructions, pipe, assertIsSendableTransaction, } from '@solana/kit';
+import { estimateComputeUnitLimitFactory, getSetComputeUnitLimitInstruction, } from '@solana-program/compute-budget';
 import { NosanaError, ErrorCodes } from '../errors/NosanaError.js';
-export class SolanaService {
-    constructor(sdk) {
-        this.sdk = sdk;
-        const rpcEndpoint = this.sdk.config.solana.rpcEndpoint;
-        if (!rpcEndpoint)
-            throw new NosanaError('RPC URL is required', ErrorCodes.INVALID_CONFIG);
-        const { rpc, rpcSubscriptions, sendAndConfirmTransaction } = createSolanaClient({
-            urlOrMoniker: rpcEndpoint,
-        });
-        this.rpc = rpc;
-        this.rpcSubscriptions = rpcSubscriptions;
-        this.sendAndConfirmTransaction = sendAndConfirmTransaction;
+/**
+ * Factory function to create an estimateAndSetComputeUnitLimit function
+ * that estimates compute units and adds the set compute unit limit instruction
+ */
+function estimateAndSetComputeUnitLimitFactory(...params) {
+    const estimateComputeUnitLimit = estimateComputeUnitLimitFactory(...params);
+    return async (transactionMessage) => {
+        const computeUnitsEstimate = await estimateComputeUnitLimit(transactionMessage);
+        return appendTransactionMessageInstructions([getSetComputeUnitLimitInstruction({ units: computeUnitsEstimate })], transactionMessage);
+    };
+}
+/**
+ * Creates a Solana service instance.
+ */
+export function createSolanaService(deps, config) {
+    if (!config.rpcEndpoint) {
+        throw new NosanaError('RPC URL is required', ErrorCodes.INVALID_CONFIG);
     }
-    async pda(seeds, programId) {
-        const addressEncoder = getAddressEncoder();
-        const [pda] = await getProgramDerivedAddress({
-            programAddress: programId,
-            seeds: seeds.map((seed) => {
-                // Address is a branded string type, so typeof will return 'string'
-                // We need to encode Address types to bytes for PDA seeds
-                // Try to encode if it looks like an address (base58, 32-44 chars), otherwise pass as-is
-                if (typeof seed === 'string') {
-                    // Check if it's likely an address (base58 encoded addresses are 32-44 chars)
-                    // Short strings like 'ClaimStatus' should be passed as-is
-                    if (seed.length >= 32 && seed.length <= 44) {
-                        try {
-                            // Try to encode as Address - if it's a valid address, this will work
-                            return addressEncoder.encode(seed);
-                        }
-                        catch {
-                            // If encoding fails, it's not a valid address, pass as-is (e.g., 'ClaimStatus')
-                            return seed;
+    const rpc = createSolanaRpc(config.rpcEndpoint);
+    // Use wsEndpoint if provided, otherwise fall back to rpcEndpoint
+    const rpcSubscriptions = createSolanaRpcSubscriptions(config.wsEndpoint ?? config.rpcEndpoint);
+    const sendAndConfirmTransaction = sendAndConfirmTransactionFactory({
+        rpc,
+        rpcSubscriptions,
+    });
+    // Create a function to estimate and set the compute unit limit
+    const estimateAndSetComputeUnitLimit = estimateAndSetComputeUnitLimitFactory({ rpc });
+    // Store feePayer in a mutable variable, initialized from config
+    let feePayer = config.feePayer;
+    return {
+        config,
+        rpc,
+        rpcSubscriptions,
+        sendAndConfirmTransaction,
+        estimateAndSetComputeUnitLimit,
+        get feePayer() {
+            return feePayer;
+        },
+        set feePayer(value) {
+            feePayer = value;
+        },
+        async pda(seeds, programId) {
+            const addressEncoder = getAddressEncoder();
+            const [pda] = await getProgramDerivedAddress({
+                programAddress: programId,
+                seeds: seeds.map((seed) => {
+                    // Address is a branded string type, so typeof will return 'string'
+                    // We need to encode Address types to bytes for PDA seeds
+                    // Try to encode if it looks like an address (base58, 32-44 chars), otherwise pass as-is
+                    if (typeof seed === 'string') {
+                        // Check if it's likely an address (base58 encoded addresses are 32-44 chars)
+                        // Short strings like 'ClaimStatus' should be passed as-is
+                        if (seed.length >= 32 && seed.length <= 44) {
+                            try {
+                                // Try to encode as Address - if it's a valid address, this will work
+                                return addressEncoder.encode(seed);
+                            }
+                            catch {
+                                // If encoding fails, it's not a valid address, pass as-is (e.g., 'ClaimStatus')
+                                return seed;
+                            }
                         }
+                        // Short strings pass as-is
+                        return seed;
                     }
-                    // Short strings pass as-is
-                    return seed;
-                }
-                // Non-string types should be encoded
-                return addressEncoder.encode(seed);
-            }),
-        });
-        return pda;
-    }
-    async getBalance(addressStr) {
-        try {
-            this.sdk.logger.debug(`Getting balance for address: ${addressStr}`);
-            const addr = address(addressStr);
-            const balance = await this.rpc.getBalance(addr).send();
-            return balance.value;
-        }
-        catch (error) {
-            this.sdk.logger.error(`Failed to get balance: ${error}`);
-            throw new NosanaError('Failed to get balance', ErrorCodes.RPC_ERROR, error);
-        }
-    }
-    async getLatestBlockhash() {
-        try {
-            const { value: blockhash } = await this.rpc.getLatestBlockhash().send();
-            return blockhash;
-        }
-        catch (error) {
-            this.sdk.logger.error(`Failed to get latest blockhash: ${error}`);
-            throw new NosanaError('Failed to get latest blockhash', ErrorCodes.RPC_ERROR, error);
-        }
-    }
-    /**
-     * Type guard to check if the input is a transaction
-     */
-    isTransaction(input) {
-        return (typeof input === 'object' &&
-            input !== null &&
-            'instructions' in input &&
-            'version' in input &&
-            !('programAddress' in input));
-    }
-    /**
-     * Type guard to check if the input is a signed transaction
-     */
-    isSignedTransaction(input) {
-        return (typeof input === 'object' &&
-            input !== null &&
-            'signatures' in input &&
-            Array.isArray(input.signatures) &&
-            input.signatures.length > 0);
-    }
-    /**
-     * Create, sign, and send a transaction with proper logging and error handling
-     * @param instructionsOrTransaction Single instruction, array of instructions, or pre-built transaction
-     * @returns The transaction signature
-     */
-    async send(instructionsOrTransaction) {
-        if (!this.sdk.wallet) {
-            throw new NosanaError('No wallet found', ErrorCodes.NO_WALLET);
-        }
-        try {
-            let signedTransaction;
-            // Check if it's already a transaction or if we need to create one from instructions
-            if (this.isTransaction(instructionsOrTransaction)) {
-                // Check if it's already signed
-                if (this.isSignedTransaction(instructionsOrTransaction)) {
-                    // Already signed, use it directly
-                    signedTransaction = instructionsOrTransaction;
+                    // Non-string types should be encoded
+                    return addressEncoder.encode(seed);
+                }),
+            });
+            return pda;
+        },
+        async getBalance(addressStr) {
+            try {
+                // Use wallet address if no address is provided
+                let addr;
+                if (addressStr) {
+                    addr = address(addressStr);
                 }
                 else {
-                    // Not signed yet, sign it
-                    signedTransaction = await signTransactionMessageWithSigners(instructionsOrTransaction);
+                    const wallet = deps.getWallet();
+                    if (!wallet) {
+                        throw new NosanaError('No wallet found and no address provided', ErrorCodes.NO_WALLET);
+                    }
+                    addr = wallet.address;
                 }
+                deps.logger.debug(`Getting balance for address: ${addr}`);
+                const balance = await rpc.getBalance(addr).send();
+                return balance.value;
             }
-            else {
-                // It's instructions, create and sign a transaction
-                const instructions = Array.isArray(instructionsOrTransaction)
-                    ? instructionsOrTransaction
-                    : [instructionsOrTransaction];
-                const transaction = createTransaction({
-                    instructions,
-                    feePayer: this.sdk.wallet,
-                    latestBlockhash: await this.getLatestBlockhash(),
-                    version: 0,
-                });
-                // Sign the transaction with all required signers
-                signedTransaction = await signTransactionMessageWithSigners(transaction);
+            catch (error) {
+                if (error instanceof NosanaError) {
+                    throw error;
+                }
+                deps.logger.error(`Failed to get balance: ${error}`);
+                throw new NosanaError('Failed to get balance', ErrorCodes.RPC_ERROR, error);
+            }
+        },
+        /**
+         * Build a transaction message from instructions
+         * This function creates a transaction message with:
+         * - Fee payer set to the provided feePayer, service feePayer, or wallet (in that order)
+         * - Latest blockhash for lifetime
+         * - Provided instructions
+         * - Estimated compute unit limit
+         *
+         * @param instructions Single instruction or array of instructions
+         * @param options Optional configuration
+         * @param options.feePayer Optional custom fee payer. Takes precedence over service feePayer and wallet.
+         * @returns An unsigned transaction message ready to be signed
+         */
+        async buildTransaction(instructions, options) {
+            // Priority: options.feePayer > service.feePayer > wallet
+            const transactionFeePayer = options?.feePayer ?? feePayer ?? deps.getWallet();
+            if (!transactionFeePayer) {
+                throw new NosanaError('No wallet found and no feePayer provided', ErrorCodes.NO_WALLET);
+            }
+            try {
+                // Get latest blockhash
+                const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
+                // Normalize instructions to array
+                const instructionsArray = Array.isArray(instructions) ? instructions : [instructions];
+                // Build transaction message using pipe
+                const transactionMessage = await pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayerSigner(transactionFeePayer, tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructionsArray, tx), (tx) => estimateAndSetComputeUnitLimit(tx));
+                return transactionMessage;
+            }
+            catch (error) {
+                deps.logger.error(`Failed to build transaction: ${error}`);
+                throw new NosanaError('Failed to build transaction', ErrorCodes.RPC_ERROR, error);
+            }
+        },
+        /**
+         * Sign a transaction message
+         * This function signs the transaction message using the signers embedded in the message.
+         * The transaction message should already contain the signers (e.g., from buildTransaction).
+         *
+         * @param transactionMessage The transaction message to sign (must contain signers)
+         * @returns A signed transaction
+         */
+        async signTransaction(transactionMessage) {
+            try {
+                // Sign the transaction message using signers embedded in the message
+                const transaction = await signTransactionMessageWithSigners(transactionMessage);
+                return transaction;
             }
-            // Get the transaction signature for logging
-            const signature = getSignatureFromTransaction(signedTransaction);
-            // Log the transaction explorer link
-            const explorerLink = getExplorerLink({
-                cluster: this.sdk.config.solana.cluster,
-                transaction: signature,
+            catch (error) {
+                deps.logger.error(`Failed to sign transaction: ${error}`);
+                throw new NosanaError('Failed to sign transaction', ErrorCodes.TRANSACTION_ERROR, error);
+            }
+        },
+        /**
+         * Send and confirm a signed transaction
+         * This function validates that the transaction is sendable, then sends it and waits for confirmation.
+         *
+         * @param transaction The signed transaction to send
+         * @param options Optional configuration (same as sendAndConfirmTransaction)
+         * @param options.commitment Commitment level for confirmation (takes precedence over config, then falls back to config.commitment, then 'confirmed')
+         * @returns The transaction signature
+         */
+        async sendTransaction(transaction, options) {
+            try {
+                // Ensure the transaction is sendable before attempting to send
+                assertIsSendableTransaction(transaction);
+                // Get the transaction signature for logging
+                const signature = getSignatureFromTransaction(transaction);
+                deps.logger.info(`Sending transaction: ${signature}`);
+                // Send and confirm the transaction with optional commitment level
+                // Priority: options.commitment > config.commitment > 'confirmed'
+                const commitment = options?.commitment ?? config.commitment ?? 'confirmed';
+                await sendAndConfirmTransaction(transaction, { commitment });
+                deps.logger.info(`Transaction ${signature} confirmed!`);
+                return signature;
+            }
+            catch (error) {
+                const errorMessage = `Failed to send transaction: ${error instanceof Error ? error.message : String(error)}`;
+                deps.logger.error(errorMessage);
+                throw new NosanaError(errorMessage, ErrorCodes.RPC_ERROR, error);
+            }
+        },
+        /**
+         * Build, sign, and send a transaction in one call
+         * This is a convenience function that combines buildTransaction, signTransaction, and sendTransaction.
+         * Use this when you want to build, sign, and send in a single operation.
+         *
+         * @param instructions Single instruction or array of instructions
+         * @param options Optional configuration
+         * @param options.feePayer Optional custom fee payer. If not provided, uses the wallet.
+         * @param options.commitment Commitment level for confirmation (takes precedence over config, then falls back to config.commitment, then 'confirmed')
+         * @returns The transaction signature
+         */
+        async buildSignAndSend(instructions, options) {
+            const transactionMessage = await this.buildTransaction(instructions, {
+                feePayer: options?.feePayer,
             });
-            this.sdk.logger.info(`Sending transaction: ${explorerLink}`);
-            // Send and confirm the transaction
-            await this.sendAndConfirmTransaction(signedTransaction);
-            this.sdk.logger.info('Transaction confirmed!');
-            return signature;
-        }
-        catch (err) {
-            const errorMessage = `Failed to send transaction: ${err instanceof Error ? err.message : String(err)}`;
-            this.sdk.logger.error(errorMessage);
-            throw new Error(errorMessage);
-        }
-    }
+            const signedTransaction = await this.signTransaction(transactionMessage);
+            return await this.sendTransaction(signedTransaction, { commitment: options?.commitment });
+        },
+    };
 }
+//# sourceMappingURL=SolanaService.js.map

package/dist/services/SolanaService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SolanaService.js","sourceRoot":"","sources":["../../src/services/SolanaService.ts"],"names":[],"mappings":"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"}