@wuwei-labs/srsly 3.0.0-beta.8 → 4.0.0-beta.1

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"}

package/dist/cjs/instructions/claimContract.js

@@ -0,0 +1,56 @@
+"use strict";
+/**
+ * @purpose Simplified claimContract instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated claimContract instruction.
+ * Permissionless — anyone can trigger, but tokens always go to the owner's ATA.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.claimContract = claimContract;
+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");
+/**
+ * Claim contract ATLAS earnings
+ *
+ * Permissionless — anyone can trigger, but tokens always go to the
+ * contract owner's ATA (derived from contract state).
+ *
+ * @param params - Contract claim parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Kit instruction (or web3.js if PublicKey in config)
+ */
+async function claimContract(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');
+    }
+    const payerSigner = (0, signer_1.toTransactionSigner)(params.payer);
+    // 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 programAddress = (0, kit_1.address)(addresses.srsly);
+    // Fetch contract to get owner and contractTokenAccount
+    const contractAccount = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
+    const contractAddress = (0, kit_1.address)(params.contract);
+    const kitInstruction = await (0, instructions_1.getClaimContractInstructionAsync)({
+        payer: payerSigner,
+        owner: contractAccount.data.owner,
+        mint: atlasMint,
+        contract: contractAddress,
+        contractTokenAccount: contractAccount.data.managedTokenAccount,
+    }, { programAddress });
+    return (0, instructions_2.prepareInstructions)(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=claimContract.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"claimContract.js","sourceRoot":"","sources":["../../../src/instructions/claimContract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAyCH,sCAwCC;AA/ED,qCAAoD;AACpD,mEAAoF;AACpF,4CAA4E;AAC5E,4CAA4E;AAC5E,wDAA4D;AAC5D,+CAAiD;AACjD,mDAAqD;AAuBrD;;;;;;;;;GASG;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;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,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,uDAAuD;IACvD,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAa,EAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAE5D,MAAM,cAAc,GAAG,MAAM,IAAA,+CAAgC,EAC3D;QACE,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,KAAK;QACjC,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,eAAe;QACzB,oBAAoB,EAAE,eAAe,CAAC,IAAI,CAAC,mBAAmB;KAC/D,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/closeBorrower.js

@@ -3,7 +3,8 @@
  * @purpose Simplified closeBorrower instruction wrapper
  *
  * Thin convenience wrapper around Codama-generated closeBorrower instruction.
- * Closes the borrower account and reclaims rent.
+ * Closes a borrower's managed token account and BorrowerState.
+ * Requires no active rentals and zero managed ATA balance (claim first).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.closeBorrower = closeBorrower;
@@ -12,13 +13,15 @@ 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 srsly_1 = require("../pda/srsly");
+const config_2 = require("../accounts/config");
 /**
- * Close borrower account
+ * Close a borrower's managed token account and BorrowerState
  *
- * Closes the borrower account and reclaims rent.
+ * Closes the managed ATA and BorrowerState PDA, returning lamports to the
+ * borrower wallet. Requires no active rentals and zero managed ATA balance.
+ * Call claimBorrower first to withdraw any remaining ATLAS.
  *
- * This function automatically derives the borrower state PDA.
+ * Permissionless — anyone can trigger since lamports always go to the borrower.
  *
  * @param params - Close borrower parameters
  * @param config - Optional SDK configuration overrides
@@ -26,31 +29,26 @@ const srsly_1 = require("../pda/srsly");
  *
  * @example
  * ```typescript
- * // Close borrower account
- * const ix = await closeBorrower({
- *   borrower: borrowerWallet
- * });
+ * const ix = await closeBorrower({ payer: borrowerWallet });
  * ```
  */
 async function closeBorrower(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);
-    const borrowerAddress = (0, signer_1.getSignerAddress)(borrowerSigner);
-    // 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 programAddress = (0, kit_1.address)(addresses.srsly);
-    // Derive borrower state PDA
-    const borrowerState = await (0, srsly_1.deriveBorrowerState)(borrowerAddress);
-    // Call Codama-generated instruction (sync version - no async derivation)
-    const kitInstruction = (0, instructions_1.getCloseBorrowerInstruction)({
-        borrower: borrowerSigner,
-        borrowerState,
+    const kitInstruction = await (0, instructions_1.getCloseBorrowerInstructionAsync)({
+        payer: payerSigner,
+        borrower: borrowerAddress,
+        mint: atlasMint,
     }, { programAddress });
     return (0, instructions_2.prepareInstructions)(kitInstruction, {
         computeUnits: params.computeUnits,

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

@@ -1 +1 @@
-{"version":3,"file":"closeBorrower.js","sourceRoot":"","sources":["../../../src/instructions/closeBorrower.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA8CH,sCAoCC;AAhFD,qCAAoD;AACpD,mEAA+E;AAC/E,4CAA4E;AAC5E,4CAA8F;AAE9F,wDAA4D;AAC5D,wCAAmD;AAmBnD;;;;;;;;;;;;;;;;;;GAkBG;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;IAC5D,MAAM,eAAe,GAAG,IAAA,yBAAgB,EAAC,cAAc,CAAC,CAAC;IAEzD,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,4BAA4B;IAC5B,MAAM,aAAa,GAAG,MAAM,IAAA,2BAAmB,EAAC,eAAe,CAAC,CAAC;IAEjE,yEAAyE;IACzE,MAAM,cAAc,GAAG,IAAA,0CAA2B,EAChD;QACE,QAAQ,EAAE,cAAc;QACxB,aAAa;KACd,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":"closeBorrower.js","sourceRoot":"","sources":["../../../src/instructions/closeBorrower.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAkDH,sCAkCC;AAlFD,qCAAoD;AACpD,mEAAoF;AACpF,4CAA4E;AAC5E,4CAA8F;AAC9F,wDAA4D;AAC5D,+CAAiD;AAyBjD;;;;;;;;;;;;;;;;;GAiBG;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,MAAM,cAAc,GAAG,MAAM,IAAA,+CAAgC,EAC3D;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,eAAe;QACzB,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"}

package/dist/cjs/instructions/closeContract.js

@@ -5,6 +5,39 @@
  * Thin convenience wrapper around Codama-generated closeContract instruction.
  * Closes a contract with no active rentals and claims remaining payments.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.closeContract = closeContract;
 const kit_1 = require("@solana/kit");
@@ -12,6 +45,11 @@ const instructions_1 = require("../generated/codama/instructions");
 const config_1 = require("../utils/config");
 const signer_1 = require("../utils/signer");
 const contract_1 = require("../accounts/contract");
+const config_2 = require("../accounts/config");
+const thread_1 = require("../accounts/thread");
+const token_1 = require("../pda/token");
+const srsly_1 = require("../pda/srsly");
+const thread_2 = require("../pda/thread");
 const instructions_2 = require("../utils/instructions");
 /**
  * Close a rental contract
@@ -20,9 +58,13 @@ const instructions_2 = require("../utils/instructions");
  * accounts don't exist, they will be created temporarily before being closed.
  * This allows recovery from partial failures during previous close attempts.
  *
- * Contract must have no active rentals. Claims all remaining payments
- * from the contract's token account, invalidates the rental in SAGE,
- * and closes the contract account.
+ * Two-phase close behavior:
+ * - **No active/queued rental**: Thread close is prepended automatically,
+ *   then contract_close fires — immediate full close.
+ * - **Active or queued rental**: Only contract_close is sent, which sets
+ *   `to_close = true`. The thread stays alive to settle escrow, chain to
+ *   `rental_close` (fiber 1), and self-close via `Signal::Close` in
+ *   `contract_process`.
  *
  * @param params - Contract closing parameters
  * @param config - Optional SDK configuration overrides
@@ -34,25 +76,19 @@ const instructions_2 = require("../utils/instructions");
  * const ix = await closeContract({
  *   owner: wallet,
  *   fleet: fleetAddress
- *   // contract derived from fleet PDA
- *   // Works even if contract doesn't exist (init_if_needed)
  * });
  *
  * // Option 2: Provide contract only (contract MUST exist)
  * const ix2 = await closeContract({
  *   owner: wallet,
  *   contract: contractAddress
- *   // fleet fetched from contract.fleet
- *   // REQUIRES contract to already exist
  * });
  *
  * // Option 3: Provide both (most explicit, no fetching)
  * const ix3 = await closeContract({
  *   owner: wallet,
  *   fleet: fleetAddress,
- *   contract: contractAddress,
- *   sageProgram: customSageProgram,  // Optional
- *   destinationTokenAccount: customTokenAccount  // Optional
+ *   contract: contractAddress
  * });
  * ```
  */
@@ -68,9 +104,10 @@ async function closeContract(params, config) {
     }
     // Convert owner to transaction signer
     const ownerSigner = (0, signer_1.toTransactionSigner)(params.owner);
-    // 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);
     // Resolve fleet and contract addresses
     let fleetAddress;
@@ -83,36 +120,72 @@ async function closeContract(params, config) {
     else if (params.fleet) {
         // Only fleet provided - derive contract from fleet PDA
         fleetAddress = (0, kit_1.address)(params.fleet);
-        contractAddress = undefined; // Will be derived on-chain
+        contractAddress = await (0, srsly_1.deriveContract)(fleetAddress, programAddress);
     }
     else if (params.contract) {
         // Only contract provided - fetch contract to get fleet
-        const contract = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
-        fleetAddress = contract.data.fleet;
         contractAddress = (0, kit_1.address)(params.contract);
     }
     else {
         // Should never reach here due to validation above
         throw new Error('Either fleet or contract must be provided');
     }
+    // Always fetch contract — needed for fleet (if not provided) and thread check
+    const contractAccount = await (0, contract_1.fetchContract)(contractAddress, finalConfig.rpcUrl);
+    if (!params.fleet) {
+        fleetAddress = contractAccount.data.fleet;
+    }
     // Get sageProgram from config if not provided
     const sageProgram = params.sageProgram
         ? (0, kit_1.address)(params.sageProgram)
         : (0, kit_1.address)(addresses.sage);
-    // Optional destination token account
-    const destinationTokenAccount = params.destinationTokenAccount
-        ? (0, kit_1.address)(params.destinationTokenAccount)
-        : undefined;
+    // Derive contract token account (ATA of contract PDA for ATLAS)
+    const contractTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(contractAddress, atlasMint);
+    // Check if contract has an automation thread that needs closing first
+    const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
+    const hasThread = contractAccount.data.thread !== SYSTEM_PROGRAM_ID;
+    let hasActiveRental = contractAccount.data.activeRental !== SYSTEM_PROGRAM_ID
+        || contractAccount.data.queuedRental !== SYSTEM_PROGRAM_ID;
+    // If active rental is expired (and no queued), treat as closeable immediately
+    if (hasActiveRental && contractAccount.data.activeRental !== SYSTEM_PROGRAM_ID
+        && contractAccount.data.queuedRental === SYSTEM_PROGRAM_ID) {
+        const { fetchRental } = await Promise.resolve().then(() => __importStar(require('../accounts/rental')));
+        const activeRental = await fetchRental(contractAccount.data.activeRental, finalConfig.rpcUrl);
+        const now = Math.floor(Date.now() / 1000);
+        if (activeRental.data.endTime <= BigInt(now)) {
+            hasActiveRental = false;
+        }
+    }
+    let threadCloseIx;
+    if (hasThread && !hasActiveRental) {
+        const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
+        const contractThread = await (0, thread_2.deriveContractThread)(contractAddress, rentalAuthority);
+        // Fetch thread to get fiber IDs for remaining accounts
+        const threadAccount = await (0, thread_1.fetchThread)(contractThread, finalConfig.rpcUrl);
+        const fiberIds = Array.from(threadAccount.data.fiberIds);
+        // Derive fiber PDAs
+        const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
+            address: await (0, thread_2.deriveFiber)(contractThread, id),
+            role: kit_1.AccountRole.WRITABLE,
+        })));
+        threadCloseIx = await (0, instructions_1.getCloseContractThreadInstructionAsync)({
+            owner: ownerSigner,
+            contract: contractAddress,
+            thread: contractThread,
+        }, { programAddress });
+        threadCloseIx.accounts.push(...fiberAccounts);
+    }
     // Call Codama-generated instruction
     const kitInstruction = await (0, instructions_1.getCloseContractInstructionAsync)({
         owner: ownerSigner,
         contract: contractAddress,
         mint: atlasMint,
-        destinationTokenAccount,
         fleet: fleetAddress,
+        contractTokenAccount: contractTokenAccount,
         sageProgram,
     }, { programAddress });
-    return (0, instructions_2.prepareInstructions)(kitInstruction, {
+    const instructions = threadCloseIx ? [threadCloseIx, kitInstruction] : kitInstruction;
+    return (0, instructions_2.prepareInstructions)(instructions, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey
     });

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

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