@wuwei-labs/srsly 3.0.0-beta.21 → 3.0.0-beta.23

package/dist/esm/instructions/activateRental.js

@@ -0,0 +1,82 @@
+/**
+ * @purpose Simplified activateRental instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated activateRental instruction.
+ * Manually activates a queued rental when automation is delayed or unavailable.
+ */
+import { address } from '@solana/kit';
+import { getActivateRentalInstructionAsync } 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';
+import { fetchRental } from '../accounts/rental';
+import { fetchBorrower } from '../accounts/borrower';
+import { deriveActiveRental, deriveQueuedRental, deriveRentalAuthority } from '../pda/srsly';
+import { deriveContractThread, deriveFiber } from '../pda/thread';
+import { deriveAssociatedTokenAccount } from '../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)
+ */
+export async function activateRental(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);
+    const addresses = getAddresses(config);
+    const programAddress = address(addresses.srsly);
+    const contractAddress = address(params.contract);
+    // Fetch config and contract
+    const configAccount = await fetchConfig(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
+    const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
+    // Derive rental PDAs
+    const activeRental = await deriveActiveRental(contractAddress);
+    const queuedRental = await deriveQueuedRental(contractAddress);
+    const rentalAuthority = await deriveRentalAuthority();
+    // Derive thread PDAs — only if thread configured
+    const thread = address(contractAccount.data.thread);
+    const hasThread = thread !== '11111111111111111111111111111111';
+    const contractThread = hasThread ? await deriveContractThread(contractAddress, rentalAuthority) : undefined;
+    const closeRentalFiber = hasThread && contractThread ? await deriveFiber(contractThread, 1) : undefined;
+    // Fetch queued rental to get borrower info, then fetch borrower state for profile faction
+    const queuedRentalAccount = await fetchRental(queuedRental, finalConfig.rpcUrl);
+    const borrowerState = await fetchBorrower(queuedRentalAccount.data.borrowerState, finalConfig.rpcUrl);
+    // Get vault from config and derive vault token account
+    const vault = configAccount.data.slyvault;
+    const vaultTokenAccount = await deriveAssociatedTokenAccount(vault, atlasMint);
+    const kitInstruction = await getActivateRentalInstructionAsync({
+        payer: payerSigner,
+        contract: contractAddress,
+        contractTokenAccount: contractAccount.data.managedTokenAccount,
+        mint: atlasMint,
+        borrowerProfile: queuedRentalAccount.data.borrowerProfile,
+        borrowerProfileFaction: borrowerState.data.borrowerProfileFaction,
+        fleet: contractAccount.data.fleet,
+        gameId: contractAccount.data.gameId,
+        ...(contractThread && { contractThread }),
+        ...(closeRentalFiber && { closeRentalFiber }),
+        vault,
+        vaultTokenAccount,
+        sageProgram: address(addresses.sage),
+    }, { programAddress });
+    return prepareInstructions(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=activateRental.js.map

package/dist/esm/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/esm/instructions/cancelRental.js

@@ -8,26 +8,23 @@ import { address } from '@solana/kit';
 import { getCancelRentalInstructionAsync } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
-import { deriveRental, deriveRentalAuthority } from '../pda/srsly';
-import { deriveRentalThread } from '../pda/thread';
+import { deriveActiveRental } from '../pda/srsly';
+import { deriveAssociatedTokenAccount } from '../pda/token';
 import { prepareInstructions } from '../utils/instructions';
 import { convertDuration } from '../params/duration';
-import { requireBorrowerRentalSlot } from '../utils/rental';
 import { fetchConfig } from '../accounts/config';
+import { fetchContract } from '../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
@@ -41,7 +38,7 @@ import { fetchConfig } from '../accounts/config';
  *   contract: contractAddress
  * });
  *
- * // Instant cancellation (requires allowInstantCancel on contract)
+ * // Instant cancellation
  * const ix2 = await cancelRental({
  *   borrower: borrowerWallet,
  *   contract: contractAddress,
@@ -73,28 +70,33 @@ export async function cancelRental(params, config) {
     const atlasMint = configAccount.data.atlasMint;
     const addresses = getAddresses(config);
     const programAddress = address(addresses.srsly);
-    // Auto-detect rental slot if not provided
-    const rentalSlot = params.rentalSlot ?? await requireBorrowerRentalSlot(params.contract, borrowerSigner.address, finalConfig.rpcUrl || 'https://api.devnet.solana.com');
-    // Derive rental state using slot
-    const rentalState = await deriveRental(params.contract, rentalSlot);
-    const rentalAuthority = await deriveRentalAuthority();
-    const rentalThread = await deriveRentalThread(rentalState, rentalAuthority);
+    // Fetch contract to get fleet
+    const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
+    const fleet = contractAccount.data.fleet;
+    // Derive active rental PDA (no more slot logic)
+    const rentalState = await deriveActiveRental(params.contract);
+    // Derive contract token account (ATA of contract PDA)
+    const contractAddress = address(params.contract);
+    const contractTokenAccount = await 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 1 hour if not specified (safer than instant cancel)
     const cancelDelay = params.cancelDelay !== undefined
         ? BigInt(convertDuration(params.cancelDelay))
         : BigInt(convertDuration({ hours: 1 }));
+    // Resolve contract thread (system_program::ID means no thread configured)
+    const thread = address(contractAccount.data.thread);
+    const hasThread = thread !== '11111111111111111111111111111111';
     // Call Codama-generated instruction
-    // Note: Codama auto-derives config, borrowerState, borrowerTokenAccount,
-    // rentalTokenAccount, rentalAuthority, antegenProgram, tokenProgram
+    // Note: Codama auto-derives config, borrowerState, borrowerTokenAccount, rentalAuthority
     const kitInstruction = await getCancelRentalInstructionAsync({
         mint: atlasMint,
         borrower: borrowerSigner,
         rentalState,
-        rentalThread,
-        contract: address(params.contract),
+        contractTokenAccount,
+        contract: contractAddress,
+        fleet: address(fleet),
+        ...(hasThread && { contractThread: thread }),
         cancelDelay,
-        rentalSlot,
     }, { programAddress });
     return prepareInstructions(kitInstruction, {
         computeUnits: params.computeUnits,

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

@@ -1 +1 @@
-{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAsB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAuCrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,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;IACD,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;IAE5D,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,8BAA8B;IAC9B,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,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,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE9D,sDAAsD;IACtD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG,MAAM,4BAA4B,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAE5F,yEAAyE;IACzE,iEAAiE;IACjE,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,KAAK,SAAS;QAClD,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC7C,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAE1C,0EAA0E;IAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,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,+BAA+B,CAC1D;QACE,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,cAAc;QACxB,WAAW;QACX,oBAAoB;QACpB,QAAQ,EAAE,eAAe;QACzB,KAAK,EAAE,OAAO,CAAC,KAAgB,CAAC;QAChC,GAAG,CAAC,SAAS,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;QAC5C,WAAW;KACZ,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/claimBorrower.js

@@ -2,10 +2,12 @@
  * @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.
  */
 import { address } from '@solana/kit';
-import { getClaimBorrowerInstructionAsync } from '../generated/codama/instructions';
+import { getClaimBorrowerInstructionAsync, getCloseBorrowerInstructionAsync } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner, getSignerAddress } from '../utils/signer';
 import { prepareInstructions } from '../utils/instructions';
@@ -18,48 +20,68 @@ import { fetchConfig } from '../accounts/config';
  * 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
  * });
  * ```
  */
 export async function claimBorrower(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);
-    // Get atlasMint from on-chain config
+    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);
-    // Call Codama-generated instruction
-    // Most accounts are auto-derived (config, borrowerState, managed account, destination)
-    const kitInstruction = await getClaimBorrowerInstructionAsync({
-        payer: borrowerSigner,
-        borrower: getSignerAddress(borrowerSigner),
+    // Build claim instruction
+    const claimIx = await getClaimBorrowerInstructionAsync({
+        payer: payerSigner,
+        borrower: borrowerAddress,
         mint: atlasMint,
-        close: params.close ?? false,
     }, { programAddress });
-    return prepareInstructions(kitInstruction, {
+    // If close requested, bundle a closeBorrower instruction after the claim
+    if (params.close) {
+        const closeIx = await getCloseBorrowerInstructionAsync({
+            payer: payerSigner,
+            borrower: borrowerAddress,
+            mint: atlasMint,
+        }, { programAddress });
+        return prepareInstructions([claimIx, closeIx], {
+            computeUnits: params.computeUnits,
+            PublicKey: finalConfig.PublicKey
+        });
+    }
+    return prepareInstructions(claimIx, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey
     });

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

@@ -1 +1 @@
-{"version":3,"file":"claimBorrower.js","sourceRoot":"","sources":["../../../src/instructions/claimBorrower.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,EAAE,gBAAgB,EAAwB,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AA0BjD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;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;IAE5D,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,oCAAoC;IACpC,uFAAuF;IACvF,MAAM,cAAc,GAAG,MAAM,gCAAgC,CAC3D;QACE,KAAK,EAAE,cAAc;QACrB,QAAQ,EAAE,gBAAgB,CAAC,cAAc,CAAC;QAC1C,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,KAAK;KAC7B,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":"claimBorrower.js","sourceRoot":"","sources":["../../../src/instructions/claimBorrower.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,gCAAgC,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AACtH,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;AAmCjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;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,0BAA0B;IAC1B,MAAM,OAAO,GAAG,MAAM,gCAAgC,CACpD;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,gCAAgC,CACpD;YACE,KAAK,EAAE,WAAW;YAClB,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE,SAAS;SAChB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;QAEF,OAAO,mBAAmB,CAAC,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,mBAAmB,CAAC,OAAO,EAAE;QAClC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}

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/closeBorrower.js

@@ -0,0 +1,55 @@
+/**
+ * @purpose Simplified closeBorrower instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated closeBorrower instruction.
+ * 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 { getCloseBorrowerInstructionAsync } from '../generated/codama/instructions';
+import { mergeConfig, getAddresses } from '../utils/config';
+import { toTransactionSigner, getSignerAddress } from '../utils/signer';
+import { prepareInstructions } from '../utils/instructions';
+import { fetchConfig } from '../accounts/config';
+/**
+ * Close a borrower's managed token account and BorrowerState
+ *
+ * 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.
+ *
+ * Permissionless — anyone can trigger since lamports always go to the borrower.
+ *
+ * @param params - Close borrower parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Kit instruction (or web3.js if PublicKey in config)
+ *
+ * @example
+ * ```typescript
+ * const ix = await closeBorrower({ payer: borrowerWallet });
+ * ```
+ */
+export async function closeBorrower(params, config) {
+    const finalConfig = mergeConfig(config);
+    if (!params.payer) {
+        throw new Error('payer is required');
+    }
+    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);
+    const kitInstruction = await getCloseBorrowerInstructionAsync({
+        payer: payerSigner,
+        borrower: borrowerAddress,
+        mint: atlasMint,
+    }, { programAddress });
+    return prepareInstructions(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=closeBorrower.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -10,6 +10,8 @@ import { mergeConfig, getAddresses } 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 } from '../pda/srsly';
 import { prepareInstructions } from '../utils/instructions';
 /**
  * Close a rental contract
@@ -32,25 +34,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
  * });
  * ```
  */
@@ -82,7 +78,7 @@ 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
@@ -98,16 +94,21 @@ export async function closeContract(params, config) {
     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)
+    // For the codama call, we need to provide it since it's not optional in the async input
+    // We need contract address to derive it, which may need to be derived from fleet
+    // Let codama auto-derive it if we don't have a contract address
+    let contractTokenAccount;
+    if (contractAddress) {
+        contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
+    }
     // Call Codama-generated instruction
     const kitInstruction = await getCloseContractInstructionAsync({
         owner: ownerSigner,
         contract: contractAddress,
         mint: atlasMint,
         fleet: fleetAddress,
+        contractTokenAccount: contractTokenAccount,
         sageProgram,
     }, { programAddress });
     return prepareInstructions(kitInstruction, {

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

@@ -1 +1 @@
-{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.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;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AA4C5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;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,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAED,sCAAsC;IACtC,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,uCAAuC;IACvC,IAAI,YAAqB,CAAC;IAC1B,IAAI,eAAoC,CAAC;IAEzC,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,4BAA4B;QAC5B,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,KAAgB,CAAC,CAAC;QAChD,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IACxD,CAAC;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACxB,uDAAuD;QACvD,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,KAAgB,CAAC,CAAC;QAChD,eAAe,GAAG,SAAS,CAAC,CAAC,2BAA2B;IAC1D,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC3B,uDAAuD;QACvD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QAC1E,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QACnC,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,kDAAkD;QAClD,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAED,8CAA8C;IAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW;QACpC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAsB,CAAC;QACxC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IAEvC,qCAAqC;IACrC,MAAM,uBAAuB,GAAG,MAAM,CAAC,uBAAuB;QAC5D,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,uBAAkC,CAAC;QACpD,CAAC,CAAC,SAAS,CAAC;IAEd,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,gCAAgC,CAC3D;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,YAAY;QACnB,WAAW;KACZ,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":"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"}