@wuwei-labs/srsly 2.0.0-beta.44 → 2.0.0-beta.45

package/README.md

@@ -80,13 +80,37 @@ const signature = await wallet.sendTransaction(transaction, connection);
 
 ## Core Features
 
+### Universal Signer Pattern
+
+The SDK supports both CLI/Node.js and browser usage patterns through its Universal Signer functionality:
+
+**Browser Usage** (String Addresses):
+```typescript
+// Pass string addresses for browser wallets
+const instruction = await acceptRental({
+  borrower: wallet.publicKey.toString(),  // String address
+  // ... other params
+});
+// Browser wallet handles signing separately
+```
+
+**CLI/Node.js Usage** (Signer Objects):
+```typescript
+// Pass signer objects for full signing capability
+const instruction = await acceptRental({
+  borrower: wallet,  // Signer object
+  // ... other params
+});
+// Can sign transactions directly
+```
+
 ### Instruction Building & Format Conversion
 
 The SDK creates @solana/kit compatible instructions with seamless web3.js conversion:
 
 - **📦 Instruction-Only**: Focus on instruction building, users handle transaction assembly/sending
 - **🔄 Format Conversion**: Built-in `.web3js(PublicKey)` method for wallet compatibility
-- **🎯 String Addresses**: Simple string-based addressing for all inputs  
+- **🎯 Universal Signer**: Accepts both string addresses and signer objects
 - **⚡ Lightweight**: Uses @solana/kit internally with optional web3.js conversion
 
 ### Web3.js Format Conversion
@@ -464,3 +488,5 @@ The SDK provides optimized builds for different environments:
 
 - **NPM Package**: [@wuwei-labs/srsly](https://www.npmjs.com/package/@wuwei-labs/srsly)
 - **TypeDoc Documentation**: [API Reference](https://wuwei-labs.github.io/srsly/)
+- **Browser Usage Examples**: [Browser Integration Guide](./examples/browser-usage.md)
+- **Universal Signer Tests**: [Test Examples](./tests/features/universal-signer.test.mjs)

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wuwei-labs/srsly",
-  "version": "2.0.0-beta.44",
+  "version": "2.0.0-beta.45",
   "description": "",
   "source": "./src/index.ts",
   "sideEffects": false,

package/dist/cjs/rental/accept.js

@@ -9,6 +9,7 @@ const instruction_converter_1 = require("../utils/instruction-converter");
 const fetch_accounts_1 = require("../utils/fetch-accounts");
 const paymentFrequency_1 = require("../utils/paymentFrequency");
 const pda_1 = require("../utils/pda");
+const signer_1 = require("../utils/signer");
 /**
  * Internal function to accept a rental instruction with configuration options.
  *
@@ -24,7 +25,7 @@ const pda_1 = require("../utils/pda");
  * @throws Error when contract is not found, duration constraints are violated, or account derivation fails
  */
 async function _acceptRental(params, config) {
-    const { borrower, borrowerProfile, borrowerFaction, contract, duration, } = params;
+    const { borrowerProfile, borrowerFaction, contract, duration, } = params;
     // Get the resolved addresses from config (including network-specific addresses)
     // Use global config as fallback, same pattern as constants.ts
     const globalConfig = (0, config_1.getConfig)();
@@ -33,7 +34,7 @@ async function _acceptRental(params, config) {
     // Fetch contract state to get payment frequency and validate parameters
     let contractState;
     try {
-        contractState = await (0, fetch_accounts_1.fetchContractState)(resolvedAddresses.rpcUrl, (0, constants_1.toAddress)(contract));
+        contractState = await (0, fetch_accounts_1.fetchContractState)(contract);
     }
     catch (error) {
         throw new Error(`Failed to fetch contract state: ${error}`);
@@ -57,15 +58,17 @@ async function _acceptRental(params, config) {
     // Manually derive ALL game accounts - they all use different program addresses than main SAGE program
     const { profileFaction, starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(borrowerProfile), borrowerFaction, resolvedAddresses.gameId, 0, // starbaseSeqId
     config);
+    // Handle borrower using smart signer handler for universal compatibility
+    const borrower = (0, signer_1.createTransactionSigner)(params.borrower);
     // Manually derive PDAs with correct program IDs
-    const rentalStatePda = await (0, pda_1.deriveRentalState)((0, constants_1.toAddress)(contract), borrower.address, // Extract address from signer
+    const rentalStatePda = await (0, pda_1.deriveRentalState)((0, constants_1.toAddress)(contract), borrower.address, // Use TransactionSigner.address for PDA derivation
     resolvedAddresses.srslyProgramAddress);
     const rentalAuthorityPda = await (0, pda_1.deriveRentalAuthority)(resolvedAddresses.srslyProgramAddress);
     // 🔧 FIX: Derive rental thread PDA using Antegen program ID
     const rentalThreadPda = await (0, pda_1.deriveRentalThread)(rentalAuthorityPda, rentalStatePda, resolvedAddresses.antegenProgramAddress);
     // Create input with ALL manually derived game accounts - they use different program addresses
     const input = {
-        borrower: borrower, // Pass signer directly to Codama
+        borrower: borrower, // TransactionSigner for Codama
         borrowerProfile: (0, constants_1.toAddress)(borrowerProfile), // Ensure string
         borrowerProfileFaction: (0, constants_1.toAddress)(profileFaction), // Manually derived (Profile program)
         fleet: (0, constants_1.toAddress)(fleet), // Ensure string
@@ -138,27 +141,36 @@ async function _acceptRental(params, config) {
  * ```typescript
  * import { acceptRental, days } from '@srsly/sdk';
  *
- * // Basic rental acceptance
+ * // CLI usage with wallet/signer object
  * const instruction = await acceptRental({
- *   borrower: wallet,                     // Borrower's wallet
- *   borrowerProfile: "ProfileAddr...",    // Borrower's Star Atlas profile
- *   borrowerFaction: 'mud',               // Faction: 'mud', 'oni', or 'ustur'
- *   contract: "ContractAddr...",          // Contract to accept
- *   duration: days(7)                     // 7 days rental duration
+ *   borrower: wallet,                      // Wallet object for signing
+ *   borrowerProfile: "ProfileAddr...",     // Borrower's Star Atlas profile
+ *   borrowerFaction: 'mud',                // Faction: 'mud', 'oni', or 'ustur'
+ *   contract: "ContractAddr...",           // Contract to accept
+ *   duration: days(7)                      // 7 days rental duration
  * });
  *
- * // Configure for mainnet
+ * // Browser usage with address string
+ * const browserInstruction = await acceptRental({
+ *   borrower: wallet.publicKey.toString(), // Address string for browser
+ *   borrowerProfile: "ProfileAddr...",     // Borrower's Star Atlas profile
+ *   borrowerFaction: 'mud',                // Faction: 'mud', 'oni', or 'ustur'
+ *   contract: "ContractAddr...",           // Contract to accept
+ *   duration: days(7)                      // 7 days rental duration
+ * });
+ *
+ * // Configure for mainnet (both patterns work)
  * const mainnetInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: wallet,                      // Wallet object (CLI style)
  *   borrowerProfile: "ProfileAddr...",
- *   borrowerFaction: 1,                   // Can use numbers: 1=mud, 2=oni, 3=ustur
+ *   borrowerFaction: 1,                    // Can use numbers: 1=mud, 2=oni, 3=ustur
  *   contract: "ContractAddr...",
  *   duration: days(7)
  * }).set({ programs: 'mainnet' });
  *
  * // Override specific game configuration
  * const customInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: "BorrowerAddress123...",     // Address string (browser style)
  *   borrowerProfile: "ProfileAddr...",
  *   borrowerFaction: 'mud',
  *   contract: "ContractAddr...",
@@ -170,7 +182,7 @@ async function _acceptRental(params, config) {
  *
  * // Convert to @solana/web3.js format
  * const web3jsInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: wallet,                      // Universal: works with both patterns
  *   borrowerProfile: "ProfileAddr...",
  *   borrowerFaction: 'mud',
  *   contract: "ContractAddr...",

package/dist/cjs/rental/accept.js.map

@@ -1 +1 @@
-{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":";;AA+RA,oCAKC;AAcD,0EAKC;AAvTD,4CAA+I;AAC/I,kDAAkE;AAClE,oCAA8C;AAC9C,0EAAkK;AAClK,4DAA6D;AAC7D,gEAA4E;AAC5E,sCAA4F;AAyD5F;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,eAAe,EACf,eAAe,EACf,QAAQ,EACR,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,8DAA8D;IAC9D,MAAM,YAAY,GAAG,IAAA,kBAAS,GAAE,CAAC;IACjC,MAAM,eAAe,GAAG,EAAE,GAAG,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC;IACvD,MAAM,iBAAiB,GAAG,MAAM,IAAA,gCAAuB,EAAC,eAAe,CAAC,CAAC;IAEzE,wEAAwE;IACxE,IAAI,aAAa,CAAC;IAClB,IAAI,CAAC;QACH,aAAa,GAAG,MAAM,IAAA,mCAAkB,EAAC,iBAAiB,CAAC,MAAO,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,CAAC,CAAC;IAC3F,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,mCAAmC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;IAEvC,gCAAgC;IAChC,MAAM,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAExC,IAAI,cAAc,GAAG,WAAW,IAAI,cAAc,GAAG,WAAW,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,YAAY,cAAc,6CAA6C,WAAW,IAAI,WAAW,WAAW,CAAC,CAAC;IAChI,CAAC;IAED,mFAAmF;IACnF,MAAM,uBAAuB,GAAG,IAAA,kDAA+B,EAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChG,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,uBAAuB,CAAC,CAAC;IAE5E,iGAAiG;IACjG,MAAM,eAAe,GAAG,6BAAiB,CAAC,CAAC,gCAAgC;IAC3E,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;IAG/E,sGAAsG;IACtG,MAAM,EACJ,cAAc,EACd,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,IAAA,0BAAkB,EAC1B,IAAA,qBAAS,EAAC,eAAe,CAAC,EAC1B,eAAe,EACf,iBAAiB,CAAC,MAAM,EACxB,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,gDAAgD;IAChD,MAAM,cAAc,GAAG,MAAM,IAAA,uBAAiB,EAC5C,IAAA,qBAAS,EAAC,QAAQ,CAAC,EACnB,QAAQ,CAAC,OAAO,EAAE,8BAA8B;IAChD,iBAAiB,CAAC,mBAAmB,CACtC,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,IAAA,2BAAqB,EACpD,iBAAiB,CAAC,mBAAmB,CACtC,CAAC;IAEF,4DAA4D;IAC5D,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAkB,EAC9C,kBAAkB,EAClB,cAAc,EACd,iBAAiB,CAAC,qBAAqB,CACxC,CAAC;IAEF,8FAA8F;IAC9F,MAAM,KAAK,GAAoC;QAC7C,QAAQ,EAAE,QAAQ,EAA6B,iCAAiC;QAChF,eAAe,EAAE,IAAA,qBAAS,EAAC,eAAe,CAAC,EAAK,gBAAgB;QAChE,sBAAsB,EAAE,IAAA,qBAAS,EAAC,cAAc,CAAC,EAAE,qCAAqC;QACxF,KAAK,EAAE,IAAA,qBAAS,EAAC,KAAK,CAAC,EAAyB,gBAAgB;QAChE,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAmB,gBAAgB;QAChE,MAAM,EAAE,iBAAiB,CAAC,MAAM,EAAe,+CAA+C;QAC9F,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAmB,2DAA2D;QAC3G,cAAc,EAAE,IAAA,qBAAS,EAAC,cAAc,CAAC,EAAO,2DAA2D;QAC3G,IAAI,EAAE,iBAAiB,CAAC,SAAS,EAAc,yBAAyB;QACxE,WAAW,EAAE,iBAAiB,CAAC,kBAAkB,EAAE,2BAA2B;QAC9E,cAAc,EAAE,iBAAiB,CAAC,qBAAqB,EAAE,8BAA8B;QAEvF,iDAAiD;QACjD,WAAW,EAAE,cAAc;QAC3B,eAAe,EAAE,kBAAkB;QACnC,YAAY,EAAE,eAAe,EAAmB,2BAA2B;QAE3E,MAAM,EAAyC,eAAe;QAC9D,QAAQ,EAAuC,eAAe;KAC/D,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAE/D,MAAM,cAAc,GAAG,MAAM,+BAA+B,CAC1D,KAAY,EACZ,EAAE,cAAc,EAAE,iBAAiB,CAAC,mBAAmB,EAAE,CAC1D,CAAC;IACF,OAAO,IAAA,+CAAuB,EAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGG;AACH,SAAgB,YAAY,CAC1B,MAA0B;IAE1B,MAAM,YAAY,GAAG,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACrF,OAAO,IAAA,uDAA+B,EAAC,YAAY,CAAC,CAAC;AACvD,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,IAAA,6BAAoB,EAAC,KAAK,IAAI,EAAE;QACrC,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":"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"}

package/dist/cjs/rental/cancel.js

@@ -4,6 +4,7 @@ exports.cancelRental = cancelRental;
 exports.getCancelRentalInstructionAsync = getCancelRentalInstructionAsync;
 const config_1 = require("../utils/config");
 const constants_1 = require("../utils/constants");
+const signer_1 = require("../utils/signer");
 /**
  * Internal function to cancel a rental instruction with configuration options.
  *
@@ -18,13 +19,15 @@ const constants_1 = require("../utils/constants");
  * @throws Error when instruction generation fails or required parameters are missing
  */
 async function _cancelRental(params, config) {
-    const { borrower, contract, } = params;
+    const { contract, } = params;
+    // Handle borrower using smart signer handler for universal compatibility
+    const borrower = (0, signer_1.createTransactionSigner)(params.borrower);
     // Get the resolved addresses from config (including network-specific addresses)
     // Note: resolvedAddresses not currently needed for this instruction but kept for consistency
     // const resolvedAddresses = resolveProgramAddresses(config || {});
     // Let codama derive all the optional accounts
     const input = {
-        borrower, // Pass signer directly to Codama
+        borrower: borrower, // TransactionSigner for Codama
         contract: (0, constants_1.toAddress)(contract), // Ensure string
     };
     // Get network-specific codama functions from centralized config

package/dist/cjs/rental/cancel.js.map

@@ -1 +1 @@
-{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":";;AAiJA,oCAIC;AAcD,0EAKC;AAxKD,4CAAoI;AACpI,kDAA+C;AA+B/C;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,6FAA6F;IAC7F,mEAAmE;IAEnE,8CAA8C;IAC9C,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAqB,iCAAiC;QAC9D,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAE,gBAAgB;KAChD,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAC/D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,+BAA+B,CACpC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AACH,SAAgB,YAAY,CAC1B,MAA0B;IAE1B,OAAO,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,IAAA,6BAAoB,EAAC,KAAK,IAAI,EAAE;QACrC,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":";;AAoJA,oCAIC;AAcD,0EAKC;AA3KD,4CAAoI;AACpI,kDAA+C;AAC/C,4CAAgF;AA+BhF;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,yEAAyE;IACzE,MAAM,QAAQ,GAAG,IAAA,gCAAuB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE1D,gFAAgF;IAChF,6FAA6F;IAC7F,mEAAmE;IAEnE,8CAA8C;IAC9C,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAE,QAAQ,EAAE,+BAA+B;QACnD,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAE,gBAAgB;KAChD,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAC/D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,+BAA+B,CACpC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AACH,SAAgB,YAAY,CAC1B,MAA0B;IAE1B,OAAO,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,IAAA,6BAAoB,EAAC,KAAK,IAAI,EAAE;QACrC,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/cjs/utils/fetch-accounts.js

@@ -6,57 +6,39 @@ exports.fetchMultipleContractStates = fetchMultipleContractStates;
 exports.fetchMultipleRentalStates = fetchMultipleRentalStates;
 const kit_1 = require("@solana/kit");
 const accounts_1 = require("../codama/accounts");
-/**
- * Convenience wrapper functions for fetching account states with RPC URL strings.
- * These functions handle creating the RPC connection for you.
- */
-/**
- * Fetches contract state data from the blockchain using a simple RPC URL
- *
- * @param rpcUrl - The RPC endpoint URL as a string
- * @param contractAddress - The contract account address to fetch
- * @returns The deserialized contract state data
- *
- * @example
- * ```typescript
- * const contractState = await fetchContractState(
- *   'https://api.devnet.solana.com',
- *   'ContractAddress123...'
- * );
- *
- * console.log('Contract owner:', contractState.data.owner);
- * console.log('Contract rate:', contractState.data.rate);
- * ```
- */
-async function fetchContractState(rpcUrl, contractAddress) {
-    // Create RPC connection
+const config_1 = require("./config");
+const constants_1 = require("./constants");
+// Implementation
+async function fetchContractState(rpcUrlOrAddress, contractAddress) {
+    // If only one argument, it's the contract address using default RPC
+    if (contractAddress === undefined) {
+        const address = (0, constants_1.toAddress)(rpcUrlOrAddress);
+        const config = (0, config_1.getConfig)();
+        const resolved = await (0, config_1.resolveProgramAddresses)(config);
+        const rpc = (0, kit_1.createSolanaRpc)(resolved.rpcUrl);
+        return (0, accounts_1.fetchContractState)(rpc, address);
+    }
+    // If two arguments, first is rpcUrl, second is address
+    const rpcUrl = rpcUrlOrAddress;
+    const address = (0, constants_1.toAddress)(contractAddress);
     const rpc = (0, kit_1.createSolanaRpc)(rpcUrl);
-    // Fetch and return the contract state
-    return (0, accounts_1.fetchContractState)(rpc, contractAddress);
+    return (0, accounts_1.fetchContractState)(rpc, address);
 }
-/**
- * Fetches rental state data from the blockchain using a simple RPC URL
- *
- * @param rpcUrl - The RPC endpoint URL as a string
- * @param rentalAddress - The rental account address to fetch
- * @returns The deserialized rental state data
- *
- * @example
- * ```typescript
- * const rentalState = await fetchRentalState(
- *   'https://api.devnet.solana.com',
- *   'RentalAddress123...'
- * );
- *
- * console.log('Rental borrower:', rentalState.data.borrower);
- * console.log('Rental start:', rentalState.data.start);
- * ```
- */
-async function fetchRentalState(rpcUrl, rentalAddress) {
-    // Create RPC connection
+// Implementation
+async function fetchRentalState(rpcUrlOrAddress, rentalAddress) {
+    // If only one argument, it's the rental address using default RPC
+    if (rentalAddress === undefined) {
+        const address = (0, constants_1.toAddress)(rpcUrlOrAddress);
+        const config = (0, config_1.getConfig)();
+        const resolved = await (0, config_1.resolveProgramAddresses)(config);
+        const rpc = (0, kit_1.createSolanaRpc)(resolved.rpcUrl);
+        return (0, accounts_1.fetchRentalState)(rpc, address);
+    }
+    // If two arguments, first is rpcUrl, second is address
+    const rpcUrl = rpcUrlOrAddress;
+    const address = (0, constants_1.toAddress)(rentalAddress);
     const rpc = (0, kit_1.createSolanaRpc)(rpcUrl);
-    // Fetch and return the rental state
-    return (0, accounts_1.fetchRentalState)(rpc, rentalAddress);
+    return (0, accounts_1.fetchRentalState)(rpc, address);
 }
 /**
  * Fetches multiple contract states in a single RPC call

package/dist/cjs/utils/fetch-accounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-accounts.js","sourceRoot":"","sources":["../../../src/utils/fetch-accounts.ts"],"names":[],"mappings":";;AA+BA,gDASC;AAoBD,4CASC;AAuBD,kEASC;AAuBD,8DASC;AArID,qCAA4D;AAC5D,iDAK4B;AAE5B;;;GAGG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACI,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,eAAkC;IAElC,wBAAwB;IACxB,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IAEpC,sCAAsC;IACtC,OAAO,IAAA,6BAAwB,EAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AACxD,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACI,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,aAAgC;IAEhC,wBAAwB;IACxB,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IAEpC,oCAAoC;IACpC,OAAO,IAAA,2BAAsB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACI,KAAK,UAAU,2BAA2B,CAC/C,MAAc,EACd,iBAAsC;IAEtC,wBAAwB;IACxB,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IAEpC,uCAAuC;IACvC,OAAO,IAAA,gCAAqB,EAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AACvD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACI,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,eAAoC;IAEpC,wBAAwB;IACxB,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IAEpC,qCAAqC;IACrC,OAAO,IAAA,8BAAmB,EAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"fetch-accounts.js","sourceRoot":"","sources":["../../../src/utils/fetch-accounts.ts"],"names":[],"mappings":";;AAwDA,gDAkBC;AA2CD,4CAkBC;AAuBD,kEASC;AAuBD,8DASC;AAvMD,qCAA4D;AAC5D,iDAK4B;AAC5B,qCAA8D;AAC9D,2CAAwC;AA+CxC,iBAAiB;AACV,KAAK,UAAU,kBAAkB,CACtC,eAA2C,EAC3C,eAA4C;IAE5C,oEAAoE;IACpE,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,IAAA,qBAAS,EAAC,eAA6C,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAuB,EAAC,MAAM,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,IAAA,6BAAwB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,uDAAuD;IACvD,MAAM,MAAM,GAAG,eAAyB,CAAC;IACzC,MAAM,OAAO,GAAG,IAAA,qBAAS,EAAC,eAAe,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IACpC,OAAO,IAAA,6BAAwB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AA0CD,iBAAiB;AACV,KAAK,UAAU,gBAAgB,CACpC,eAA2C,EAC3C,aAA0C;IAE1C,kEAAkE;IAClE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,IAAA,qBAAS,EAAC,eAA6C,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAuB,EAAC,MAAM,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,IAAA,2BAAsB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,uDAAuD;IACvD,MAAM,MAAM,GAAG,eAAyB,CAAC;IACzC,MAAM,OAAO,GAAG,IAAA,qBAAS,EAAC,aAAa,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IACpC,OAAO,IAAA,2BAAsB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACI,KAAK,UAAU,2BAA2B,CAC/C,MAAc,EACd,iBAAsC;IAEtC,wBAAwB;IACxB,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IAEpC,uCAAuC;IACvC,OAAO,IAAA,gCAAqB,EAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AACvD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACI,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,eAAoC;IAEpC,wBAAwB;IACxB,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IAEpC,qCAAqC;IACrC,OAAO,IAAA,8BAAmB,EAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AACnD,CAAC"}

package/dist/cjs/utils/index.js

@@ -22,4 +22,5 @@ __exportStar(require("./duration"), exports);
 __exportStar(require("./instruction-converter"), exports);
 __exportStar(require("./fetch-accounts"), exports);
 __exportStar(require("./pda"), exports);
+__exportStar(require("./signer"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,6CAA2B;AAC3B,2CAAyB;AACzB,qDAAmC;AACnC,6CAA2B;AAC3B,0DAAwC;AACxC,mDAAiC;AACjC,wCAAsB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,6CAA2B;AAC3B,2CAAyB;AACzB,qDAAmC;AACnC,6CAA2B;AAC3B,0DAAwC;AACxC,mDAAiC;AACjC,wCAAsB;AACtB,2CAAyB"}

package/dist/cjs/utils/signer.js

@@ -0,0 +1,61 @@
+"use strict";
+/**
+ * Universal signer handling utilities for cross-library compatibility
+ *
+ * This module provides utilities to handle different signer types across
+ * @solana/kit, @solana/web3.js, and plain address strings in a unified way.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTransactionSigner = createTransactionSigner;
+exports.isSignerObject = isSignerObject;
+exports.isAddressString = isAddressString;
+const kit_1 = require("@solana/kit");
+/**
+ * Creates TransactionSigner from UniversalSigner input for universal compatibility
+ *
+ * This function provides universal compatibility by:
+ * - Converting string addresses to TransactionSigner using createNoopSigner
+ * - Passing through existing TransactionSigner objects unchanged
+ * - Safely handling different signer interfaces (kit, web3.js, etc.)
+ *
+ * The returned TransactionSigner has both .address property and signing capability,
+ * making it suitable for both PDA derivation and codama instruction building.
+ *
+ * @param signer - The signer input (string address or signer object)
+ * @returns TransactionSigner that can be used directly for codama and has .address property
+ *
+ * @example
+ * ```typescript
+ * // Browser usage with string address
+ * const borrower = createTransactionSigner("base58AddressString");
+ * // borrower.address → Address object for PDA derivation
+ * // borrower → TransactionSigner for codama
+ *
+ * // CLI usage with wallet object
+ * const borrower = createTransactionSigner(wallet);
+ * // borrower.address → wallet.address for PDA derivation
+ * // borrower → wallet signer for codama
+ * ```
+ */
+function createTransactionSigner(signer) {
+    // Handle string address case (browser usage)
+    if (typeof signer === 'string') {
+        return (0, kit_1.createNoopSigner)((0, kit_1.address)(signer)); // Returns TransactionSigner with .address property
+    }
+    // Handle signer object cases (CLI and other wallet interfaces)
+    // These should already be TransactionSigner objects with .address property
+    return signer;
+}
+/**
+ * Type guard to check if a value is a signer object (not a string)
+ */
+function isSignerObject(signer) {
+    return typeof signer !== 'string';
+}
+/**
+ * Type guard to check if a value is an address string
+ */
+function isAddressString(signer) {
+    return typeof signer === 'string';
+}
+//# sourceMappingURL=signer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../src/utils/signer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA2CH,0DASC;AAKD,wCAEC;AAKD,0CAEC;AAhED,qCAAgF;AAchF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,SAAgB,uBAAuB,CAAC,MAAuB;IAC7D,6CAA6C;IAC7C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,IAAA,sBAAgB,EAAC,IAAA,aAAO,EAAC,MAAM,CAAC,CAAC,CAAC,CAAE,mDAAmD;IAChG,CAAC;IAED,+DAA+D;IAC/D,2EAA2E;IAC3E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc,CAAC,MAAuB;IACpD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe,CAAC,MAAuB;IACrD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;AACpC,CAAC"}

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wuwei-labs/srsly",
-  "version": "2.0.0-beta.44",
+  "version": "2.0.0-beta.45",
   "description": "",
   "source": "./src/index.ts",
   "sideEffects": false,

package/dist/esm/rental/accept.js

@@ -5,6 +5,7 @@ import { createFluentInstruction, createSmartFluentConfigSelector } from '../uti
 import { fetchContractState } from '../utils/fetch-accounts';
 import { paymentFrequencyStringToSeconds } from '../utils/paymentFrequency';
 import { deriveRentalThread, deriveRentalState, deriveRentalAuthority } from '../utils/pda';
+import { createTransactionSigner } from '../utils/signer';
 /**
  * Internal function to accept a rental instruction with configuration options.
  *
@@ -20,7 +21,7 @@ import { deriveRentalThread, deriveRentalState, deriveRentalAuthority } from '..
  * @throws Error when contract is not found, duration constraints are violated, or account derivation fails
  */
 async function _acceptRental(params, config) {
-    const { borrower, borrowerProfile, borrowerFaction, contract, duration, } = params;
+    const { borrowerProfile, borrowerFaction, contract, duration, } = params;
     // Get the resolved addresses from config (including network-specific addresses)
     // Use global config as fallback, same pattern as constants.ts
     const globalConfig = getConfig();
@@ -29,7 +30,7 @@ async function _acceptRental(params, config) {
     // Fetch contract state to get payment frequency and validate parameters
     let contractState;
     try {
-        contractState = await fetchContractState(resolvedAddresses.rpcUrl, toAddress(contract));
+        contractState = await fetchContractState(contract);
     }
     catch (error) {
         throw new Error(`Failed to fetch contract state: ${error}`);
@@ -53,15 +54,17 @@ async function _acceptRental(params, config) {
     // Manually derive ALL game accounts - they all use different program addresses than main SAGE program
     const { profileFaction, starbase, starbasePlayer } = await deriveGameAccounts(toAddress(borrowerProfile), borrowerFaction, resolvedAddresses.gameId, 0, // starbaseSeqId
     config);
+    // Handle borrower using smart signer handler for universal compatibility
+    const borrower = createTransactionSigner(params.borrower);
     // Manually derive PDAs with correct program IDs
-    const rentalStatePda = await deriveRentalState(toAddress(contract), borrower.address, // Extract address from signer
+    const rentalStatePda = await deriveRentalState(toAddress(contract), borrower.address, // Use TransactionSigner.address for PDA derivation
     resolvedAddresses.srslyProgramAddress);
     const rentalAuthorityPda = await deriveRentalAuthority(resolvedAddresses.srslyProgramAddress);
     // 🔧 FIX: Derive rental thread PDA using Antegen program ID
     const rentalThreadPda = await deriveRentalThread(rentalAuthorityPda, rentalStatePda, resolvedAddresses.antegenProgramAddress);
     // Create input with ALL manually derived game accounts - they use different program addresses
     const input = {
-        borrower: borrower, // Pass signer directly to Codama
+        borrower: borrower, // TransactionSigner for Codama
         borrowerProfile: toAddress(borrowerProfile), // Ensure string
         borrowerProfileFaction: toAddress(profileFaction), // Manually derived (Profile program)
         fleet: toAddress(fleet), // Ensure string
@@ -134,27 +137,36 @@ async function _acceptRental(params, config) {
  * ```typescript
  * import { acceptRental, days } from '@srsly/sdk';
  *
- * // Basic rental acceptance
+ * // CLI usage with wallet/signer object
  * const instruction = await acceptRental({
- *   borrower: wallet,                     // Borrower's wallet
- *   borrowerProfile: "ProfileAddr...",    // Borrower's Star Atlas profile
- *   borrowerFaction: 'mud',               // Faction: 'mud', 'oni', or 'ustur'
- *   contract: "ContractAddr...",          // Contract to accept
- *   duration: days(7)                     // 7 days rental duration
+ *   borrower: wallet,                      // Wallet object for signing
+ *   borrowerProfile: "ProfileAddr...",     // Borrower's Star Atlas profile
+ *   borrowerFaction: 'mud',                // Faction: 'mud', 'oni', or 'ustur'
+ *   contract: "ContractAddr...",           // Contract to accept
+ *   duration: days(7)                      // 7 days rental duration
  * });
  *
- * // Configure for mainnet
+ * // Browser usage with address string
+ * const browserInstruction = await acceptRental({
+ *   borrower: wallet.publicKey.toString(), // Address string for browser
+ *   borrowerProfile: "ProfileAddr...",     // Borrower's Star Atlas profile
+ *   borrowerFaction: 'mud',                // Faction: 'mud', 'oni', or 'ustur'
+ *   contract: "ContractAddr...",           // Contract to accept
+ *   duration: days(7)                      // 7 days rental duration
+ * });
+ *
+ * // Configure for mainnet (both patterns work)
  * const mainnetInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: wallet,                      // Wallet object (CLI style)
  *   borrowerProfile: "ProfileAddr...",
- *   borrowerFaction: 1,                   // Can use numbers: 1=mud, 2=oni, 3=ustur
+ *   borrowerFaction: 1,                    // Can use numbers: 1=mud, 2=oni, 3=ustur
  *   contract: "ContractAddr...",
  *   duration: days(7)
  * }).set({ programs: 'mainnet' });
  *
  * // Override specific game configuration
  * const customInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: "BorrowerAddress123...",     // Address string (browser style)
  *   borrowerProfile: "ProfileAddr...",
  *   borrowerFaction: 'mud',
  *   contract: "ContractAddr...",
@@ -166,7 +178,7 @@ async function _acceptRental(params, config) {
  *
  * // Convert to @solana/web3.js format
  * const web3jsInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: wallet,                      // Universal: works with both patterns
  *   borrowerProfile: "ProfileAddr...",
  *   borrowerFaction: 'mud',
  *   contract: "ContractAddr...",

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

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

package/dist/esm/rental/cancel.js

@@ -1,5 +1,6 @@
 import { getModule, createConfigSelector } from '../utils/config';
 import { toAddress } from '../utils/constants';
+import { createTransactionSigner } from '../utils/signer';
 /**
  * Internal function to cancel a rental instruction with configuration options.
  *
@@ -14,13 +15,15 @@ import { toAddress } from '../utils/constants';
  * @throws Error when instruction generation fails or required parameters are missing
  */
 async function _cancelRental(params, config) {
-    const { borrower, contract, } = params;
+    const { contract, } = params;
+    // Handle borrower using smart signer handler for universal compatibility
+    const borrower = createTransactionSigner(params.borrower);
     // Get the resolved addresses from config (including network-specific addresses)
     // Note: resolvedAddresses not currently needed for this instruction but kept for consistency
     // const resolvedAddresses = resolveProgramAddresses(config || {});
     // Let codama derive all the optional accounts
     const input = {
-        borrower, // Pass signer directly to Codama
+        borrower: borrower, // TransactionSigner for Codama
         contract: toAddress(contract), // Ensure string
     };
     // Get network-specific codama functions from centralized config

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

@@ -1 +1 @@
-{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAoE,MAAM,iBAAiB,CAAC;AACpI,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AA+B/C;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,6FAA6F;IAC7F,mEAAmE;IAEnE,8CAA8C;IAC9C,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAqB,iCAAiC;QAC9D,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,gBAAgB;KAChD,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAC/D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,+BAA+B,CACpC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AACH,MAAM,UAAU,YAAY,CAC1B,MAA0B;IAE1B,OAAO,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,oBAAoB,CAAC,KAAK,IAAI,EAAE;QACrC,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAoE,MAAM,iBAAiB,CAAC;AACpI,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAwB,MAAM,iBAAiB,CAAC;AA+BhF;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,yEAAyE;IACzE,MAAM,QAAQ,GAAG,uBAAuB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE1D,gFAAgF;IAChF,6FAA6F;IAC7F,mEAAmE;IAEnE,8CAA8C;IAC9C,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAE,QAAQ,EAAE,+BAA+B;QACnD,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,gBAAgB;KAChD,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAC/D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,+BAA+B,CACpC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AACH,MAAM,UAAU,YAAY,CAC1B,MAA0B;IAE1B,OAAO,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,oBAAoB,CAAC,KAAK,IAAI,EAAE;QACrC,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/esm/utils/fetch-accounts.js

@@ -1,56 +1,38 @@
 import { createSolanaRpc } from '@solana/kit';
 import { fetchContractState as fetchContractStateCodama, fetchRentalState as fetchRentalStateCodama, fetchAllContractState, fetchAllRentalState } from '../codama/accounts';
-/**
- * Convenience wrapper functions for fetching account states with RPC URL strings.
- * These functions handle creating the RPC connection for you.
- */
-/**
- * Fetches contract state data from the blockchain using a simple RPC URL
- *
- * @param rpcUrl - The RPC endpoint URL as a string
- * @param contractAddress - The contract account address to fetch
- * @returns The deserialized contract state data
- *
- * @example
- * ```typescript
- * const contractState = await fetchContractState(
- *   'https://api.devnet.solana.com',
- *   'ContractAddress123...'
- * );
- *
- * console.log('Contract owner:', contractState.data.owner);
- * console.log('Contract rate:', contractState.data.rate);
- * ```
- */
-export async function fetchContractState(rpcUrl, contractAddress) {
-    // Create RPC connection
+import { getConfig, resolveProgramAddresses } from './config';
+import { toAddress } from './constants';
+// Implementation
+export async function fetchContractState(rpcUrlOrAddress, contractAddress) {
+    // If only one argument, it's the contract address using default RPC
+    if (contractAddress === undefined) {
+        const address = toAddress(rpcUrlOrAddress);
+        const config = getConfig();
+        const resolved = await resolveProgramAddresses(config);
+        const rpc = createSolanaRpc(resolved.rpcUrl);
+        return fetchContractStateCodama(rpc, address);
+    }
+    // If two arguments, first is rpcUrl, second is address
+    const rpcUrl = rpcUrlOrAddress;
+    const address = toAddress(contractAddress);
     const rpc = createSolanaRpc(rpcUrl);
-    // Fetch and return the contract state
-    return fetchContractStateCodama(rpc, contractAddress);
+    return fetchContractStateCodama(rpc, address);
 }
-/**
- * Fetches rental state data from the blockchain using a simple RPC URL
- *
- * @param rpcUrl - The RPC endpoint URL as a string
- * @param rentalAddress - The rental account address to fetch
- * @returns The deserialized rental state data
- *
- * @example
- * ```typescript
- * const rentalState = await fetchRentalState(
- *   'https://api.devnet.solana.com',
- *   'RentalAddress123...'
- * );
- *
- * console.log('Rental borrower:', rentalState.data.borrower);
- * console.log('Rental start:', rentalState.data.start);
- * ```
- */
-export async function fetchRentalState(rpcUrl, rentalAddress) {
-    // Create RPC connection
+// Implementation
+export async function fetchRentalState(rpcUrlOrAddress, rentalAddress) {
+    // If only one argument, it's the rental address using default RPC
+    if (rentalAddress === undefined) {
+        const address = toAddress(rpcUrlOrAddress);
+        const config = getConfig();
+        const resolved = await resolveProgramAddresses(config);
+        const rpc = createSolanaRpc(resolved.rpcUrl);
+        return fetchRentalStateCodama(rpc, address);
+    }
+    // If two arguments, first is rpcUrl, second is address
+    const rpcUrl = rpcUrlOrAddress;
+    const address = toAddress(rentalAddress);
     const rpc = createSolanaRpc(rpcUrl);
-    // Fetch and return the rental state
-    return fetchRentalStateCodama(rpc, rentalAddress);
+    return fetchRentalStateCodama(rpc, address);
 }
 /**
  * Fetches multiple contract states in a single RPC call

package/dist/esm/utils/fetch-accounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-accounts.js","sourceRoot":"","sources":["../../../src/utils/fetch-accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAgB,MAAM,aAAa,CAAC;AAC5D,OAAO,EACL,kBAAkB,IAAI,wBAAwB,EAC9C,gBAAgB,IAAI,sBAAsB,EAC1C,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B;;;GAGG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,eAAkC;IAElC,wBAAwB;IACxB,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAEpC,sCAAsC;IACtC,OAAO,wBAAwB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AACxD,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,aAAgC;IAEhC,wBAAwB;IACxB,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAEpC,oCAAoC;IACpC,OAAO,sBAAsB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,MAAc,EACd,iBAAsC;IAEtC,wBAAwB;IACxB,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAEpC,uCAAuC;IACvC,OAAO,qBAAqB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AACvD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,eAAoC;IAEpC,wBAAwB;IACxB,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAEpC,qCAAqC;IACrC,OAAO,mBAAmB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"fetch-accounts.js","sourceRoot":"","sources":["../../../src/utils/fetch-accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAgB,MAAM,aAAa,CAAC;AAC5D,OAAO,EACL,kBAAkB,IAAI,wBAAwB,EAC9C,gBAAgB,IAAI,sBAAsB,EAC1C,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA+CxC,iBAAiB;AACjB,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,eAA2C,EAC3C,eAA4C;IAE5C,oEAAoE;IACpE,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,SAAS,CAAC,eAA6C,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,uDAAuD;IACvD,MAAM,MAAM,GAAG,eAAyB,CAAC;IACzC,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACpC,OAAO,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AA0CD,iBAAiB;AACjB,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,eAA2C,EAC3C,aAA0C;IAE1C,kEAAkE;IAClE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,SAAS,CAAC,eAA6C,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,sBAAsB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,uDAAuD;IACvD,MAAM,MAAM,GAAG,eAAyB,CAAC;IACzC,MAAM,OAAO,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACpC,OAAO,sBAAsB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,MAAc,EACd,iBAAsC;IAEtC,wBAAwB;IACxB,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAEpC,uCAAuC;IACvC,OAAO,qBAAqB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AACvD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,eAAoC;IAEpC,wBAAwB;IACxB,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAEpC,qCAAqC;IACrC,OAAO,mBAAmB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AACnD,CAAC"}

package/dist/esm/utils/index.js

@@ -6,4 +6,5 @@ export * from "./duration";
 export * from "./instruction-converter";
 export * from "./fetch-accounts";
 export * from "./pda";
+export * from "./signer";
 //# 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,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,OAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC"}

package/dist/esm/utils/signer.js

@@ -0,0 +1,56 @@
+/**
+ * Universal signer handling utilities for cross-library compatibility
+ *
+ * This module provides utilities to handle different signer types across
+ * @solana/kit, @solana/web3.js, and plain address strings in a unified way.
+ */
+import { createNoopSigner, address } from '@solana/kit';
+/**
+ * Creates TransactionSigner from UniversalSigner input for universal compatibility
+ *
+ * This function provides universal compatibility by:
+ * - Converting string addresses to TransactionSigner using createNoopSigner
+ * - Passing through existing TransactionSigner objects unchanged
+ * - Safely handling different signer interfaces (kit, web3.js, etc.)
+ *
+ * The returned TransactionSigner has both .address property and signing capability,
+ * making it suitable for both PDA derivation and codama instruction building.
+ *
+ * @param signer - The signer input (string address or signer object)
+ * @returns TransactionSigner that can be used directly for codama and has .address property
+ *
+ * @example
+ * ```typescript
+ * // Browser usage with string address
+ * const borrower = createTransactionSigner("base58AddressString");
+ * // borrower.address → Address object for PDA derivation
+ * // borrower → TransactionSigner for codama
+ *
+ * // CLI usage with wallet object
+ * const borrower = createTransactionSigner(wallet);
+ * // borrower.address → wallet.address for PDA derivation
+ * // borrower → wallet signer for codama
+ * ```
+ */
+export function createTransactionSigner(signer) {
+    // Handle string address case (browser usage)
+    if (typeof signer === 'string') {
+        return createNoopSigner(address(signer)); // Returns TransactionSigner with .address property
+    }
+    // Handle signer object cases (CLI and other wallet interfaces)
+    // These should already be TransactionSigner objects with .address property
+    return signer;
+}
+/**
+ * Type guard to check if a value is a signer object (not a string)
+ */
+export function isSignerObject(signer) {
+    return typeof signer !== 'string';
+}
+/**
+ * Type guard to check if a value is an address string
+ */
+export function isAddressString(signer) {
+    return typeof signer === 'string';
+}
+//# sourceMappingURL=signer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../src/utils/signer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAA0B,MAAM,aAAa,CAAC;AAchF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAuB;IAC7D,6CAA6C;IAC7C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,mDAAmD;IAChG,CAAC;IAED,+DAA+D;IAC/D,2EAA2E;IAC3E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,MAAuB;IACpD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,MAAuB;IACrD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;AACpC,CAAC"}

package/dist/types/rental/accept.d.ts

@@ -1,7 +1,7 @@
 import { type ConfigSelector } from '../utils/config';
 import { type FluentInstruction, type SmartFluentConfigSelector } from '../utils/instruction-converter';
+import { type UniversalSigner } from '../utils/signer';
 type UniversalAddress = string;
-type UniversalSigner = any;
 /**
  * Parameters for accepting a rental contract.
  *
@@ -13,8 +13,9 @@ type UniversalSigner = any;
  */
 export interface AcceptRentalParams {
     /**
-     * The borrower who will rent the fleet (must be a signer object).
+     * The borrower who will rent the fleet (signer object or base58 string address).
      * This account will control the fleet during the rental period and make payments.
+     * Can be a wallet/signer object (CLI usage) or base58 address string (browser usage).
      */
     borrower: UniversalSigner;
     /**
@@ -96,27 +97,36 @@ export interface AcceptRentalParams {
  * ```typescript
  * import { acceptRental, days } from '@srsly/sdk';
  *
- * // Basic rental acceptance
+ * // CLI usage with wallet/signer object
  * const instruction = await acceptRental({
- *   borrower: wallet,                     // Borrower's wallet
- *   borrowerProfile: "ProfileAddr...",    // Borrower's Star Atlas profile
- *   borrowerFaction: 'mud',               // Faction: 'mud', 'oni', or 'ustur'
- *   contract: "ContractAddr...",          // Contract to accept
- *   duration: days(7)                     // 7 days rental duration
+ *   borrower: wallet,                      // Wallet object for signing
+ *   borrowerProfile: "ProfileAddr...",     // Borrower's Star Atlas profile
+ *   borrowerFaction: 'mud',                // Faction: 'mud', 'oni', or 'ustur'
+ *   contract: "ContractAddr...",           // Contract to accept
+ *   duration: days(7)                      // 7 days rental duration
  * });
  *
- * // Configure for mainnet
+ * // Browser usage with address string
+ * const browserInstruction = await acceptRental({
+ *   borrower: wallet.publicKey.toString(), // Address string for browser
+ *   borrowerProfile: "ProfileAddr...",     // Borrower's Star Atlas profile
+ *   borrowerFaction: 'mud',                // Faction: 'mud', 'oni', or 'ustur'
+ *   contract: "ContractAddr...",           // Contract to accept
+ *   duration: days(7)                      // 7 days rental duration
+ * });
+ *
+ * // Configure for mainnet (both patterns work)
  * const mainnetInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: wallet,                      // Wallet object (CLI style)
  *   borrowerProfile: "ProfileAddr...",
- *   borrowerFaction: 1,                   // Can use numbers: 1=mud, 2=oni, 3=ustur
+ *   borrowerFaction: 1,                    // Can use numbers: 1=mud, 2=oni, 3=ustur
  *   contract: "ContractAddr...",
  *   duration: days(7)
  * }).set({ programs: 'mainnet' });
  *
  * // Override specific game configuration
  * const customInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: "BorrowerAddress123...",     // Address string (browser style)
  *   borrowerProfile: "ProfileAddr...",
  *   borrowerFaction: 'mud',
  *   contract: "ContractAddr...",
@@ -128,7 +138,7 @@ export interface AcceptRentalParams {
  *
  * // Convert to @solana/web3.js format
  * const web3jsInstruction = await acceptRental({
- *   borrower: wallet,
+ *   borrower: wallet,                      // Universal: works with both patterns
  *   borrowerProfile: "ProfileAddr...",
  *   borrowerFaction: 'mud',
  *   contract: "ContractAddr...",

package/dist/types/rental/accept.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accept.d.ts","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuE,KAAK,cAAc,EAAsB,MAAM,iBAAiB,CAAC;AAG/I,OAAO,EAA4D,KAAK,iBAAiB,EAAE,KAAK,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAMlK,KAAK,gBAAgB,GAAG,MAAM,CAAC;AAC/B,KAAK,eAAe,GAAG,GAAG,CAAC;AAG3B;;;;;;;;GAQG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,QAAQ,EAAE,eAAe,CAAC;IAE1B;;;OAGG;IACH,eAAe,EAAE,gBAAgB,CAAC;IAElC;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;IAEjC;;;;;;;;OAQG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAiID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,kBAAkB,GACzB,yBAAyB,CAAC,iBAAiB,CAAC,CAG9C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAK9F"}
+{"version":3,"file":"accept.d.ts","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuE,KAAK,cAAc,EAAsB,MAAM,iBAAiB,CAAC;AAG/I,OAAO,EAA4D,KAAK,iBAAiB,EAAE,KAAK,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAIlK,OAAO,EAA2B,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGhF,KAAK,gBAAgB,GAAG,MAAM,CAAC;AAG/B;;;;;;;;GAQG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,QAAQ,EAAE,eAAe,CAAC;IAE1B;;;OAGG;IACH,eAAe,EAAE,gBAAgB,CAAC;IAElC;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;IAEjC;;;;;;;;OAQG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAmID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyGG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,kBAAkB,GACzB,yBAAyB,CAAC,iBAAiB,CAAC,CAG9C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAK9F"}

package/dist/types/rental/cancel.d.ts

@@ -1,6 +1,6 @@
 import { type ConfigSelector } from '../utils/config';
+import { type UniversalSigner } from '../utils/signer';
 type UniversalAddress = string;
-type UniversalSigner = any;
 type CancelRentalInstruction = any;
 /**
  * Parameters for canceling an active rental.
@@ -13,9 +13,10 @@ type CancelRentalInstruction = any;
  */
 export interface CancelRentalParams {
     /**
-     * The borrower who wants to cancel the rental (must be a signer object).
+     * The borrower who wants to cancel the rental (signer object or base58 string address).
      * Must be the original borrower who accepted the rental contract.
      * This account will pay any cancellation penalties.
+     * Can be a wallet/signer object (CLI usage) or base58 address string (browser usage).
      */
     borrower: UniversalSigner;
     /**

package/dist/types/rental/cancel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cancel.d.ts","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4D,KAAK,cAAc,EAAsB,MAAM,iBAAiB,CAAC;AAIpI,KAAK,gBAAgB,GAAG,MAAM,CAAC;AAC/B,KAAK,eAAe,GAAG,GAAG,CAAC;AAC3B,KAAK,uBAAuB,GAAG,GAAG,CAAC;AAEnC;;;;;;;;GAQG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,QAAQ,EAAE,eAAe,CAAC;IAE1B;;;OAGG;IACH,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AA8CD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,kBAAkB,GACzB,cAAc,CAAC,uBAAuB,CAAC,CAEzC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAK9F"}
+{"version":3,"file":"cancel.d.ts","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4D,KAAK,cAAc,EAAsB,MAAM,iBAAiB,CAAC;AAEpI,OAAO,EAA2B,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGhF,KAAK,gBAAgB,GAAG,MAAM,CAAC;AAC/B,KAAK,uBAAuB,GAAG,GAAG,CAAC;AAEnC;;;;;;;;GAQG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,QAAQ,EAAE,eAAe,CAAC;IAE1B;;;OAGG;IACH,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAgDD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,kBAAkB,GACzB,cAAc,CAAC,uBAAuB,CAAC,CAEzC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAK9F"}

package/dist/types/utils/fetch-accounts.d.ts

@@ -1,13 +1,28 @@
 import { type Address } from '@solana/kit';
+import { fetchContractState as fetchContractStateCodama, fetchRentalState as fetchRentalStateCodama } from '../codama/accounts';
 /**
  * Convenience wrapper functions for fetching account states with RPC URL strings.
  * These functions handle creating the RPC connection for you.
  */
 /**
- * Fetches contract state data from the blockchain using a simple RPC URL
+ * Fetches contract state data from the blockchain using RPC URL from global config
+ *
+ * @param contractAddress - The contract account address to fetch (string or Address)
+ * @returns The deserialized contract state data
+ *
+ * @example
+ * ```typescript
+ * // Uses RPC URL from global config
+ * const contractState = await fetchContractState('ContractAddress123...');
+ * console.log('Contract owner:', contractState.data.owner);
+ * ```
+ */
+export declare function fetchContractState<TAddress extends string = string>(contractAddress: string | Address<TAddress>): Promise<ReturnType<typeof fetchContractStateCodama>>;
+/**
+ * Fetches contract state data from the blockchain using a specific RPC URL
  *
  * @param rpcUrl - The RPC endpoint URL as a string
- * @param contractAddress - The contract account address to fetch
+ * @param contractAddress - The contract account address to fetch (string or Address)
  * @returns The deserialized contract state data
  *
  * @example
@@ -21,12 +36,26 @@ import { type Address } from '@solana/kit';
  * console.log('Contract rate:', contractState.data.rate);
  * ```
  */
-export declare function fetchContractState<TAddress extends string = string>(rpcUrl: string, contractAddress: Address<TAddress>): Promise<import("@solana/kit").Account<import("../codama/accounts").ContractState, TAddress>>;
+export declare function fetchContractState<TAddress extends string = string>(rpcUrl: string, contractAddress: string | Address<TAddress>): Promise<ReturnType<typeof fetchContractStateCodama>>;
+/**
+ * Fetches rental state data from the blockchain using RPC URL from global config
+ *
+ * @param rentalAddress - The rental account address to fetch (string or Address)
+ * @returns The deserialized rental state data
+ *
+ * @example
+ * ```typescript
+ * // Uses RPC URL from global config
+ * const rentalState = await fetchRentalState('RentalAddress123...');
+ * console.log('Rental borrower:', rentalState.data.borrower);
+ * ```
+ */
+export declare function fetchRentalState<TAddress extends string = string>(rentalAddress: string | Address<TAddress>): Promise<ReturnType<typeof fetchRentalStateCodama>>;
 /**
- * Fetches rental state data from the blockchain using a simple RPC URL
+ * Fetches rental state data from the blockchain using a specific RPC URL
  *
  * @param rpcUrl - The RPC endpoint URL as a string
- * @param rentalAddress - The rental account address to fetch
+ * @param rentalAddress - The rental account address to fetch (string or Address)
  * @returns The deserialized rental state data
  *
  * @example
@@ -40,7 +69,7 @@ export declare function fetchContractState<TAddress extends string = string>(rpc
  * console.log('Rental start:', rentalState.data.start);
  * ```
  */
-export declare function fetchRentalState<TAddress extends string = string>(rpcUrl: string, rentalAddress: Address<TAddress>): Promise<import("@solana/kit").Account<import("../codama/accounts").RentalState, TAddress>>;
+export declare function fetchRentalState<TAddress extends string = string>(rpcUrl: string, rentalAddress: string | Address<TAddress>): Promise<ReturnType<typeof fetchRentalStateCodama>>;
 /**
  * Fetches multiple contract states in a single RPC call
  *

package/dist/types/utils/fetch-accounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-accounts.d.ts","sourceRoot":"","sources":["../../../src/utils/fetch-accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAQ5D;;;GAGG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EACvE,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,gGAOnC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EACrE,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,8FAOjC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,2BAA2B,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAChF,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,wFAOvC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,yBAAyB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAC9E,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,sFAOrC"}
+{"version":3,"file":"fetch-accounts.d.ts","sourceRoot":"","sources":["../../../src/utils/fetch-accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EACL,kBAAkB,IAAI,wBAAwB,EAC9C,gBAAgB,IAAI,sBAAsB,EAG3C,MAAM,oBAAoB,CAAC;AAI5B;;;GAGG;AAEH;;;;;;;;;;;;GAYG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EACvE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,GAC1C,OAAO,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC;AAExD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EACvE,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,GAC1C,OAAO,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC;AAuBxD;;;;;;;;;;;;GAYG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EACrE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,GACxC,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC;AAEtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EACrE,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,GACxC,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC;AAuBtD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,2BAA2B,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAChF,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,wFAOvC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,yBAAyB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAC9E,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,sFAOrC"}

package/dist/types/utils/index.d.ts

@@ -6,4 +6,5 @@ export * from "./duration";
 export * from "./instruction-converter";
 export * from "./fetch-accounts";
 export * from "./pda";
+export * from "./signer";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC"}

package/dist/types/utils/signer.d.ts

@@ -0,0 +1,56 @@
+/**
+ * Universal signer handling utilities for cross-library compatibility
+ *
+ * This module provides utilities to handle different signer types across
+ * @solana/kit, @solana/web3.js, and plain address strings in a unified way.
+ */
+import { type TransactionSigner } from '@solana/kit';
+/**
+ * Enhanced UniversalSigner type that accepts both signer objects and address strings
+ */
+export type UniversalSigner = string | {
+    address: string;
+} | {
+    publicKey: {
+        toString(): string;
+    };
+} | {
+    publicKey: string;
+} | any;
+/**
+ * Creates TransactionSigner from UniversalSigner input for universal compatibility
+ *
+ * This function provides universal compatibility by:
+ * - Converting string addresses to TransactionSigner using createNoopSigner
+ * - Passing through existing TransactionSigner objects unchanged
+ * - Safely handling different signer interfaces (kit, web3.js, etc.)
+ *
+ * The returned TransactionSigner has both .address property and signing capability,
+ * making it suitable for both PDA derivation and codama instruction building.
+ *
+ * @param signer - The signer input (string address or signer object)
+ * @returns TransactionSigner that can be used directly for codama and has .address property
+ *
+ * @example
+ * ```typescript
+ * // Browser usage with string address
+ * const borrower = createTransactionSigner("base58AddressString");
+ * // borrower.address → Address object for PDA derivation
+ * // borrower → TransactionSigner for codama
+ *
+ * // CLI usage with wallet object
+ * const borrower = createTransactionSigner(wallet);
+ * // borrower.address → wallet.address for PDA derivation
+ * // borrower → wallet signer for codama
+ * ```
+ */
+export declare function createTransactionSigner(signer: UniversalSigner): TransactionSigner;
+/**
+ * Type guard to check if a value is a signer object (not a string)
+ */
+export declare function isSignerObject(signer: UniversalSigner): signer is Exclude<UniversalSigner, string>;
+/**
+ * Type guard to check if a value is an address string
+ */
+export declare function isAddressString(signer: UniversalSigner): signer is string;
+//# sourceMappingURL=signer.d.ts.map

package/dist/types/utils/signer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../src/utils/signer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAA6B,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhF;;GAEG;AACH,MAAM,MAAM,eAAe,GACvB,MAAM,GACN;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GACnB;IAAE,SAAS,EAAE;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAA;CAAE,GACrC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACrB,GAAG,CAAC;AAGR;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,eAAe,GAAG,iBAAiB,CASlF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,IAAI,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,CAElG;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,IAAI,MAAM,CAEzE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wuwei-labs/srsly",
-  "version": "2.0.0-beta.44",
+  "version": "2.0.0-beta.45",
   "description": "",
   "main": "./dist/cjs/index.js",
   "types": "./dist/types/index.d.ts",