@wuwei-labs/srsly 2.0.0-beta.4 → 2.0.0-beta.41

package/dist/cjs/rental/close.js

@@ -2,49 +2,187 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.closeRental = closeRental;
 exports.getCloseRentalInstructionAsync = getCloseRentalInstructionAsync;
-const network_1 = require("../network");
+const config_1 = require("../utils/config");
+const constants_1 = require("../utils/constants");
+const instruction_converter_1 = require("../utils/instruction-converter");
+const accounts_1 = require("../codama/accounts");
+const kit_1 = require("@solana/kit");
+const pda_1 = require("../utils/pda");
 /**
- * Asynchronously creates an instruction to close a rental with minimal required parameters.
- * This is called by an owner to close a rental that was previously accepted by a borrower.
- * Derives rentalState, rentalThread, rentalTokenAccount and rentalAuthority automatically if not provided.
+ * 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 { payer, rentalStateAddress, } = params;
+    // Get the resolved addresses from config (including network-specific addresses)
+    const resolvedAddresses = await (0, config_1.resolveProgramAddresses)(config || {});
+    // Create RPC from resolved addresses
+    const rpc = (0, kit_1.createSolanaRpc)(resolvedAddresses.rpcUrl);
+    // Fetch rental state to get contract and borrower
+    let rentalState;
+    try {
+        if (!rentalStateAddress) {
+            throw new Error(`rentalStateAddress is ${rentalStateAddress}, cannot proceed`);
+        }
+        rentalState = await (0, accounts_1.fetchMaybeRentalState)(rpc, (0, constants_1.toAddress)(rentalStateAddress));
+        if (!rentalState.exists) {
+            throw new Error(`Rental state not found: ${rentalStateAddress}`);
+        }
+    }
+    catch (error) {
+        throw new Error(`Failed to fetch rental state: ${error}`);
+    }
+    // Extract required addresses from rental state
+    const contractAddress = rentalState.data.contract;
+    const borrower = rentalState.data.borrower;
+    // Derive PDAs similar to accept.ts
+    const rentalAuthorityPda = await (0, pda_1.deriveRentalAuthority)(resolvedAddresses.srslyProgramAddress.toString());
+    // 🔧 FIX: Derive rental thread PDA using Antegen program ID and the passed-in rental state address
+    const rentalThreadPda = await (0, pda_1.deriveRentalThread)(rentalAuthorityPda, (0, constants_1.toAddress)(rentalStateAddress), // Use the passed-in rental state address
+    resolvedAddresses.antegenProgramAddress);
+    // Fetch contract state to get owner
+    let contractState;
+    try {
+        contractState = await (0, accounts_1.fetchMaybeContractState)(rpc, (0, constants_1.toAddress)(contractAddress));
+        if (!contractState.exists) {
+            throw new Error(`Contract not found: ${contractAddress}`);
+        }
+    }
+    catch (error) {
+        throw new Error(`Failed to fetch contract state: ${error}`);
+    }
+    // Fetch config state to get the authority (we already have mint from resolved addresses)
+    const [configPda] = await (0, kit_1.getProgramDerivedAddress)({
+        programAddress: resolvedAddresses.srslyProgramAddress,
+        seeds: [
+            (0, kit_1.getBytesEncoder)().encode(new Uint8Array([99, 111, 110, 102, 105, 103])), // "config"
+        ],
+    });
+    let configState;
+    try {
+        configState = await (0, accounts_1.fetchMaybeConfig)(rpc, configPda);
+        if (!configState.exists) {
+            throw new Error(`Config not found: ${configPda}`);
+        }
+    }
+    catch (error) {
+        throw new Error(`Failed to fetch config state: ${error}`);
+    }
+    // Only provide required fields - let Codama auto-generate the rest except rental_thread
+    const input = {
+        payer: payer, // Pass the signer directly to Codama
+        mint: resolvedAddresses.atlasMint, // Use resolved ATLAS mint from config
+        authority: (0, constants_1.toAddress)(configState.data.authority), // Config authority for fee collection
+        borrower: (0, constants_1.toAddress)(borrower),
+        owner: (0, constants_1.toAddress)(contractState.data.owner),
+        contract: (0, constants_1.toAddress)(contractAddress),
+        // Only override rental_thread since Codama can't auto-generate this one
+        rentalThread: rentalThreadPda, // Uses Antegen program ID!
+    };
+    // 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 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
- * // Create the instruction with minimal parameters
- * 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
+ *   rentalStateAddress: "RentalState..."   // Rental state address
  * });
  *
- * // Add to transaction and sign
- * const tx = new Transaction().add(ix);
- * await sendAndConfirmTransaction(connection, tx, [owner]);
+ * // Configure for mainnet
+ * const mainnetInstruction = await closeRental({
+ *   payer: wallet,
+ *   rentalStateAddress: "RentalState..."
+ * }).set({ programs: 'mainnet' });
+ *
+ * // Convert to @solana/web3.js format
+ * const web3jsInstruction = await closeRental({
+ *   payer: wallet,
+ *   rentalStateAddress: "RentalState..."
+ * }).web3js();
+ *
+ * // 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 promise that resolves to the instruction to close a rental
+ * @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
  */
-async function _closeRental(params, network) {
-    const { borrower, ownerTokenAccount, contract, } = params;
-    // Let codama derive the optional accounts
-    const input = {
-        borrower,
-        ownerTokenAccount,
-        contract,
-    };
-    // Dynamically import network-specific codama functions
-    const codamaModule = await (0, network_1.getCachedNetworkModule)('instructions');
-    const { getCloseRentalInstructionAsync, SRSLY_PROGRAM_ADDRESS } = codamaModule;
-    return getCloseRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
-}
 function closeRental(params) {
-    return (0, network_1.createNetworkSelector)((network) => _closeRental(params, network));
+    const baseSelector = (0, config_1.createConfigSelector)((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 ConfigSelector for the raw instruction
+ */
 function getCloseRentalInstructionAsync(input, options) {
-    return (0, network_1.createNetworkSelector)(async (network) => {
-        const codamaModule = await (0, network_1.getCachedNetworkModule)('instructions', network);
-        return codamaModule.getCloseRentalInstructionAsync(input, options);
+    return (0, config_1.createConfigSelector)(async () => {
+        const instructionsModule = (0, config_1.getModule)('instructions');
+        return instructionsModule.getCloseRentalInstructionAsync(input, options);
     });
 }
 //# 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":";;AA8EA,kCAIC;AAED,wEAKC;AArFD,wCAA+G;AAyB/G;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,OAAiB;IAEjB,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,gCAAsB,EAAC,cAAc,CAAC,CAAC;IAClE,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,SAAgB,WAAW,CACzB,MAAyB;IAEzB,OAAO,IAAA,+BAAqB,EAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,IAAA,+BAAqB,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QAC7C,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAsB,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC3E,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,88 @@
 "use strict";
+/**
+ * # 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, days } from '@srsly/sdk';
+ *
+ * const instruction = await acceptRental({
+ *   borrower: wallet,
+ *   borrowerProfile: "ProfileAddr...",
+ *   borrowerFaction: 'mud',
+ *   contract: "ContractAddr...",
+ *   duration: days(7)
+ * });
+ * ```
+ *
+ * ### 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({
+ *   borrower: "BorrowerAddr...",
+ *   ownerTokenAccount: "TokenAcct...",
+ *   contract: "ContractAddr..."
+ * });
+ * ```
+ *
+ * ### Reset Canceled Rental
+ * ```typescript
+ * import { resetRental } from '@srsly/sdk';
+ *
+ * const instruction = await resetRental({
+ *   fleet: "FleetAddr...",
+ *   contract: "ContractAddr...",
+ *   rentalState: "RentalStateAddr...",
+ *   faction: 'mud',
+ *   ownerProfile: "OwnerProfileAddr..."
+ * });
+ * ```
+ *
+ * @module Rental
+ */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -18,4 +102,5 @@ __exportStar(require("./accept"), exports);
 __exportStar(require("./cancel"), exports);
 __exportStar(require("./close"), exports);
 __exportStar(require("./reset"), exports);
+__exportStar(require("./reset-contract-temp"), exports);
 //# sourceMappingURL=index.js.map

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmFG;;;;;;;;;;;;;;;;AAEH,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,0CAAwB;AACxB,wDAAsC"}

package/dist/cjs/rental/reset-contract-temp.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetContractTemp = resetContractTemp;
+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 accounts_1 = require("../codama/accounts");
+const kit_1 = require("@solana/kit");
+/**
+ * Internal function to create a contract reset temp instruction with configuration options.
+ *
+ * @internal
+ * @param params - The contract reset parameters
+ * @param config - Optional configuration for network and program settings
+ * @returns Promise resolving to a fluent instruction object
+ * @throws Error when contract is not found or account derivation fails
+ */
+async function _resetContractTemp(params, config) {
+    const { signer, contract, faction, ownerProfile, } = params;
+    // Get the resolved addresses from config (including network-specific addresses)
+    const globalConfig = (0, config_1.getConfig)();
+    const effectiveConfig = { ...globalConfig, ...config };
+    const resolvedAddresses = await (0, config_1.resolveProgramAddresses)(effectiveConfig);
+    // Fetch contract state to get fleet and owner details
+    let contractState;
+    try {
+        const rpc = (0, kit_1.createSolanaRpc)(resolvedAddresses.rpcUrl);
+        contractState = await (0, accounts_1.fetchMaybeContractState)(rpc, (0, constants_1.toAddress)(contract));
+        if (!contractState.exists) {
+            throw new Error(`Contract not found: ${contract}`);
+        }
+    }
+    catch (error) {
+        throw new Error(`Failed to fetch contract state: ${error}`);
+    }
+    // Extract fleet from contract state
+    const fleet = contractState.data.fleet;
+    // Manually derive ALL game accounts - they all use different program addresses
+    const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(ownerProfile), faction, resolvedAddresses.gameId, 0, // starbaseSeqId
+    config);
+    // Create input for the instruction
+    const input = {
+        signer: signer, // Pass signer directly to Codama
+        contract: (0, constants_1.toAddress)(contract), // Contract to reset
+        fleet: (0, constants_1.toAddress)(fleet), // Fleet from contract
+        gameId: resolvedAddresses.gameId, // Game ID from config
+        starbase: (0, constants_1.toAddress)(starbase), // Derived starbase
+        starbasePlayer: (0, constants_1.toAddress)(starbasePlayer), // Derived starbase player
+        sageProgram: resolvedAddresses.sageProgramAddress, // SAGE program from config
+    };
+    // Get network-specific codama functions from centralized config
+    const instructionsModule = (0, config_1.getModule)('instructions');
+    const { getResetContractTempInstructionAsync } = instructionsModule;
+    const rawInstruction = await getResetContractTempInstructionAsync(input, { programAddress: resolvedAddresses.srslyProgramAddress });
+    return (0, instruction_converter_1.createFluentInstruction)(rawInstruction);
+}
+/**
+ * Creates a temporary instruction to reset a contract's fleet in SAGE (devnet testing).
+ *
+ * This function properly resets a contract by:
+ * 1. Resetting the fleet in SAGE via CPI call to invalidate_rental(context, false)
+ * 2. Setting the contract's current_rental_state to system_program::ID
+ * 3. Making the contract available for new rentals
+ *
+ * ## Features
+ *
+ * - **Fleet Reset**: Properly resets fleet in SAGE ecosystem
+ * - **Contract Reset**: Updates contract state to be available for new rentals
+ * - **Account Derivation**: Automatically derives all required SAGE accounts
+ * - **Network Support**: Works across mainnet, atlasnet, and holosim
+ * - **Universal Library Support**: Works with both @solana/kit and @solana/web3.js
+ *
+ * @example
+ * ```typescript
+ * import { resetContractTemp } from '@wuwei-labs/srsly';
+ *
+ * // Reset a contract for testing
+ * const instruction = await resetContractTemp({
+ *   signer: wallet,
+ *   contract: "5YqtCEiGPLH3FqoTCkWXFCLtNFC7StnUydgaYfLSPHWv",
+ *   faction: 'mud',
+ *   ownerProfile: "OwnerProfileAddr..."
+ * });
+ *
+ * // Configure for specific network
+ * const instruction = await resetContractTemp({
+ *   signer: wallet,
+ *   contract: "ContractAddr...",
+ *   faction: 2,
+ *   ownerProfile: "OwnerProfileAddr..."
+ * }).set({ programs: 'holosim' });
+ * ```
+ *
+ * @param params - The contract reset parameters
+ * @returns A FluentConfigSelector that can be configured with .set() or awaited directly
+ * @throws Error when contract is not found or account derivation fails
+ */
+function resetContractTemp(params) {
+    const baseSelector = (0, config_1.createConfigSelector)((config) => _resetContractTemp(params, config));
+    return (0, instruction_converter_1.createSmartFluentConfigSelector)(baseSelector);
+}
+//# sourceMappingURL=reset-contract-temp.js.map

package/dist/cjs/rental/reset-contract-temp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reset-contract-temp.js","sourceRoot":"","sources":["../../../src/rental/reset-contract-temp.ts"],"names":[],"mappings":";;AAkKA,8CAKC;AAvKD,4CAA+I;AAC/I,kDAA+C;AAC/C,oCAA8C;AAC9C,0EAAkK;AAClK,iDAA6D;AAC7D,qCAA8C;AAwC9C;;;;;;;;GAQG;AACH,KAAK,UAAU,kBAAkB,CAC/B,MAA+B,EAC/B,MAAsB;IAEtB,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,OAAO,EACP,YAAY,GACb,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,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,sDAAsD;IACtD,IAAI,aAAa,CAAC;IAClB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACtD,aAAa,GAAG,MAAM,IAAA,kCAAuB,EAAC,GAAG,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,CAAC,CAAC;QAExE,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,oCAAoC;IACpC,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;IAEvC,+EAA+E;IAC/E,MAAM,EACJ,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,IAAA,0BAAkB,EAC1B,IAAA,qBAAS,EAAC,YAAY,CAAC,EACvB,OAAO,EACP,iBAAiB,CAAC,MAAM,EACxB,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,mCAAmC;IACnC,MAAM,KAAK,GAAG;QACZ,MAAM,EAAE,MAAM,EAA6B,iCAAiC;QAC5E,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAe,oBAAoB;QAChE,KAAK,EAAE,IAAA,qBAAS,EAAC,KAAK,CAAC,EAAqB,sBAAsB;QAClE,MAAM,EAAE,iBAAiB,CAAC,MAAM,EAAY,sBAAsB;QAClE,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAe,mBAAmB;QAC/D,cAAc,EAAE,IAAA,qBAAS,EAAC,cAAc,CAAC,EAAG,0BAA0B;QACtE,WAAW,EAAE,iBAAiB,CAAC,kBAAkB,EAAE,2BAA2B;KAC/E,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,EAAE,oCAAoC,EAAE,GAAG,kBAAkB,CAAC;IAEpE,MAAM,cAAc,GAAG,MAAM,oCAAoC,CAC/D,KAAY,EACZ,EAAE,cAAc,EAAE,iBAAiB,CAAC,mBAAmB,EAAE,CAC1D,CAAC;IAEF,OAAO,IAAA,+CAAuB,EAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,SAAgB,iBAAiB,CAC/B,MAA+B;IAE/B,MAAM,YAAY,GAAG,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1F,OAAO,IAAA,uDAA+B,EAAC,YAAY,CAAC,CAAC;AACvD,CAAC"}

package/dist/cjs/rental/reset.js

@@ -2,66 +2,155 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetRental = resetRental;
 exports.getResetRentalInstructionAsync = getResetRentalInstructionAsync;
-const network_1 = require("../network");
+const config_1 = require("../utils/config");
+const constants_1 = require("../utils/constants");
 const utils_1 = require("../utils");
 /**
- * Asynchronously creates an instruction to reset a rental with minimal required parameters.
- * This is used to reset a fleet's rental state after a rental has ended.
- * Can derive starbase, starbasePlayer, and rentalAuthority automatically.
+ * 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 { payer, fleet, contract, rentalState, faction, ownerProfile, } = params;
+    // Get the resolved addresses from config (including network-specific addresses)
+    const resolvedAddresses = await (0, config_1.resolveProgramAddresses)(config || {});
+    // Derive the three accounts we need
+    const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(ownerProfile), faction, resolvedAddresses.gameId, 0, // starbaseSeqId
+    config);
+    // 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;
+    const { SRSLY_PROGRAM_ADDRESS } = programsModule;
+    // Let codama derive the rest (rentalAuthority)  
+    const input = {
+        signer: payer, // Pass signer directly to Codama (maps to 'signer' in Rust)
+        fleet: (0, constants_1.toAddress)(fleet), // Ensure string
+        contract: (0, constants_1.toAddress)(contract), // Ensure string
+        rentalState: (0, constants_1.toAddress)(rentalState), // Ensure string
+        gameId: resolvedAddresses.gameId, // Already Address from resolveProgramAddresses
+        starbase, // Already string from deriveGameAccounts
+        starbasePlayer, // Already string from deriveGameAccounts
+    };
+    return getResetRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
+}
+/**
+ * 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
- * // Create the instruction with minimum required parameters and faction
- * const ix = await resetRental({
- *   fleet: fleetAddress,
- *   contract: contractAddress,
- *   rentalState: rentalStateAddress,
- *   faction: 'mud',
- *   ownerProfile: ownerProfileAddress
+ * import { resetRental } from '@srsly/sdk';
+ *
+ * // Reset a canceled rental
+ * const instruction = await resetRental({
+ *   fleet: "FleetAddress123...",        // Fleet to reset
+ *   contract: "ContractAddr...",        // Contract to reactivate
+ *   rentalState: "RentalStateAddr...",  // Canceled rental state
+ *   faction: 'mud',                     // Owner's faction
+ *   ownerProfile: "OwnerProfileAddr..." // Owner's Star Atlas profile
  * });
  *
- * // Or with explicit starbase and starbasePlayer
- * const ix = await resetRental({
- *   fleet: fleetAddress,
- *   contract: contractAddress,
- *   rentalState: rentalStateAddress,
- *   starbase: starbaseAddress,
- *   starbasePlayer: starbasePlayerAddress
+ * // Configure for mainnet
+ * const mainnetInstruction = await resetRental({
+ *   fleet: "FleetAddress123...",
+ *   contract: "ContractAddr...",
+ *   rentalState: "RentalStateAddr...",
+ *   faction: 1,                         // Can use numbers: 1=mud, 2=oni, 3=ustur
+ *   ownerProfile: "OwnerProfileAddr..."
+ * }).set({ programs: 'mainnet' });
+ *
+ * // Override specific game configuration
+ * const customInstruction = await resetRental({
+ *   fleet: "FleetAddress123...",
+ *   contract: "ContractAddr...",
+ *   rentalState: "RentalStateAddr...",
+ *   faction: 'mud',
+ *   ownerProfile: "OwnerProfileAddr..."
+ * }).set({
+ *   programs: 'mainnet',
+ *   gameId: 'custom-game-id...'
  * });
  *
- * // Add to transaction and sign
- * const tx = new Transaction().add(ix);
- * await sendAndConfirmTransaction(connection, tx, [owner]);
+ * // Convert to @solana/web3.js format
+ * const web3jsInstruction = await resetRental({
+ *   fleet: "FleetAddress123...",
+ *   contract: "ContractAddr...",
+ *   rentalState: "RentalStateAddr...",
+ *   faction: 'mud',
+ *   ownerProfile: "OwnerProfileAddr..."
+ * }).web3js();
+ *
+ * // 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 promise that resolves to the instruction to reset a rental
+ * @param params - The rental reset parameters including fleet, contract, rental state, and owner details
+ * @returns A ConfigSelector that can be configured with .set() or awaited directly
+ * @throws Error when rental is not in canceled state or instruction generation fails
  */
-async function _resetRental(params, network) {
-    const { fleet, contract, rentalState, gameId = utils_1.DEFAULT_GAME_ID, faction, ownerProfile, } = params;
-    // Derive the three accounts we need
-    const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)(ownerProfile, faction, gameId);
-    // Dynamically import network-specific codama functions
-    const codamaModule = await (0, network_1.getCachedNetworkModule)('instructions');
-    const { getResetRentalInstructionAsync, SRSLY_PROGRAM_ADDRESS } = codamaModule;
-    // Let codama derive the rest (rentalAuthority)
-    const input = {
-        fleet,
-        contract,
-        rentalState,
-        gameId,
-        starbase,
-        starbasePlayer,
-    };
-    return getResetRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
-}
 function resetRental(params) {
-    return (0, network_1.createNetworkSelector)((network) => _resetRental(params, network));
+    return (0, config_1.createConfigSelector)((config) => _resetRental(params, config));
 }
+/**
+ * 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 ConfigSelector for the raw instruction
+ */
 function getResetRentalInstructionAsync(input, options) {
-    return (0, network_1.createNetworkSelector)(async (network) => {
-        const codamaModule = await (0, network_1.getCachedNetworkModule)('instructions', network);
-        return codamaModule.getResetRentalInstructionAsync(input, options);
+    return (0, config_1.createConfigSelector)(async (config) => {
+        const instructionsModule = (0, config_1.getModule)('instructions');
+        return instructionsModule.getResetRentalInstructionAsync(input, options);
     });
 }
 //# 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":";;AAiIA,kCAIC;AAED,wEAKC;AAxID,wCAA+G;AAK/G,oCAGkB;AAyClB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,OAAiB;IAEjB,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,WAAW,EACX,MAAM,GAAG,uBAAkC,EAC3C,OAAO,EACP,YAAY,GACb,GAAG,MAAM,CAAC;IAEX,oCAAoC;IACpC,MAAM,EACJ,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,IAAA,0BAAkB,EAC1B,YAAY,EACZ,OAAO,EACP,MAAM,CACP,CAAC;IAEF,uDAAuD;IACvD,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAsB,EAAC,cAAc,CAAC,CAAC;IAClE,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;QACN,QAAQ;QACR,cAAc;KACf,CAAC;IAEF,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED,SAAgB,WAAW,CACzB,MAAyB;IAEzB,OAAO,IAAA,+BAAqB,EAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,IAAA,+BAAqB,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QAC7C,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAsB,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC3E,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":";;AAqNA,kCAIC;AAcD,wEAKC;AA5OD,4CAAoI;AACpI,kDAA+C;AAC/C,oCAA8C;AAyD9C;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,MAAsB;IAEtB,MAAM,EACJ,KAAK,EACL,KAAK,EACL,QAAQ,EACR,WAAW,EACX,OAAO,EACP,YAAY,GACb,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,MAAM,IAAA,gCAAuB,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEtE,oCAAoC;IACpC,MAAM,EACJ,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,IAAA,0BAAkB,EAC1B,IAAA,qBAAS,EAAC,YAAY,CAAC,EACvB,OAAO,EACP,iBAAiB,CAAC,MAAM,EACxB,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,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,8BAA8B,EAAE,GAAG,kBAAkB,CAAC;IAC9D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,iDAAiD;IACjD,MAAM,KAAK,GAAG;QACZ,MAAM,EAAE,KAAK,EAAoB,4DAA4D;QAC7F,KAAK,EAAE,IAAA,qBAAS,EAAC,KAAK,CAAC,EAAW,gBAAgB;QAClD,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAK,gBAAgB;QAClD,WAAW,EAAE,IAAA,qBAAS,EAAC,WAAW,CAAC,EAAE,gBAAgB;QACrD,MAAM,EAAE,iBAAiB,CAAC,MAAM,EAAE,+CAA+C;QACjF,QAAQ,EAAyB,yCAAyC;QAC1E,cAAc,EAAmB,yCAAyC;KAC3E,CAAC;IAEF,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyFG;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;;;;;;;;;;;GAWG;AACH,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,8BAA8B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC"}