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

package/dist/cjs/instructions/acceptRental.js

@@ -8,20 +8,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.acceptRental = acceptRental;
 const kit_1 = require("@solana/kit");
-const rpc_1 = require("../utils/rpc");
 const instructions_1 = require("../generated/codama/instructions");
 const config_1 = require("../utils/config");
 const signer_1 = require("../utils/signer");
+const amount_1 = require("../params/amount");
 const duration_1 = require("../params/duration");
 const fleet_1 = require("../accounts/fleet");
 const contract_1 = require("../accounts/contract");
 const config_2 = require("../accounts/config");
-const accounts_1 = require("../generated/codama/accounts");
+const rental_1 = require("../accounts/rental");
 const sage_1 = require("../pda/sage");
 const srsly_1 = require("../pda/srsly");
 const token_1 = require("../pda/token");
 const thread_1 = require("../pda/thread");
 const instructions_2 = require("../utils/instructions");
+const discountAuth_1 = require("../utils/discountAuth");
+const types_1 = require("../generated/codama/types");
 /**
  * Accept a rental contract
  *
@@ -31,13 +33,13 @@ const instructions_2 = require("../utils/instructions");
  *
  * This function automatically fetches the contract and config to get required
  * data (fleet, vault, gameId), then derives all SAGE accounts (profile faction,
- * starbase, starbase player) and the rental thread for automated payments.
+ * starbase, starbase player) and the contract thread for automated payments.
  *
  * @param params - Rental acceptance parameters
  * @param config - Optional SDK configuration overrides
  * @returns Array of instructions (Kit format or web3.js if PublicKey in config)
  *
- * @demo
+ * @example
  * ```typescript
  * // Accept a 7-day rental (borrowerProfile auto-fetched)
  * const ixs = await acceptRental({
@@ -47,27 +49,6 @@ const instructions_2 = require("../utils/instructions");
  *   computeUnits: 400_000
  * });
  * ```
- *
- * @example
- * ```typescript
- * // Accept a 7-day rental (fleet and vault auto-fetched)
- * const ixs = await acceptRental({
- *   borrower: wallet,
- *   borrowerProfile: borrowerProfileAddress,
- *   contract: contractAddress,
- *   duration: { days: 7 }
- * });
- *
- * // With referrer and compute budget
- * const ixs2 = await acceptRental({
- *   borrower: wallet,
- *   borrowerProfile: borrowerProfileAddress,
- *   contract: contractAddress,
- *   referrer: referrerAddress,
- *   duration: { weeks: 2 },
- *   computeUnits: 400_000
- * });
- * ```
  */
 async function acceptRental(params, config) {
     // Merge config
@@ -84,93 +65,117 @@ async function acceptRental(params, config) {
     }
     // Convert borrower to transaction signer
     const borrowerSigner = (0, signer_1.toTransactionSigner)(params.borrower);
-    // Fetch or use provided borrower profile
-    let borrowerProfile;
-    if (params.borrowerProfile) {
-        // User provided profile - use it directly
-        borrowerProfile = (0, kit_1.address)(params.borrowerProfile);
-    }
-    else {
-        // Fetch borrower_state to get profile
-        const borrowerStateAddress = await (0, srsly_1.deriveBorrowerState)(borrowerSigner.address);
-        const rpc = (0, rpc_1.createRpc)(finalConfig.rpcUrl || 'https://api.devnet.solana.com');
-        const borrowerState = await (0, accounts_1.fetchBorrowerState)(rpc, borrowerStateAddress);
-        // Check if borrowerProfile is set (Option type check)
-        const profileOption = borrowerState.data.borrowerProfile;
-        if (!profileOption || (typeof profileOption === 'object' && '__option' in profileOption && profileOption.__option === 'None')) {
-            throw new Error('Borrower profile not set. Please run borrower-update to set your SAGE profile.');
-        }
-        // Extract value from Some variant
-        borrowerProfile = typeof profileOption === 'object' && 'value' in profileOption ? profileOption.value : profileOption;
-    }
     // Fetch config to get vault
     const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
     const vault = configAccount.data.slyvault;
-    // Fetch contract to get fleet, gameId, ownerProfile
+    // Fetch contract to get fleet, gameId
     const contractAccount = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
     const fleet = contractAccount.data.fleet;
     const gameId = contractAccount.data.gameId;
+    // Client-side rate safety check
+    if (params.rate != null) {
+        const expectedRate = (0, amount_1.convertAmount)(params.rate);
+        const contractRate = BigInt(contractAccount.data.rate);
+        if (expectedRate !== contractRate) {
+            throw new Error(`Contract rate mismatch: expected ${expectedRate} stardust but contract has ${contractRate} stardust. The rate may have changed since you last fetched it.`);
+        }
+    }
     // Fetch fleet data for faction (needed to derive SAGE accounts)
     const fleetState = await (0, fleet_1.fetchFleet)(fleet, finalConfig.rpcUrl);
     const faction = fleetState.faction;
+    // Use param if provided, fallback to fleet.subProfile (current occupant's profile)
+    let borrowerProfile;
+    if (params.borrowerProfile) {
+        borrowerProfile = (0, kit_1.address)(params.borrowerProfile);
+    }
+    else {
+        borrowerProfile = fleetState.subProfile.key;
+    }
     // Derive all SAGE game accounts (profile faction, starbase, starbase player)
     const gameAccounts = await (0, sage_1.deriveGameAccounts)(borrowerProfile, faction, gameId);
-    // Derive rental and rental authority PDAs
-    const rental = await (0, srsly_1.deriveRental)(params.contract, borrowerSigner.address);
+    // Derive active rental PDA (no more slot logic)
+    const rentalState = await (0, srsly_1.deriveActiveRental)(params.contract);
+    // Resolve expiredBorrowerState: use param if provided, otherwise auto-detect
+    // When the same borrower re-rents their own expired contract, skip passing
+    // expiredBorrowerState to avoid Anchor's duplicate mutable account error.
+    const borrowerStatePda = await (0, srsly_1.deriveBorrowerState)(borrowerSigner);
+    let expiredBorrowerState;
+    if (params.expiredBorrowerState) {
+        const explicit = (0, kit_1.address)(params.expiredBorrowerState);
+        // Don't pass if it matches the current borrower's state (same-borrower re-rent)
+        if (explicit !== borrowerStatePda) {
+            expiredBorrowerState = explicit;
+        }
+    }
+    else {
+        try {
+            const activeRental = await (0, rental_1.fetchRental)(rentalState, finalConfig.rpcUrl);
+            if (activeRental.data.status !== types_1.RentalStatus.Available) {
+                // Only pass as separate account if it's a DIFFERENT borrower's state
+                if (activeRental.data.borrowerState !== borrowerStatePda) {
+                    expiredBorrowerState = activeRental.data.borrowerState;
+                }
+            }
+        }
+        catch {
+            // Rental state doesn't exist or can't be fetched — no expired rental to replace
+        }
+    }
+    // Derive rental authority PDA
     const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
-    // Derive rental thread for automated payments
-    const rentalThread = await (0, thread_1.deriveRentalThread)(rental, rentalAuthority);
+    // Derive contract thread and close_rental fiber (fiber index 1) — only if thread configured
+    const thread = (0, kit_1.address)(contractAccount.data.thread);
+    const hasThread = thread !== '11111111111111111111111111111111';
+    const contractThread = hasThread ? await (0, thread_1.deriveContractThread)(params.contract, rentalAuthority) : undefined;
+    const closeRentalFiber = hasThread && contractThread ? await (0, thread_1.deriveFiber)(contractThread, 1) : undefined;
     // Convert duration parameter
     const durationSeconds = (0, duration_1.convertDuration)(params.duration);
-    // Get network-specific addresses
+    // Get network-specific addresses (atlasMint sourced from on-chain config)
+    const atlasMint = configAccount.data.atlasMint;
     const addresses = (0, config_1.getAddresses)(config);
-    const atlasMint = (0, kit_1.address)(addresses.atlasMint);
     const sageProgram = (0, kit_1.address)(addresses.sage);
     const programAddress = (0, kit_1.address)(addresses.srsly);
-    // Optional referrer
+    // Deserialize discount auth if provided
+    let discountAuth = null;
+    if (params.discountAuth) {
+        discountAuth = (0, discountAuth_1.deserializeDiscountAuth)(params.discountAuth);
+    }
     const referrer = params.referrer ? (0, kit_1.address)(params.referrer) : undefined;
-    // Determine if we need to include scheduleRental
-    // Either explicitly requested or contract requires automation
-    const shouldSchedule = params.autoSchedule || contractAccount.data.requiresAutomation;
     // Derive vault token account (ATA)
     const vaultTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(vault, atlasMint);
+    // Derive contract token account (ATA of contract PDA)
+    const contractAddress = (0, kit_1.address)(params.contract);
+    const contractTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(contractAddress, atlasMint);
+    // Derive borrower token account (ATA)
+    const borrowerTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(borrowerSigner.address, atlasMint);
     // Call Codama-generated acceptRental instruction
     const acceptRentalIx = await (0, instructions_1.getAcceptRentalInstructionAsync)({
         borrower: borrowerSigner,
-        borrowerProfile,
-        borrowerProfileFaction: gameAccounts.profileFaction,
+        borrowerTokenAccount,
         fleet: (0, kit_1.address)(fleet),
-        contract: (0, kit_1.address)(params.contract),
-        gameId: (0, kit_1.address)(gameId),
-        starbase: gameAccounts.starbase,
-        starbasePlayer: gameAccounts.starbasePlayer,
+        expiredBorrowerState,
+        contract: contractAddress,
+        rentalState,
         vault: (0, kit_1.address)(vault),
         vaultTokenAccount,
+        contractTokenAccount,
+        ...(contractThread && { contractThread }),
+        ...(closeRentalFiber && { closeRentalFiber }),
         referrer,
-        mint: atlasMint,
         sageProgram,
         duration: BigInt(durationSeconds),
-        rebateAuth: null
+        discountAuth
     }, { programAddress });
-    // If auto-schedule is enabled, bundle scheduleRental instruction
-    if (shouldSchedule) {
-        const scheduleRentalIx = await (0, instructions_1.getScheduleRentalInstructionAsync)({
-            payer: borrowerSigner,
-            mint: atlasMint,
-            contract: (0, kit_1.address)(params.contract),
-            fleet: (0, kit_1.address)(fleet),
-            rentalState: rental,
-            rentalThread,
-            borrowerProfileFaction: gameAccounts.profileFaction,
-            sageProgram
-        }, { programAddress });
-        // Return both instructions as array
-        return (0, instructions_2.prepareInstructions)([acceptRentalIx, scheduleRentalIx], {
-            computeUnits: params.computeUnits,
-            PublicKey: finalConfig.PublicKey
-        });
-    }
-    // Prepare single instruction with optional compute budget and web3.js conversion
+    // Append SAGE pass-through accounts as remaining accounts
+    const sageRemainingAccounts = [
+        { address: borrowerProfile, role: kit_1.AccountRole.READONLY },
+        { address: gameAccounts.profileFaction, role: kit_1.AccountRole.READONLY },
+        { address: (0, kit_1.address)(gameId), role: kit_1.AccountRole.READONLY },
+        { address: gameAccounts.starbase, role: kit_1.AccountRole.READONLY },
+        { address: gameAccounts.starbasePlayer, role: kit_1.AccountRole.WRITABLE },
+    ];
+    acceptRentalIx.accounts.push(...sageRemainingAccounts);
+    // Prepare instruction with optional compute budget
     return (0, instructions_2.prepareInstructions)(acceptRentalIx, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey

package/dist/cjs/instructions/acceptRental.js.map

@@ -1 +1 @@
-{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAwHH,oCA0IC;AAhQD,qCAAoD;AACpD,sCAAyC;AACzC,mEAAsH;AACtH,4CAA4E;AAC5E,4CAA4E;AAE5E,iDAAyE;AACzE,6CAA+C;AAC/C,mDAAqD;AACrD,+CAAiD;AACjD,2DAAkE;AAClE,sCAAiD;AACjD,wCAAwF;AACxF,wCAA4D;AAC5D,0CAAmD;AACnD,wDAA4D;AAwD5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACI,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,yCAAyC;IACzC,IAAI,eAAwB,CAAC;IAC7B,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QAC3B,0CAA0C;QAC1C,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,eAA0B,CAAC,CAAC;IAC/D,CAAC;SAAM,CAAC;QACN,sCAAsC;QACtC,MAAM,oBAAoB,GAAG,MAAM,IAAA,2BAAmB,EAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,GAAG,GAAG,IAAA,eAAS,EAAC,WAAW,CAAC,MAAM,IAAI,+BAA+B,CAAC,CAAC;QAC7E,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAkB,EAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC;QAE1E,sDAAsD;QACtD,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC;QACzD,IAAI,CAAC,aAAa,IAAI,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,UAAU,IAAI,aAAa,IAAI,aAAa,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAAC;YAC9H,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;QACpG,CAAC;QAED,kCAAkC;QAClC,eAAe,GAAG,OAAO,aAAa,KAAK,QAAQ,IAAI,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,aAAwB,CAAC;IACnI,CAAC;IAED,4BAA4B;IAC5B,MAAM,aAAa,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC;IAE1C,oDAAoD;IACpD,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAa,EAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC;IAE3C,gEAAgE;IAChE,MAAM,UAAU,GAAG,MAAM,IAAA,kBAAU,EAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,6EAA6E;IAC7E,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAkB,EAC3C,eAAe,EACf,OAAO,EACP,MAAM,CACP,CAAC;IAEF,0CAA0C;IAC1C,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAC3E,MAAM,eAAe,GAAG,MAAM,IAAA,6BAAqB,GAAE,CAAC;IAEtD,8CAA8C;IAC9C,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAkB,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAEvE,6BAA6B;IAC7B,MAAM,eAAe,GAAG,IAAA,0BAAe,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEzD,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,oBAAoB;IACpB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEnF,iDAAiD;IACjD,8DAA8D;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,IAAI,eAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC;IAEtF,mCAAmC;IACnC,MAAM,iBAAiB,GAAG,MAAM,IAAA,oCAA4B,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAE/E,iDAAiD;IACjD,MAAM,cAAc,GAAG,MAAM,IAAA,8CAA+B,EAC1D;QACE,QAAQ,EAAE,cAAc;QACxB,eAAe;QACf,sBAAsB,EAAE,YAAY,CAAC,cAAc;QACnD,KAAK,EAAE,IAAA,aAAO,EAAC,KAAgB,CAAC;QAChC,QAAQ,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC;QAC7C,MAAM,EAAE,IAAA,aAAO,EAAC,MAAiB,CAAC;QAClC,QAAQ,EAAE,YAAY,CAAC,QAAQ;QAC/B,cAAc,EAAE,YAAY,CAAC,cAAc;QAC3C,KAAK,EAAE,IAAA,aAAO,EAAC,KAAgB,CAAC;QAChC,iBAAiB;QACjB,QAAQ;QACR,IAAI,EAAE,SAAS;QACf,WAAW;QACX,QAAQ,EAAE,MAAM,CAAC,eAAe,CAAC;QACjC,UAAU,EAAE,IAAI;KACjB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,iEAAiE;IACjE,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,gBAAgB,GAAG,MAAM,IAAA,gDAAiC,EAC9D;YACE,KAAK,EAAE,cAAc;YACrB,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC;YAC7C,KAAK,EAAE,IAAA,aAAO,EAAC,KAAgB,CAAC;YAChC,WAAW,EAAE,MAAM;YACnB,YAAY;YACZ,sBAAsB,EAAE,YAAY,CAAC,cAAc;YACnD,WAAW;SACZ,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;QAEF,oCAAoC;QACpC,OAAO,IAAA,kCAAmB,EAAC,CAAC,cAAc,EAAE,gBAAgB,CAAC,EAAE;YAC7D,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC,CAAC;IACL,CAAC;IAED,iFAAiF;IACjF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}

package/dist/cjs/instructions/activateRental.js

@@ -0,0 +1,98 @@
+"use strict";
+/**
+ * @purpose Simplified activateRental instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated activateRental instruction.
+ * Manually activates a queued rental when automation is delayed or unavailable.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.activateRental = activateRental;
+const kit_1 = require("@solana/kit");
+const instructions_1 = require("../generated/codama/instructions");
+const config_1 = require("../utils/config");
+const signer_1 = require("../utils/signer");
+const instructions_2 = require("../utils/instructions");
+const config_2 = require("../accounts/config");
+const contract_1 = require("../accounts/contract");
+const fleet_1 = require("../accounts/fleet");
+const rental_1 = require("../accounts/rental");
+const sage_1 = require("../pda/sage");
+const srsly_1 = require("../pda/srsly");
+const thread_1 = require("../pda/thread");
+const token_1 = require("../pda/token");
+/**
+ * Manually activate a queued rental
+ *
+ * This is a fallback for when the Antegen automation thread is delayed.
+ * Anyone can call this — it's permissionless. The queued rental will be
+ * promoted to active, the fleet will be delegated to the borrower in SAGE,
+ * and deferred fees will be paid.
+ *
+ * @param params - Activate rental parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Kit instruction (or web3.js if PublicKey in config)
+ */
+async function activateRental(params, config) {
+    const finalConfig = (0, config_1.mergeConfig)(config);
+    if (!params.payer) {
+        throw new Error('payer is required');
+    }
+    if (!params.contract) {
+        throw new Error('contract is required');
+    }
+    if (!params.borrowerProfile) {
+        throw new Error('borrowerProfile is required for manual activation');
+    }
+    const payerSigner = (0, signer_1.toTransactionSigner)(params.payer);
+    const addresses = (0, config_1.getAddresses)(config);
+    const programAddress = (0, kit_1.address)(addresses.srsly);
+    const contractAddress = (0, kit_1.address)(params.contract);
+    // Fetch config and contract
+    const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
+    const contractAccount = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
+    // Derive rental PDAs
+    const activeRental = await (0, srsly_1.deriveActiveRental)(contractAddress);
+    const queuedRental = await (0, srsly_1.deriveQueuedRental)(contractAddress);
+    const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
+    // Derive thread PDAs — only if thread configured
+    const thread = (0, kit_1.address)(contractAccount.data.thread);
+    const hasThread = thread !== '11111111111111111111111111111111';
+    const contractThread = hasThread ? await (0, thread_1.deriveContractThread)(contractAddress, rentalAuthority) : undefined;
+    const closeRentalFiber = hasThread && contractThread ? await (0, thread_1.deriveFiber)(contractThread, 1) : undefined;
+    // Fetch queued rental to get borrower info
+    const queuedRentalAccount = await (0, rental_1.fetchRental)(queuedRental, finalConfig.rpcUrl);
+    // Derive SAGE accounts from borrowerProfile + fleet faction
+    const borrowerProfileAddr = (0, kit_1.address)(params.borrowerProfile);
+    const fleetState = await (0, fleet_1.fetchFleet)(contractAccount.data.fleet, finalConfig.rpcUrl);
+    const gameAccounts = await (0, sage_1.deriveGameAccounts)(borrowerProfileAddr, fleetState.faction, contractAccount.data.gameId);
+    // Get vault from config and derive vault token account
+    const vault = configAccount.data.slyvault;
+    const vaultTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(vault, atlasMint);
+    const kitInstruction = await (0, instructions_1.getActivateRentalInstructionAsync)({
+        payer: payerSigner,
+        contract: contractAddress,
+        contractTokenAccount: contractAccount.data.managedTokenAccount,
+        mint: atlasMint,
+        borrowerProfile: borrowerProfileAddr,
+        borrowerProfileFaction: gameAccounts.profileFaction,
+        fleet: contractAccount.data.fleet,
+        gameId: contractAccount.data.gameId,
+        ...(contractThread && { contractThread }),
+        ...(closeRentalFiber && { closeRentalFiber }),
+        vault,
+        vaultTokenAccount,
+        sageProgram: (0, kit_1.address)(addresses.sage),
+    }, { programAddress });
+    // Append starbase + starbasePlayer as remaining accounts (for fiber 1 building)
+    const sageRemainingAccounts = [
+        { address: gameAccounts.starbase, role: kit_1.AccountRole.READONLY },
+        { address: gameAccounts.starbasePlayer, role: kit_1.AccountRole.READONLY },
+    ];
+    kitInstruction.accounts.push(...sageRemainingAccounts);
+    return (0, instructions_2.prepareInstructions)(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=activateRental.js.map

package/dist/cjs/instructions/activateRental.js.map

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

package/dist/cjs/instructions/approveAffiliate.js

@@ -0,0 +1,11 @@
+"use strict";
+/**
+ * @purpose Approve and activate an affiliate
+ *
+ * Re-exports slyvault's approveAffiliate instruction.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.approveAffiliate = void 0;
+var slyvault_1 = require("@wuwei-labs/slyvault");
+Object.defineProperty(exports, "approveAffiliate", { enumerable: true, get: function () { return slyvault_1.approveAffiliate; } });
+//# sourceMappingURL=approveAffiliate.js.map

package/dist/cjs/instructions/approveAffiliate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approveAffiliate.js","sourceRoot":"","sources":["../../../src/instructions/approveAffiliate.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,iDAG8B;AAF5B,4GAAA,gBAAgB,OAAA"}

package/dist/cjs/instructions/cancelRental.js

@@ -12,23 +12,22 @@ const instructions_1 = require("../generated/codama/instructions");
 const config_1 = require("../utils/config");
 const signer_1 = require("../utils/signer");
 const srsly_1 = require("../pda/srsly");
-const thread_1 = require("../pda/thread");
+const token_1 = require("../pda/token");
 const instructions_2 = require("../utils/instructions");
 const duration_1 = require("../params/duration");
+const config_2 = require("../accounts/config");
+const contract_1 = require("../accounts/contract");
 /**
  * Cancel a rental
  *
- * Allows a borrower to cancel an active rental.
+ * Allows a borrower to cancel an active rental. Always targets the active
+ * rental PDA (no more slot detection needed).
  *
  * **Cancellation Behavior:**
- * - `cancelDelay = 0`: Instant cancellation (requires `allowInstantCancel` on contract)
- *   - Sets `Trigger::Immediate` so `rental_pay` fires immediately
- *   - Returns `InstantCancelNotAllowed` error if contract doesn't allow it
- * - `cancelDelay > 0`: Deferred cancellation
- *   - Rental continues until `now + cancelDelay`
- *   - Existing Cron trigger handles cleanup when `end_time` is reached
+ * - `cancelDelay = 0`: Instant cancellation
+ * - `cancelDelay > 0`: Deferred cancellation, rental continues until `now + cancelDelay`
  *
- * Both paths refund the borrower for unused time. Owner gets paid when `rental_pay` fires.
+ * Both paths refund the borrower for unused time.
  *
  * @param params - Cancellation parameters (borrower, contract, cancelDelay)
  * @param config - Optional SDK configuration overrides
@@ -36,13 +35,13 @@ const duration_1 = require("../params/duration");
  *
  * @example
  * ```typescript
- * // Deferred cancellation (cancel after 1 hour - default)
+ * // Default cancellation (uses contract's cancelDelayMin)
  * const ix = await cancelRental({
  *   borrower: borrowerWallet,
  *   contract: contractAddress
  * });
  *
- * // Instant cancellation (requires allowInstantCancel on contract)
+ * // Instant cancellation
  * const ix2 = await cancelRental({
  *   borrower: borrowerWallet,
  *   contract: contractAddress,
@@ -69,27 +68,37 @@ async function cancelRental(params, config) {
     }
     // Convert borrower to transaction signer
     const borrowerSigner = (0, signer_1.toTransactionSigner)(params.borrower);
-    // Get network-specific addresses
+    // Get atlasMint from on-chain config
+    const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
     const addresses = (0, config_1.getAddresses)(config);
-    const atlasMint = (0, kit_1.address)(addresses.atlasMint);
     const programAddress = (0, kit_1.address)(addresses.srsly);
-    // Derive rental thread (only PDA not auto-derived by Codama)
-    const rentalState = await (0, srsly_1.deriveRental)(params.contract, borrowerSigner.address);
-    const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
-    const rentalThread = await (0, thread_1.deriveRentalThread)(rentalState, rentalAuthority);
+    // Fetch contract to get fleet
+    const contractAccount = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
+    const fleet = contractAccount.data.fleet;
+    // Derive active rental PDA (no more slot logic)
+    const rentalState = await (0, srsly_1.deriveActiveRental)(params.contract);
+    // Derive contract token account (ATA of contract PDA)
+    const contractAddress = (0, kit_1.address)(params.contract);
+    const contractTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(contractAddress, atlasMint);
     // Convert duration to seconds (supports { hours: 1 }, { days: 1 }, etc.)
-    // Default to 1 hour if not specified (safer than instant cancel which requires flag)
+    // Default to contract's cancelDelayMin if not specified
     const cancelDelay = params.cancelDelay !== undefined
         ? BigInt((0, duration_1.convertDuration)(params.cancelDelay))
-        : BigInt((0, duration_1.convertDuration)({ hours: 1 }));
+        : contractAccount.data.cancelDelayMin;
+    // Resolve contract thread (system_program::ID means no thread configured)
+    const thread = (0, kit_1.address)(contractAccount.data.thread);
+    const hasThread = thread !== '11111111111111111111111111111111';
     // Call Codama-generated instruction
-    // Note: Codama auto-derives config, borrowerState, borrowerTokenAccount,
-    // rentalState, rentalTokenAccount, rentalAuthority, antegenProgram, tokenProgram
+    // Note: Codama auto-derives config, borrowerState, borrowerTokenAccount, rentalAuthority
     const kitInstruction = await (0, instructions_1.getCancelRentalInstructionAsync)({
         mint: atlasMint,
         borrower: borrowerSigner,
-        rentalThread,
-        contract: (0, kit_1.address)(params.contract),
+        rentalState,
+        contractTokenAccount,
+        contract: contractAddress,
+        fleet: (0, kit_1.address)(fleet),
+        ...(hasThread && { contractThread: thread }),
         cancelDelay,
     }, { programAddress });
     return (0, instructions_2.prepareInstructions)(kitInstruction, {

package/dist/cjs/instructions/cancelRental.js.map

@@ -1 +1 @@
-{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA4FH,oCAoDC;AA9ID,qCAAoD;AACpD,mEAAmF;AACnF,4CAA4E;AAC5E,4CAA4E;AAC5E,wCAAmE;AACnE,0CAAmD;AACnD,wDAA4D;AAC5D,iDAAyE;AAyCzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACI,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,6DAA6D;IAC7D,MAAM,WAAW,GAAG,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAChF,MAAM,eAAe,GAAG,MAAM,IAAA,6BAAqB,GAAE,CAAC;IACtD,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAkB,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAE5E,yEAAyE;IACzE,qFAAqF;IACrF,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,KAAK,SAAS;QAClD,CAAC,CAAC,MAAM,CAAC,IAAA,0BAAe,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC7C,CAAC,CAAC,MAAM,CAAC,IAAA,0BAAe,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAE1C,oCAAoC;IACpC,yEAAyE;IACzE,iFAAiF;IACjF,MAAM,cAAc,GAAG,MAAM,IAAA,8CAA+B,EAC1D;QACE,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,cAAc;QACxB,YAAY;QACZ,QAAQ,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC;QAC7C,WAAW;KACZ,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAyFH,oCAiEC;AAxJD,qCAAoD;AACpD,mEAAmF;AACnF,4CAA4E;AAC5E,4CAA4E;AAC5E,wCAAkD;AAClD,wCAA4D;AAC5D,wDAA4D;AAC5D,iDAAyE;AACzE,+CAAiD;AACjD,mDAAqD;AAuCrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACI,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,qCAAqC;IACrC,MAAM,aAAa,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,8BAA8B;IAC9B,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAa,EAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;IAEzC,gDAAgD;IAChD,MAAM,WAAW,GAAG,MAAM,IAAA,0BAAkB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE9D,sDAAsD;IACtD,MAAM,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG,MAAM,IAAA,oCAA4B,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAE5F,yEAAyE;IACzE,wDAAwD;IACxD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,KAAK,SAAS;QAClD,CAAC,CAAC,MAAM,CAAC,IAAA,0BAAe,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC7C,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC;IAExC,0EAA0E;IAC1E,MAAM,MAAM,GAAG,IAAA,aAAO,EAAC,eAAe,CAAC,IAAI,CAAC,MAAiB,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,MAAM,KAAK,kCAAkC,CAAC;IAEhE,oCAAoC;IACpC,yFAAyF;IACzF,MAAM,cAAc,GAAG,MAAM,IAAA,8CAA+B,EAC1D;QACE,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,cAAc;QACxB,WAAW;QACX,oBAAoB;QACpB,QAAQ,EAAE,eAAe;QACzB,KAAK,EAAE,IAAA,aAAO,EAAC,KAAgB,CAAC;QAChC,GAAG,CAAC,SAAS,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;QAC5C,WAAW;KACZ,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}

package/dist/cjs/instructions/claimBorrower.js

@@ -3,7 +3,9 @@
  * @purpose Simplified claimBorrower instruction wrapper
  *
  * Thin convenience wrapper around Codama-generated claimBorrower instruction.
- * Allows borrowers to claim accumulated ATLAS from their managed token account.
+ * Allows claiming accumulated ATLAS from a borrower's managed token account.
+ * When close is true, bundles a closeBorrower instruction to also close the
+ * managed ATA and BorrowerState in a single transaction.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.claimBorrower = claimBorrower;
@@ -12,6 +14,7 @@ const instructions_1 = require("../generated/codama/instructions");
 const config_1 = require("../utils/config");
 const signer_1 = require("../utils/signer");
 const instructions_2 = require("../utils/instructions");
+const config_2 = require("../accounts/config");
 /**
  * Claim borrower ATLAS refunds
  *
@@ -20,45 +23,68 @@ const instructions_2 = require("../utils/instructions");
  * account (an ATA with the borrower_state as authority). This instruction
  * transfers those funds to the borrower's personal wallet.
  *
+ * The payer and borrower can be different accounts, allowing a third party
+ * to pay for the claim transaction on behalf of the borrower.
+ *
+ * When close is true, a closeBorrower instruction is bundled to also close
+ * the managed ATA and BorrowerState PDA in the same transaction.
+ *
  * @param params - Borrower claim parameters
  * @param config - Optional SDK configuration overrides
  * @returns Kit instruction (or web3.js if PublicKey in config)
  *
  * @example
  * ```typescript
- * // Claim accumulated ATLAS refunds
+ * // Self-claim: payer is the borrower
  * const ix = await claimBorrower({
- *   borrower: borrowerWallet
+ *   payer: borrowerWallet,
  * });
  *
- * // With web3.js
- * import { PublicKey } from '@solana/web3.js';
- * setSdkConfig({ network: 'mainnet-beta', PublicKey });
- * const web3Ix = await claimBorrower({
- *   borrower: keypair
+ * // Third-party claim: someone else pays
+ * const ix2 = await claimBorrower({
+ *   payer: relayerWallet,
+ *   borrower: "BORROWER_ADDRESS"
+ * });
+ *
+ * // Claim and close the BorrowerState account
+ * const ix3 = await claimBorrower({
+ *   payer: borrowerWallet,
+ *   close: true
  * });
  * ```
  */
 async function claimBorrower(params, config) {
-    // Merge config
     const finalConfig = (0, config_1.mergeConfig)(config);
-    // Validate required params
-    if (!params.borrower) {
-        throw new Error('borrower is required');
+    if (!params.payer) {
+        throw new Error('payer is required');
     }
-    // Convert borrower to transaction signer
-    const borrowerSigner = (0, signer_1.toTransactionSigner)(params.borrower);
-    // Get network-specific addresses
+    const payerSigner = (0, signer_1.toTransactionSigner)(params.payer);
+    const borrowerAddress = params.borrower
+        ? (0, kit_1.address)(params.borrower)
+        : (0, signer_1.getSignerAddress)(payerSigner);
+    const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
     const addresses = (0, config_1.getAddresses)(config);
-    const atlasMint = (0, kit_1.address)(addresses.atlasMint);
     const programAddress = (0, kit_1.address)(addresses.srsly);
-    // Call Codama-generated instruction
-    // Most accounts are auto-derived (config, borrowerState, managed account, destination)
-    const kitInstruction = await (0, instructions_1.getClaimBorrowerInstructionAsync)({
-        borrower: borrowerSigner,
+    // Build claim instruction
+    const claimIx = await (0, instructions_1.getClaimBorrowerInstructionAsync)({
+        payer: payerSigner,
+        borrower: borrowerAddress,
         mint: atlasMint,
     }, { programAddress });
-    return (0, instructions_2.prepareInstructions)(kitInstruction, {
+    // If close requested, bundle a closeBorrower instruction after the claim
+    if (params.close) {
+        const closeIx = await (0, instructions_1.getCloseBorrowerInstructionAsync)({
+            payer: payerSigner,
+            borrower: borrowerAddress,
+            mint: atlasMint,
+        }, { programAddress });
+        return (0, instructions_2.prepareInstructions)([claimIx, closeIx], {
+            computeUnits: params.computeUnits,
+            PublicKey: finalConfig.PublicKey
+        });
+    }
+    return (0, instructions_2.prepareInstructions)(claimIx, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey
     });

package/dist/cjs/instructions/claimBorrower.js.map

@@ -1 +1 @@
-{"version":3,"file":"claimBorrower.js","sourceRoot":"","sources":["../../../src/instructions/claimBorrower.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAoDH,sCAkCC;AApFD,qCAAoD;AACpD,mEAAoF;AACpF,4CAA4E;AAC5E,4CAA4E;AAC5E,wDAA4D;AAmB5D;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACI,KAAK,UAAU,aAAa,CACjC,MAA2B,EAC3B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,oCAAoC;IACpC,uFAAuF;IACvF,MAAM,cAAc,GAAG,MAAM,IAAA,+CAAgC,EAC3D;QACE,QAAQ,EAAE,cAAc;QACxB,IAAI,EAAE,SAAS;KAChB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"claimBorrower.js","sourceRoot":"","sources":["../../../src/instructions/claimBorrower.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;AAgFH,sCAoDC;AAlID,qCAAoD;AACpD,mEAAsH;AACtH,4CAA4E;AAC5E,4CAA8F;AAC9F,wDAA4D;AAC5D,+CAAiD;AAmCjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACI,KAAK,UAAU,aAAa,CACjC,MAA2B,EAC3B,MAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ;QACrC,CAAC,CAAC,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC;QACrC,CAAC,CAAC,IAAA,yBAAgB,EAAC,WAAW,CAAC,CAAC;IAElC,MAAM,aAAa,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,0BAA0B;IAC1B,MAAM,OAAO,GAAG,MAAM,IAAA,+CAAgC,EACpD;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,SAAS;KAChB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,yEAAyE;IACzE,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,MAAM,IAAA,+CAAgC,EACpD;YACE,KAAK,EAAE,WAAW;YAClB,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE,SAAS;SAChB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;QAEF,OAAO,IAAA,kCAAmB,EAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;YAC7C,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAA,kCAAmB,EAAC,OAAO,EAAE;QAClC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}