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

package/dist/esm/utils/rental.js

@@ -3,127 +3,43 @@
  * @module utils/rental
  */
 import { fetchRentalState } from '../generated/codama/accounts';
-import { deriveRental } from '../pda/srsly';
+import { RentalStatus } from '../generated/codama/types';
+import { deriveActiveRental, deriveQueuedRental } from '../pda/srsly';
 import { createRpc } from './rpc';
-// System program ID constant
-const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
 /**
- * Find which slot has an existing rental from contract data.
- *
- * Uses the contract's rentalSlot0/rentalSlot1 fields to determine which slot has a rental.
- * If both slots have rentals, returns the active slot.
- * If only one slot has a rental, returns that slot.
- *
- * @param contractData - Object with rentalSlot0, rentalSlot1, and activeSlot fields
- * @returns The slot number (0 or 1) if found, undefined if no rentals exist
- *
- * @example
- * ```typescript
- * const contract = await fetchContract(contractAddress, rpcUrl);
- * const slot = findExistingRentalSlot(contract.data);
- * if (slot !== undefined) {
- *   console.log(`Found rental at slot ${slot}`);
- * }
- * ```
- */
-export function findExistingRentalSlot(contractData) {
-    const slot0HasRental = contractData.rentalSlot0 !== SYSTEM_PROGRAM_ID;
-    const slot1HasRental = contractData.rentalSlot1 !== SYSTEM_PROGRAM_ID;
-    if (slot0HasRental && slot1HasRental) {
-        // Both slots have rentals, return the active one
-        return contractData.activeSlot;
-    }
-    else if (slot0HasRental) {
-        return 0;
-    }
-    else if (slot1HasRental) {
-        return 1;
-    }
-    return undefined;
-}
-/**
- * Find which slot has an existing rental, throwing if none found.
- *
- * @param contractData - Object with rentalSlot0, rentalSlot1, and activeSlot fields
- * @returns The slot number (0 or 1)
- * @throws Error if no rental exists on this contract
- */
-export function requireExistingRentalSlot(contractData) {
-    const slot = findExistingRentalSlot(contractData);
-    if (slot === undefined) {
-        throw new Error('No rental exists on this contract');
-    }
-    return slot;
-}
-/**
- * Find which rental slot belongs to a borrower on a contract.
- *
- * Checks both slot 0 and slot 1 to find the rental that belongs to the borrower.
- * Useful for operations like cancel where the borrower can only act on their own rental.
+ * Check if a contract has an active rental.
  *
  * @param contract - The contract address
- * @param borrower - The borrower address to search for
- * @param rpcUrl - RPC URL to use for fetching rental states
- * @returns The slot number (0 or 1) if found, undefined if no rental exists for this borrower
- *
- * @example
- * ```typescript
- * const slot = await findBorrowerRentalSlot(contractAddress, borrowerAddress, rpcUrl);
- * if (slot !== undefined) {
- *   console.log(`Borrower has rental at slot ${slot}`);
- * }
- * ```
+ * @param rpcUrl - RPC URL to use for fetching rental state
+ * @returns true if active rental exists and has Active status
  */
-export async function findBorrowerRentalSlot(contract, borrower, rpcUrl) {
+export async function hasActiveRental(contract, rpcUrl) {
     const rpc = createRpc(rpcUrl);
-    // Address type is a branded string, so we can compare directly
-    const borrowerStr = typeof borrower === 'string' ? borrower : borrower;
-    // Try slot 0 first
-    try {
-        const rental0 = await deriveRental(contract, 0);
-        const rentalState0 = await fetchRentalState(rpc, rental0);
-        if (rentalState0.data.borrower === borrowerStr) {
-            return 0;
-        }
-    }
-    catch {
-        // slot 0 doesn't exist or fetch failed
-    }
-    // Try slot 1
     try {
-        const rental1 = await deriveRental(contract, 1);
-        const rentalState1 = await fetchRentalState(rpc, rental1);
-        if (rentalState1.data.borrower === borrowerStr) {
-            return 1;
-        }
+        const activeRentalPda = await deriveActiveRental(contract);
+        const rentalState = await fetchRentalState(rpc, activeRentalPda);
+        return rentalState.data.status === RentalStatus.Active;
     }
     catch {
-        // slot 1 doesn't exist or fetch failed
+        return false;
     }
-    return undefined;
 }
 /**
- * Find which rental slot belongs to a borrower, throwing if not found.
- *
- * Same as findBorrowerRentalSlot but throws an error if no rental is found.
+ * Check if a contract has a queued rental reservation.
  *
  * @param contract - The contract address
- * @param borrower - The borrower address to search for
- * @param rpcUrl - RPC URL to use for fetching rental states
- * @returns The slot number (0 or 1)
- * @throws Error if no rental is found for this borrower
- *
- * @example
- * ```typescript
- * const slot = await requireBorrowerRentalSlot(contractAddress, borrowerAddress, rpcUrl);
- * // Will throw if borrower has no rental on this contract
- * ```
+ * @param rpcUrl - RPC URL to use for fetching rental state
+ * @returns true if queued rental exists and has Queued status
  */
-export async function requireBorrowerRentalSlot(contract, borrower, rpcUrl) {
-    const slot = await findBorrowerRentalSlot(contract, borrower, rpcUrl);
-    if (slot === undefined) {
-        throw new Error('No active rental found for this borrower on this contract');
+export async function hasQueuedRental(contract, rpcUrl) {
+    const rpc = createRpc(rpcUrl);
+    try {
+        const queuedRentalPda = await deriveQueuedRental(contract);
+        const rentalState = await fetchRentalState(rpc, queuedRentalPda);
+        return rentalState.data.status === RentalStatus.Queued;
+    }
+    catch {
+        return false;
     }
-    return slot;
 }
 //# sourceMappingURL=rental.js.map

package/dist/esm/utils/rental.js.map

@@ -1 +1 @@
-{"version":3,"file":"rental.js","sourceRoot":"","sources":["../../../src/utils/rental.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,6BAA6B;AAC7B,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AAW7D;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,sBAAsB,CAAC,YAA8B;IACnE,MAAM,cAAc,GAAG,YAAY,CAAC,WAAW,KAAK,iBAAiB,CAAC;IACtE,MAAM,cAAc,GAAG,YAAY,CAAC,WAAW,KAAK,iBAAiB,CAAC;IAEtE,IAAI,cAAc,IAAI,cAAc,EAAE,CAAC;QACrC,iDAAiD;QACjD,OAAO,YAAY,CAAC,UAAU,CAAC;IACjC,CAAC;SAAM,IAAI,cAAc,EAAE,CAAC;QAC1B,OAAO,CAAC,CAAC;IACX,CAAC;SAAM,IAAI,cAAc,EAAE,CAAC;QAC1B,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CAAC,YAA8B;IACtE,MAAM,IAAI,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAClD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAA0B,EAC1B,QAA0B,EAC1B,MAAc;IAEd,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9B,+DAA+D;IAC/D,MAAM,WAAW,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAE,QAAmB,CAAC;IAEnF,mBAAmB;IACnB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC/C,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,uCAAuC;IACzC,CAAC;IAED,aAAa;IACb,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC/C,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,uCAAuC;IACzC,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,QAA0B,EAC1B,QAA0B,EAC1B,MAAc;IAEd,MAAM,IAAI,GAAG,MAAM,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"rental.js","sourceRoot":"","sources":["../../../src/utils/rental.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAA0B,EAC1B,MAAc;IAEd,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACjE,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAA0B,EAC1B,MAAc;IAEd,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACjE,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/esm/version.js

@@ -1,4 +1,4 @@
 // Auto-generated from package.json - DO NOT EDIT
 // Run "pnpm run generate:version" to update
-export const VERSION = '3.0.0-beta.20';
+export const VERSION = '3.0.0-beta.22';
 //# sourceMappingURL=version.js.map