evernode-js-client 0.6.53 → 0.6.54

package/index.js

@@ -9189,7 +9189,7 @@ module.exports = { mask, unmask };
 
 
 try {
-  module.exports = require(__nccwpck_require__.ab + "prebuilds/linux-x64/node.napi1.node");
+  module.exports = require(__nccwpck_require__.ab + "prebuilds/linux-x64/node.napi.node");
 } catch (e) {
   module.exports = __nccwpck_require__(9467);
 }
@@ -38321,7 +38321,7 @@ module.exports = isValidUTF8;
 
 
 try {
-  module.exports = require(__nccwpck_require__.ab + "prebuilds/linux-x64/node.napi.node");
+  module.exports = require(__nccwpck_require__.ab + "prebuilds/linux-x64/node.napi1.node");
 } catch (e) {
   module.exports = __nccwpck_require__(6982);
 }
@@ -61224,6 +61224,7 @@ const { XflHelpers } = __nccwpck_require__(3972);
 const { EvernodeHelpers } = __nccwpck_require__(6384);
 const { StateHelpers } = __nccwpck_require__(3390);
 const { TransactionHelper } = __nccwpck_require__(5358);
+const { UtilHelpers } = __nccwpck_require__(3726);
 
 const OFFER_WAIT_TIMEOUT = 60;
 
@@ -61720,81 +61721,109 @@ class HostClient extends BaseEvernodeClient {
      * @param {string} outboundIPAddress Assigned IP Address.
      */
     async offerLease(leaseIndex, leaseAmount, tosHash, outboundIPAddress = null, options = {}) {
+        const leases = await this.getLeases();
+        const decoded = (leases ?? []).map((l) => {
+            return {
+                token: l,
+                info: UtilHelpers.decodeLeaseTokenUri(l.URI)
+            }
+        });
+        let existing = decoded.find(l => l.info.leaseIndex == leaseIndex);
+
+        let uriToken;
+        if (!existing) {
+            // <prefix><version tag ("LTV"+uint8)><lease index (uint16)><half of tos hash><lease amount (int64)><identifier (uint32)><ip data>
+            // Lengths of sub sections.
+            const prefixLen = EvernodeConstants.LEASE_TOKEN_PREFIX_HEX.length / 2;
+            const versionPrefixLen = EvernodeConstants.LEASE_TOKEN_VERSION_PREFIX_HEX.length / 2;
+            const versionLen = versionPrefixLen + 2; // ("LTV"<Version Number>)
+            const indexLen = 2;
+            const halfToSLen = tosHash.length / 4;
+            const leaseAmountLen = 8;
+            const identifierLen = 4;
+            const ipDataLen = 17;
+
+            // Offsets of sub sections
+            const versionPrefixOffset = prefixLen;
+            const versionOffset = prefixLen + versionPrefixLen;
+            const indexOffset = prefixLen + versionLen;
+            const halfTosHashOffset = prefixLen + versionLen + indexLen;
+            const leaseAmountOffset = prefixLen + versionLen + indexLen + halfToSLen;
+            const identifierOffset = prefixLen + versionLen + indexLen + halfToSLen + leaseAmountLen;
+            const ipDataOffset = prefixLen + versionLen + indexLen + halfToSLen + leaseAmountLen + identifierLen;
+
+            const uriBuf = Buffer.alloc((prefixLen + versionLen + indexLen + halfToSLen + leaseAmountLen + identifierLen + ipDataLen));
+
+            Buffer.from(EvernodeConstants.LEASE_TOKEN_PREFIX_HEX, 'hex').copy(uriBuf);
+            Buffer.from(EvernodeConstants.LEASE_TOKEN_VERSION_PREFIX_HEX, 'hex').copy(uriBuf, versionPrefixOffset, 0, versionPrefixLen);
+            uriBuf.writeUInt16BE(EvernodeConstants.LEASE_TOKEN_VERSION, versionOffset);
+            uriBuf.writeUInt16BE(leaseIndex, indexOffset);
+            Buffer.from(tosHash, 'hex').copy(uriBuf, halfTosHashOffset, 0, halfToSLen);
+            uriBuf.writeBigInt64BE(XflHelpers.getXfl(leaseAmount.toString()), leaseAmountOffset);
+            uriBuf.writeUInt32BE((await this.xrplAcc.getSequence()), identifierOffset);
+
+            if (outboundIPAddress) {
+                if (outboundIPAddress.includes(":")) {
+                    uriBuf.writeUInt8(IPV6_FAMILY, ipDataOffset);
+                    const ipBuf = Buffer.from(outboundIPAddress.split(':').map(v => {
+                        const bytes = [];
+                        for (let i = 0; i < v.length; i += 2) {
+                            bytes.push(parseInt(v.substr(i, 2), 16));
+                        }
+                        return bytes;
+                    }).flat());
 
-        // <prefix><version tag ("LTV"+uint8)><lease index (uint16)><half of tos hash><lease amount (int64)><identifier (uint32)><ip data>
-        // Lengths of sub sections.
-        const prefixLen = EvernodeConstants.LEASE_TOKEN_PREFIX_HEX.length / 2;
-        const versionPrefixLen = EvernodeConstants.LEASE_TOKEN_VERSION_PREFIX_HEX.length / 2;
-        const versionLen = versionPrefixLen + 2; // ("LTV"<Version Number>)
-        const indexLen = 2;
-        const halfToSLen = tosHash.length / 4;
-        const leaseAmountLen = 8;
-        const identifierLen = 4;
-        const ipDataLen = 17;
-
-        // Offsets of sub sections
-        const versionPrefixOffset = prefixLen;
-        const versionOffset = prefixLen + versionPrefixLen;
-        const indexOffset = prefixLen + versionLen;
-        const halfTosHashOffset = prefixLen + versionLen + indexLen;
-        const leaseAmountOffset = prefixLen + versionLen + indexLen + halfToSLen;
-        const identifierOffset = prefixLen + versionLen + indexLen + halfToSLen + leaseAmountLen;
-        const ipDataOffset = prefixLen + versionLen + indexLen + halfToSLen + leaseAmountLen + identifierLen;
-
-        const uriBuf = Buffer.alloc((prefixLen + versionLen + indexLen + halfToSLen + leaseAmountLen + identifierLen + ipDataLen));
+                    ipBuf.copy(uriBuf, ipDataOffset + 1, 0, ipDataLen);
+                } else {
+                    throw "Invalid outbound IP address was provided";
+                }
+            }
 
-        Buffer.from(EvernodeConstants.LEASE_TOKEN_PREFIX_HEX, 'hex').copy(uriBuf);
-        Buffer.from(EvernodeConstants.LEASE_TOKEN_VERSION_PREFIX_HEX, 'hex').copy(uriBuf, versionPrefixOffset, 0, versionPrefixLen);
-        uriBuf.writeUInt16BE(EvernodeConstants.LEASE_TOKEN_VERSION, versionOffset);
-        uriBuf.writeUInt16BE(leaseIndex, indexOffset);
-        Buffer.from(tosHash, 'hex').copy(uriBuf, halfTosHashOffset, 0, halfToSLen);
-        uriBuf.writeBigInt64BE(XflHelpers.getXfl(leaseAmount.toString()), leaseAmountOffset);
-        uriBuf.writeUInt32BE((await this.xrplAcc.getSequence()), identifierOffset);
+            const uri = uriBuf.toString('base64');
 
-        if (outboundIPAddress) {
-            if (outboundIPAddress.includes(":")) {
-                uriBuf.writeUInt8(IPV6_FAMILY, ipDataOffset);
-                const ipBuf = Buffer.from(outboundIPAddress.split(':').map(v => {
-                    const bytes = [];
-                    for (let i = 0; i < v.length; i += 2) {
-                        bytes.push(parseInt(v.substr(i, 2), 16));
-                    }
-                    return bytes;
-                }).flat());
+            try {
+                await this.#submitWithRetry(async (feeUplift, submissionRef) => {
+                    await this.xrplAcc.mintURIToken(uri, null, { isBurnable: true, isHexUri: false }, { maxLedgerIndex: this.#getMaxLedgerSequence(), feeUplift: feeUplift, submissionRef: submissionRef });
+                }, { ...(options.retryOptions ? options.retryOptions : {}), submissionRef: options.submissionRef });
+            } catch (e) {
+                // Re-minting the URIToken after burning that sold URIToken.
+                if (e.code === "tecDUPLICATE") {
+                    const uriTokenId = this.xrplAcc.generateIssuedURITokenId(uri);
+                    console.log(`Burning URIToken related to a previously sold lease.`);
+                    await this.xrplAcc.burnURIToken(uriTokenId, { maxLedgerIndex: this.#getMaxLedgerSequence() });
+                    console.log("Re-mint the URIToken for the new lease offer.")
+                    await this.xrplAcc.mintURIToken(uri, null, { isBurnable: true, isHexUri: false }, { maxLedgerIndex: this.#getMaxLedgerSequence() });
+                }
+            }
 
-                ipBuf.copy(uriBuf, ipDataOffset + 1, 0, ipDataLen);
-            } else {
-                throw "Invalid outbound IP address was provided";
+            uriToken = await this.xrplAcc.getURITokenByUri(uri);
+            // If uri token is not found in first try, Retry again.
+            if (!uriToken) {
+                console.log(`URI token not found, Retrying in 1 second.`)
+                await new Promise(resolve => setTimeout(resolve, 1000));
+                uriToken = await this.xrplAcc.getURITokenByUri(uri);
             }
         }
+        else {
+            uriToken = existing.token;
+            console.log(`Found exiting lease for index ${leaseIndex}. Minting skipped.`);
+        }
 
-        const uri = uriBuf.toString('base64');
+        // Throw if still not found.
+        if (!uriToken)
+            throw "Offer lease URI token not found.";
 
-        try {
+        if (!uriToken.Amount) {
             await this.#submitWithRetry(async (feeUplift, submissionRef) => {
-                await this.xrplAcc.mintURIToken(uri, null, { isBurnable: true, isHexUri: false }, { maxLedgerIndex: this.#getMaxLedgerSequence(), feeUplift: feeUplift, submissionRef: submissionRef });
+                await this.xrplAcc.sellURIToken(uriToken.index,
+                    leaseAmount.toString(),
+                    EvernodeConstants.EVR,
+                    this.config.evrIssuerAddress, null, null, { maxLedgerIndex: this.#getMaxLedgerSequence(), feeUplift: feeUplift, submissionRef: submissionRef });
             }, { ...(options.retryOptions ? options.retryOptions : {}), submissionRef: options.submissionRef });
-        } catch (e) {
-            // Re-minting the URIToken after burning that sold URIToken.
-            if (e.code === "tecDUPLICATE") {
-                const uriTokenId = this.xrplAcc.generateIssuedURITokenId(uri);
-                console.log(`Burning URIToken related to a previously sold lease.`);
-                await this.xrplAcc.burnURIToken(uriTokenId, { maxLedgerIndex: this.#getMaxLedgerSequence() });
-                console.log("Re-mint the URIToken for the new lease offer.")
-                await this.xrplAcc.mintURIToken(uri, null, { isBurnable: true, isHexUri: false }, { maxLedgerIndex: this.#getMaxLedgerSequence() });
-            }
         }
-
-        const uriToken = await this.xrplAcc.getURITokenByUri(uri);
-        if (!uriToken)
-            throw "Offer lease NFT creation error.";
-
-        await this.#submitWithRetry(async (feeUplift, submissionRef) => {
-            await this.xrplAcc.sellURIToken(uriToken.index,
-                leaseAmount.toString(),
-                EvernodeConstants.EVR,
-                this.config.evrIssuerAddress, null, null, { maxLedgerIndex: this.#getMaxLedgerSequence(), feeUplift: feeUplift, submissionRef: submissionRef });
-        }, { ...(options.retryOptions ? options.retryOptions : {}), submissionRef: options.submissionRef });
+        else {
+            console.log(`Found exiting offer for the lease ${uriToken.uriTokenId}. Offer skipped.`);
+        }
     }
 
     /**
@@ -61889,9 +61918,15 @@ class HostClient extends BaseEvernodeClient {
      * @param {string} uriTokenId Hex URI token id of the lease.
      */
     async expireLease(uriTokenId, options = {}) {
-        await this.#submitWithRetry(async (feeUplift, submissionRef) => {
-            await this.xrplAcc.burnURIToken(uriTokenId, { maxLedgerIndex: this.#getMaxLedgerSequence(), feeUplift: feeUplift, submissionRef: submissionRef });
-        }, { ...(options.retryOptions ? options.retryOptions : {}), submissionRef: options.submissionRef });
+        const uriToken = await this.xrplApi.getURITokenByIndex(uriTokenId);
+        if (uriToken) {
+            await this.#submitWithRetry(async (feeUplift, submissionRef) => {
+                await this.xrplAcc.burnURIToken(uriTokenId, { maxLedgerIndex: this.#getMaxLedgerSequence(), feeUplift: feeUplift, submissionRef: submissionRef });
+            }, { ...(options.retryOptions ? options.retryOptions : {}), submissionRef: options.submissionRef });
+        }
+        else {
+            console.log(`Uri token ${uriTokenId} not found or already burned. Burn skipped.`);
+        }
     }
 
     /**
@@ -65660,23 +65695,18 @@ class XrplAccount {
     }
 
     async getURITokenByUri(uri, isHexUri = false) {
-        const tokens = await this.getURITokens();
-        const hexUri = isHexUri ? uri : TransactionHelper.asciiToHex(uri).toUpperCase();
-        return tokens.find(t => t.URI == hexUri);
+        const index = this.generateIssuedURITokenId(uri, isHexUri);
+        return await this.xrplApi.getURITokenByIndex(index);
     }
 
 
-    generateIssuedURITokenId(uri) {
+    generateIssuedURITokenId(uri, isHexUri = false) {
         if (uri.length < 1 || uri.length > 256)
             throw 'Invalid URI';
 
         const URITOKEN_LEDGER_TYPE_PREFIX = 85; // Decimal value of ASCII 'U'
         const accIdHex = (codec.decodeAccountID(this.address)).toString('hex').toUpperCase();
-        let uriHex = '';
-        for (let n in uri) {
-            let digit = uri.charCodeAt(n).toString(16).toUpperCase();
-            uriHex += (digit.length == 1 ? '0' : '') + digit
-        }
+        const uriHex = isHexUri ? uri : TransactionHelper.asciiToHex(uri).toUpperCase();
 
         let hash = crypto.createHash('sha512');
 
@@ -66307,6 +66337,13 @@ class XrplApi {
         }
     }
 
+    async getURITokenByIndex(index) {
+        const entry = await this.getLedgerEntry(index);
+        if (!entry || entry.LedgerEntryType !== 'URIToken')
+            return null;
+        return entry;
+    }
+
     async getTxnInfo(txnHash, options) {
         const resp = (await this.#handleClientRequest({ command: 'tx', transaction: txnHash, binary: false, ...options }));
         return resp?.result;

package/package.json

@@ -6,7 +6,7 @@
     ],
     "homepage": "https://github.com/HotPocketDev/evernode-js-client",
     "license": "SEE LICENSE IN https://raw.githubusercontent.com/EvernodeXRPL/evernode-resources/main/license/evernode-license.pdf",
-    "version": "0.6.53",
+    "version": "0.6.54",
     "dependencies": {
         "elliptic": "6.5.4",
         "libsodium-wrappers": "0.7.10",