@wuwei-labs/srsly 2.0.0-beta.9 → 2.3.3-canary.36.16828894446.0

package/dist/cjs/rental/close.js

@@ -1,56 +1,184 @@
 "use strict";
+/**
+ * @purpose Rental closure with fund transfer and thread cleanup
+ * @reviewed 2025-07-29
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.closeRentalDemo = void 0;
 exports.closeRental = closeRental;
 exports.getCloseRentalInstructionAsync = getCloseRentalInstructionAsync;
 const config_1 = require("../utils/config");
+const constants_1 = require("../utils/constants");
+const instruction_converter_1 = require("../utils/instruction-converter");
+const fetch_accounts_1 = require("../utils/fetch-accounts");
+const derive_pda_1 = require("../utils/derive-pda");
+const signer_1 = require("../utils/signer");
 /**
- * Internal function to close a rental instruction with configuration options
+ * Internal function to close a rental instruction with configuration options.
+ *
+ * This function handles the core logic of creating a rental closure instruction,
+ * including address resolution and instruction generation. The closure finalizes
+ * the rental period and transfers any remaining funds to the owner.
+ *
+ * @internal
+ * @param params - The rental closure parameters
+ * @param config - Optional configuration for network and program settings
+ * @returns Promise resolving to a closure instruction
+ * @throws Error when instruction generation fails or required parameters are missing
  */
 async function _closeRental(params, config) {
-    const { borrower, ownerTokenAccount, contract, } = params;
-    // Let codama derive the optional accounts
+    let { payer, rental, borrowerProfile, borrowerFaction } = params;
+    // Get the resolved addresses from config (including network-specific addresses)
+    const globalConfig = (0, config_1.getSdkConfig)();
+    const effectiveConfig = { ...globalConfig, ...config };
+    const resolvedAddresses = (0, config_1.resolveProgramAddresses)(effectiveConfig);
+    const rentalState = await (0, fetch_accounts_1.fetchRentalState)(rental);
+    // Extract required addresses from rental state
+    const contract = rentalState.contract;
+    const borrower = rentalState.borrower;
+    const rentalAuthorityPda = await (0, derive_pda_1.deriveRentalAuthority)(resolvedAddresses.srslyProgramAddress.toString());
+    const rentalThreadPda = await (0, derive_pda_1.deriveRentalThread)(rentalAuthorityPda, (0, constants_1.toAddress)(rental), // Use the passed-in rental state address
+    resolvedAddresses.antegenProgramAddress);
+    // Fetch contract state to get owner and SAGE-related accounts
+    const contractState = await (0, fetch_accounts_1.fetchContractState)(contract);
+    // Fetch config state to get the authority using zero-argument overload
+    const configState = await (0, fetch_accounts_1.fetchConfigState)();
+    // Handle payer using smart signer handler for universal compatibility
+    const payerSigner = (0, signer_1.createTransactionSigner)(payer);
+    // Resolve faction - use provided faction or fetch from fleet
+    if (!borrowerFaction) {
+        const fleetState = await (0, fetch_accounts_1.fetchFleetState)(contractState.fleet);
+        borrowerFaction = fleetState.faction;
+    }
+    // Derive game accounts for the BORROWER (not the owner)
+    const gameAccounts = await (0, derive_pda_1.deriveGameAccounts)((0, constants_1.toAddress)(borrowerProfile), borrowerFaction, 0, // starbaseSeqId
+    contractState.gameId);
+    const starbase = (0, constants_1.toAddress)(gameAccounts.starbase);
+    const starbasePlayer = (0, constants_1.toAddress)(gameAccounts.starbasePlayer);
+    // Only provide required fields - let Codama auto-generate the rest except rental_thread
     const input = {
-        borrower,
-        ownerTokenAccount,
-        contract,
+        payer: payerSigner, // Pass TransactionSigner for proper handling
+        mint: resolvedAddresses.atlasMint, // Use resolved ATLAS mint from config
+        authority: (0, constants_1.toAddress)(configState.authority), // Config authority for fee collection
+        borrower: (0, constants_1.toAddress)(borrower),
+        owner: (0, constants_1.toAddress)(contractState.owner),
+        contract: (0, constants_1.toAddress)(contract),
+        // Only override rental_thread since Codama can't auto-generate this one
+        rentalThread: rentalThreadPda, // Uses Antegen program ID!
+        // Add SAGE-related accounts
+        fleet: (0, constants_1.toAddress)(contractState.fleet),
+        gameId: contractState.gameId,
+        starbase: (0, constants_1.toAddress)(starbase),
+        starbasePlayer: (0, constants_1.toAddress)(starbasePlayer),
+        sageProgram: resolvedAddresses.sageProgramAddress,
     };
-    // Dynamically import network-specific codama functions
-    const codamaModule = await (0, config_1.getCachedNetworkModule)('instructions', config?.network);
-    const { getCloseRentalInstructionAsync, SRSLY_PROGRAM_ADDRESS } = codamaModule;
-    return getCloseRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
+    // Get network-specific codama functions from centralized config
+    const instructionsModule = (0, config_1.getModule)('instructions');
+    const { getCloseRentalInstructionAsync } = instructionsModule;
+    const rawInstruction = await getCloseRentalInstructionAsync(input, {
+        programAddress: resolvedAddresses.srslyProgramAddress,
+    });
+    return (0, instruction_converter_1.createFluentInstruction)(rawInstruction);
 }
 /**
- * Creates an instruction to close a rental with fluent configuration.
+ * Creates an instruction to close a completed rental with fluent configuration.
+ *
+ * This function finalizes a rental that has reached its expiration or been fully paid.
+ * It transfers any remaining funds to the owner, returns fleet control, and cleans up
+ * the rental state account. This instruction can be called by anyone once the rental
+ * period has ended.
+ *
+ * ## Features
+ *
+ * - **Rental Finalization**: Properly closes completed or expired rentals
+ * - **Fund Transfer**: Moves any remaining payments or deposits to the owner
+ * - **Fleet Return**: Ensures fleet ownership is returned to the original owner
+ * - **State Cleanup**: Closes rental state account and returns lamports
+ * - **Thread Cleanup**: Cleans up automated payment threads
+ * - **Universal Library Support**: Works with both @solana/kit and @solana/web3.js
+ *
+ * ## Process
+ *
+ * 1. **Validate Completion**: Ensures rental period has ended or been fully paid
+ * 2. **Transfer Funds**: Moves any remaining ATLAS tokens to owner's account
+ * 3. **Return Fleet**: Transfers fleet ownership back to original owner
+ * 4. **Clean State**: Closes rental state account and returns SOL to payer
+ * 5. **Cancel Thread**: Cleans up any remaining automated payment threads
+ *
+ * ## Requirements
+ *
+ * - Rental must be completed or expired
+ * - Owner token account must be valid ATLAS token account
+ * - Rental state account must exist and be properly initialized
+ *
+ * ## When to Use
+ *
+ * - **Natural Expiration**: When rental period has ended
+ * - **Full Payment**: When all required payments have been made
+ * - **Account Cleanup**: To close expired rental accounts and recover SOL
+ * - **Fleet Recovery**: When fleet needs to be returned to owner
  *
  * @example
  * ```typescript
- * // Use devnet defaults
- * const ix = await closeRental({
- *   borrower: borrowerAddress,
- *   ownerTokenAccount: ownerTokenAccountAddress,
- *   contract: contractAddress
+ * import { closeRental } from '@srsly/sdk';
+ *
+ * // Close a completed rental
+ * const instruction = await closeRental({
+ *   payer: wallet,                         // Transaction payer
+ *   rental: "RentalState..."   // Rental state address
  * });
  *
- * // Use mainnet configuration
- * const ix = await closeRental(params).set({ network: 'mainnet' });
+ * // Configure for mainnet
+ * const mainnetInstruction = await closeRental({
+ *   payer: wallet,
+ *   rental: "RentalState..."
+ * }).set({ programs: 'mainnet' });
  *
- * // Override specific constants
- * const ix = await closeRental(params).set({
- *   network: 'mainnet',
- *   sageProgramAddress: 'custom...'
- * });
+ * // Convert to @solana/web3.js format
+ * const web3jsInstruction = await closeRental({
+ *   payer: wallet,
+ *   rental: "RentalState..."
+ * }).web3js(PublicKey);
+ *
+ * // Use with your preferred Solana library
+ * const transaction = new Transaction().add(web3jsInstruction);
+ * await sendAndConfirmTransaction(connection, transaction, [wallet]);
  * ```
  *
- * @param params The simplified parameters for closing a rental
- * @returns A ConfigSelector that can be configured with .set() or awaited directly
+ * @param params - The rental closure parameters including payer and rental state address
+ * @returns A FluentConfigSelector that can be configured with .set() or awaited directly
+ * @throws Error when rental is not ready for closure or instruction generation fails
  */
 function closeRental(params) {
-    return (0, config_1.createConfigSelector)((config) => _closeRental(params, config));
+    const baseSelector = (0, config_1.createSdkConfigSelector)(config => _closeRental(params, config));
+    return (0, instruction_converter_1.createSmartFluentConfigSelector)(baseSelector);
 }
+/**
+ * Low-level function to create a rental closure instruction with raw input parameters.
+ *
+ * This function provides direct access to the underlying codama-generated instruction
+ * builder. It's primarily used internally by the SDK but can be used for advanced
+ * use cases where full control over instruction parameters is needed.
+ *
+ * @internal
+ * @param input - Raw instruction input parameters as expected by codama
+ * @param options - Optional instruction options including program address
+ * @returns A SdkConfigSelector for the raw instruction
+ */
 function getCloseRentalInstructionAsync(input, options) {
-    return (0, config_1.createConfigSelector)(async (config) => {
-        const codamaModule = await (0, config_1.getCachedNetworkModule)('instructions', config?.network);
-        return codamaModule.getCloseRentalInstructionAsync(input, options);
+    return (0, config_1.createSdkConfigSelector)(async () => {
+        const instructionsModule = (0, config_1.getModule)('instructions');
+        return instructionsModule.getCloseRentalInstructionAsync(input, options);
     });
 }
+// Demo export for documentation site
+exports.closeRentalDemo = {
+    tabName: 'close',
+    description: 'Close a completed rental',
+    imports: `import { closeRental } from '@wuwei-labs/srsly';`,
+    instruction: `const instruction = await closeRental({
+  payer: {{signerType}}.publicKey?.toBase58(),
+  rental: "RENTAL_STATE_ADDRESS"
+});`,
+};
 //# sourceMappingURL=close.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/rental/close.ts"],"names":[],"mappings":";;AAoFA,kCAIC;AAED,wEAKC;AA3FD,4CAAwH;AAyBxH;;GAEG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,iBAAiB,EACjB,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,0CAA0C;IAC1C,MAAM,KAAK,GAAG;QACZ,QAAQ;QACR,iBAAiB;QACjB,QAAQ;KACT,CAAC;IAEF,uDAAuD;IACvD,MAAM,YAAY,GAAG,MAAM,IAAA,+BAAsB,EAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACnF,MAAM,EAAE,8BAA8B,EAAE,qBAAqB,EAAE,GAAG,YAAY,CAAC;IAE/E,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,SAAgB,WAAW,CACzB,MAAyB;IAEzB,OAAO,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,YAAY,GAAG,MAAM,IAAA,+BAAsB,EAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACnF,OAAO,YAAY,CAAC,8BAA8B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/rental/close.ts"],"names":[],"mappings":"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"}

package/dist/cjs/rental/index.js

@@ -1,4 +1,8 @@
 "use strict";
+/**
+ * @purpose Rental operations module with accept, cancel, close, and reset functionality
+ * @reviewed 2025-07-29
+ */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -14,6 +18,86 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * # Rental Operations Module
+ *
+ * This module provides comprehensive functionality for managing rental operations
+ * on the SRSLY program. It includes functions for accepting, canceling, closing,
+ * and resetting rentals, with full support for both @solana/kit and @solana/web3.js libraries.
+ *
+ * ## Available Functions
+ *
+ * - **acceptRental**: Accept an existing rental contract as a borrower
+ * - **cancelRental**: Cancel an active rental before completion
+ * - **closeRental**: Close a completed or expired rental
+ * - **resetRental**: Reset a canceled rental to make the contract available again
+ *
+ * ## Rental Lifecycle
+ *
+ * ```text
+ * Contract Created → Accept → [Active Rental] → Close (Complete)
+ *                     ↓            ↓
+ *                 [Payment]    Cancel → Reset → [Available Again]
+ *                     ↑            ↓
+ *                 [Automated]   [Cleanup]
+ * ```
+ *
+ * ## Features
+ *
+ * - **Universal Library Support**: Works with both major Solana libraries
+ * - **String-Based Addresses**: Eliminates library-specific type conflicts
+ * - **Fluent API**: Chainable configuration and format conversion
+ * - **Network Agnostic**: Supports different Solana networks
+ * - **Automated Payments**: Integration with Clockwork for scheduled payments
+ * - **SAGE Integration**: Fleet ownership management in Star Atlas ecosystem
+ *
+ * ## Common Patterns
+ *
+ * ### Accept a Rental
+ * ```typescript
+ * import { acceptRental } from '@srsly/sdk';
+ *
+ * const instruction = await acceptRental({
+ *   borrower: wallet,
+ *   borrowerProfile: "ProfileAddr...",
+ *   contract: "ContractAddr...",
+ *   duration: { days: 7 }  // Smart parameter format
+ * });
+ * ```
+ *
+ * ### Cancel Active Rental
+ * ```typescript
+ * import { cancelRental } from '@srsly/sdk';
+ *
+ * const instruction = await cancelRental({
+ *   borrower: wallet,
+ *   contract: "ContractAddr..."
+ * });
+ * ```
+ *
+ * ### Close Completed Rental
+ * ```typescript
+ * import { closeRental } from '@srsly/sdk';
+ *
+ * const instruction = await closeRental({
+ *   payer: wallet,
+ *   rental: "RentalStateAddr..."
+ * });
+ * ```
+ *
+ * ### Reset Canceled Rental
+ * ```typescript
+ * import { resetRental } from '@srsly/sdk';
+ *
+ * const instruction = await resetRental({
+ *   payer: wallet,
+ *   contract: "ContractAddr..."
+ *   // fleet, rental, faction, ownerProfile auto-fetched if not provided
+ * });
+ * ```
+ *
+ * @module Rental
+ */
 __exportStar(require("./accept"), exports);
 __exportStar(require("./cancel"), exports);
 __exportStar(require("./close"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rental/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rental/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+EG;AAEH,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,0CAAwB"}

package/dist/cjs/rental/reset.js

@@ -1,69 +1,192 @@
 "use strict";
+/**
+ * @purpose Rental reset after cancellation with fleet reactivation and SAGE integration
+ * @reviewed 2025-07-29
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetRentalDemo = void 0;
 exports.resetRental = resetRental;
 exports.getResetRentalInstructionAsync = getResetRentalInstructionAsync;
 const config_1 = require("../utils/config");
 const constants_1 = require("../utils/constants");
 const utils_1 = require("../utils");
+const instruction_converter_1 = require("../utils/instruction-converter");
+const fetch_accounts_1 = require("../utils/fetch-accounts");
+const signer_1 = require("../utils/signer");
 /**
- * Internal function to reset a rental instruction with configuration options
+ * Internal function to reset a rental instruction with configuration options.
+ *
+ * This function handles the core logic of creating a rental reset instruction,
+ * including account derivation, address resolution, and instruction generation.
+ * The reset clears canceled rental state and prepares the contract for new rentals.
+ *
+ * @internal
+ * @param params - The rental reset parameters
+ * @param config - Optional configuration for network and program settings
+ * @returns Promise resolving to a reset instruction
+ * @throws Error when account derivation fails or required parameters are missing
  */
 async function _resetRental(params, config) {
-    const { fleet, contract, rentalState, gameId, faction, ownerProfile, } = params;
-    // Get the actual game ID to use (param override, config override, or network default)
-    const actualGameId = gameId || await (0, constants_1.getSageGameId)(config);
+    let { payer, fleet, contract, rental, faction, ownerProfile } = params;
+    // Get the resolved addresses from config (including network-specific addresses)
+    const globalConfig = (0, config_1.getSdkConfig)();
+    const effectiveConfig = { ...globalConfig, ...config };
+    const resolvedAddresses = (0, config_1.resolveProgramAddresses)(effectiveConfig);
+    const contractState = await (0, fetch_accounts_1.fetchContractState)(contract);
+    if (!fleet) {
+        fleet = contractState.fleet;
+    }
+    if (!rental) {
+        rental = contractState.currentRentalState;
+    }
+    if (!ownerProfile) {
+        ownerProfile = contractState.ownerProfile;
+    }
+    // Resolve faction - use provided faction or fetch from fleet
+    if (!faction) {
+        const fleetState = await (0, fetch_accounts_1.fetchFleetState)(fleet);
+        faction = fleetState.faction;
+    }
     // Derive the three accounts we need
-    const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)(ownerProfile, faction, actualGameId, 0, // starbaseSeqId
-    config);
-    // Dynamically import network-specific codama functions
-    const codamaModule = await (0, config_1.getCachedNetworkModule)('instructions', config?.network);
-    const { getResetRentalInstructionAsync, SRSLY_PROGRAM_ADDRESS } = codamaModule;
-    // Let codama derive the rest (rentalAuthority)
+    const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(ownerProfile), faction, 0, // starbaseSeqId
+    contractState.gameId);
+    // Get network-specific codama functions from centralized config
+    const instructionsModule = (0, config_1.getModule)('instructions');
+    const programsModule = (0, config_1.getModule)('programs');
+    const { getResetRentalInstructionAsync } = instructionsModule;
+    // Handle payer using smart signer handler for universal compatibility
+    const payerSigner = (0, signer_1.createTransactionSigner)(payer);
     const input = {
-        fleet,
-        contract,
-        rentalState,
-        gameId: actualGameId,
+        signer: payerSigner,
+        fleet: (0, constants_1.toAddress)(fleet),
+        contract: (0, constants_1.toAddress)(contract),
+        rentalState: (0, constants_1.toAddress)(rental),
+        gameId: contractState.gameId,
         starbase,
         starbasePlayer,
     };
-    return getResetRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
+    const rawInstruction = await getResetRentalInstructionAsync(input, {
+        programAddress: resolvedAddresses.srslyProgramAddress,
+    });
+    return (0, instruction_converter_1.createFluentInstruction)(rawInstruction);
 }
 /**
- * Creates an instruction to reset a rental with fluent configuration.
+ * Creates an instruction to reset a rental contract after cancellation with fluent configuration.
+ *
+ * This function clears the rental state from a canceled rental, making the contract
+ * available for new rentals. It's typically called after a rental has been canceled
+ * to clean up the state and allow the fleet to be rented out again.
+ *
+ * ## Features
+ *
+ * - **State Cleanup**: Clears canceled rental state from accounts
+ * - **Contract Reactivation**: Makes the contract available for new rentals
+ * - **Fleet Preparation**: Ensures fleet is ready for future rental operations
+ * - **SAGE Integration**: Updates fleet status in the Star Atlas ecosystem
+ * - **Account Derivation**: Automatically derives required game accounts
+ * - **Universal Library Support**: Works with both @solana/kit and @solana/web3.js
+ *
+ * ## Process
+ *
+ * 1. **Validate State**: Ensures rental was properly canceled before reset
+ * 2. **Derive Accounts**: Generates required game accounts (starbase, etc.)
+ * 3. **Clear State**: Removes canceled rental data from accounts
+ * 4. **Update SAGE**: Resets fleet status in the Star Atlas ecosystem
+ * 5. **Reactivate Contract**: Makes contract available for new rentals
+ *
+ * ## Requirements
+ *
+ * - Rental must be in canceled state (not active or completed)
+ * - Caller must have authority to reset the rental
+ * - All accounts must be properly initialized
+ * - Fleet must be under owner control
+ *
+ * ## When to Use
+ *
+ * - **After Cancellation**: When a rental has been canceled and needs cleanup
+ * - **Contract Reuse**: To make a contract available for new rentals
+ * - **State Recovery**: When rental state needs to be cleared
+ * - **Fleet Management**: To prepare fleet for future rental operations
  *
  * @example
  * ```typescript
- * // Use devnet defaults
- * const ix = await resetRental({
- *   fleet: fleetAddress,
- *   contract: contractAddress,
- *   rentalState: rentalStateAddress,
- *   faction: 'mud',
- *   ownerProfile: ownerProfileAddress
+ * import { resetRental } from '@srsly/sdk';
+ *
+ * // Reset a canceled rental (all addresses auto-fetched from contract)
+ * const instruction = await resetRental({
+ *   payer: wallet,                      // Transaction payer
+ *   contract: "ContractAddr...",        // Contract to reactivate
  * });
  *
- * // Use mainnet configuration
- * const ix = await resetRental(params).set({ network: 'mainnet' });
+ * // Optionally provide explicit addresses to avoid fetching
+ * const instruction = await resetRental({
+ *   payer: wallet,
+ *   fleet: "FleetAddress123...",        // Optional: will be fetched if omitted
+ *   contract: "ContractAddr...",
+ *   rental: "RentalStateAddr...",       // Optional: will be fetched if omitted
+ *   ownerProfile: "OwnerProfileAddr..." // Optional: will be fetched if omitted
+ * });
+ *
+ * // Manual faction specification (optional)
+ * const manualInstruction = await resetRental({
+ *   payer: wallet,
+ *   contract: "ContractAddr...",
+ * }).set({ programs: 'mainnet' });
  *
- * // Override specific constants
- * const ix = await resetRental(params).set({
- *   network: 'mainnet',
- *   gameId: 'custom-game-id...',
- *   sageProgramAddress: 'custom...'
+ * // Override specific game configuration
+ * const customInstruction = await resetRental({
+ *   payer: wallet,
+ *   contract: "ContractAddr...",
+ * }).set({
+ *   programs: 'mainnet',
+ *   gameId: 'custom-game-id...'
  * });
+ *
+ * // Convert to @solana/web3.js format
+ * const web3jsInstruction = await resetRental({
+ *   payer: wallet,
+ *   contract: "ContractAddr..."
+ * }).web3js(PublicKey);
+ *
+ * // Use with your preferred Solana library
+ * const transaction = new Transaction().add(web3jsInstruction);
+ * await sendAndConfirmTransaction(connection, transaction, [wallet]);
  * ```
  *
- * @param params The simplified parameters for resetting a rental
- * @returns A ConfigSelector that can be configured with .set() or awaited directly
+ * @param params - The rental reset parameters including fleet, contract, rental state, and owner details
+ * @returns A SmartFluentConfigSelector that can be configured with .set() or awaited directly
+ * @throws Error when rental is not in canceled state or instruction generation fails
  */
 function resetRental(params) {
-    return (0, config_1.createConfigSelector)((config) => _resetRental(params, config));
+    const baseSelector = (0, config_1.createSdkConfigSelector)(config => _resetRental(params, config));
+    return (0, instruction_converter_1.createSmartFluentConfigSelector)(baseSelector);
 }
+/**
+ * Low-level function to create a rental reset instruction with raw input parameters.
+ *
+ * This function provides direct access to the underlying codama-generated instruction
+ * builder. It's primarily used internally by the SDK but can be used for advanced
+ * use cases where full control over instruction parameters is needed.
+ *
+ * @internal
+ * @param input - Raw instruction input parameters as expected by codama
+ * @param options - Optional instruction options including program address
+ * @returns A SdkConfigSelector for the raw instruction
+ */
 function getResetRentalInstructionAsync(input, options) {
-    return (0, config_1.createConfigSelector)(async (config) => {
-        const codamaModule = await (0, config_1.getCachedNetworkModule)('instructions', config?.network);
-        return codamaModule.getResetRentalInstructionAsync(input, options);
+    return (0, config_1.createSdkConfigSelector)(async () => {
+        const instructionsModule = (0, config_1.getModule)('instructions');
+        return instructionsModule.getResetRentalInstructionAsync(input, options);
     });
 }
+// Demo export for documentation site
+exports.resetRentalDemo = {
+    tabName: 'reset',
+    description: 'Reset a canceled rental',
+    imports: `import { resetRental } from '@wuwei-labs/srsly';`,
+    instruction: `const instruction = await resetRental({
+  payer: {{signerType}}.publicKey?.toBase58(),
+  contract: "CONTRACT_ADDRESS",
+});`,
+};
 //# sourceMappingURL=reset.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/rental/reset.ts"],"names":[],"mappings":";;AAoIA,kCAIC;AAED,wEAKC;AA3ID,4CAAwH;AACxH,kDAAmD;AAKnD,oCAEkB;AAyClB;;GAEG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,MAAsB;IAEtB,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,WAAW,EACX,MAAM,EACN,OAAO,EACP,YAAY,GACb,GAAG,MAAM,CAAC;IAEX,sFAAsF;IACtF,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,IAAA,yBAAa,EAAC,MAAM,CAAC,CAAC;IAE3D,oCAAoC;IACpC,MAAM,EACJ,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,IAAA,0BAAkB,EAC1B,YAAY,EACZ,OAAO,EACP,YAA+B,EAC/B,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,uDAAuD;IACvD,MAAM,YAAY,GAAG,MAAM,IAAA,+BAAsB,EAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACnF,MAAM,EAAE,8BAA8B,EAAE,qBAAqB,EAAE,GAAG,YAAY,CAAC;IAE/E,+CAA+C;IAC/C,MAAM,KAAK,GAAG;QACZ,KAAK;QACL,QAAQ;QACR,WAAW;QACX,MAAM,EAAE,YAAY;QACpB,QAAQ;QACR,cAAc;KACf,CAAC;IAEF,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,SAAgB,WAAW,CACzB,MAAyB;IAEzB,OAAO,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,YAAY,GAAG,MAAM,IAAA,+BAAsB,EAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACnF,OAAO,YAAY,CAAC,8BAA8B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/rental/reset.ts"],"names":[],"mappings":"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"}