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

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,29 @@ 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 }));
     // 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),
         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":"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"}

package/dist/esm/instructions/claimBorrower.js

@@ -2,7 +2,7 @@
  * @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.
  */
 import { address } from '@solana/kit';
 import { getClaimBorrowerInstructionAsync } from '../generated/codama/instructions';
@@ -18,22 +18,31 @@ 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.
+ *
  * @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,
+ *   // borrower defaults to payer
+ * });
+ *
+ * // Third-party claim: someone else pays
+ * const ix2 = await claimBorrower({
+ *   payer: relayerWallet,
+ *   borrower: "BORROWER_ADDRESS"
  * });
  *
- * // With web3.js
- * import { PublicKey } from '@solana/web3.js';
- * setSdkConfig({ network: 'mainnet-beta', PublicKey });
- * const web3Ix = await claimBorrower({
- *   borrower: keypair
+ * // Claim and close the BorrowerState account
+ * const ix3 = await claimBorrower({
+ *   payer: borrowerWallet,
+ *   close: true
  * });
  * ```
  */
@@ -41,11 +50,15 @@ 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);
+    // Convert payer to transaction signer
+    const payerSigner = toTransactionSigner(params.payer);
+    // Resolve borrower address: use provided or default to payer
+    const borrowerAddress = params.borrower
+        ? address(params.borrower)
+        : getSignerAddress(payerSigner);
     // Get atlasMint from on-chain config
     const configAccount = await fetchConfig(finalConfig.rpcUrl);
     const atlasMint = configAccount.data.atlasMint;
@@ -54,8 +67,8 @@ export async function claimBorrower(params, config) {
     // Call Codama-generated instruction
     // Most accounts are auto-derived (config, borrowerState, managed account, destination)
     const kitInstruction = await getClaimBorrowerInstructionAsync({
-        payer: borrowerSigner,
-        borrower: getSignerAddress(borrowerSigner),
+        payer: payerSigner,
+        borrower: borrowerAddress,
         mint: atlasMint,
         close: params.close ?? false,
     }, { programAddress });

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;;;;;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;AAkCjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;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;IAED,sCAAsC;IACtC,MAAM,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,6DAA6D;IAC7D,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ;QACrC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;QACrC,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAElC,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,WAAW;QAClB,QAAQ,EAAE,eAAe;QACzB,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"}

package/dist/esm/instructions/claimContract.js

@@ -0,0 +1,53 @@
+/**
+ * @purpose Simplified claimContract instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated claimContract instruction.
+ * Allows contract owners to claim accumulated ATLAS from the contract's escrow.
+ */
+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
+ *
+ * Transfers `owner_claimable` ATLAS from the contract's token account
+ * to the owner's wallet. No OwnerState needed — claims directly from
+ * the per-contract escrow.
+ *
+ * @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.owner) {
+        throw new Error('owner is required');
+    }
+    if (!params.contract) {
+        throw new Error('contract is required');
+    }
+    const ownerSigner = toTransactionSigner(params.owner);
+    // 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 fleet and contractTokenAccount
+    const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
+    const contractAddress = address(params.contract);
+    const kitInstruction = await getClaimContractInstructionAsync({
+        owner: ownerSigner,
+        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;AAsBrD;;;;;;;;;;GAUG;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,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/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,55 @@
+/**
+ * @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 { mergeConfig, getAddresses } from '../utils/config';
+import { toTransactionSigner } from '../utils/signer';
+import { prepareInstructions } from '../utils/instructions';
+import { deriveContractThread, deriveFiber } from '../pda/thread';
+import { deriveRentalAuthority } from '../pda/srsly';
+/**
+ * Close a per-contract automation thread
+ *
+ * Closes the Antegen thread and any existing fiber PDAs, reclaiming rent to the owner.
+ * Fiber PDAs are derived and passed as remaining accounts. Only initialized fibers
+ * will be closed on-chain.
+ *
+ * @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 and fiber PDAs
+    const rentalAuthority = await deriveRentalAuthority();
+    const contractThread = await deriveContractThread(contractAddress, rentalAuthority);
+    const closeRentalFiber = await deriveFiber(contractThread, 1);
+    const activateRentalFiber = await deriveFiber(contractThread, 2);
+    const kitInstruction = await getCloseContractThreadInstructionAsync({
+        owner: ownerSigner,
+        contract: contractAddress,
+        thread: contractThread,
+    }, { programAddress });
+    // Add fiber PDAs as remaining accounts (writable, non-signer)
+    // On-chain handler filters to only initialized accounts
+    kitInstruction.accounts.push({ address: closeRentalFiber, role: AccountRole.WRITABLE }, { address: activateRentalFiber, role: AccountRole.WRITABLE });
+    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,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,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,+BAA+B;IAC/B,MAAM,eAAe,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACtD,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IACpF,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IAC9D,MAAM,mBAAmB,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IAEjE,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,wDAAwD;IACxD,cAAc,CAAC,QAAQ,CAAC,IAAI,CAC1B,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,EACzD,EAAE,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,CAC7D,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/closeRental.js

@@ -6,32 +6,29 @@
  */
 import { address } from '@solana/kit';
 import { getCloseRentalInstructionAsync } from '../generated/codama/instructions';
-import { fetchRentalState } from '../generated/codama/accounts';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { fetchContract } from '../accounts/contract';
 import { fetchConfig } from '../accounts/config';
 import { fetchFleet } from '../accounts/fleet';
+import { fetchRental } from '../accounts/rental';
+import { fetchBorrower } from '../accounts/borrower';
 import { deriveGameAccounts } from '../pda/sage';
-import { deriveRental, deriveRentalAuthority, deriveBorrowerState, deriveOwnerState } from '../pda/srsly';
-import { deriveRentalThread } from '../pda/thread';
+import { deriveActiveRental, deriveBorrowerState } from '../pda/srsly';
 import { prepareInstructions } from '../utils/instructions';
-import { createRpc } from '../utils/rpc';
-import { requireExistingRentalSlot } from '../utils/rental';
 /**
  * Close a rental
  *
  * Closes a completed rental and transfers the fleet back to the owner.
- * Payments are sent to the owner's token account.
+ * Always targets the active rental PDA.
  *
  * This function automatically:
- * - Fetches contract to get owner, ownerTokenAccount, fleet, gameId
- * - Fetches fleet to get faction for SAGE account derivation
+ * - Fetches contract to get owner, fleet, gameId
+ * - Fetches the active rental to get borrower (if not provided)
+ * - Fetches the borrower's SAGE profile from borrower_state
  * - Derives required SAGE accounts (starbase, starbase player)
- * - Derives rental thread for automated payments
- * - Codama auto-derives contractTokenAccount as ATA
  *
- * @param params - Rental closure parameters (payer, rentalSlot, contract)
+ * @param params - Rental closure parameters (payer, contract)
  * @param config - Optional SDK configuration overrides
  * @returns Kit instruction (or web3.js if PublicKey in config)
  *
@@ -39,7 +36,6 @@ import { requireExistingRentalSlot } from '../utils/rental';
  * ```typescript
  * const ix = await closeRental({
  *   payer: ownerWallet,
- *   rentalSlot: 0,
  *   contract: contractAddress
  * });
  * ```
@@ -56,34 +52,21 @@ export async function closeRental(params, config) {
     }
     // Fetch contract to get owner, fleet, gameId
     const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
-    const owner = contractAccount.data.owner;
     const fleet = contractAccount.data.fleet;
     const gameId = contractAccount.data.gameId;
     // Convert payer to transaction signer
     const payerSigner = toTransactionSigner(params.payer);
-    // Auto-detect rental slot if not provided
-    const rentalSlot = params.rentalSlot ?? requireExistingRentalSlot(contractAccount.data);
-    const otherSlot = rentalSlot === 0 ? 1 : 0;
-    // Fetch fleet data to get faction (for SAGE account derivation)
-    const fleetState = await fetchFleet(fleet, finalConfig.rpcUrl);
-    const faction = fleetState.faction;
-    const ownerProfile = fleetState.ownerProfile;
-    // Derive SAGE game accounts (we need owner's profile for starbase player)
-    const gameAccounts = await deriveGameAccounts(ownerProfile, faction, gameId);
-    // Derive rental and rental authority PDAs
-    const rental = await deriveRental(params.contract, rentalSlot);
-    const rentalAuthority = await deriveRentalAuthority();
+    // Derive active rental PDA (no more slot logic)
+    const rentalState = await deriveActiveRental(params.contract);
     // Get borrower - use provided value, or fetch from rental state, or fall back to payer
     let borrower;
     if (params.borrower) {
-        borrower = params.borrower;
+        borrower = address(params.borrower);
     }
     else {
-        // Try to fetch from rental state
         try {
-            const rpc = createRpc(finalConfig.rpcUrl || 'https://api.devnet.solana.com');
-            const rentalState = await fetchRentalState(rpc, rental);
-            borrower = rentalState.data.borrower;
+            const rental = await fetchRental(rentalState, finalConfig.rpcUrl);
+            borrower = rental.data.borrower;
         }
         catch {
             // Rental state doesn't exist, fall back to payer
@@ -92,37 +75,43 @@ export async function closeRental(params, config) {
     }
     // Derive borrower state PDA
     const borrowerState = await deriveBorrowerState(borrower);
-    // Derive rental thread for automated payments
-    const rentalThread = await deriveRentalThread(rental, rentalAuthority);
+    // Fetch borrower's SAGE profile from borrower_state to derive game accounts
+    let borrowerProfile;
+    let faction;
+    try {
+        const borrowerAccount = await fetchBorrower(borrower, finalConfig.rpcUrl);
+        borrowerProfile = borrowerAccount.data.borrowerProfile;
+    }
+    catch {
+        // Borrower state doesn't exist, fallback to fleet owner profile
+        const fleetState = await fetchFleet(fleet, finalConfig.rpcUrl);
+        borrowerProfile = fleetState.ownerProfile;
+        faction = fleetState.faction;
+    }
+    // Get faction from fleet if not set above
+    if (faction === undefined) {
+        const fleetState = await fetchFleet(fleet, finalConfig.rpcUrl);
+        faction = fleetState.faction;
+    }
+    // Derive SAGE game accounts using borrower's profile
+    const gameAccounts = await deriveGameAccounts(borrowerProfile, faction, gameId);
     // Get atlasMint from on-chain config
     const configAccount = await fetchConfig(finalConfig.rpcUrl);
-    const atlasMint = configAccount.data.atlasMint;
     const addresses = getAddresses(config);
     const sageProgram = address(addresses.sage);
     const programAddress = address(addresses.srsly);
-    // Derive queuedThread from the other slot's rental
-    const otherSlotRental = await deriveRental(params.contract, otherSlot);
-    const queuedThread = await deriveRentalThread(otherSlotRental, rentalAuthority);
-    // Derive ownerState PDA from owner address
-    const ownerState = await deriveOwnerState(owner);
     // Call Codama-generated instruction
-    // Note: ownerTokenAccount is auto-derived by Codama as ATA for ownerState + mint
     const kitInstruction = await getCloseRentalInstructionAsync({
         payer: payerSigner,
-        mint: atlasMint,
-        borrower: address(borrower),
+        borrower,
         borrowerState,
-        ownerState,
         contract: address(params.contract),
-        rentalState: rental,
-        rentalThread,
+        rentalState,
         fleet: address(fleet),
         gameId: address(gameId),
         starbase: gameAccounts.starbase,
         starbasePlayer: gameAccounts.starbasePlayer,
-        queuedThread,
         sageProgram,
-        rentalSlot,
     }, { programAddress });
     return prepareInstructions(kitInstruction, {
         computeUnits: params.computeUnits,

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

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

package/dist/esm/instructions/createBorrower.js

@@ -0,0 +1,61 @@
+/**
+ * @purpose Simplified createBorrower instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated createBorrower instruction.
+ * Creates a BorrowerState PDA with managed token account for a borrower.
+ * Derives SAGE accounts (profileFaction, starbase, starbasePlayer) from
+ * borrowerProfile + faction automatically.
+ */
+import { address } from '@solana/kit';
+import { getCreateBorrowerInstructionAsync } 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 { deriveGameAccounts } from '../pda/sage';
+/**
+ * Create a borrower state account
+ *
+ * Creates a BorrowerState PDA and an associated managed token account.
+ * The managed token account holds ATLAS refunds from reservation knockoffs.
+ *
+ * Derives borrowerProfileFaction, starbase, and starbasePlayer PDAs
+ * automatically from the borrowerProfile and faction.
+ *
+ * @param params - Borrower creation parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Kit instruction (or web3.js if PublicKey in config)
+ */
+export async function createBorrower(params, config) {
+    const finalConfig = mergeConfig(config);
+    if (!params.borrower) {
+        throw new Error('borrower is required');
+    }
+    if (!params.borrowerProfile) {
+        throw new Error('borrowerProfile is required');
+    }
+    if (params.faction === undefined || params.faction === null) {
+        throw new Error('faction is required (\'mud\' | \'oni\' | \'ustur\' or 1 | 2 | 3)');
+    }
+    const borrowerSigner = toTransactionSigner(params.borrower);
+    // Get atlasMint from on-chain config and gameId from addresses
+    const configAccount = await fetchConfig(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
+    const addresses = getAddresses(config);
+    const programAddress = address(addresses.srsly);
+    // Derive all SAGE accounts from profile + faction
+    const gameAccounts = await deriveGameAccounts(address(params.borrowerProfile), params.faction, address(addresses.gameId));
+    const kitInstruction = await getCreateBorrowerInstructionAsync({
+        borrower: borrowerSigner,
+        mint: atlasMint,
+        borrowerProfile: address(params.borrowerProfile),
+        borrowerProfileFaction: gameAccounts.profileFaction,
+        starbase: gameAccounts.starbase,
+        starbasePlayer: gameAccounts.starbasePlayer,
+    }, { programAddress });
+    return prepareInstructions(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=createBorrower.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createBorrower.js","sourceRoot":"","sources":["../../../src/instructions/createBorrower.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAC;AACrF,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,kBAAkB,EAAE,MAAM,aAAa,CAAC;AA4BjD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAA4B,EAC5B,MAA2B;IAE3B,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,+DAA+D;IAC/D,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,kDAAkD;IAClD,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,OAAO,CAAC,MAAM,CAAC,eAA0B,CAAC,EAC1C,MAAM,CAAC,OAAO,EACd,OAAO,CAAC,SAAS,CAAC,MAAiB,CAAC,CACrC,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,iCAAiC,CAC5D;QACE,QAAQ,EAAE,cAAc;QACxB,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,eAA0B,CAAC;QAC3D,sBAAsB,EAAE,YAAY,CAAC,cAAc;QACnD,QAAQ,EAAE,YAAY,CAAC,QAAQ;QAC/B,cAAc,EAAE,YAAY,CAAC,cAAc;KAC5C,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"}