@wuwei-labs/srsly 3.0.0-beta.3 → 3.0.0-beta.30

package/dist/esm/instructions/claimContract.js

@@ -0,0 +1,53 @@
+/**
+ * @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.
+ */
+import { address } from '@solana/kit';
+import { getClaimContractInstructionAsync } from '../generated/codama/instructions';
+import { mergeConfig, getAddresses } from '../utils/config';
+import { toTransactionSigner } from '../utils/signer';
+import { prepareInstructions } from '../utils/instructions';
+import { fetchConfig } from '../accounts/config';
+import { fetchContract } from '../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)
+ */
+export async function claimContract(params, config) {
+    const finalConfig = mergeConfig(config);
+    if (!params.payer) {
+        throw new Error('payer is required');
+    }
+    if (!params.contract) {
+        throw new Error('contract is required');
+    }
+    const payerSigner = toTransactionSigner(params.payer);
+    // Get atlasMint from on-chain config
+    const configAccount = await fetchConfig(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
+    const addresses = getAddresses(config);
+    const programAddress = address(addresses.srsly);
+    // Fetch contract to get owner and contractTokenAccount
+    const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
+    const contractAddress = address(params.contract);
+    const kitInstruction = await getClaimContractInstructionAsync({
+        payer: payerSigner,
+        owner: contractAccount.data.owner,
+        mint: atlasMint,
+        contract: contractAddress,
+        contractTokenAccount: contractAccount.data.managedTokenAccount,
+    }, { programAddress });
+    return prepareInstructions(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=claimContract.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"claimContract.js","sourceRoot":"","sources":["../../../src/instructions/claimContract.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAuBrD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B,EAC3B,MAA2B;IAE3B,MAAM,WAAW,GAAG,WAAW,CAAC,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,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,qCAAqC;IACrC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,uDAAuD;IACvD,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAE5D,MAAM,cAAc,GAAG,MAAM,gCAAgC,CAC3D;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,mBAAmB,CAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}

package/dist/esm/instructions/claimRental.js

@@ -0,0 +1,198 @@
+/**
+ * @purpose Simplified claimRental instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated claimRental instruction.
+ * Claims a rental slot as the crowned winner while fleet is currently rented.
+ */
+import { address } from '@solana/kit';
+import { createRpc } from '../utils/rpc';
+import { getClaimRentalInstructionAsync, getScheduleRentalInstructionAsync } from '../generated/codama/instructions';
+import { mergeConfig, getAddresses } from '../utils/config';
+import { toTransactionSigner } from '../utils/signer';
+import { convertAmount } from '../params/amount';
+import { convertDuration } from '../params/duration';
+import { fetchFleet } from '../accounts/fleet';
+import { fetchContract } from '../accounts/contract';
+import { fetchConfig } from '../accounts/config';
+import { deriveGameAccounts } from '../pda/sage';
+import { deriveRental, deriveRentalAuthority, deriveBorrowerState } from '../pda/srsly';
+import { deriveAssociatedTokenAccount } from '../pda/token';
+import { deriveRentalThread } from '../pda/thread';
+import { prepareInstructions } from '../utils/instructions';
+import { fetchBorrowerState } from '../generated/codama/accounts';
+import { deserializeDiscountAuth } from '../utils/discountAuth';
+/**
+ * Claim a rental slot as the crowned winner
+ *
+ * This instruction is EXCLUSIVELY for crowned winners (reservation holders)
+ * to queue for the next rental while the fleet is currently rented.
+ * Others must wait for rental_accept when the claim window expires.
+ *
+ * This function automatically fetches the contract and config to get required
+ * data (fleet, vault), fetches fleet for faction, and derives SAGE starbase accounts.
+ *
+ * @param params - Rental claim parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Array of instructions (Kit format or web3.js if PublicKey in config)
+ *
+ * @example
+ * ```typescript
+ * // Claim a 7-day rental slot
+ * const ixs = await claimRental({
+ *   borrower: wallet,
+ *   contract: "CONTRACT_ADDRESS",
+ *   duration: { days: 7 },
+ *   computeUnits: 400_000
+ * });
+ *
+ * // With automate (or contract.automationRequired)
+ * const ixs2 = await claimRental({
+ *   borrower: wallet,
+ *   contract: "CONTRACT_ADDRESS",
+ *   duration: { days: 7 },
+ *   automate: true,
+ *   computeUnits: 600_000
+ * });
+ * ```
+ */
+export async function claimRental(params, config) {
+    // Merge config
+    const finalConfig = mergeConfig(config);
+    // Validate required params
+    if (!params.borrower) {
+        throw new Error('borrower is required');
+    }
+    if (!params.contract) {
+        throw new Error('contract is required');
+    }
+    if (!params.duration) {
+        throw new Error('duration is required');
+    }
+    // Convert borrower to transaction signer
+    const borrowerSigner = toTransactionSigner(params.borrower);
+    // Try to fetch borrowerProfile from existing borrower_state, fallback to param
+    let borrowerProfile;
+    try {
+        const borrowerStateAddress = await deriveBorrowerState(borrowerSigner.address);
+        const rpc = createRpc(finalConfig.rpcUrl || 'https://api.devnet.solana.com');
+        const borrowerState = await fetchBorrowerState(rpc, borrowerStateAddress);
+        const profileOption = borrowerState.data.borrowerProfile;
+        if (profileOption && typeof profileOption === 'object' && '__option' in profileOption && profileOption.__option === 'Some') {
+            // borrower_state exists and has profile set - use it
+            borrowerProfile = profileOption.value;
+        }
+        else if (params.borrowerProfile) {
+            // borrower_state exists but no profile - use provided param
+            borrowerProfile = address(params.borrowerProfile);
+        }
+        else {
+            throw new Error('borrowerProfile is required when not set in borrower_state');
+        }
+    }
+    catch (e) {
+        // borrower_state doesn't exist yet - require param for first-time borrowers
+        if (params.borrowerProfile) {
+            borrowerProfile = address(params.borrowerProfile);
+        }
+        else {
+            throw new Error('borrowerProfile is required for first-time borrowers');
+        }
+    }
+    // Fetch config to get vault
+    const configAccount = await fetchConfig(finalConfig.rpcUrl);
+    const vault = configAccount.data.slyvault;
+    // Fetch contract to get fleet, gameId
+    const contractAccount = await 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 = 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 fetchFleet(fleet, finalConfig.rpcUrl);
+    const faction = fleetState.faction;
+    // Derive SAGE game accounts (starbase, starbase player)
+    const gameAccounts = await deriveGameAccounts(borrowerProfile, faction, gameId);
+    // Determine which slot is free
+    // claim_rental requires one slot occupied, one free
+    const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
+    const slot0Empty = contractAccount.data.rentalSlot0 === SYSTEM_PROGRAM_ID;
+    const slot1Empty = contractAccount.data.rentalSlot1 === SYSTEM_PROGRAM_ID;
+    // Use the free slot (slot 0 if empty, else slot 1)
+    const rentalSlot = slot0Empty ? 0 : 1;
+    const otherSlot = slot0Empty ? 1 : 0;
+    // Derive rental and rental authority PDAs
+    const rental = await deriveRental(params.contract, rentalSlot);
+    const rentalAuthority = await deriveRentalAuthority();
+    // Derive rental thread for automated payments
+    const rentalThread = await deriveRentalThread(rental, rentalAuthority);
+    // Derive queued thread for the other slot
+    const otherSlotRental = await deriveRental(params.contract, otherSlot);
+    const queuedThread = await deriveRentalThread(otherSlotRental, rentalAuthority);
+    // Convert duration parameter
+    const durationSeconds = convertDuration(params.duration);
+    // Get network-specific addresses (atlasMint sourced from on-chain config)
+    const atlasMint = configAccount.data.atlasMint;
+    const addresses = getAddresses(config);
+    const sageProgram = address(addresses.sage);
+    const programAddress = address(addresses.srsly);
+    // Deserialize discount auth if provided
+    let discountAuth = null;
+    if (params.discountAuth) {
+        discountAuth = deserializeDiscountAuth(params.discountAuth);
+    }
+    const referrer = params.referrer ? address(params.referrer) : undefined;
+    // Determine if we need to include scheduleRental
+    // Either explicitly requested or contract requires automation
+    const shouldSchedule = params.automate || contractAccount.data.automationRequired;
+    // Derive vault token account (ATA)
+    const vaultTokenAccount = await deriveAssociatedTokenAccount(vault, atlasMint);
+    // Call Codama-generated claimRental instruction
+    const claimRentalIx = await getClaimRentalInstructionAsync({
+        borrower: borrowerSigner,
+        contract: address(params.contract),
+        rentalState: rental,
+        fleet: address(fleet),
+        starbase: gameAccounts.starbase,
+        starbasePlayer: gameAccounts.starbasePlayer,
+        borrowerProfile,
+        vault: address(vault),
+        vaultTokenAccount,
+        referrer,
+        mint: atlasMint,
+        duration: BigInt(durationSeconds),
+        rentalSlot,
+        discountAuth
+    }, { programAddress });
+    // If auto-schedule is enabled, bundle scheduleRental instruction
+    if (shouldSchedule) {
+        const scheduleRentalIx = await getScheduleRentalInstructionAsync({
+            payer: borrowerSigner,
+            mint: atlasMint,
+            contract: address(params.contract),
+            fleet: address(fleet),
+            rentalState: rental,
+            rentalThread,
+            queuedThread,
+            borrowerProfileFaction: gameAccounts.profileFaction,
+            sageProgram,
+            rentalSlot,
+        }, { programAddress });
+        // Return both instructions as array
+        return prepareInstructions([claimRentalIx, scheduleRentalIx], {
+            computeUnits: params.computeUnits,
+            PublicKey: finalConfig.PublicKey
+        });
+    }
+    // Prepare single instruction with optional compute budget and web3.js conversion
+    return prepareInstructions(claimRentalIx, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=claimRental.js.map

package/dist/esm/instructions/claimRental.js.map

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

package/dist/esm/instructions/closeBorrower.js

@@ -2,20 +2,23 @@
  * @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).
  */
 import { address } from '@solana/kit';
-import { getCloseBorrowerInstruction } from '../generated/codama/instructions';
+import { getCloseBorrowerInstructionAsync } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner, getSignerAddress } from '../utils/signer';
 import { prepareInstructions } from '../utils/instructions';
-import { deriveBorrowerState } from '../pda/srsly';
+import { fetchConfig } from '../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
@@ -23,31 +26,26 @@ import { deriveBorrowerState } from '../pda/srsly';
  *
  * @example
  * ```typescript
- * // Close borrower account
- * const ix = await closeBorrower({
- *   borrower: borrowerWallet
- * });
+ * const ix = await closeBorrower({ payer: borrowerWallet });
  * ```
  */
 export async function closeBorrower(params, config) {
-    // Merge config
     const finalConfig = 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 = toTransactionSigner(params.borrower);
-    const borrowerAddress = getSignerAddress(borrowerSigner);
-    // Get network-specific addresses
+    const payerSigner = toTransactionSigner(params.payer);
+    const borrowerAddress = params.borrower
+        ? address(params.borrower)
+        : getSignerAddress(payerSigner);
+    const configAccount = await fetchConfig(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
     const addresses = getAddresses(config);
     const programAddress = address(addresses.srsly);
-    // Derive borrower state PDA
-    const borrowerState = await deriveBorrowerState(borrowerAddress);
-    // Call Codama-generated instruction (sync version - no async derivation)
-    const kitInstruction = getCloseBorrowerInstruction({
-        borrower: borrowerSigner,
-        borrowerState,
+    const kitInstruction = await getCloseBorrowerInstructionAsync({
+        payer: payerSigner,
+        borrower: borrowerAddress,
+        mint: atlasMint,
     }, { programAddress });
     return prepareInstructions(kitInstruction, {
         computeUnits: params.computeUnits,

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

@@ -1 +1 @@
-{"version":3,"file":"closeBorrower.js","sourceRoot":"","sources":["../../../src/instructions/closeBorrower.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAwB,MAAM,iBAAiB,CAAC;AAE9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAmBnD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B,EAC3B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,WAAW,CAAC,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,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5D,MAAM,eAAe,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAEzD,iCAAiC;IACjC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,4BAA4B;IAC5B,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,CAAC;IAEjE,yEAAyE;IACzE,MAAM,cAAc,GAAG,2BAA2B,CAChD;QACE,QAAQ,EAAE,cAAc;QACxB,aAAa;KACd,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,mBAAmB,CAAC,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;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAwB,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAyBjD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B,EAC3B,MAA2B;IAE3B,MAAM,WAAW,GAAG,WAAW,CAAC,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,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ;QACrC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;QACrC,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAElC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,MAAM,cAAc,GAAG,MAAM,gCAAgC,CAC3D;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,SAAS;KAChB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,mBAAmB,CAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}

package/dist/esm/instructions/closeContract.js

@@ -4,11 +4,17 @@
  * Thin convenience wrapper around Codama-generated closeContract instruction.
  * Closes a contract with no active rentals and claims remaining payments.
  */
-import { address } from '@solana/kit';
-import { getCloseContractInstructionAsync } from '../generated/codama/instructions';
-import { mergeConfig, getAddresses } from '../utils/config';
+import { AccountRole, address } from '@solana/kit';
+import { getCloseContractInstructionAsync, getCloseContractThreadInstructionAsync } from '../generated/codama/instructions';
+import { fetchThread } from '../generated/codama/accounts/thread';
+import { mergeConfig, getAddresses, getRpcUrl } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { fetchContract } from '../accounts/contract';
+import { fetchConfig } from '../accounts/config';
+import { deriveAssociatedTokenAccount } from '../pda/token';
+import { deriveContract, deriveRentalAuthority } from '../pda/srsly';
+import { deriveContractThread, deriveFiber } from '../pda/thread';
+import { createRpc } from '../utils/rpc';
 import { prepareInstructions } from '../utils/instructions';
 /**
  * Close a rental contract
@@ -17,9 +23,13 @@ import { prepareInstructions } from '../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
@@ -31,25 +41,19 @@ import { prepareInstructions } from '../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
  * });
  * ```
  */
@@ -65,9 +69,10 @@ export async function closeContract(params, config) {
     }
     // Convert owner to transaction signer
     const ownerSigner = toTransactionSigner(params.owner);
-    // Get network-specific addresses
+    // Get atlasMint from on-chain config
+    const configAccount = await fetchConfig(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
     const addresses = getAddresses(config);
-    const atlasMint = address(addresses.atlasMint);
     const programAddress = address(addresses.srsly);
     // Resolve fleet and contract addresses
     let fleetAddress;
@@ -80,36 +85,73 @@ export async function closeContract(params, config) {
     else if (params.fleet) {
         // Only fleet provided - derive contract from fleet PDA
         fleetAddress = address(params.fleet);
-        contractAddress = undefined; // Will be derived on-chain
+        contractAddress = await deriveContract(fleetAddress, programAddress);
     }
     else if (params.contract) {
         // Only contract provided - fetch contract to get fleet
-        const contract = await fetchContract(params.contract, finalConfig.rpcUrl);
-        fleetAddress = contract.data.fleet;
         contractAddress = 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 fetchContract(contractAddress, finalConfig.rpcUrl);
+    if (!params.fleet) {
+        fleetAddress = contractAccount.data.fleet;
+    }
     // Get sageProgram from config if not provided
     const sageProgram = params.sageProgram
         ? address(params.sageProgram)
         : address(addresses.sage);
-    // Optional destination token account
-    const destinationTokenAccount = params.destinationTokenAccount
-        ? address(params.destinationTokenAccount)
-        : undefined;
+    // Derive contract token account (ATA of contract PDA for ATLAS)
+    const contractTokenAccount = await 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 import('../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 deriveRentalAuthority();
+        const contractThread = await deriveContractThread(contractAddress, rentalAuthority);
+        // Fetch thread to get fiber IDs for remaining accounts
+        const rpc = createRpc(getRpcUrl(config));
+        const threadAccount = await fetchThread(rpc, contractThread);
+        const fiberIds = Array.from(threadAccount.data.fiberIds);
+        // Derive fiber PDAs
+        const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
+            address: await deriveFiber(contractThread, id),
+            role: AccountRole.WRITABLE,
+        })));
+        threadCloseIx = await getCloseContractThreadInstructionAsync({
+            owner: ownerSigner,
+            contract: contractAddress,
+            thread: contractThread,
+        }, { programAddress });
+        threadCloseIx.accounts.push(...fiberAccounts);
+    }
     // Call Codama-generated instruction
     const kitInstruction = await getCloseContractInstructionAsync({
         owner: ownerSigner,
         contract: contractAddress,
         mint: atlasMint,
-        destinationTokenAccount,
         fleet: fleetAddress,
+        contractTokenAccount: contractTokenAccount,
         sageProgram,
     }, { programAddress });
-    return prepareInstructions(kitInstruction, {
+    const instructions = threadCloseIx ? [threadCloseIx, kitInstruction] : kitInstruction;
+    return prepareInstructions(instructions, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey
     });

package/dist/esm/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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"}

package/dist/esm/instructions/closeContractThread.js

@@ -0,0 +1,63 @@
+/**
+ * @purpose Simplified closeContractThread instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated closeContractThread instruction.
+ * Closes a per-contract automation thread and reclaims rent.
+ */
+import { AccountRole, address } from '@solana/kit';
+import { getCloseContractThreadInstructionAsync } from '../generated/codama/instructions';
+import { fetchThread } from '../generated/codama/accounts/thread';
+import { mergeConfig, getAddresses, getRpcUrl } from '../utils/config';
+import { toTransactionSigner } from '../utils/signer';
+import { prepareInstructions } from '../utils/instructions';
+import { createRpc } from '../utils/rpc';
+import { deriveContractThread, deriveFiber } from '../pda/thread';
+import { deriveRentalAuthority } from '../pda/srsly';
+/**
+ * Close a per-contract automation thread
+ *
+ * Closes the Antegen thread and all fiber PDAs, reclaiming rent to the owner.
+ * Fetches the thread account to read `fiberIds`, then derives and passes only
+ * the fibers that actually exist as remaining accounts.
+ *
+ * @param params - Thread closing parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Kit instruction (or web3.js if PublicKey in config)
+ */
+export async function closeContractThread(params, config) {
+    const finalConfig = mergeConfig(config);
+    if (!params.owner) {
+        throw new Error('owner is required');
+    }
+    if (!params.contract) {
+        throw new Error('contract is required');
+    }
+    const ownerSigner = toTransactionSigner(params.owner);
+    const addresses = getAddresses(config);
+    const programAddress = address(addresses.srsly);
+    const contractAddress = address(params.contract);
+    // Derive thread PDA
+    const rentalAuthority = await deriveRentalAuthority();
+    const contractThread = await deriveContractThread(contractAddress, rentalAuthority);
+    // Fetch thread account to read actual fiber_ids
+    const rpc = createRpc(getRpcUrl(config));
+    const threadAccount = await fetchThread(rpc, contractThread);
+    const fiberIds = Array.from(threadAccount.data.fiberIds);
+    // Derive fiber PDAs only for fibers that actually exist on the thread
+    const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
+        address: await deriveFiber(contractThread, id),
+        role: AccountRole.WRITABLE,
+    })));
+    const kitInstruction = await getCloseContractThreadInstructionAsync({
+        owner: ownerSigner,
+        contract: contractAddress,
+        thread: contractThread,
+    }, { programAddress });
+    // Add fiber PDAs as remaining accounts (writable, non-signer)
+    kitInstruction.accounts.push(...fiberAccounts);
+    return prepareInstructions(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=closeContractThread.js.map

package/dist/esm/instructions/closeContractThread.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"closeContractThread.js","sourceRoot":"","sources":["../../../src/instructions/closeContractThread.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,sCAAsC,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAsBrD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,MAAiC,EACjC,MAA2B;IAE3B,MAAM,WAAW,GAAG,WAAW,CAAC,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,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAE5D,oBAAoB;IACpB,MAAM,eAAe,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACtD,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAEpF,gDAAgD;IAChD,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEzD,sEAAsE;IACtE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,OAAO,EAAE,MAAM,WAAW,CAAC,cAAc,EAAE,EAAE,CAAC;QAC9C,IAAI,EAAE,WAAW,CAAC,QAAiB;KACpC,CAAC,CAAC,CACJ,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,sCAAsC,CACjE;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,eAAe;QACzB,MAAM,EAAE,cAAc;KACvB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,8DAA8D;IAC9D,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;IAE/C,OAAO,mBAAmB,CAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}