@wuwei-labs/srsly 3.0.0-beta.9 → 4.0.0-beta.2

package/dist/esm/utils/index.js

@@ -3,7 +3,7 @@
  * @module utils
  */
 // Configuration
-export { setSdkConfig, getSdkConfig, clearSdkConfig, mergeConfig, getAddresses } from './config';
+export { setSdkConfig, getSdkConfig, clearSdkConfig, mergeConfig, getAddresses, getAffiliateConfig, getRpcUrl } from './config';
 // Network Addresses
 export { getProgramAddresses, getNetworkAddresses, isValidProgramSet, isValidNetwork, MAINNET_ADDRESSES, ATLASNET_ADDRESSES } from './addresses';
 // Signer Utilities
@@ -12,8 +12,14 @@ export { toTransactionSigner, validateAddress, isWeb3jsSigner, isKitSigner, isAd
 export { toWeb3Instruction, toAddress } from './web3js';
 // Instruction Utilities
 export { prepareInstructions } from './instructions';
+// Instruction Result
+export { InstructionResult } from './instructionResult';
 // RPC Utilities
 export { createRpc, setRpcDebug, isRpcDebugEnabled } from './rpc';
 // Address Lookup Table Utilities
 export { fetchLookupTable, getLookupTableAddress } from './lookupTable';
+// Rental Utilities
+export { hasActiveRental, hasQueuedRental, } from './rental';
+// Discount Authorization Utilities
+export { createDiscount, serializeDiscountAuth, deserializeDiscountAuth, isSerializedDiscountAuth } from './discountAuth';
 //# sourceMappingURL=index.js.map

package/dist/esm/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,gBAAgB;AAChB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,WAAW,EACX,YAAY,EAGb,MAAM,UAAU,CAAC;AAElB,oBAAoB;AACpB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAInB,MAAM,aAAa,CAAC;AAErB,mBAAmB;AACnB,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,WAAW,EACX,eAAe,EAEhB,MAAM,UAAU,CAAC;AAElB,wBAAwB;AACxB,OAAO,EACL,iBAAiB,EACjB,SAAS,EAIV,MAAM,UAAU,CAAC;AAElB,wBAAwB;AACxB,OAAO,EACL,mBAAmB,EAEpB,MAAM,gBAAgB,CAAC;AAExB,gBAAgB;AAChB,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAElE,iCAAiC;AACjC,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,gBAAgB;AAChB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,SAAS,EAIV,MAAM,UAAU,CAAC;AAElB,oBAAoB;AACpB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAInB,MAAM,aAAa,CAAC;AAErB,mBAAmB;AACnB,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,WAAW,EACX,eAAe,EAEhB,MAAM,UAAU,CAAC;AAElB,wBAAwB;AACxB,OAAO,EACL,iBAAiB,EACjB,SAAS,EAIV,MAAM,UAAU,CAAC;AAElB,wBAAwB;AACxB,OAAO,EACL,mBAAmB,EAEpB,MAAM,gBAAgB,CAAC;AAExB,qBAAqB;AACrB,OAAO,EACL,iBAAiB,EAElB,MAAM,qBAAqB,CAAC;AAE7B,gBAAgB;AAChB,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAElE,iCAAiC;AACjC,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,eAAe,CAAC;AAEvB,mBAAmB;AACnB,OAAO,EACL,eAAe,EACf,eAAe,GAChB,MAAM,UAAU,CAAC;AAElB,mCAAmC;AACnC,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,uBAAuB,EACvB,wBAAwB,EAKzB,MAAM,gBAAgB,CAAC"}

package/dist/esm/utils/instructionResult.js

@@ -0,0 +1,72 @@
+/**
+ * @purpose InstructionResult - Array-like wrapper for @solana/kit Instructions with legacy conversion
+ *
+ * Provides native @solana/kit Instruction[] compatibility with optional .toLegacy() conversion
+ * for web3.js users.
+ */
+import { getSdkConfig } from './config';
+/**
+ * Convert a single @solana/kit Instruction to legacy web3.js format
+ */
+function convertToLegacy(instruction, PublicKey) {
+    const accounts = instruction.accounts || [];
+    const data = instruction.data || new Uint8Array();
+    return {
+        keys: accounts.map(account => ({
+            pubkey: new PublicKey(String(account.address)),
+            isWritable: (account.role & 1) === 1, // Check writable bit
+            isSigner: (account.role & 2) === 2 // Check signer bit
+        })),
+        programId: new PublicKey(String(instruction.programAddress)),
+        data
+    };
+}
+/**
+ * InstructionResult - Wrapper for @solana/kit Instructions with legacy conversion
+ *
+ * Contains a plain Instruction[] array accessible via `.instructions`.
+ * Supports iteration (`for...of`, spread) and `.toLegacy()` conversion for web3.js.
+ *
+ * @example
+ * ```typescript
+ * // Kit users - access instructions directly
+ * const result = await createContract(params);
+ * for (const ix of result) { ... }
+ * // Or unwrap: result.instructions
+ *
+ * // Web3.js users - convert to legacy format
+ * import { PublicKey } from '@solana/web3.js';
+ * const legacyIxs = result.toLegacy(PublicKey);
+ * // Or if PublicKey is configured in SDK:
+ * setSdkConfig({ PublicKey });
+ * const legacyIxs = result.toLegacy();
+ * ```
+ */
+export class InstructionResult {
+    instructions;
+    constructor(instructions) {
+        this.instructions = instructions;
+    }
+    /**
+     * Convert to legacy web3.js instruction format
+     *
+     * @param PublicKey - Optional PublicKey constructor. If not provided,
+     *                    uses the PublicKey from SDK config (set via setSdkConfig)
+     * @returns Array of instructions in web3.js format
+     * @throws Error if no PublicKey is available
+     */
+    toLegacy(PublicKey) {
+        const pk = PublicKey || getSdkConfig().PublicKey;
+        if (!pk) {
+            throw new Error('PublicKey constructor required - pass it to toLegacy() or set in SDK config via setSdkConfig({ PublicKey })');
+        }
+        return this.instructions.map(ix => convertToLegacy(ix, pk));
+    }
+    get length() {
+        return this.instructions.length;
+    }
+    [Symbol.iterator]() {
+        return this.instructions[Symbol.iterator]();
+    }
+}
+//# sourceMappingURL=instructionResult.js.map

package/dist/esm/utils/instructionResult.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instructionResult.js","sourceRoot":"","sources":["../../../src/utils/instructionResult.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAA6B,MAAM,UAAU,CAAC;AAenE;;GAEG;AACH,SAAS,eAAe,CACtB,WAAwB,EACxB,SAA2C;IAE3C,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC;IAC5C,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,IAAI,IAAI,UAAU,EAAE,CAAC;IAElD,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7B,MAAM,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9C,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,qBAAqB;YAC3D,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,mBAAmB;SACvD,CAAC,CAAC;QACH,SAAS,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QAC5D,IAAI;KACL,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,OAAO,iBAAiB;IACnB,YAAY,CAAgB;IAErC,YAAY,YAA2B;QACrC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED;;;;;;;OAOG;IACH,QAAQ,CACN,SAA4C;QAE5C,MAAM,EAAE,GAAG,SAAS,IAAI,YAAY,EAAE,CAAC,SAAS,CAAC;QACjD,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CACb,6GAA6G,CAC9G,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;IAClC,CAAC;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC;QACf,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC9C,CAAC;CACF"}

package/dist/esm/utils/instructions.js

@@ -1,8 +1,8 @@
 /**
- * Shared utilities for preparing instructions with compute budget and web3.js conversion
+ * Shared utilities for preparing instructions with compute budget
  * @module utils/instructions
  */
-import { toWeb3Instruction } from './web3js';
+import { InstructionResult } from './instructionResult';
 /**
  * Compute Budget Program ID
  */
@@ -15,7 +15,7 @@ const SET_COMPUTE_UNIT_LIMIT_DISCRIMINATOR = 0x02;
  * Create a SetComputeUnitLimit instruction manually
  *
  * @param units - Compute units to allocate
- * @returns Kit instruction for setting compute unit limit
+ * @returns Instruction for setting compute unit limit
  */
 function createComputeBudgetInstruction(units) {
     // Encode u32 in little-endian format
@@ -36,26 +36,25 @@ function createComputeBudgetInstruction(units) {
  * This utility handles the common workflow of:
  * 1. Normalizing single instruction to array
  * 2. Optionally prepending compute budget instruction
- * 3. Optionally converting to web3.js format
+ * 3. Returning an InstructionResult that can be used directly with @solana/kit
+ *    or converted to web3.js format via .toLegacy()
  *
  * @param instructions - Single instruction or array of instructions
- * @param options - Optional configuration for compute budget and web3.js conversion
- * @returns Prepared instruction array (Kit or web3.js format)
+ * @param options - Optional configuration for compute budget
+ * @returns InstructionResult (extends Instruction[], has .toLegacy() method)
  *
  * @example
  * ```typescript
- * // Just return kit instructions as array
+ * // Kit users - use result directly as Instruction[]
  * const ixs = prepareInstructions(acceptRentalIx);
+ * // ixs works with appendTransactionMessageInstruction()
  *
  * // Add compute budget
  * const ixs = prepareInstructions(acceptRentalIx, { computeUnits: 400_000 });
  *
- * // Convert to web3.js
+ * // Web3.js users - call .toLegacy()
  * import { PublicKey } from '@solana/web3.js';
- * const ixs = prepareInstructions(acceptRentalIx, { PublicKey });
- *
- * // Both compute budget and web3.js conversion
- * const ixs = prepareInstructions(acceptRentalIx, { computeUnits: 400_000, PublicKey });
+ * const legacyIxs = prepareInstructions(acceptRentalIx).toLegacy(PublicKey);
  * ```
  */
 export function prepareInstructions(instructions, options) {
@@ -67,10 +66,6 @@ export function prepareInstructions(instructions, options) {
         const computeBudgetIx = createComputeBudgetInstruction(options.computeUnits);
         finalIxs = [computeBudgetIx, ...ixArray];
     }
-    // Optionally convert to web3.js format
-    if (options?.PublicKey) {
-        return finalIxs.map(ix => toWeb3Instruction(ix, options.PublicKey));
-    }
-    return finalIxs;
+    return new InstructionResult(finalIxs);
 }
 //# sourceMappingURL=instructions.js.map

package/dist/esm/utils/instructions.js.map

@@ -1 +1 @@
-{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../../src/utils/instructions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,iBAAiB,EAA2E,MAAM,UAAU,CAAC;AAGtH;;GAEG;AACH,MAAM,sBAAsB,GAAG,6CAA6C,CAAC;AAE7E;;GAEG;AACH,MAAM,oCAAoC,GAAG,IAAI,CAAC;AAElD;;;;;GAKG;AACH,SAAS,8BAA8B,CAAC,KAAa;IACnD,qCAAqC;IACrC,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,GAAG,oCAAoC,CAAC;IAC/C,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC;IACvB,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAC9B,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IAE/B,OAAO;QACL,cAAc,EAAE,sBAAsB;QACtC,IAAI;KACL,CAAC;AACJ,CAAC;AAmBD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,UAAU,mBAAmB,CACjC,YAA+C,EAC/C,OAAgD;IAEhD,qBAAqB;IACrB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAE5E,gDAAgD;IAChD,IAAI,QAAQ,GAAqB,OAAO,CAAC;IACzC,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;QAC1B,MAAM,eAAe,GAAG,8BAA8B,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7E,QAAQ,GAAG,CAAC,eAAe,EAAE,GAAG,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,uCAAuC;IACvC,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../../src/utils/instructions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD;;GAEG;AACH,MAAM,sBAAsB,GAAG,6CAAwD,CAAC;AAExF;;GAEG;AACH,MAAM,oCAAoC,GAAG,IAAI,CAAC;AAElD;;;;;GAKG;AACH,SAAS,8BAA8B,CAAC,KAAa;IACnD,qCAAqC;IACrC,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,GAAG,oCAAoC,CAAC;IAC/C,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC;IACvB,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAC9B,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IAE/B,OAAO;QACL,cAAc,EAAE,sBAAsB;QACtC,IAAI;KACL,CAAC;AACJ,CAAC;AAmBD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,mBAAmB,CACjC,YAAyC,EACzC,OAAoC;IAEpC,qBAAqB;IACrB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAE5E,gDAAgD;IAChD,IAAI,QAAQ,GAAkB,OAAO,CAAC;IACtC,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;QAC1B,MAAM,eAAe,GAAG,8BAA8B,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7E,QAAQ,GAAG,CAAC,eAAe,EAAE,GAAG,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;AACzC,CAAC"}

package/dist/esm/utils/rental.js

@@ -0,0 +1,45 @@
+/**
+ * Rental utility functions
+ * @module utils/rental
+ */
+import { fetchRentalState } from '../generated/codama/accounts';
+import { RentalStatus } from '../generated/codama/types';
+import { deriveActiveRental, deriveQueuedRental } from '../pda/srsly';
+import { createRpc } from './rpc';
+/**
+ * Check if a contract has an active rental.
+ *
+ * @param contract - The contract address
+ * @param rpcUrl - RPC URL to use for fetching rental state
+ * @returns true if active rental exists and has Active status
+ */
+export async function hasActiveRental(contract, rpcUrl) {
+    const rpc = createRpc(rpcUrl);
+    try {
+        const activeRentalPda = await deriveActiveRental(contract);
+        const rentalState = await fetchRentalState(rpc, activeRentalPda);
+        return rentalState.data.status === RentalStatus.Active;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Check if a contract has a queued rental reservation.
+ *
+ * @param contract - The contract address
+ * @param rpcUrl - RPC URL to use for fetching rental state
+ * @returns true if queued rental exists and has Queued status
+ */
+export async function hasQueuedRental(contract, rpcUrl) {
+    const rpc = createRpc(rpcUrl);
+    try {
+        const queuedRentalPda = await deriveQueuedRental(contract);
+        const rentalState = await fetchRentalState(rpc, queuedRentalPda);
+        return rentalState.data.status === RentalStatus.Queued;
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=rental.js.map

package/dist/esm/utils/rental.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rental.js","sourceRoot":"","sources":["../../../src/utils/rental.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAA0B,EAC1B,MAAc;IAEd,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACjE,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAA0B,EAC1B,MAAc;IAEd,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACjE,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/esm/utils/signer.js

@@ -31,26 +31,33 @@ export function getSignerAddress(signer) {
     // Handle string address
     if (typeof signer === 'string') {
         validateAddress(signer);
-        return signer;
+        return address(signer);
     }
     // Handle object signers
     if (signer && typeof signer === 'object') {
-        // web3.js Keypair/Wallet format
+        // web3.js Keypair/Wallet format (has publicKey.toBase58())
         if ('publicKey' in signer && signer.publicKey && typeof signer.publicKey.toBase58 === 'function') {
-            const address = signer.publicKey.toBase58();
-            validateAddress(address);
-            return address;
+            const addr = signer.publicKey.toBase58();
+            validateAddress(addr);
+            return address(addr);
+        }
+        // web3.js PublicKey format (has direct toBase58())
+        if ('toBase58' in signer && typeof signer.toBase58 === 'function') {
+            const addr = signer.toBase58();
+            validateAddress(addr);
+            return address(addr);
         }
         // @solana/kit signer format
         if ('address' in signer) {
-            const address = String(signer.address);
-            validateAddress(address);
-            return address;
+            const addr = String(signer.address);
+            validateAddress(addr);
+            return address(addr);
         }
     }
     throw new Error('Invalid signer format. Expected:\n' +
         '  - string address\n' +
         '  - web3.js Keypair (with publicKey.toBase58())\n' +
+        '  - web3.js PublicKey (with toBase58())\n' +
         '  - @solana/kit TransactionSigner (with address property)');
 }
 /**
@@ -133,6 +140,6 @@ export function toTransactionSigner(signer) {
         return signer;
     }
     // Otherwise, extract address and create noop signer (for browser/wallet cases)
-    return createNoopSigner(address(getSignerAddress(signer)));
+    return createNoopSigner(getSignerAddress(signer));
 }
 //# sourceMappingURL=signer.js.map

package/dist/esm/utils/signer.js.map

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

package/dist/esm/version.js

@@ -1,4 +1,4 @@
 // Auto-generated from package.json - DO NOT EDIT
 // Run "pnpm run generate:version" to update
-export const VERSION = '3.0.0-beta.9';
+export const VERSION = '4.0.0-beta.2';
 //# sourceMappingURL=version.js.map