evernode-js-client 0.4.42 → 0.4.43

package/index.js

@@ -12090,6 +12090,7 @@ const { EncryptionHelper } = __nccwpck_require__(1247);
 const { Buffer } = __nccwpck_require__(4300);
 const codec = __nccwpck_require__(597);
 const { XflHelpers } = __nccwpck_require__(9281);
+const { EvernodeHelpers } = __nccwpck_require__(7498);
 
 const OFFER_WAIT_TIMEOUT = 60;
 
@@ -12131,6 +12132,10 @@ class HostClient extends BaseEvernodeClient {
         return null;
     }
 
+    async getLeaseOffers() {
+        return await EvernodeHelpers.getLeaseOffers(this.xrplAcc);
+    }
+
     async cancelOffer(offerIndex) {
         return this.xrplAcc.cancelOffer(offerIndex);
     }
@@ -12477,6 +12482,7 @@ const { XrplAccount } = __nccwpck_require__(6962);
 const { UtilHelpers } = __nccwpck_require__(4954);
 const { Buffer } = __nccwpck_require__(4300);
 const codec = __nccwpck_require__(597);
+const { EvernodeHelpers } = __nccwpck_require__(7498);
 
 const ACQUIRE_WATCH_PREFIX = 'acquire_';
 const EXTEND_WATCH_PREFIX = 'extend_';
@@ -12546,25 +12552,30 @@ class TenantClient extends BaseEvernodeClient {
     }
 
     async acquireLeaseSubmit(hostAddress, requirement, options = {}) {
-        const host = await this.getLeaseHost(hostAddress);
-        const hostNfts = (await host.getNfts()).filter(nft => nft.URI.startsWith(EvernodeConstants.LEASE_NFT_PREFIX_HEX));
-        const hostTokenIDs = hostNfts.map(nft => nft.NFTokenID);
-        const nftOffers = (await host.getNftOffers())?.filter(offer => (offer.Flags == 1 && hostTokenIDs.includes(offer.NFTokenID))); // Filter only sell offers
-
-        // Accept the offer.
-        if (nftOffers && nftOffers.length > 0) {
-            // Encrypt the requirements with the host's encryption key (Specified in MessageKey field of the host account).
-            const encKey = await host.getMessageKey();
-            if (!encKey)
-                throw { reason: ErrorReasons.INTERNAL_ERR, error: "Host encryption key not set." };
-
-            const ecrypted = await EncryptionHelper.encrypt(encKey, requirement, {
-                iv: options.iv, // Must be null or 16 bytes.
-                ephemPrivateKey: options.ephemPrivateKey // Must be null or 32 bytes.
-            });
-            return this.xrplAcc.buyNft(nftOffers[0].index, [{ type: MemoTypes.ACQUIRE_LEASE, format: MemoFormats.BASE64, data: ecrypted }], options.transactionOptions);
-        } else
-            throw { reason: ErrorReasons.NO_OFFER, error: "No offers available." };
+
+        const hostAcc = await this.getLeaseHost(hostAddress);
+        let selectedOfferIndex = options.leaseOfferIndex;
+
+        // Attempt to get first available offer, if offer is not specified in options.
+        if (!selectedOfferIndex) {
+            const nftOffers = EvernodeHelpers.getLeaseOffers(hostAcc);
+            selectedOfferIndex = nftOffers && nftOffers[0] && nftOffers[0].index;
+
+            if (!selectedOfferIndex)
+                throw { reason: ErrorReasons.NO_OFFER, error: "No offers available." };
+        }
+
+        // Encrypt the requirements with the host's encryption key (Specified in MessageKey field of the host account).
+        const encKey = await hostAcc.getMessageKey();
+        if (!encKey)
+            throw { reason: ErrorReasons.INTERNAL_ERR, error: "Host encryption key not set." };
+
+        const ecrypted = await EncryptionHelper.encrypt(encKey, requirement, {
+            iv: options.iv, // Must be null or 16 bytes.
+            ephemPrivateKey: options.ephemPrivateKey // Must be null or 32 bytes.
+        });
+
+        return this.xrplAcc.buyNft(selectedOfferIndex, [{ type: MemoTypes.ACQUIRE_LEASE, format: MemoFormats.BASE64, data: ecrypted }], options.transactionOptions);
     }
 
     watchAcquireResponse(tx, options = {}) {
@@ -13163,6 +13174,26 @@ module.exports = {
 
 /***/ }),
 
+/***/ 7498:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+const { EvernodeConstants } = __nccwpck_require__(5716);
+
+class EvernodeHelpers {
+    static async getLeaseOffers(xrplAcc) {
+        const hostNfts = (await xrplAcc.getNfts()).filter(nft => nft.URI.startsWith(EvernodeConstants.LEASE_NFT_PREFIX_HEX));
+        const hostTokenIDs = hostNfts.map(nft => nft.NFTokenID);
+        const nftOffers = (await xrplAcc.getNftOffers())?.filter(offer => (offer.Flags == 1 && hostTokenIDs.includes(offer.NFTokenID))); // Filter only sell offers
+        return nftOffers;
+    }
+}
+
+module.exports = {
+    EvernodeHelpers
+}
+
+/***/ }),
+
 /***/ 2092:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "evernode-js-client",
-    "version": "0.4.42",
+    "version": "0.4.43",
     "dependencies": {
         "elliptic": "6.5.4",
         "ripple-address-codec": "4.2.0",