@wuwei-labs/srsly 2.0.0-beta.46 → 2.0.0-beta.48

package/dist/cjs/rental/accept.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.acceptRentalDemo = void 0;
 exports.acceptRental = acceptRental;
 exports.getAcceptRentalInstructionAsync = getAcceptRentalInstructionAsync;
 const config_1 = require("../utils/config");
@@ -26,6 +27,23 @@ const signer_1 = require("../utils/signer");
  */
 async function _acceptRental(params, config) {
     const { borrowerProfile, borrowerFaction, contract, duration, } = params;
+    // Validate that placeholder values have been replaced
+    if (contract === "CONTRACT_ADDRESS") {
+        throw new Error('Please replace "CONTRACT_ADDRESS" with a real contract address.\n\n' +
+            'To find contract addresses:\n' +
+            '1. Use the "Create Contract" operation to create a new contract\n' +
+            '2. Copy the contract address from the transaction result\n' +
+            '3. Replace "CONTRACT_ADDRESS" with the real address\n\n' +
+            'Example: "9WzDXwBbmkg8ZTbNMqUxvQRAyrZzDsGYdLVL9zYtAWWM"');
+    }
+    if (borrowerProfile === "BORROWER_PROFILE_ADDRESS") {
+        throw new Error('Please replace "BORROWER_PROFILE_ADDRESS" with a real Star Atlas profile address.\n\n' +
+            'To find your profile address:\n' +
+            '1. Connect to Star Atlas SAGE with your wallet\n' +
+            '2. Your profile address will be displayed in the game\n' +
+            '3. Replace "BORROWER_PROFILE_ADDRESS" with the real address\n\n' +
+            'Example: "7CgMBZdvS8qXqv2fTQ9YZXPqJsKmn4TKEVa98MSTkHJ8"');
+    }
     // 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)();
@@ -220,4 +238,17 @@ function getAcceptRentalInstructionAsync(input, options) {
         return instructionsModule.getAcceptRentalInstructionAsync(input, options);
     });
 }
+// Demo export for documentation site
+exports.acceptRentalDemo = {
+    tabName: "accept",
+    description: "Accept a rental offer from an existing contract",
+    imports: `import { acceptRental, days } from '@wuwei-labs/srsly';`,
+    instruction: `const instruction = await acceptRental({
+  borrower: (signer || wallet).publicKey?.toBase58(),
+  borrowerProfile: "BORROWER_PROFILE_ADDRESS",
+  borrowerFaction: "oni", // or "mud", "ustur"
+  contract: "CONTRACT_ADDRESS",
+  duration: days(1) // or 86400 seconds
+});`
+};
 //# sourceMappingURL=accept.js.map

package/dist/cjs/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/cjs/rental/cancel.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cancelRentalDemo = void 0;
 exports.cancelRental = cancelRental;
 exports.getCancelRentalInstructionAsync = getCancelRentalInstructionAsync;
 const config_1 = require("../utils/config");
 const constants_1 = require("../utils/constants");
 const signer_1 = require("../utils/signer");
+const instruction_converter_1 = require("../utils/instruction-converter");
+const fetch_accounts_1 = require("../utils/fetch-accounts");
+const pda_1 = require("../utils/pda");
 /**
  * Internal function to cancel a rental instruction with configuration options.
  *
@@ -20,22 +24,58 @@ const signer_1 = require("../utils/signer");
  */
 async function _cancelRental(params, config) {
     const { contract, } = params;
+    // Validate that placeholder values have been replaced
+    if (contract === "CONTRACT_ADDRESS") {
+        throw new Error('Please replace "CONTRACT_ADDRESS" with a real contract address.\n\n' +
+            'To find contract addresses:\n' +
+            '1. Use the "Create Contract" operation to create a new contract\n' +
+            '2. Copy the contract address from the transaction result\n' +
+            '3. Replace "CONTRACT_ADDRESS" with the real address\n\n' +
+            'Example: "9WzDXwBbmkg8ZTbNMqUxvQRAyrZzDsGYdLVL9zYtAWWM"');
+    }
+    // Additional validation for short strings that might cause issues
+    if (typeof contract === 'string' && contract.length < 32) {
+        throw new Error(`Invalid contract address: "${contract}" (length: ${contract.length})\n\n` +
+            'Solana addresses must be 32-44 characters long.\n' +
+            'Please provide a valid base58-encoded Solana address.\n\n' +
+            'Example: "9WzDXwBbmkg8ZTbNMqUxvQRAyrZzDsGYdLVL9zYtAWWM"');
+    }
     // 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
+    // Use global config as fallback, same pattern as closeContract
+    const globalConfig = (0, config_1.getConfig)();
+    const effectiveConfig = { ...globalConfig, ...config };
+    const resolvedAddresses = await (0, config_1.resolveProgramAddresses)(effectiveConfig);
+    // Fetch contract state using high-level function (same pattern as close contract)
+    const contractState = await (0, fetch_accounts_1.fetchContractState)((0, constants_1.toAddress)(contract));
+    // Fetch config state to get the authority using zero-argument overload
+    const configState = await (0, fetch_accounts_1.fetchConfigState)();
+    if (!configState.exists) {
+        throw new Error('Config not found');
+    }
+    const authorityAddress = configState.data.authority;
+    // Derive PDAs individually (same pattern as accept rental to ensure consistency)
+    const rentalStatePda = await (0, pda_1.deriveRentalState)((0, constants_1.toAddress)(contract), (0, constants_1.toAddress)(borrower.address), resolvedAddresses.srslyProgramAddress);
+    const rentalAuthorityPda = await (0, pda_1.deriveRentalAuthority)(resolvedAddresses.srslyProgramAddress.toString());
+    const rentalThreadPda = await (0, pda_1.deriveRentalThread)(rentalAuthorityPda, rentalStatePda, resolvedAddresses.antegenProgramAddress);
+    // Build the input with all required accounts (same pattern as accept rental)
     const input = {
         borrower: borrower, // TransactionSigner for Codama
-        contract: (0, constants_1.toAddress)(contract), // Ensure string
+        owner: (0, constants_1.toAddress)(contractState.data.owner),
+        contract: (0, constants_1.toAddress)(contract),
+        authority: (0, constants_1.toAddress)(authorityAddress),
+        mint: resolvedAddresses.atlasMint,
+        // Override the auto-generated PDAs with our manually derived ones (same as accept rental)
+        rentalState: rentalStatePda,
+        rentalAuthority: rentalAuthorityPda,
+        rentalThread: rentalThreadPda,
     };
     // Get network-specific codama functions from centralized config
     const instructionsModule = (0, config_1.getModule)('instructions');
-    const programsModule = (0, config_1.getModule)('programs');
     const { getCancelRentalInstructionAsync } = instructionsModule;
-    const { SRSLY_PROGRAM_ADDRESS } = programsModule;
-    return getCancelRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
+    const rawInstruction = await getCancelRentalInstructionAsync(input, { programAddress: resolvedAddresses.srslyProgramAddress });
+    return (0, instruction_converter_1.createFluentInstruction)(rawInstruction);
 }
 /**
  * Creates an instruction to cancel a rental with fluent configuration.
@@ -103,11 +143,12 @@ async function _cancelRental(params, config) {
  * ```
  *
  * @param params - The rental cancellation parameters including borrower and contract
- * @returns A ConfigSelector that can be configured with .set() or awaited directly
+ * @returns A SmartFluentConfigSelector that can be configured with .set() or awaited directly
  * @throws Error when rental is not active, caller is not the borrower, or instruction generation fails
  */
 function cancelRental(params) {
-    return (0, config_1.createConfigSelector)((config) => _cancelRental(params, config));
+    const baseSelector = (0, config_1.createConfigSelector)((config) => _cancelRental(params, config));
+    return (0, instruction_converter_1.createSmartFluentConfigSelector)(baseSelector);
 }
 /**
  * Low-level function to create a rental cancellation instruction with raw input parameters.
@@ -127,4 +168,14 @@ function getCancelRentalInstructionAsync(input, options) {
         return instructionsModule.getCancelRentalInstructionAsync(input, options);
     });
 }
+// Demo export for documentation site
+exports.cancelRentalDemo = {
+    tabName: "cancel",
+    description: "Cancel an active rental",
+    imports: `import { cancelRental } from '@wuwei-labs/srsly';`,
+    instruction: `const instruction = await cancelRental({
+  borrower: (signer || wallet).publicKey?.toBase58(),
+  contract: "CONTRACT_ADDRESS"
+});`
+};
 //# sourceMappingURL=cancel.js.map

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

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

package/dist/cjs/rental/close.js

@@ -1,13 +1,16 @@
 "use strict";
 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 accounts_1 = require("../codama/accounts");
+const fetch_accounts_1 = require("../utils/fetch-accounts");
 const kit_1 = require("@solana/kit");
 const pda_1 = require("../utils/pda");
+const signer_1 = require("../utils/signer");
 /**
  * Internal function to close a rental instruction with configuration options.
  *
@@ -22,22 +25,25 @@ const pda_1 = require("../utils/pda");
  * @throws Error when instruction generation fails or required parameters are missing
  */
 async function _closeRental(params, config) {
-    const { payer, rentalStateAddress, } = params;
+    const { payer, rentalState, } = params;
     // Get the resolved addresses from config (including network-specific addresses)
-    const resolvedAddresses = await (0, config_1.resolveProgramAddresses)(config || {});
+    // Use global config as fallback, same pattern as acceptRental
+    const globalConfig = (0, config_1.getConfig)();
+    const effectiveConfig = { ...globalConfig, ...config };
+    const resolvedAddresses = await (0, config_1.resolveProgramAddresses)(effectiveConfig);
     // Create RPC from resolved addresses
     if (!resolvedAddresses.rpcUrl) {
         throw new Error('rpcUrl is required for close rental operation. Use setConfig({ library: "kit", rpcUrl: "https://..." })');
     }
     const rpc = (0, kit_1.createSolanaRpc)(resolvedAddresses.rpcUrl);
     // Fetch rental state to get contract and borrower
-    let rentalState;
+    let rentalStateAddress;
     try {
-        if (!rentalStateAddress) {
-            throw new Error(`rentalStateAddress is ${rentalStateAddress}, cannot proceed`);
+        if (!rentalState) {
+            throw new Error(`rentalState is ${rentalState}, cannot proceed`);
         }
-        rentalState = await (0, accounts_1.fetchMaybeRentalState)(rpc, (0, constants_1.toAddress)(rentalStateAddress));
-        if (!rentalState.exists) {
+        rentalStateAddress = await (0, accounts_1.fetchMaybeRentalState)(rpc, (0, constants_1.toAddress)(rentalState));
+        if (!rentalStateAddress.exists) {
             throw new Error(`Rental state not found: ${rentalStateAddress}`);
         }
     }
@@ -45,12 +51,12 @@ async function _closeRental(params, config) {
         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;
+    const contractAddress = rentalStateAddress.data.contract;
+    const borrower = rentalStateAddress.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
+    const rentalThreadPda = await (0, pda_1.deriveRentalThread)(rentalAuthorityPda, (0, constants_1.toAddress)(rentalState), // Use the passed-in rental state address
     resolvedAddresses.antegenProgramAddress);
     // Fetch contract state to get owner
     let contractState;
@@ -63,26 +69,22 @@ async function _closeRental(params, config) {
     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"
-        ],
-    });
+    // Fetch config state to get the authority using zero-argument overload
     let configState;
     try {
-        configState = await (0, accounts_1.fetchMaybeConfig)(rpc, configPda);
+        configState = await (0, fetch_accounts_1.fetchConfigState)();
         if (!configState.exists) {
-            throw new Error(`Config not found: ${configPda}`);
+            throw new Error('Config not found');
         }
     }
     catch (error) {
         throw new Error(`Failed to fetch config state: ${error}`);
     }
+    // Handle payer using smart signer handler for universal compatibility
+    const payerSigner = (0, signer_1.createTransactionSigner)(payer);
     // Only provide required fields - let Codama auto-generate the rest except rental_thread
     const input = {
-        payer: payer, // Pass the signer directly to Codama
+        payer: payerSigner, // Pass TransactionSigner for proper handling
         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),
@@ -142,19 +144,19 @@ async function _closeRental(params, config) {
  * // Close a completed rental
  * const instruction = await closeRental({
  *   payer: wallet,                         // Transaction payer
- *   rentalStateAddress: "RentalState..."   // Rental state address
+ *   rentalState: "RentalState..."   // Rental state address
  * });
  *
  * // Configure for mainnet
  * const mainnetInstruction = await closeRental({
  *   payer: wallet,
- *   rentalStateAddress: "RentalState..."
+ *   rentalState: "RentalState..."
  * }).set({ programs: 'mainnet' });
  *
  * // Convert to @solana/web3.js format
  * const web3jsInstruction = await closeRental({
  *   payer: wallet,
- *   rentalStateAddress: "RentalState..."
+ *   rentalState: "RentalState..."
  * }).web3js();
  *
  * // Use with your preferred Solana library
@@ -188,4 +190,14 @@ function getCloseRentalInstructionAsync(input, options) {
         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: (signer || wallet).publicKey?.toBase58(),
+  rentalState: "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":"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"}
+{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/rental/close.ts"],"names":[],"mappings":"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"}

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

@@ -7,6 +7,7 @@ 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");
+const signer_1 = require("../utils/signer");
 /**
  * Internal function to create a contract reset temp instruction with configuration options.
  *
@@ -42,9 +43,11 @@ async function _resetContractTemp(params, config) {
     // 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);
+    // Handle signer using smart signer handler for universal compatibility
+    const signerTransactionSigner = (0, signer_1.createTransactionSigner)(signer);
     // Create input for the instruction
     const input = {
-        signer: signer, // Pass signer directly to Codama
+        signer: signerTransactionSigner, // Pass TransactionSigner for proper handling
         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

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

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

package/dist/cjs/rental/reset.js

@@ -1,10 +1,14 @@
 "use strict";
 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.
  *
@@ -19,28 +23,115 @@ const utils_1 = require("../utils");
  * @throws Error when account derivation fails or required parameters are missing
  */
 async function _resetRental(params, config) {
+    console.log('🔄 Starting resetRental with params:', {
+        hasPayer: !!params.payer,
+        hasFleet: !!params.fleet,
+        contract: params.contract,
+        hasRentalState: !!params.rentalState,
+        faction: params.faction,
+        hasOwnerProfile: !!params.ownerProfile
+    });
     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 || {});
+    // Use global config as fallback, same pattern as acceptRental
+    const globalConfig = (0, config_1.getConfig)();
+    const effectiveConfig = { ...globalConfig, ...config };
+    const resolvedAddresses = await (0, config_1.resolveProgramAddresses)(effectiveConfig);
+    // Validate contract address before fetching
+    if (typeof contract === 'string' && (contract.includes('CONTRACT_ADDRESS') || contract.length < 32)) {
+        throw new Error(`Invalid contract address: "${contract}". Please provide a valid Solana address (32-44 characters).`);
+    }
+    // Fetch fleet, rentalState, and ownerProfile from contract if not provided
+    let fleetAddress;
+    let rentalStateAddress;
+    let ownerProfileAddress;
+    // Check if we need to fetch contract state
+    const needsContractFetch = !fleet || !rentalState || !ownerProfile;
+    if (needsContractFetch) {
+        console.log('🔍 Fetching contract state to retrieve missing fields...');
+        try {
+            const contractState = await (0, fetch_accounts_1.fetchContractState)((0, constants_1.toAddress)(contract));
+            // Use provided fleet or fetch from contract
+            if (fleet) {
+                if (typeof fleet === 'string' && (fleet.includes('FLEET_ADDRESS') || fleet.length < 32)) {
+                    throw new Error(`Invalid fleet address: "${fleet}". Please provide a valid Solana address (32-44 characters).`);
+                }
+                fleetAddress = fleet;
+            }
+            else {
+                fleetAddress = contractState.data.fleet;
+            }
+            // Use provided rentalState or fetch from contract
+            if (rentalState) {
+                if (typeof rentalState === 'string' && (rentalState.includes('RENTAL_STATE_ADDRESS') || rentalState.length < 32)) {
+                    throw new Error(`Invalid rental state address: "${rentalState}". Please provide a valid Solana address (32-44 characters).`);
+                }
+                rentalStateAddress = rentalState;
+            }
+            else {
+                rentalStateAddress = contractState.data.currentRentalState;
+            }
+            // Use provided ownerProfile or fetch from contract
+            if (ownerProfile) {
+                if (typeof ownerProfile === 'string' && (ownerProfile.includes('OWNER_PROFILE_ADDRESS') || ownerProfile.length < 32)) {
+                    throw new Error(`Invalid owner profile address: "${ownerProfile}". Please provide a valid Solana address (32-44 characters).`);
+                }
+                ownerProfileAddress = ownerProfile;
+            }
+            else {
+                ownerProfileAddress = contractState.data.ownerProfile;
+            }
+            console.log('✅ Contract state fetched:', {
+                fleet: fleetAddress,
+                owner: contractState.data.owner,
+                currentRentalState: rentalStateAddress,
+                ownerProfile: ownerProfileAddress,
+                toClose: contractState.data.toClose
+            });
+        }
+        catch (error) {
+            console.error('❌ Failed to fetch contract state:', error);
+            throw new Error(`Failed to fetch contract state: ${error}`);
+        }
+    }
+    else {
+        console.log('🚢 Using all provided addresses');
+        // Validate all provided addresses
+        if (typeof fleet === 'string' && (fleet.includes('FLEET_ADDRESS') || fleet.length < 32)) {
+            throw new Error(`Invalid fleet address: "${fleet}". Please provide a valid Solana address (32-44 characters).`);
+        }
+        if (typeof rentalState === 'string' && (rentalState.includes('RENTAL_STATE_ADDRESS') || rentalState.length < 32)) {
+            throw new Error(`Invalid rental state address: "${rentalState}". Please provide a valid Solana address (32-44 characters).`);
+        }
+        if (typeof ownerProfile === 'string' && (ownerProfile.includes('OWNER_PROFILE_ADDRESS') || ownerProfile.length < 32)) {
+            throw new Error(`Invalid owner profile address: "${ownerProfile}". Please provide a valid Solana address (32-44 characters).`);
+        }
+        fleetAddress = fleet;
+        rentalStateAddress = rentalState;
+        ownerProfileAddress = ownerProfile;
+    }
     // Derive the three accounts we need
-    const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(ownerProfile), faction, resolvedAddresses.gameId, 0, // starbaseSeqId
+    const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(ownerProfileAddress), 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)  
+    // Handle payer using smart signer handler for universal compatibility
+    const payerSigner = (0, signer_1.createTransactionSigner)(payer);
+    // 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
+        signer: payerSigner, // Pass TransactionSigner for proper handling
+        fleet: (0, constants_1.toAddress)(fleetAddress), // Use resolved fleet address
         contract: (0, constants_1.toAddress)(contract), // Ensure string
-        rentalState: (0, constants_1.toAddress)(rentalState), // Ensure string
+        rentalState: (0, constants_1.toAddress)(rentalStateAddress), // Use resolved rental state address
         gameId: resolvedAddresses.gameId, // Already Address from resolveProgramAddresses
         starbase, // Already string from deriveGameAccounts
         starbasePlayer, // Already string from deriveGameAccounts
     };
-    return getResetRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
+    const rawInstruction = await getResetRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
+    return (0, instruction_converter_1.createFluentInstruction)(rawInstruction);
 }
 /**
  * Creates an instruction to reset a rental contract after cancellation with fluent configuration.
@@ -84,31 +175,35 @@ async function _resetRental(params, config) {
  * ```typescript
  * import { resetRental } from '@srsly/sdk';
  *
- * // Reset a canceled rental
+ * // Reset a canceled rental (all addresses auto-fetched from contract)
  * const instruction = await resetRental({
- *   fleet: "FleetAddress123...",        // Fleet to reset
+ *   payer: wallet,                      // Transaction payer
  *   contract: "ContractAddr...",        // Contract to reactivate
- *   rentalState: "RentalStateAddr...",  // Canceled rental state
- *   faction: 'mud',                     // Owner's faction
- *   ownerProfile: "OwnerProfileAddr..." // Owner's Star Atlas profile
+ *   faction: 'mud'                      // Owner's faction
+ * });
+ *
+ * // Optionally provide explicit addresses to avoid fetching
+ * const instruction = await resetRental({
+ *   payer: wallet,
+ *   fleet: "FleetAddress123...",        // Optional: will be fetched if omitted
+ *   contract: "ContractAddr...",
+ *   rentalState: "RentalStateAddr...",  // Optional: will be fetched if omitted
+ *   faction: 'mud',
+ *   ownerProfile: "OwnerProfileAddr..." // Optional: will be fetched if omitted
  * });
  *
  * // Configure for mainnet
  * const mainnetInstruction = await resetRental({
- *   fleet: "FleetAddress123...",
+ *   payer: wallet,
  *   contract: "ContractAddr...",
- *   rentalState: "RentalStateAddr...",
- *   faction: 1,                         // Can use numbers: 1=mud, 2=oni, 3=ustur
- *   ownerProfile: "OwnerProfileAddr..."
+ *   faction: 1                          // Can use numbers: 1=mud, 2=oni, 3=ustur
  * }).set({ programs: 'mainnet' });
  *
  * // Override specific game configuration
  * const customInstruction = await resetRental({
- *   fleet: "FleetAddress123...",
+ *   payer: wallet,
  *   contract: "ContractAddr...",
- *   rentalState: "RentalStateAddr...",
- *   faction: 'mud',
- *   ownerProfile: "OwnerProfileAddr..."
+ *   faction: 'mud'
  * }).set({
  *   programs: 'mainnet',
  *   gameId: 'custom-game-id...'
@@ -116,11 +211,9 @@ async function _resetRental(params, config) {
  *
  * // Convert to @solana/web3.js format
  * const web3jsInstruction = await resetRental({
- *   fleet: "FleetAddress123...",
+ *   payer: wallet,
  *   contract: "ContractAddr...",
- *   rentalState: "RentalStateAddr...",
- *   faction: 'mud',
- *   ownerProfile: "OwnerProfileAddr..."
+ *   faction: 'mud'
  * }).web3js();
  *
  * // Use with your preferred Solana library
@@ -129,11 +222,12 @@ async function _resetRental(params, config) {
  * ```
  *
  * @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
+ * @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.createConfigSelector)((config) => _resetRental(params, config));
+    return (0, instruction_converter_1.createSmartFluentConfigSelector)(baseSelector);
 }
 /**
  * Low-level function to create a rental reset instruction with raw input parameters.
@@ -153,4 +247,15 @@ function getResetRentalInstructionAsync(input, options) {
         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: (signer || wallet).publicKey?.toBase58(),
+  contract: "CONTRACT_ADDRESS",
+  faction: "oni" // or "mud", "ustur"
+});`
+};
 //# sourceMappingURL=reset.js.map