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

package/dist/esm/instructions/invalidateRental.js

@@ -6,11 +6,10 @@
  */
 import { address } from '@solana/kit';
 import { getInvalidateRentalInstructionAsync } from '../generated/codama/instructions';
-import { mergeConfig, getAddresses, getRpcUrl } from '../utils/config';
+import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { prepareInstructions } from '../utils/instructions';
 import { deriveGameAccounts } from '../pda/sage';
-import { fetchFleet } from '../accounts/fleet';
 /**
  * Invalidate a rental
  *
@@ -27,7 +26,7 @@ import { fetchFleet } from '../accounts/fleet';
  * - Contract was never created but fleet shows as rented
  *
  * **This function:**
- * - Fetches fleet to get ownerProfile and faction (if not provided)
+ * - Derives contract PDA from fleet (but doesn't require it to exist)
  * - Gets gameId from config (based on programSet)
  * - Derives owner's SAGE accounts (starbase, starbase_player)
  * - Calls SAGE invalidate_rental to unlock the fleet
@@ -38,24 +37,20 @@ import { fetchFleet } from '../accounts/fleet';
  *
  * @example
  * ```typescript
- * // Simplest usage - just fleet and signer (auto-fetches owner info)
+ * // Emergency invalidation of a stuck fleet (contract doesn't exist)
  * const ix = await invalidateRental({
  *   fleet: "FLEET_ADDRESS",
- *   signer: wallet
- * });
- *
- * // With explicit owner info (skips fleet fetch)
- * const ix2 = await invalidateRental({
- *   fleet: fleetAddress,
  *   signer: wallet,
- *   ownerProfile: ownerProfileAddress,
+ *   ownerProfile: "OWNER_PROFILE_ADDRESS",
  *   faction: "mud"
  * });
  *
  * // With compute budget
- * const ix3 = await invalidateRental({
+ * const ix2 = await invalidateRental({
  *   fleet: fleetAddress,
- *   signer: wallet,
+ *   signer: adminWallet,
+ *   ownerProfile: ownerProfileAddress,
+ *   faction: 1,
  *   computeUnits: 200_000
  * });
  * ```
@@ -70,6 +65,12 @@ export async function invalidateRental(params, config) {
     if (!params.signer) {
         throw new Error('signer is required');
     }
+    if (!params.ownerProfile) {
+        throw new Error('ownerProfile is required');
+    }
+    if (!params.faction) {
+        throw new Error('faction is required');
+    }
     // Convert signer to transaction signer
     const signerAccount = toTransactionSigner(params.signer);
     // Get network-specific addresses (including gameId)
@@ -77,24 +78,10 @@ export async function invalidateRental(params, config) {
     const gameId = address(addresses.gameId);
     const sageProgram = address(addresses.sage);
     const programAddress = address(addresses.srsly);
-    // Get ownerProfile and faction - either from params or fetch from fleet
-    let ownerProfile;
-    let faction;
-    if (params.ownerProfile && params.faction) {
-        // Use provided values
-        ownerProfile = address(params.ownerProfile);
-        faction = params.faction;
-    }
-    else {
-        // Fetch fleet to get owner info
-        const rpcUrl = getRpcUrl(config);
-        const fleetData = await fetchFleet(params.fleet, rpcUrl);
-        ownerProfile = fleetData.ownerProfile;
-        faction = fleetData.faction;
-    }
-    // Derive owner's SAGE accounts
-    const gameAccounts = await deriveGameAccounts(ownerProfile, faction, gameId);
+    // Derive owner's SAGE accounts (NOT borrower's)
+    const gameAccounts = await deriveGameAccounts(params.ownerProfile, params.faction, gameId);
     // Call Codama-generated instruction
+    // Contract and rentalAuthority are auto-derived by Codama
     const kitInstruction = await getInvalidateRentalInstructionAsync({
         signer: signerAccount,
         fleet: address(params.fleet),

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

@@ -1 +1 @@
-{"version":3,"file":"invalidateRental.js","sourceRoot":"","sources":["../../../src/instructions/invalidateRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAC;AACvF,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,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAmC/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAA8B,EAC9B,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,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,uCAAuC;IACvC,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEzD,oDAAoD;IACpD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAiB,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,wEAAwE;IACxE,IAAI,YAAqB,CAAC;IAC1B,IAAI,OAAwB,CAAC;IAE7B,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC1C,sBAAsB;QACtB,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,YAAuB,CAAC,CAAC;QACvD,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAC3B,CAAC;SAAM,CAAC;QACN,gCAAgC;QAChC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACzD,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QACtC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,+BAA+B;IAC/B,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,YAAY,EACZ,OAAO,EACP,MAAM,CACP,CAAC;IAEF,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,mCAAmC,CAC9D;QACE,MAAM,EAAE,aAAa;QACrB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAgB,CAAC;QACvC,MAAM,EAAE,MAAM;QACd,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"}
+{"version":3,"file":"invalidateRental.js","sourceRoot":"","sources":["../../../src/instructions/invalidateRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAC;AACvF,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,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAoCjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAA8B,EAC9B,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,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IAED,uCAAuC;IACvC,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEzD,oDAAoD;IACpD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAiB,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,gDAAgD;IAChD,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,OAAO,EACd,MAAM,CACP,CAAC;IAEF,oCAAoC;IACpC,0DAA0D;IAC1D,MAAM,cAAc,GAAG,MAAM,mCAAmC,CAC9D;QACE,MAAM,EAAE,aAAa;QACrB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAgB,CAAC;QACvC,MAAM,EAAE,MAAM;QACd,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/releaseRental.js

@@ -2,70 +2,52 @@
  * @purpose Simplified releaseRental instruction wrapper
  *
  * Thin convenience wrapper around Codama-generated releaseRental instruction.
- * Emergency function to release a fleet from rental control when rental state is deleted.
+ * Release a fleet from SRSLY rental control when contract exists but rental is inactive.
  */
 import { address } from '@solana/kit';
 import { getReleaseRentalInstructionAsync } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { prepareInstructions } from '../utils/instructions';
-import { deriveContract, deriveRental, deriveRentalAuthority } from '../pda/srsly';
 import { deriveGameAccounts } from '../pda/sage';
-import { deriveRentalThread } from '../pda/thread';
 /**
  * Release a rental
  *
- * Emergency function to release a fleet from rental control when rental state is deleted.
- * This works even when the contract has been deleted. Automatically deletes the payment
- * thread if it still exists (skips if already deleted).
+ * Release a fleet from SRSLY rental control when:
+ * - Contract EXISTS for the fleet
+ * - No active rental (rental_state has been cleaned up via rental_close)
+ *
+ * If contract doesn't exist, use `invalidateRental` instead.
  *
  * **Use Cases:**
- * - Rental state deleted but fleet still locked in SAGE
- * - Contract deleted but fleet still locked in SAGE
- * - Recovery from broken state after manual deletions
- * - Thread still exists after rental_state was deleted
+ * - Fleet stuck in SAGE rental mode after rental_close
+ * - Recovery when rental_state is gone but fleet still locked
  *
  * **This function:**
- * - Derives contract PDA from fleet (but doesn't fetch - may not exist)
- * - Derives rental_state, rental_authority, rental_thread PDAs
+ * - Derives contract PDA from fleet (must exist)
  * - Gets gameId from config (based on programSet)
- * - Derives all SAGE accounts from provided borrowerProfile/faction
+ * - Derives owner's SAGE accounts (starbase, starbase_player)
  * - Calls SAGE invalidate_rental to unlock the fleet
- * - Deletes the payment thread if it exists (skips if already deleted)
  *
- * @param params - Release rental parameters (gameId from config, other SAGE params required)
+ * @param params - Release rental parameters
  * @param config - Optional SDK configuration overrides
  * @returns Kit instruction (or web3.js if PublicKey in config)
  *
- * @demo
+ * @example
  * ```typescript
- * // Emergency release of a stuck fleet (also deletes thread if exists)
+ * // Release a stuck fleet (contract must exist)
  * const ix = await releaseRental({
  *   fleet: "FLEET_ADDRESS",
- *   borrower: "BORROWER_ADDRESS",
  *   signer: wallet,
- *   borrowerProfile: "BORROWER_PROFILE_ADDRESS",
+ *   ownerProfile: "OWNER_PROFILE_ADDRESS",
  *   faction: "mud"
  * });
- * ```
- *
- * @example
- * ```typescript
- * // Emergency release of a stuck fleet
- * const ix = await releaseRental({
- *   fleet: fleetAddress,
- *   borrower: borrowerAddress,
- *   signer: wallet,
- *   borrowerProfile: borrowerProfileAddress,
- *   faction: "mud"  // or "oni", "ustur", or 1, 2, 3
- * });
  *
  * // With compute budget
  * const ix2 = await releaseRental({
  *   fleet: fleetAddress,
- *   borrower: borrowerAddress,
  *   signer: adminWallet,
- *   borrowerProfile: borrowerProfileAddress,
+ *   ownerProfile: ownerProfileAddress,
  *   faction: 1,
  *   computeUnits: 200_000
  * });
@@ -78,14 +60,11 @@ export async function releaseRental(params, config) {
     if (!params.fleet) {
         throw new Error('fleet is required');
     }
-    if (!params.borrower) {
-        throw new Error('borrower is required');
-    }
     if (!params.signer) {
         throw new Error('signer is required');
     }
-    if (!params.borrowerProfile) {
-        throw new Error('borrowerProfile is required');
+    if (!params.ownerProfile) {
+        throw new Error('ownerProfile is required');
     }
     if (!params.faction) {
         throw new Error('faction is required');
@@ -97,28 +76,16 @@ export async function releaseRental(params, config) {
     const gameId = address(addresses.gameId);
     const sageProgram = address(addresses.sage);
     const programAddress = address(addresses.srsly);
-    // 1. Derive contract PDA from fleet (but don't fetch - contract may be deleted)
-    const contract = await deriveContract(params.fleet);
-    // 2. Derive rental_state PDA
-    const rentalState = await deriveRental(contract, params.borrower);
-    // 3. Derive rental_authority PDA
-    const rentalAuthority = await deriveRentalAuthority();
-    // 4. Derive all SAGE accounts using provided params (no fetch needed)
-    const gameAccounts = await deriveGameAccounts(params.borrowerProfile, params.faction, gameId);
-    // 5. Derive rental thread (will be deleted if exists, skipped if empty)
-    const rentalThread = await deriveRentalThread(rentalState, rentalAuthority);
+    // Derive owner's SAGE accounts (NOT borrower's)
+    const gameAccounts = await deriveGameAccounts(params.ownerProfile, params.faction, gameId);
     // Call Codama-generated instruction
+    // Contract and rentalAuthority are auto-derived by Codama from seeds
     const kitInstruction = await getReleaseRentalInstructionAsync({
         signer: signerAccount,
-        borrower: address(params.borrower),
         fleet: address(params.fleet),
         gameId: gameId,
         starbase: gameAccounts.starbase,
         starbasePlayer: gameAccounts.starbasePlayer,
-        rentalState: address(rentalState),
-        contract: address(contract),
-        rentalAuthority: address(rentalAuthority),
-        rentalThread,
         sageProgram,
     }, { programAddress });
     return prepareInstructions(kitInstruction, {

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

@@ -1 +1 @@
-{"version":3,"file":"releaseRental.js","sourceRoot":"","sources":["../../../src/instructions/releaseRental.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"releaseRental.js","sourceRoot":"","sources":["../../../src/instructions/releaseRental.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,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAoCjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IAED,uCAAuC;IACvC,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEzD,oDAAoD;IACpD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAiB,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,gDAAgD;IAChD,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,OAAO,EACd,MAAM,CACP,CAAC;IAEF,oCAAoC;IACpC,qEAAqE;IACrE,MAAM,cAAc,GAAG,MAAM,gCAAgC,CAC3D;QACE,MAAM,EAAE,aAAa;QACrB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAgB,CAAC;QACvC,MAAM,EAAE,MAAM;QACd,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/removeAffiliate.js

@@ -0,0 +1,7 @@
+/**
+ * @purpose Remove an affiliate and close account
+ *
+ * Re-exports slyvault's removeAffiliate instruction.
+ */
+export { removeAffiliate, } from '@wuwei-labs/slyvault';
+//# sourceMappingURL=removeAffiliate.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"removeAffiliate.js","sourceRoot":"","sources":["../../../src/instructions/removeAffiliate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,eAAe,GAEhB,MAAM,sBAAsB,CAAC"}

package/dist/esm/instructions/reserveRental.js

@@ -2,50 +2,48 @@
  * @purpose Simplified reserveRental instruction wrapper
  *
  * Thin convenience wrapper around Codama-generated reserveRental instruction.
- * Reserves a rental contract using points or ATLAS for a GBM-style auction.
+ * Reserves a rental contract using ATLAS for a GBM-style auction.
  */
-import { address } from '@solana/kit';
-import { createRpc } from '../utils/rpc';
+import { AccountRole, address } from '@solana/kit';
 import { getReserveRentalInstructionAsync } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
+import { convertAmount } from '../params/amount';
+import { convertDuration } from '../params/duration';
 import { fetchContract } from '../accounts/contract';
 import { fetchConfig } from '../accounts/config';
-import { fetchBorrowerState } from '../generated/codama/accounts';
-import { deriveBorrowerState } from '../pda/srsly';
+import { fetchFleet } from '../accounts/fleet';
+import { fetchBorrower } from '../accounts/borrower';
+import { fetchRental } from '../accounts/rental';
+import { RentalStatus } from '../generated/codama/types';
+import { deriveGameAccounts } from '../pda/sage';
+import { deriveQueuedRental, deriveRentalAuthority } from '../pda/srsly';
 import { deriveAssociatedTokenAccount } from '../pda/token';
+import { deriveContractThread, deriveFiber } from '../pda/thread';
 import { prepareInstructions } from '../utils/instructions';
+import { deserializeDiscountAuth } from '../utils/discountAuth';
 /**
  * Reserve a rental contract via GBM-style auction
  *
- * Allows a user to reserve (bid on) a rental contract using either
- * accumulated capture points or ATLAS tokens. Winners get an exclusive
- * reservation window to accept the rental once the current rental ends.
+ * Allows a user to reserve (bid on) a rental contract using ATLAS tokens.
+ * Winners get an exclusive reservation window to accept the rental once
+ * the current rental ends.
  *
- * The reservation type is determined by the `useAtlas` parameter:
- * - If `useAtlas=false` (default): Uses capture points from borrower state
- * - If `useAtlas=true`: Transfers ATLAS from challenger's wallet
+ * The reservation uses the queued rental PDA and requires the contract
+ * thread and activate_rental fiber for scheduling.
  *
  * @param params - Reservation parameters
  * @param config - Optional SDK configuration overrides
  * @returns Array of instructions (Kit format or web3.js if PublicKey in config)
  *
- * @demo
+ * @example
  * ```typescript
- * // Reserve with 5 points
+ * // Reserve with 5 ATLAS for a 7-day rental
  * const ixs = await reserveRental({
  *   challenger: wallet,
  *   contract: "CONTRACT_ADDRESS",
- *   amount: 5,       // 5 points deducted from borrower state
- *   useAtlas: false
- * });
- *
- * // Reserve with 5 point-equivalents in ATLAS
- * const ixs2 = await reserveRental({
- *   challenger: wallet,
- *   contract: "CONTRACT_ADDRESS",
- *   amount: 5,       // 5 * atlas_per_point = ATLAS lamports transferred
- *   useAtlas: true,
+ *   amount: 5,
+ *   duration: { days: 7 },
  *   computeUnits: 200_000
  * });
  * ```
@@ -60,71 +58,97 @@ export async function reserveRental(params, config) {
     if (!params.contract) {
         throw new Error('contract is required');
     }
-    if (params.amount === undefined || params.amount === null) {
-        throw new Error('amount is required');
+    if (!params.borrowerProfile) {
+        throw new Error('borrowerProfile is required for reserveRental');
+    }
+    if (!params.duration) {
+        throw new Error('duration is required');
+    }
+    const bidPoints = params.bidPoints ?? 0;
+    const bidAtlasValue = params.bidAtlas ? convertAmount(params.bidAtlas) : 0n;
+    if (bidPoints === 0 && bidAtlasValue === 0n) {
+        throw new Error('Must provide either bidPoints or bidAtlas');
+    }
+    if (bidPoints > 0 && bidAtlasValue > 0n) {
+        throw new Error('bidPoints and bidAtlas are mutually exclusive');
     }
     // Convert challenger to transaction signer
     const challengerSigner = toTransactionSigner(params.challenger);
     // Get network-specific addresses
     const addresses = getAddresses(config);
-    const atlasMint = address(addresses.atlasMint);
     const programAddress = address(addresses.srsly);
-    // Derive challenger state PDA
-    const challengerState = await deriveBorrowerState(challengerSigner.address);
-    // Fetch contract to get contract token account
-    const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
-    const contractTokenAccount = contractAccount.data.contractTokenAccount;
-    // Fetch config for mint validation
+    const sageProgram = address(addresses.sage);
+    // Fetch config for mint
     const configAccount = await fetchConfig(finalConfig.rpcUrl);
-    // Derive challenger's managed token account (used for receiving ATLAS bonuses)
-    const challengerManagedTokenAccount = await deriveAssociatedTokenAccount(challengerState, atlasMint);
-    // Convert amount based on reservation type
-    // - Points: use raw number as-is
-    // - ATLAS: multiply by atlas_per_point to get lamports
-    const amountValue = params.useAtlas
-        ? BigInt(params.amount) * BigInt(configAccount.data.atlasPerPoint) // point-equivalents → lamports
-        : BigInt(params.amount); // points stay as-is
+    const atlasMint = configAccount.data.atlasMint;
+    // Fetch contract to get contractTokenAccount
+    const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
+    // Derive queued rental PDA
+    const rentalState = await deriveQueuedRental(params.contract);
+    // Derive rental authority
+    const rentalAuthority = await deriveRentalAuthority();
+    // Derive contract thread and activate_rental fiber (fiber index 2)
+    const contractThread = await deriveContractThread(params.contract, rentalAuthority);
+    const activateRentalFiber = await deriveFiber(contractThread, 2);
+    // Derive contract token account (ATA of contract PDA)
+    const contractAddress = address(params.contract);
+    const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
+    // Derive challenger's token account
+    const challengerTokenAccount = await deriveAssociatedTokenAccount(challengerSigner.address, atlasMint);
+    // Convert duration to seconds
+    const durationSeconds = convertDuration(params.duration);
+    // Deserialize discount auth if provided
+    let discountAuth = null;
+    if (params.discountAuth) {
+        discountAuth = deserializeDiscountAuth(params.discountAuth);
+    }
+    const referrer = params.referrer ? address(params.referrer) : undefined;
     // Build instruction input
     const instructionInput = {
         challenger: challengerSigner,
-        mint: atlasMint,
-        contract: address(params.contract),
-        challengerState,
-        challengerManagedTokenAccount,
-        contractTokenAccount: address(contractTokenAccount),
-        amount: amountValue,
-        // Optional accounts based on reservation type
-        challengerTokenAccount: undefined,
-        defenderState: undefined,
-        defenderManagedTokenAccount: undefined,
+        contract: contractAddress,
+        contractThread,
+        activateRentalFiber,
+        contractTokenAccount,
+        challengerTokenAccount,
+        rentalState,
+        referrer,
+        sageProgram,
+        bidPoints,
+        bidAtlas: bidAtlasValue,
+        duration: BigInt(durationSeconds),
+        discountAuth,
     };
-    // If using ATLAS, include challenger's token account
-    if (params.useAtlas) {
-        const challengerTokenAccount = await deriveAssociatedTokenAccount(challengerSigner.address, atlasMint);
-        instructionInput.challengerTokenAccount = challengerTokenAccount;
-    }
-    // If there's a current reservation holder, we need to provide defender accounts
-    if (contractAccount.data.reservationHolder &&
-        typeof contractAccount.data.reservationHolder === 'object' &&
-        '__option' in contractAccount.data.reservationHolder &&
-        contractAccount.data.reservationHolder.__option === 'Some') {
-        const defenderState = contractAccount.data.reservationHolder.value;
-        instructionInput.defenderState = defenderState;
-        // Fetch defender state to get their managed token account
-        const rpc = createRpc(finalConfig.rpcUrl || 'https://api.devnet.solana.com');
-        try {
-            const defenderStateAccount = await fetchBorrowerState(rpc, defenderState);
-            if (defenderStateAccount.data.managedTokenAccount) {
-                instructionInput.defenderManagedTokenAccount = defenderStateAccount.data.managedTokenAccount;
-            }
-        }
-        catch {
-            // Defender state might not exist or be readable, continue without it
+    // If there's a current queued reservation, provide defender accounts
+    // Fetch queued rental to check if there's an existing reservation holder
+    try {
+        const queuedRental = await fetchRental(rentalState, finalConfig.rpcUrl);
+        if (queuedRental.data.status === RentalStatus.Queued) {
+            const defenderBorrowerState = queuedRental.data.borrowerState;
+            instructionInput.defenderState = defenderBorrowerState;
+            // Fetch defender's managed token account from their borrower state
+            const defenderAccount = await fetchBorrower(defenderBorrowerState, finalConfig.rpcUrl);
+            instructionInput.defenderManagedTokenAccount = defenderAccount.data.managedTokenAccount;
         }
     }
+    catch {
+        // Queued rental doesn't exist or is Available — no defender
+    }
+    // Derive SAGE accounts for remaining_accounts
+    const borrowerProfileAddr = address(params.borrowerProfile);
+    const fleetState = await fetchFleet(contractAccount.data.fleet, finalConfig.rpcUrl);
+    const gameAccounts = await deriveGameAccounts(borrowerProfileAddr, fleetState.faction, contractAccount.data.gameId);
     // Call Codama-generated instruction
     const kitInstruction = await getReserveRentalInstructionAsync(instructionInput, { programAddress });
-    // Prepare instructions with optional compute budget and web3.js conversion
+    // Append SAGE accounts as remaining_accounts
+    const sageRemainingAccounts = [
+        { address: borrowerProfileAddr, role: AccountRole.READONLY },
+        { address: gameAccounts.profileFaction, role: AccountRole.READONLY },
+        { address: gameAccounts.starbase, role: AccountRole.READONLY },
+        { address: gameAccounts.starbasePlayer, role: AccountRole.READONLY },
+    ];
+    kitInstruction.accounts.push(...sageRemainingAccounts);
+    // Prepare instructions with optional compute budget
     return prepareInstructions(kitInstruction, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey

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

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

package/dist/esm/instructions/updateAffiliate.js

@@ -0,0 +1,54 @@
+/**
+ * @purpose Update affiliate settings (discount authority, authority transfer)
+ *
+ * Convenience wrapper around slyvault's affiliateUpdate instruction.
+ * Auto-fetches vault from affiliate member state.
+ */
+import { address } from '@solana/kit';
+import { affiliateUpdate, fetchMember, } from '@wuwei-labs/slyvault';
+import { mergeConfig } from '../utils/config';
+/**
+ * Update affiliate settings or transfer authority
+ *
+ * Auto-fetches the vault address from the affiliate member state.
+ * Validates that the member is an Affiliate type before proceeding.
+ *
+ * @param params - Update parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Prepared instruction(s)
+ *
+ * @example
+ * ```typescript
+ * import { updateAffiliate } from '@wuwei-labs/srsly';
+ *
+ * // Set discount authority for affiliate
+ * const ix = await updateAffiliate({
+ *   authority: affiliateWallet,
+ *   affiliateState: "AFFILIATE_STATE_PDA",
+ *   discountAuthority: "DISCOUNT_AUTHORITY_ADDRESS"
+ * });
+ * ```
+ */
+export async function updateAffiliate(params, config) {
+    const finalConfig = mergeConfig(config);
+    if (!params.authority)
+        throw new Error('authority is required');
+    if (!params.affiliateState)
+        throw new Error('affiliateState is required');
+    // Fetch affiliate member state to get vault
+    const { data: memberState } = await fetchMember(address(params.affiliateState), finalConfig.rpcUrl);
+    // Validate member is Affiliate type
+    if (memberState.memberType.__kind !== 'Affiliate') {
+        throw new Error('Member is not an Affiliate type - use updateMember for Normal members');
+    }
+    // Delegate to slyvault affiliateUpdate
+    return affiliateUpdate({
+        authority: params.authority,
+        vault: memberState.vault,
+        memberState: address(params.affiliateState),
+        discountAuthority: params.discountAuthority,
+        newAuthority: params.newAuthority,
+        computeUnits: params.computeUnits,
+    });
+}
+//# sourceMappingURL=updateAffiliate.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"updateAffiliate.js","sourceRoot":"","sources":["../../../src/instructions/updateAffiliate.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EACL,eAAe,EACf,WAAW,GAEZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAkB,MAAM,iBAAiB,CAAC;AAsC9D;;;;;;;;;;;;;;;;;;;;;GAqBG;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,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAE1E,4CAA4C;IAC5C,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,WAAW,CAC7C,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,EAC9B,WAAW,CAAC,MAAM,CACnB,CAAC;IAEF,oCAAoC;IACpC,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;IAC3F,CAAC;IAED,uCAAuC;IACvC,OAAO,eAAe,CAAC;QACrB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,KAAK,EAAE,WAAW,CAAC,KAAK;QACxB,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC;QAC3C,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;AACL,CAAC"}