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

package/dist/esm/instructions/closeRental.js

@@ -9,27 +9,25 @@ import { getCloseRentalInstructionAsync } from '../generated/codama/instructions
 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 { deriveGameAccounts } from '../pda/sage';
-import { deriveRental, deriveRentalAuthority, deriveBorrowerState } from '../pda/srsly';
-import { deriveRentalThread } from '../pda/thread';
+import { deriveActiveRental, deriveBorrowerState } from '../pda/srsly';
 import { prepareInstructions } from '../utils/instructions';
-// System program ID constant
-const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
 /**
  * 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, borrower, contract)
+ * @param params - Rental closure parameters (payer, contract)
  * @param config - Optional SDK configuration overrides
  * @returns Kit instruction (or web3.js if PublicKey in config)
  *
@@ -37,7 +35,6 @@ const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
  * ```typescript
  * const ix = await closeRental({
  *   payer: ownerWallet,
- *   borrower: borrowerAddress,
  *   contract: contractAddress
  * });
  * ```
@@ -49,65 +46,57 @@ export async function closeRental(params, config) {
     if (!params.payer) {
         throw new Error('payer is required');
     }
-    if (!params.borrower) {
-        throw new Error('borrower is required');
-    }
     if (!params.contract) {
         throw new Error('contract is required');
     }
     // 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);
-    // Fetch fleet data to get faction (for SAGE account derivation)
+    // 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 = address(params.borrower);
+    }
+    else {
+        try {
+            const rental = await fetchRental(rentalState, finalConfig.rpcUrl);
+            borrower = rental.data.borrower;
+        }
+        catch {
+            // Rental state doesn't exist, fall back to payer
+            borrower = payerSigner.address;
+        }
+    }
+    // Derive borrower state PDA
+    const borrowerState = await deriveBorrowerState(borrower);
+    // Fetch fleet to get faction and derive SAGE accounts
+    // During an active rental, fleet.subProfile IS the current borrower's profile
     const fleetState = await fetchFleet(fleet, finalConfig.rpcUrl);
+    const borrowerProfile = fleetState.subProfile.key;
     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, params.borrower);
-    const rentalAuthority = await deriveRentalAuthority();
-    // Derive borrower state PDA
-    const borrowerState = await deriveBorrowerState(params.borrower);
-    // Derive rental thread for automated payments
-    const rentalThread = await deriveRentalThread(rental, rentalAuthority);
-    // Get network-specific addresses
+    // 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 addresses = getAddresses(config);
-    const atlasMint = address(addresses.atlasMint);
     const sageProgram = address(addresses.sage);
     const programAddress = address(addresses.srsly);
-    // Determine queuedThread from the other slot's rental
-    // If closing slot 0's rental, derive thread for slot 1's rental (and vice versa)
-    const systemProgramId = address(SYSTEM_PROGRAM_ID);
-    const slot0 = contractAccount.data.rentalSlot0;
-    const slot1 = contractAccount.data.rentalSlot1;
-    // Find the other slot's rental address (not the one we're closing)
-    const otherSlotRental = slot0 === rental ? slot1 : slot0;
-    // Derive queued thread - if other slot has a rental, derive its thread
-    // Program will check data_is_empty() to determine if thread actually exists
-    let queuedThread = systemProgramId;
-    if (otherSlotRental !== systemProgramId) {
-        queuedThread = await deriveRentalThread(otherSlotRental, rentalAuthority);
-    }
     // Call Codama-generated instruction
-    // Note: contractTokenAccount is auto-derived by Codama as ATA for contract + mint
     const kitInstruction = await getCloseRentalInstructionAsync({
         payer: payerSigner,
-        mint: atlasMint,
-        borrower: address(params.borrower),
+        borrower,
         borrowerState,
-        owner: address(owner),
         contract: address(params.contract),
-        rentalThread,
+        rentalState,
         fleet: address(fleet),
         gameId: address(gameId),
         starbase: gameAccounts.starbase,
         starbasePlayer: gameAccounts.starbasePlayer,
-        queuedThread,
         sageProgram,
     }, { programAddress });
     return prepareInstructions(kitInstruction, {

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

@@ -1 +1 @@
-{"version":3,"file":"closeRental.js","sourceRoot":"","sources":["../../../src/instructions/closeRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,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,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,6BAA6B;AAC7B,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AA8B7D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAyB,EACzB,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,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,6CAA6C;IAC7C,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;IACzC,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC;IAE3C,sCAAsC;IACtC,MAAM,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,gEAAgE;IAChE,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IACnC,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAE7C,0EAA0E;IAC1E,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,YAAY,EACZ,OAAO,EACP,MAAM,CACP,CAAC;IAEF,0CAA0C;IAC1C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,MAAM,qBAAqB,EAAE,CAAC;IAEtD,4BAA4B;IAC5B,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEjE,8CAA8C;IAC9C,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAEvE,iCAAiC;IACjC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,sDAAsD;IACtD,iFAAiF;IACjF,MAAM,eAAe,GAAG,OAAO,CAAC,iBAA4B,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC;IAC/C,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC;IAE/C,mEAAmE;IACnE,MAAM,eAAe,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAEzD,uEAAuE;IACvE,4EAA4E;IAC5E,IAAI,YAAY,GAAY,eAAe,CAAC;IAC5C,IAAI,eAAe,KAAK,eAAe,EAAE,CAAC;QACxC,YAAY,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAC5E,CAAC;IAED,oCAAoC;IACpC,kFAAkF;IAClF,MAAM,cAAc,GAAG,MAAM,8BAA8B,CACzD;QACE,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;QAC7C,aAAa;QACb,KAAK,EAAE,OAAO,CAAC,KAAgB,CAAC;QAChC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;QAC7C,YAAY;QACZ,KAAK,EAAE,OAAO,CAAC,KAAgB,CAAC;QAChC,MAAM,EAAE,OAAO,CAAC,MAAiB,CAAC;QAClC,QAAQ,EAAE,YAAY,CAAC,QAAQ;QAC/B,cAAc,EAAE,YAAY,CAAC,cAAc;QAC3C,YAAY;QACZ,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":"closeRental.js","sourceRoot":"","sources":["../../../src/instructions/closeRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AA+B5D;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAyB,EACzB,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,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,6CAA6C;IAC7C,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;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC;IAE3C,sCAAsC;IACtC,MAAM,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,gDAAgD;IAChD,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE9D,uFAAuF;IACvF,IAAI,QAAiB,CAAC;IACtB,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IACjD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;YAClE,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,iDAAiD;YACjD,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC;QACjC,CAAC;IACH,CAAC;IAED,4BAA4B;IAC5B,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAE1D,sDAAsD;IACtD,8EAA8E;IAC9E,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC;IAClD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,qDAAqD;IACrD,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,eAAe,EACf,OAAO,EACP,MAAM,CACP,CAAC;IAEF,qCAAqC;IACrC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,8BAA8B,CACzD;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ;QACR,aAAa;QACb,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;QAC7C,WAAW;QACX,KAAK,EAAE,OAAO,CAAC,KAAgB,CAAC;QAChC,MAAM,EAAE,OAAO,CAAC,MAAiB,CAAC;QAClC,QAAQ,EAAE,YAAY,CAAC,QAAQ;QAC/B,cAAc,EAAE,YAAY,CAAC,cAAc;QAC3C,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/createAffiliate.js

@@ -0,0 +1,70 @@
+/**
+ * @purpose Create a pending affiliate (Affiliate member) for SRSLY vault
+ *
+ * Wraps slyvault's initMember instruction with Affiliate type pre-configured.
+ * Auto-fetches vault and nonce from parent member state.
+ */
+import { address } from '@solana/kit';
+import { initMember, fetchMember, } from '@wuwei-labs/slyvault';
+import { mergeConfig } from '../utils/config';
+/**
+ * Create a pending affiliate (Affiliate member)
+ *
+ * Creates a new Affiliate member state that references a parent Normal member.
+ * The affiliate must be approved by the parent member's authority using approveAffiliate.
+ *
+ * This function auto-fetches the vault address and parent member nonce from the
+ * parent member state, making it easier to use than the underlying initMember.
+ *
+ * @param params - Affiliate creation parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Prepared instruction(s)
+ *
+ * @example
+ * ```typescript
+ * import { createAffiliate } from '@wuwei-labs/srsly';
+ *
+ * // Create affiliate linked to parent member
+ * const ix = await createAffiliate({
+ *   affiliate: wallet,
+ *   parentMemberState: "PARENT_MEMBER_STATE_PDA",
+ *   discountAuthority: "OPTIONAL_DISCOUNT_SIGNER", // optional, defaults to main authority
+ *   // vault and nonce are auto-fetched from parent state
+ * });
+ * ```
+ */
+export async function createAffiliate(params, config) {
+    const finalConfig = mergeConfig(config);
+    if (!params.affiliate)
+        throw new Error('affiliate is required');
+    if (!params.parentMemberState)
+        throw new Error('parentMemberState is required');
+    // Fetch parent member state to get vault and nonce
+    const { data: parentState } = await fetchMember(address(params.parentMemberState), finalConfig.rpcUrl);
+    // Validate parent is Normal type with affiliateEnabled
+    if (parentState.memberType.__kind !== 'Normal') {
+        throw new Error('Parent member is not a Normal member type');
+    }
+    if (!parentState.memberType.affiliateEnabled) {
+        throw new Error('Parent member does not have affiliates enabled');
+    }
+    // Get vault and nonce from parent state
+    const vaultAddress = parentState.vault;
+    const parentNonce = parentState.nonce;
+    // Call slyvault initMember with Affiliate type pre-configured
+    return initMember({
+        member: params.affiliate,
+        vault: vaultAddress,
+        nonce: params.nonce,
+        memberType: {
+            __kind: 'Affiliate',
+            parentMemberNonce: parentNonce,
+            percentageBps: 0,
+            claimableBalance: 0n,
+            isActive: false,
+        },
+        discountAuthority: params.discountAuthority,
+        computeUnits: params.computeUnits,
+    });
+}
+//# sourceMappingURL=createAffiliate.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createAffiliate.js","sourceRoot":"","sources":["../../../src/instructions/createAffiliate.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EACL,UAAU,EACV,WAAW,GAEZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAkB,MAAM,iBAAiB,CAAC;AAoC9D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAA6B,EAC7B,MAA2B;IAE3B,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,iBAAiB;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAEhF,mDAAmD;IACnD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,WAAW,CAC7C,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EACjC,WAAW,CAAC,MAAM,CACnB,CAAC;IAEF,uDAAuD;IACvD,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IAED,wCAAwC;IACxC,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC;IACvC,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC;IAEtC,8DAA8D;IAC9D,OAAO,UAAU,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,UAAU,EAAE;YACV,MAAM,EAAE,WAAW;YACnB,iBAAiB,EAAE,WAAW;YAC9B,aAAa,EAAE,CAAC;YAChB,gBAAgB,EAAE,EAAE;YACpB,QAAQ,EAAE,KAAK;SAChB;QACD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;AACL,CAAC"}

package/dist/esm/instructions/createBorrower.js

@@ -0,0 +1,43 @@
+/**
+ * @purpose Simplified createBorrower instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated createBorrower instruction.
+ * Creates a BorrowerState PDA with managed token account for a borrower.
+ */
+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';
+/**
+ * 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.
+ *
+ * @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');
+    }
+    const borrowerSigner = toTransactionSigner(params.borrower);
+    // 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);
+    const kitInstruction = await getCreateBorrowerInstructionAsync({
+        borrower: borrowerSigner,
+        mint: atlasMint,
+    }, { 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;;;;;GAKG;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;AAmBjD;;;;;;;;;GASG;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;IAED,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,MAAM,cAAc,GAAG,MAAM,iCAAiC,CAC5D;QACE,QAAQ,EAAE,cAAc;QACxB,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/createContract.js

@@ -5,14 +5,19 @@
  * Handles parameter conversion and optional web3.js compatibility.
  */
 import { address } from '@solana/kit';
-import { getCreateContractInstructionAsync } from '../generated/codama/instructions';
+import { getCreateContractInstructionAsync, getCreateContractThreadInstructionAsync } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
-import { toTransactionSigner } from '../utils/signer';
+import { toTransactionSigner, getSignerAddress } from '../utils/signer';
 import { convertAmount, stardustToAtlas } from '../params/amount';
 import { convertDuration } from '../params/duration';
 import { normalizeSchedule } from '../params/schedule';
+import { convertSol } from '../params/sol';
 import { fetchFleet } from '../accounts/fleet';
+import { fetchConfig } from '../accounts/config';
 import { prepareInstructions } from '../utils/instructions';
+import { deriveContract, deriveRentalAuthority } from '../pda/srsly';
+import { deriveContractThread, deriveFiber } from '../pda/thread';
+import { deriveAssociatedTokenAccount } from '../pda/token';
 /**
  * Create a rental contract for a Star Atlas fleet
  *
@@ -27,34 +32,9 @@ import { prepareInstructions } from '../utils/instructions';
  * const ix = await createContract({
  *   owner: wallet,
  *   fleet: fleetAddress,
- *   // ownerProfile and gameId fetched automatically from fleet
  *   rate: 100,
- *   durationMax: { days: 30 },
- *   paymentsFreq: '@daily'
+ *   durationMax: { days: 30 }
  * });
- *
- * // Explicit ownerProfile and gameId (skips fetch)
- * const ix2 = await createContract({
- *   owner: wallet,
- *   fleet: fleetAddress,
- *   ownerProfile: profileAddress,  // Explicitly provided
- *   gameId: gameAddress,             // Explicitly provided
- *   rate: 100,
- *   durationMax: { days: 30 },
- *   paymentsFreq: '@daily'
- * });
- *
- * // With web3.js
- * import { PublicKey } from '@solana/web3.js';
- * setSdkConfig({ network: 'atlasnet', PublicKey });
- * const web3Ix = await createContract({
- *   owner: keypair,
- *   fleet: fleetPubkey,
- *   rate: 100,
- *   durationMax: { days: 30 },
- *   paymentsFreq: '@daily'
- * });
- * // web3Ix.keys[0].pubkey is a PublicKey instance
  * ```
  */
 export async function createContract(params, config) {
@@ -73,9 +53,6 @@ export async function createContract(params, config) {
     if (!params.durationMax) {
         throw new Error('durationMax is required');
     }
-    if (!params.paymentsFreq) {
-        throw new Error('paymentsFreq is required');
-    }
     // Convert owner to transaction signer
     const ownerSigner = toTransactionSigner(params.owner);
     // Fetch fleet data (source of truth for ownerProfile and gameId)
@@ -94,19 +71,19 @@ export async function createContract(params, config) {
         ? convertDuration(params.durationMin)
         : 3600; // Default 1 hour
     const durationMaxSeconds = convertDuration(params.durationMax);
-    const normalizedSchedule = normalizeSchedule(params.paymentsFreq);
     // Validate duration logic
     if (durationMaxSeconds < durationMinSeconds) {
         throw new Error(`durationMax (${durationMaxSeconds}s) must be >= durationMin (${durationMinSeconds}s)`);
     }
-    // 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 sageProgram = address(addresses.sage);
     const programAddress = address(addresses.srsly);
-    // Convert minCancelDelay duration to seconds
-    const minCancelDelaySeconds = params.minCancelDelay
-        ? BigInt(convertDuration(params.minCancelDelay))
+    // Convert cancelDelayMin duration to seconds
+    const cancelDelayMinSeconds = params.cancelDelayMin !== undefined
+        ? BigInt(convertDuration(params.cancelDelayMin))
         : 1n; // Default 1 second (no instant cancel)
     // Call Codama-generated instruction
     const kitInstruction = await getCreateContractInstructionAsync({
@@ -119,12 +96,41 @@ export async function createContract(params, config) {
         rate: rateStardust,
         durationMin: BigInt(durationMinSeconds),
         durationMax: BigInt(durationMaxSeconds),
-        paymentsFreq: normalizedSchedule,
         ownerKeyIndex: params.ownerKeyIndex ?? 0,
-        minCancelDelay: minCancelDelaySeconds,
-        reservationsDisabled: params.disableReservations ?? false,
-        requiresAutomation: params.requiresAutomation ?? false
+        cancelDelayMin: cancelDelayMinSeconds,
+        reservationsDisabled: params.reservationsDisabled ?? true
     }, { programAddress });
+    // Default: bundle thread creation for automation
+    if (params.automated !== false) {
+        const paymentsFreq = normalizeSchedule(params.paymentsFreq ?? '@daily');
+        // Derive PDAs locally (contract doesn't exist on-chain yet)
+        const contractAddress = await deriveContract(params.fleet);
+        const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
+        const rentalAuthority = await deriveRentalAuthority();
+        const contractThread = await deriveContractThread(contractAddress, rentalAuthority);
+        const fiber0 = await deriveFiber(contractThread, 0);
+        const closeRentalFiber = await deriveFiber(contractThread, 1);
+        const ownerAddress = getSignerAddress(params.owner);
+        const MINIMUM_THREAD_FUNDING = 40000000n;
+        const DEFAULT_EXECUTION_BUDGET = 2190000n; // 1 year daily @ 0.000006 SOL/tick
+        const threadIx = await getCreateContractThreadInstructionAsync({
+            payer: ownerSigner,
+            mint: atlasMint,
+            contract: contractAddress,
+            contractThread,
+            fiber0,
+            closeRentalFiber,
+            owner: ownerAddress,
+            contractTokenAccount,
+            sageProgram,
+            lamports: MINIMUM_THREAD_FUNDING + (params.threadLamports ? convertSol(params.threadLamports) : DEFAULT_EXECUTION_BUDGET),
+            paymentsFreq,
+        }, { programAddress });
+        return prepareInstructions([kitInstruction, threadIx], {
+            computeUnits: params.computeUnits,
+            PublicKey: finalConfig.PublicKey
+        });
+    }
     return prepareInstructions(kitInstruction, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey

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

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

package/dist/esm/instructions/createContractThread.js

@@ -0,0 +1,99 @@
+/**
+ * @purpose Simplified createContractThread instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated createContractThread instruction.
+ * Creates a per-contract automation thread with fiber-based dispatch.
+ */
+import { AccountRole, address } from '@solana/kit';
+import { getCreateContractThreadInstructionAsync } 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';
+import { fetchContract } from '../accounts/contract';
+import { fetchFleet } from '../accounts/fleet';
+import { fetchRental } from '../accounts/rental';
+import { RentalStatus } from '../generated/codama/types';
+import { deriveGameAccounts } from '../pda/sage';
+import { deriveActiveRental } from '../pda/srsly';
+import { deriveContractThread, deriveFiber } from '../pda/thread';
+import { deriveRentalAuthority } from '../pda/srsly';
+import { normalizeSchedule } from '../params/schedule';
+import { convertSol } from '../params/sol';
+// Minimum: 3 fiber rents (~0.01 each) + thread rent (~0.01) = 0.04 SOL
+const MINIMUM_THREAD_FUNDING = 40000000n;
+const DEFAULT_EXECUTION_BUDGET = 2190000n; // 1 year daily @ 0.000006 SOL/tick
+/**
+ * Create a per-contract automation thread
+ *
+ * Creates an Antegen thread with controller fiber (fiber 0, inline).
+ * Thread starts **paused** by default. Fiber 1 (rental_close) and
+ * fiber 2 (rental_activate) are created lazily when needed by
+ * rental_accept and rental_reserve respectively.
+ *
+ * @param params - Thread creation parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Kit instruction (or web3.js if PublicKey in config)
+ */
+export async function createContractThread(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 ownerAddress = getSignerAddress(params.owner);
+    // Get atlasMint and sage program from 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 managed_token_account
+    const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
+    const contractAddress = address(params.contract);
+    // Derive thread and fiber PDAs
+    const rentalAuthority = await deriveRentalAuthority();
+    const contractThread = await deriveContractThread(contractAddress, rentalAuthority);
+    const fiber0 = await deriveFiber(contractThread, 0);
+    const closeRentalFiber = await deriveFiber(contractThread, 1);
+    // Normalize schedule to cron string
+    const paymentsFreq = normalizeSchedule(params.paymentsFreq);
+    const kitInstruction = await getCreateContractThreadInstructionAsync({
+        payer: ownerSigner,
+        mint: atlasMint,
+        contract: contractAddress,
+        contractThread,
+        fiber0,
+        closeRentalFiber,
+        owner: ownerAddress,
+        contractTokenAccount: contractAccount.data.managedTokenAccount,
+        sageProgram: address(addresses.sage),
+        lamports: MINIMUM_THREAD_FUNDING + (params.lamports ? convertSol(params.lamports) : DEFAULT_EXECUTION_BUDGET),
+        paymentsFreq,
+    }, { programAddress });
+    // If active rental exists, append starbase + starbasePlayer as remaining_accounts
+    // (Rust reads them from remaining_accounts when building fiber 1 close instruction)
+    try {
+        const activeRentalPda = await deriveActiveRental(contractAddress);
+        const activeRental = await fetchRental(activeRentalPda, finalConfig.rpcUrl);
+        if (activeRental.data.status === RentalStatus.Active) {
+            const fleetState = await fetchFleet(contractAccount.data.fleet, finalConfig.rpcUrl);
+            const gameAccounts = await deriveGameAccounts(fleetState.subProfile.key, fleetState.faction, contractAccount.data.gameId);
+            const sageRemainingAccounts = [
+                { address: gameAccounts.starbase, role: AccountRole.READONLY },
+                { address: gameAccounts.starbasePlayer, role: AccountRole.READONLY },
+            ];
+            kitInstruction.accounts.push(...sageRemainingAccounts);
+        }
+    }
+    catch {
+        // No active rental — remaining_accounts not needed
+    }
+    return prepareInstructions(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=createContractThread.js.map

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

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

package/dist/esm/instructions/deleteBorrower.js

@@ -2,8 +2,8 @@
  * @purpose Simplified deleteBorrower instruction wrapper
  *
  * Thin convenience wrapper around Codama-generated deleteBorrower instruction.
- * Allows admin OR borrower to delete borrower state for schema migrations.
- * Returns lamports to the borrower. Next rental will lazy-init fresh state.
+ * Admin-only instruction to delete borrower state for schema migrations.
+ * Uses UncheckedAccount to bypass deserialization for old-format accounts.
  */
 import { address } from '@solana/kit';
 import { getDeleteBorrowerInstructionAsync } from '../generated/codama/instructions';
@@ -11,10 +11,11 @@ import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { prepareInstructions } from '../utils/instructions';
 /**
- * Delete borrower state (admin only)
+ * Delete borrower state (admin-only for schema migrations)
  *
- * Used for schema migrations when BorrowerState structure changes.
- * Returns lamports to the borrower. Next rental will lazy-init fresh state.
+ * Used to delete old-format BorrowerState accounts that can't be deserialized
+ * with the current struct layout. Returns lamports to the borrower wallet.
+ * Uses UncheckedAccount to bypass deserialization.
  *
  * @param params - Delete borrower parameters
  * @param config - Optional SDK configuration overrides
@@ -22,32 +23,31 @@ import { prepareInstructions } from '../utils/instructions';
  *
  * @example
  * ```typescript
- * // Admin deletes borrower state for migration
  * const ix = await deleteBorrower({
  *   admin: adminWallet,
- *   borrower: "BORROWER_WALLET_ADDRESS"
+ *   borrower: "BORROWER_WALLET_ADDRESS",
+ *   borrowerState: "BORROWER_STATE_PDA_ADDRESS"
  * });
  * ```
  */
 export async function deleteBorrower(params, config) {
-    // Merge config
     const finalConfig = mergeConfig(config);
-    // Validate required params
     if (!params.admin) {
         throw new Error('admin is required');
     }
     if (!params.borrower) {
         throw new Error('borrower is required');
     }
-    // Convert admin to transaction signer
+    if (!params.borrowerState) {
+        throw new Error('borrowerState is required');
+    }
     const adminSigner = toTransactionSigner(params.admin);
-    // Get network-specific addresses
     const addresses = getAddresses(config);
     const programAddress = address(addresses.srsly);
-    // Call Codama-generated instruction
     const kitInstruction = await getDeleteBorrowerInstructionAsync({
         admin: adminSigner,
-        borrower: address(params.borrower)
+        borrower: address(params.borrower),
+        borrowerState: address(params.borrowerState),
     }, { programAddress });
     return prepareInstructions(kitInstruction, {
         computeUnits: params.computeUnits,

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

@@ -1 +1 @@
-{"version":3,"file":"deleteBorrower.js","sourceRoot":"","sources":["../../../src/instructions/deleteBorrower.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;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;AA0B5D;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAA4B,EAC5B,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,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,sCAAsC;IACtC,MAAM,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,iCAAiC;IACjC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,iCAAiC,CAC5D;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;KAC9C,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":"deleteBorrower.js","sourceRoot":"","sources":["../../../src/instructions/deleteBorrower.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;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;AA6B5D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAA4B,EAC5B,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;IACD,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,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;IAE3D,MAAM,cAAc,GAAG,MAAM,iCAAiC,CAC5D;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;QAC7C,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,aAAwB,CAAC;KACxD,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"}