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

package/dist/esm/instructions/deleteConfig.js

@@ -12,7 +12,8 @@ import { getDeleteConfigInstructionAsync } from '../generated/codama/instruction
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { prepareInstructions } from '../utils/instructions';
-import { deriveSlyvaultVault } from '../pda/slyvault';
+import { fetchConfig } from '../accounts/config';
+import { deriveVault } from '../pda/slyvault';
 /**
  * Delete program configuration
  *
@@ -50,17 +51,27 @@ export async function deleteConfig(params, config) {
     if (!addresses.srsly || addresses.srsly === 'undefined') {
         throw new Error(`Invalid SRSLY program address: ${addresses.srsly}. SDK config may not be initialized properly.`);
     }
-    if (!params.mint) {
-        throw new Error('mint is required for vault derivation');
-    }
     const programAddress = address(addresses.srsly);
-    const mintAddress = address(params.mint);
+    // Resolve mint: explicit param > on-chain config > hardcoded fallback
+    let mintAddress;
+    if (params.mint) {
+        mintAddress = address(params.mint);
+    }
+    else {
+        try {
+            const configAccount = await fetchConfig(finalConfig.rpcUrl);
+            mintAddress = configAccount.data.atlasMint;
+        }
+        catch {
+            mintAddress = address(addresses.atlasMint);
+        }
+    }
     // Convert authority to TransactionSigner if provided
     const authoritySigner = params.authority
         ? toTransactionSigner(params.authority)
         : undefined;
     // Derive vault PDA (creator = SRSLY program)
-    const { vault, vaultTokenAccount } = await deriveSlyvaultVault(programAddress, mintAddress);
+    const { vault, vaultTokenAccount } = await deriveVault(programAddress, mintAddress);
     // Call Codama-generated instruction
     const kitInstruction = await getDeleteConfigInstructionAsync({
         authority: authoritySigner,

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

@@ -1 +1 @@
-{"version":3,"file":"deleteConfig.js","sourceRoot":"","sources":["../../../src/instructions/deleteConfig.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAyBtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,iCAAiC;IACjC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAEvC,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,CAAC,KAAK,+CAA+C,CAAC,CAAC;IACpH,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzC,qDAAqD;IACrD,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS;QACtC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC;IAEd,6CAA6C;IAC7C,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,MAAM,mBAAmB,CAC5D,cAAc,EACd,WAAW,CACZ,CAAC;IAEF,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,+BAA+B,CAC1D;QACE,SAAS,EAAE,eAAe;QAC1B,KAAK;QACL,iBAAiB;QACjB,IAAI,EAAE,WAAW;KAClB,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":"deleteConfig.js","sourceRoot":"","sources":["../../../src/instructions/deleteConfig.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AA2B9C;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,iCAAiC;IACjC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAEvC,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,CAAC,KAAK,+CAA+C,CAAC,CAAC;IACpH,CAAC;IAED,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,sEAAsE;IACtE,IAAI,WAAoB,CAAC;IACzB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC5D,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;QAC7C,CAAC;QAAC,MAAM,CAAC;YACP,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,qDAAqD;IACrD,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS;QACtC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC;IAEd,6CAA6C;IAC7C,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,MAAM,WAAW,CACpD,cAAc,EACd,WAAW,CACZ,CAAC;IAEF,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,+BAA+B,CAC1D;QACE,SAAS,EAAE,eAAe;QAC1B,KAAK;QACL,iBAAiB;QACjB,IAAI,EAAE,WAAW;KAClB,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/deleteRental.js

@@ -47,9 +47,6 @@ export async function deleteRental(params, config) {
     if (!params.admin) {
         throw new Error('admin is required');
     }
-    if (!params.borrower) {
-        throw new Error('borrower is required');
-    }
     if (!params.rentalState) {
         throw new Error('rentalState is required');
     }
@@ -61,7 +58,7 @@ export async function deleteRental(params, config) {
     // Call Codama-generated instruction
     const kitInstruction = await getDeleteRentalInstructionAsync({
         admin: adminSigner,
-        borrower: address(params.borrower),
+        borrower: address((params.borrower ?? '11111111111111111111111111111111')),
         rentalState: address(params.rentalState)
     }, { programAddress });
     return prepareInstructions(kitInstruction, {

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

@@ -1 +1 @@
-{"version":3,"file":"deleteRental.js","sourceRoot":"","sources":["../../../src/instructions/deleteRental.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AA8B5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,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,WAAW,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,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,+BAA+B,CAC1D;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;QAC7C,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,WAAsB,CAAC;KACpD,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":"deleteRental.js","sourceRoot":"","sources":["../../../src/instructions/deleteRental.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AA+B5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,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,+BAA+B,CAC1D;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,kCAAkC,CAAY,CAAC;QACrF,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,WAAsB,CAAC;KACpD,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/index.js

@@ -0,0 +1,33 @@
+/**
+ * Instruction wrappers for SRSLY
+ * @module instructions
+ */
+export * from './createContract';
+export * from './updateContract';
+export * from './closeContract';
+export * from './deleteContract';
+export * from './setDelegate';
+export * from './acceptRental';
+export * from './cancelRental';
+export * from './closeRental';
+export * from './releaseRental';
+export * from './invalidateRental';
+export * from './reserveRental';
+export * from './deleteRental';
+export * from './claimBorrower';
+export * from './closeBorrower';
+export * from './createBorrower';
+export * from './deleteBorrower';
+export * from './claimContract';
+export * from './activateRental';
+export * from './createContractThread';
+export * from './closeContractThread';
+export * from './updateContractThread';
+export * from './createConfig';
+export * from './updateConfig';
+export * from './deleteConfig';
+export * from './createAffiliate';
+export * from './approveAffiliate';
+export * from './removeAffiliate';
+export * from './updateAffiliate';
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/instructions/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,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"}

package/dist/esm/instructions/updateBorrower.js

@@ -2,54 +2,42 @@
  * @purpose Simplified updateBorrower instruction wrapper
  *
  * Thin convenience wrapper around Codama-generated updateBorrower instruction.
- * Updates the borrower's refund destination and/or profile.
+ * Updates the borrower's SAGE profile addresses.
  */
 import { address } from '@solana/kit';
-import { getUpdateBorrowerInstructionAsync } from '../generated/codama/instructions';
+import { getUpdateBorrowerInstruction } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { prepareInstructions } from '../utils/instructions';
+import { deriveBorrowerState } from '../pda/srsly';
 /**
  * Update borrower account
  *
- * Updates the borrower's SAGE profile and/or refund destination.
- * The SAGE profile is required for rental operations. The refund destination
- * will be used for refunds and payment claims if initialized.
+ * Updates the borrower's SAGE-related addresses. These addresses are stored
+ * on-chain in the BorrowerState and used during rental operations.
  *
- * This function automatically derives the borrower state PDA.
+ * This is a synchronous instruction (no async account resolution needed).
+ * The borrower state PDA is derived from the borrower's address.
  *
  * @param params - Update borrower parameters
  * @param config - Optional SDK configuration overrides
  * @returns Kit instruction (or web3.js if PublicKey in config)
  *
- * @demo
+ * @example
  * ```typescript
  * // Update borrower's SAGE profile
  * const ix = await updateBorrower({
  *   borrower: wallet,
  *   borrowerProfile: "NEW_BORROWER_PROFILE_ADDRESS"
  * });
- * ```
- *
- * @example
- * ```typescript
- * // Set SAGE profile
- * const ix = await updateBorrower({
- *   borrower: borrowerWallet,
- *   borrowerProfile: borrowerProfileAddress
- * });
  *
- * // Set refund destination
+ * // Update all SAGE addresses at once
  * const ix2 = await updateBorrower({
- *   borrower: borrowerWallet,
- *   refundDestination: newTokenAccount
- * });
- *
- * // Update both
- * const ix3 = await updateBorrower({
- *   borrower: borrowerWallet,
- *   borrowerProfile: borrowerProfileAddress,
- *   refundDestination: newTokenAccount
+ *   borrower: wallet,
+ *   borrowerProfile: profileAddr,
+ *   borrowerProfileFaction: factionAddr,
+ *   starbase: starbaseAddr,
+ *   starbasePlayer: starbasePlayerAddr
  * });
  * ```
  */
@@ -60,24 +48,42 @@ export async function updateBorrower(params, config) {
     if (!params.borrower) {
         throw new Error('borrower is required');
     }
+    // At least one field must be updated
+    if (params.borrowerProfile === undefined &&
+        params.borrowerProfileFaction === undefined &&
+        params.starbase === undefined &&
+        params.starbasePlayer === undefined) {
+        throw new Error('At least one SAGE address field must be provided to update');
+    }
     // Convert borrower to transaction signer
     const borrowerSigner = toTransactionSigner(params.borrower);
-    // Get network-specific addresses
+    // Get program address
     const addresses = getAddresses(config);
-    const atlasMint = address(addresses.atlasMint);
     const programAddress = address(addresses.srsly);
-    // Call Codama-generated instruction
-    // Note: borrowerState will be auto-derived by Codama
-    // NOTE: borrowerProfile will be added once Codama types are regenerated
-    const instructionAccounts = {
+    // Derive borrower state PDA
+    const borrowerState = await deriveBorrowerState(borrowerSigner.address);
+    // Build data args: null means "don't update" (Option::None)
+    const borrowerProfile = params.borrowerProfile
+        ? address(params.borrowerProfile)
+        : null;
+    const borrowerProfileFaction = params.borrowerProfileFaction
+        ? address(params.borrowerProfileFaction)
+        : null;
+    const starbase = params.starbase
+        ? address(params.starbase)
+        : null;
+    const starbasePlayer = params.starbasePlayer
+        ? address(params.starbasePlayer)
+        : null;
+    // Call Codama-generated instruction (sync - not async)
+    const kitInstruction = getUpdateBorrowerInstruction({
         borrower: borrowerSigner,
-        mint: atlasMint,
-    };
-    // Add borrowerProfile if provided
-    if (params.borrowerProfile) {
-        instructionAccounts.borrowerProfile = address(params.borrowerProfile);
-    }
-    const kitInstruction = await getUpdateBorrowerInstructionAsync(instructionAccounts, { programAddress });
+        borrowerState,
+        borrowerProfile,
+        borrowerProfileFaction,
+        starbase,
+        starbasePlayer,
+    }, { programAddress });
     return prepareInstructions(kitInstruction, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey

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

@@ -1 +1 @@
-{"version":3,"file":"updateBorrower.js","sourceRoot":"","sources":["../../../src/instructions/updateBorrower.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;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AA+B5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;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,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,iCAAiC;IACjC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,oCAAoC;IACpC,qDAAqD;IACrD,wEAAwE;IACxE,MAAM,mBAAmB,GAAQ;QAC/B,QAAQ,EAAE,cAAc;QACxB,IAAI,EAAE,SAAS;KAChB,CAAC;IAEF,kCAAkC;IAClC,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QAC3B,mBAAmB,CAAC,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,eAA0B,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,iCAAiC,CAC5D,mBAAmB,EACnB,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":"updateBorrower.js","sourceRoot":"","sources":["../../../src/instructions/updateBorrower.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,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,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAwCnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;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,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,qCAAqC;IACrC,IACE,MAAM,CAAC,eAAe,KAAK,SAAS;QACpC,MAAM,CAAC,sBAAsB,KAAK,SAAS;QAC3C,MAAM,CAAC,QAAQ,KAAK,SAAS;QAC7B,MAAM,CAAC,cAAc,KAAK,SAAS,EACnC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAChF,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,sBAAsB;IACtB,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,4BAA4B;IAC5B,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAExE,4DAA4D;IAC5D,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe;QAC5C,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,eAA0B,CAAC;QAC5C,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,sBAAsB,GAAG,MAAM,CAAC,sBAAsB;QAC1D,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAiC,CAAC;QACnD,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ;QAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC;QACrC,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc;QAC1C,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,cAAyB,CAAC;QAC3C,CAAC,CAAC,IAAI,CAAC;IAET,uDAAuD;IACvD,MAAM,cAAc,GAAG,4BAA4B,CACjD;QACE,QAAQ,EAAE,cAAc;QACxB,aAAa;QACb,eAAe;QACf,sBAAsB;QACtB,QAAQ;QACR,cAAc;KACf,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/updateConfig.js

@@ -78,18 +78,14 @@ export async function updateConfig(params, config) {
         rentalDurationMinSeconds: toOption(params.rentalDurationMinSeconds),
         rentalDurationMaxSeconds: toOption(params.rentalDurationMaxSeconds),
         atlasMint: toOption(atlasMintAddress),
-        defaultPaymentFrequency: toOption(params.defaultPaymentFrequency),
-        allowedFrequencies: toOption(params.allowedFrequencies),
         reservationsEnabled: toOption(params.reservationsEnabled),
         pointsPerDay: toOption(params.pointsPerDay),
         cancellationPenalty: toOption(params.cancellationPenalty),
-        reservationWindowHours: toOption(params.reservationWindowHours),
         minCaptureThreshold: toOption(params.minCaptureThreshold),
         weightBase: toOption(params.weightBase),
         weightMultiplier: toOption(params.weightMultiplier),
         maxWeight: toOption(params.maxWeight),
         captureRateBps: toOption(params.captureRateBps),
-        maxDiscountBps: toOption(params.maxDiscountBps),
         atlasPerPoint: toOption(params.atlasPerPoint),
     }, { programAddress });
     return prepareInstructions(kitInstruction, {

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

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