evernode-js-client 0.5.17-beta-v3.1 → 0.5.17-beta-v3.3

package/index.js

@@ -12525,6 +12525,8 @@ class BaseEvernodeClient {
                     const ownerStateDecoded = StateHelpers.decodeCandidateOwnerState(Buffer.from(ownerStateKey, 'hex'), Buffer.from(ownerStateData, 'hex'));
                     return { ...ownerStateDecoded, ...idStateDecoded };
                 }
+
+                return { ...idStateDecoded, uniqueId: candidateId };
             }
         }
         catch (e) {
@@ -13100,7 +13102,20 @@ class HostClient extends BaseEvernodeClient {
         Buffer.from(tosHash, 'hex').copy(uriBuf, prefixLen + 2, 0, halfToSLen);
         uriBuf.writeBigInt64BE(XflHelpers.getXfl(leaseAmount.toString()), prefixLen + 2 + halfToSLen);
         const uri = uriBuf.toString('base64');
-        await this.xrplAcc.mintURIToken(uri, null, { isBurnable: true, isHexUri: false });
+
+        try {
+            await this.xrplAcc.mintURIToken(uri, null, { isBurnable: true, isHexUri: false });
+        } 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);
+                console.log("Re-mint the URIToken for the new lease offer.")
+                await this.xrplAcc.mintURIToken(uri, null, { isBurnable: true, isHexUri: false });
+            }
+        }
+
         const uriToken = await this.xrplAcc.getURITokenByUri(uri);
         if (!uriToken)
             throw "Offer lease NFT creation error.";
@@ -13146,6 +13161,15 @@ class HostClient extends BaseEvernodeClient {
         if (await this.isRegistered())
             throw "Host already registered.";
 
+        // Check whether are there lease offers in for the host due to a previous registration.
+        const existingLeaseURITokens = (await this.xrplAcc.getURITokens()).filter(n => EvernodeHelpers.isValidURI(n.URI, EvernodeConstants.LEASE_TOKEN_PREFIX_HEX));
+        if (existingLeaseURITokens) {
+            console.log("Burning unsold URITokens related to the previous leases.");
+            for (const uriToken of existingLeaseURITokens) {
+                await this.xrplAcc.burnURIToken(uriToken.index);
+            }
+        }
+
         // Check whether is there any missed NFT sell offer that needs to be accepted
         // from the client-side in order to complete the registration.
         const registryAcc = new XrplAccount(this.config.registryAddress, null, { xrplApi: this.xrplApi });
@@ -14931,6 +14955,7 @@ const EPOCH_COUNT_OFFSET = 0;
 const FIRST_EPOCH_REWARD_QUOTA_OFFSET = 1;
 const EPOCH_REWARD_AMOUNT_OFFSET = 5;
 const REWARD_START_MOMENT_OFFSET = 9;
+const ACCUMULATED_REWARD_FREQUENCY_OFFSET = 13;
 
 const TRANSIT_IDX_OFFSET = 0;
 const TRANSIT_MOMENT_SIZE_OFFSET = 8;
@@ -14980,6 +15005,7 @@ const HOST_CPU_MICROSEC_OFFSET = 64;
 const HOST_RAM_MB_OFFSET = 68;
 const HOST_DISK_MB_OFFSET = 72;
 const HOST_EMAIL_ADDRESS_OFFSET = 76;
+const HOST_ACCUMULATED_REWARD_OFFSET = 116;
 
 const PREV_HOST_ADDRESS_OFFSET = 0;
 const TRANSFER_LEDGER_IDX_OFFSET = 20;
@@ -15080,7 +15106,8 @@ class StateHelpers {
             cpuMicrosec: stateDataBuf.readUInt32BE(HOST_CPU_MICROSEC_OFFSET),
             ramMb: stateDataBuf.readUInt32BE(HOST_RAM_MB_OFFSET),
             diskMb: stateDataBuf.readUInt32BE(HOST_DISK_MB_OFFSET),
-            email: stateDataBuf.slice(HOST_EMAIL_ADDRESS_OFFSET, HOST_EMAIL_ADDRESS_OFFSET + HOST_EMAIL_ADDRESS_LEN).toString().toString().replace(/\0/g, '')
+            email: stateDataBuf.slice(HOST_EMAIL_ADDRESS_OFFSET, HOST_EMAIL_ADDRESS_OFFSET + HOST_EMAIL_ADDRESS_LEN).toString().toString().replace(/\0/g, ''),
+            accumulatedRewardAmount: XflHelpers.toString(stateDataBuf.readBigInt64BE(HOST_ACCUMULATED_REWARD_OFFSET))
         }
     }
 
@@ -15250,7 +15277,8 @@ class StateHelpers {
                     epochCount: stateData.readUInt8(EPOCH_COUNT_OFFSET),
                     firstEpochRewardQuota: stateData.readUInt32BE(FIRST_EPOCH_REWARD_QUOTA_OFFSET),
                     epochRewardAmount: stateData.readUInt32BE(EPOCH_REWARD_AMOUNT_OFFSET),
-                    rewardStartMoment: stateData.readUInt32BE(REWARD_START_MOMENT_OFFSET)
+                    rewardStartMoment: stateData.readUInt32BE(REWARD_START_MOMENT_OFFSET),
+                    accumulatedRewardFrequency: stateData.readUInt16BE(ACCUMULATED_REWARD_FREQUENCY_OFFSET)
                 }
             }
         }
@@ -15331,7 +15359,7 @@ class StateHelpers {
                     voteBaseCountChangedTimestamp: Number(stateData.readBigUInt64BE(VOTER_BASE_COUNT_CHANGED_TIMESTAMP_OFFSET)),
                     foundationLastVotedCandidateIdx: stateData.readUInt32BE(FOUNDATION_LAST_VOTED_CANDIDATE_IDX),
                     foundationLastVotedTimestamp: Number(stateData.readBigUInt64BE(FOUNDATION_LAST_VOTED_TIMESTAMP_OFFSET)),
-                    electedProposalUniqueId: stateData.readUInt32BE(ELECTED_PROPOSAL_UNIQUE_ID_OFFSET),
+                    electedProposalUniqueId: stateData.slice(ELECTED_PROPOSAL_UNIQUE_ID_OFFSET, PROPOSAL_ELECTED_TIMESTAMP_OFFSET).toString('hex').toUpperCase(),
                     proposalElectedTimestamp: Number(stateData.readBigUInt64BE(PROPOSAL_ELECTED_TIMESTAMP_OFFSET)),
                     updatedHookCount: stateData.readUInt8(UPDATED_HOOK_COUNT_OFFSET),
                     supportVoteSent: stateData.readUInt8(FOUNDATION_SUPPORT_VOTE_FLAG_OFFSET)
@@ -16437,6 +16465,35 @@ class XrplAccount {
         const hexUri = isHexUri ? uri : TransactionHelper.asciiToHex(uri).toUpperCase();
         return tokens.find(t => t.URI == hexUri);
     }
+
+
+    generateIssuedURITokenId(uri) {
+        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
+        }
+
+        let hash = crypto.createHash('sha512');
+
+        const typeBuf = Buffer.allocUnsafe(2);
+        typeBuf.writeInt16BE(URITOKEN_LEDGER_TYPE_PREFIX);
+
+        const dataBuf = Buffer.from(`${accIdHex}${uriHex}`, 'hex');
+
+        let output = hash.update(typeBuf);
+        output = hash.update(dataBuf);
+
+        const digest = output.digest('hex');
+
+        // Get the first 32 bytes of hash.
+        return digest.substring(0, 64).toUpperCase();
+    }
 }
 
 function makeAmountObject(amount, currency, issuer) {

package/package.json

@@ -6,7 +6,7 @@
     ],
     "homepage": "https://github.com/HotPocketDev/evernode-js-client",
     "license": "MIT",
-    "version": "0.5.17-beta-v3.1",
+    "version": "0.5.17-beta-v3.3",
     "dependencies": {
         "elliptic": "6.5.4",
         "libsodium-wrappers": "0.7.10",