evernode-js-client 0.4.45 → 0.4.48

package/index.js

@@ -11716,6 +11716,7 @@ const { EventEmitter } = __nccwpck_require__(6170);
 const { UtilHelpers } = __nccwpck_require__(6687);
 const { FirestoreHandler } = __nccwpck_require__(9718);
 const { XflHelpers } = __nccwpck_require__(3243);
+const { StateHelpers } = __nccwpck_require__(3860);
 
 class BaseEvernodeClient {
 
@@ -11802,13 +11803,11 @@ class BaseEvernodeClient {
 
     async getHookStates() {
         const regAcc = new XrplAccount(this.registryAddress, null, { xrplApi: this.xrplApi });
-        const hookNamespaces = (await regAcc.getInfo())?.HookNamespaces;
-        if (hookNamespaces) {
-            const configs = await regAcc.getNamespaceEntries(hookNamespaces[0]);
+        const configs = await regAcc.getNamespaceEntries(EvernodeConstants.HOOK_NAMESPACE);
+
+        if (configs)
             return configs.filter(c => c.LedgerEntryType === 'HookState').map(c => { return { key: c.HookStateKey, data: c.HookStateData } });
-        }
         return [];
-
     }
 
     async getMoment(ledgerIndex = null) {
@@ -12060,6 +12059,40 @@ class BaseEvernodeClient {
         return null;
     }
 
+    // To get Host details from Hook States.
+    async getHostInfo(hostAddress = this.xrplAcc.address) {
+        try {
+            const addrStateKey = StateHelpers.generateHostAddrStateKey(hostAddress);
+            const addrStateIndex = StateHelpers.getHookStateIndex(this.registryAddress, addrStateKey);
+            const addrLedgerEntry = await this.xrplApi.getLedgerEntry(addrStateIndex);
+            const addrStateData = addrLedgerEntry?.HookStateData;
+            if (addrStateData) {
+                const addrStateDecoded = StateHelpers.decodeHostAddressState(Buffer.from(addrStateKey, 'hex'), Buffer.from(addrStateData, 'hex'));
+                const curMomentStartIdx = await this.getMomentStartIndex();
+                addrStateDecoded.active = (addrStateDecoded.lastHeartbeatLedger > (this.config.hostHeartbeatFreq * this.config.momentSize) ?
+                    (addrStateDecoded.lastHeartbeatLedger >= (curMomentStartIdx - (this.config.hostHeartbeatFreq * this.config.momentSize))) :
+                    (addrStateDecoded.lastHeartbeatLedger > 0))
+
+                const nftIdStatekey = StateHelpers.generateTokenIdStateKey(addrStateDecoded.nfTokenId);
+                const nftIdStateIndex = StateHelpers.getHookStateIndex(this.registryAddress, nftIdStatekey);
+                const nftIdLedgerEntry = await this.xrplApi.getLedgerEntry(nftIdStateIndex);
+                
+                const nftIdStateData = nftIdLedgerEntry?.HookStateData;
+                if (nftIdStateData) {
+                    const nftIdStateDecoded = StateHelpers.decodeTokenIdState(Buffer.from(nftIdStateData, 'hex'));
+                    return {...addrStateDecoded, ...nftIdStateDecoded};
+                }
+            }
+        }
+        catch (e) {
+            // If the exeption is entryNotFound from Rippled there's no entry for the host, So return null.
+            if (e?.data?.error !== 'entryNotFound')
+                throw e;
+        }
+
+        return null;
+    }
+
     // To fetch records from host collection in Firestore database. (Pagination is applied - default page size :20)
     async getHosts(filters = null, pageSize = null, nextPageToken = null) {
         const hosts = await this.#firestoreHandler.getHosts(filters, pageSize, nextPageToken);
@@ -12165,9 +12198,8 @@ class HostClient extends BaseEvernodeClient {
         // Check whether we own an evernode host token.
         const nft = await this.getRegistrationNft();
         if (nft) {
-            const host = await this.getHosts({ nfTokenId: nft.NFTokenID });
-            if (host && host.length == 1)
-                return host[0];
+            const host = await this.getHostInfo();
+            return (host?.nfTokenId == nft.NFTokenID) ? host : null;
         }
 
         return null;
@@ -12266,10 +12298,10 @@ class HostClient extends BaseEvernodeClient {
         // from the client-side in order to complete the registration.
         const regNft = await this.getRegistrationNft();
         if (!regNft) {
-            const regInfo = await this.getHosts({ address: this.xrplAcc.address });
-            if (regInfo.length !== 0) {
+            const regInfo = await this.getHostInfo(this.xrplAcc.address);
+            if (regInfo) {
                 const registryAcc = new XrplAccount(this.registryAddress, null, { xrplApi: this.xrplApi });
-                const sellOffer = (await registryAcc.getNftOffers()).find(o => o.NFTokenID == regInfo[0].nfTokenId);
+                const sellOffer = (await registryAcc.getNftOffers()).find(o => o.NFTokenID == regInfo.nfTokenId);
                 if (sellOffer) {
                     await this.xrplAcc.buyNft(sellOffer.index);
                     console.log("Registration was successfully completed after acquiring the NFT.");
@@ -12516,7 +12548,7 @@ class RegistryClient extends BaseEvernodeClient {
             while (currentPageToken) {
                 nextHosts = await this.getHosts(null, null, currentPageToken);
                 fullHostList = fullHostList.concat(nextHosts.nextPageToken ? nextHosts.data : nextHosts);
-                currentPageToken = nextHosts.nextPageToken;   
+                currentPageToken = nextHosts.nextPageToken;
             }
         } else {
             fullHostList = fullHostList.concat(hosts);
@@ -12604,10 +12636,10 @@ class TenantClient extends BaseEvernodeClient {
             throw { reason: ErrorReasons.HOST_INVALID, error: "Host is not registered." };
 
         // Check whether active.
-        const hosts = await this.getHosts({ address: host.address });
-        if (!hosts || !hosts.length)
+        const hostInfo = await this.getHostInfo(host.address);
+        if (!hostInfo)
             throw { reason: ErrorReasons.HOST_INVALID, error: "Host is not registered." };
-        else if (!hosts[0].active)
+        else if (!hostInfo.active)
             throw { reason: ErrorReasons.HOST_INACTIVE, error: "Host is not active." };
 
         return host;
@@ -12620,7 +12652,7 @@ class TenantClient extends BaseEvernodeClient {
 
         // Attempt to get first available offer, if offer is not specified in options.
         if (!selectedOfferIndex) {
-            const nftOffers = EvernodeHelpers.getLeaseOffers(hostAcc);
+            const nftOffers = await EvernodeHelpers.getLeaseOffers(hostAcc);
             selectedOfferIndex = nftOffers && nftOffers[0] && nftOffers[0].index;
 
             if (!selectedOfferIndex)
@@ -12751,7 +12783,7 @@ module.exports = {
 /***/ ((module) => {
 
 const DefaultValues = {
-    registryAddress: 'rDPqJv7zu6DfeXexAYseABNM2hT2j2rpHv',
+    registryAddress: 'raaFre81618XegCrzTzVotAmarBcqNSAvK',
     rippledServer: 'wss://hooks-testnet-v2.xrpl-labs.com',
     xrplApi: null,
     stateIndexId: 'evernodeindex'
@@ -13142,7 +13174,8 @@ module.exports = {
 const EvernodeConstants = {
     EVR: 'EVR',
     NFT_PREFIX_HEX: '657672686F7374', // evrhost
-    LEASE_NFT_PREFIX_HEX: '6576726C65617365' // evrlease
+    LEASE_NFT_PREFIX_HEX: '6576726C65617365', // evrlease
+    HOOK_NAMESPACE: '01EAF09326B4911554384121FF56FA8FECC215FDDE2EC35D9E59F2C53EC665A0'
 }
 
 const MemoTypes = {
@@ -13587,10 +13620,11 @@ module.exports = {
 
 const codec = __nccwpck_require__(597);
 const { Buffer } = __nccwpck_require__(4300);
-const { HookStateKeys } = __nccwpck_require__(9849);
+const { HookStateKeys, EvernodeConstants } = __nccwpck_require__(9849);
 const { XflHelpers } = __nccwpck_require__(3243);
+const crypto = __nccwpck_require__(6113);
 
-const NFTOKEN_PREFIX = '00080000';
+const NFTOKEN_PREFIX = '00000000';
 
 const HOST_TOKEN_ID_OFFSET = 0;
 const HOST_COUNTRY_CODE_OFFSET = 32;
@@ -13618,6 +13652,7 @@ const STATE_KEY_TYPES = {
 
 const EVERNODE_PREFIX = 'EVR';
 const HOST_ADDR_KEY_ZERO_COUNT = 8;
+const HOOK_STATE_LEDGER_TYPE_PREFIX = 118; // Decimal value of ASCII 'v'
 
 class StateHelpers {
     static StateTypes = {
@@ -13645,7 +13680,7 @@ class StateHelpers {
     static decodeTokenIdState(stateDataBuf) {
         return {
             address: codec.encodeAccountID(stateDataBuf.slice(HOST_ADDRESS_OFFSET, HOST_CPU_MODEL_NAME_OFFSET)),
-            cpuModelName: stateDataBuf.slice(HOST_CPU_MODEL_NAME_OFFSET, HOST_CPU_COUNT_OFFSET).toString(),
+            cpuModelName: stateDataBuf.slice(HOST_CPU_MODEL_NAME_OFFSET, HOST_CPU_COUNT_OFFSET).toString().replace(/\x00+$/, ''), // Remove trailing \x00 characters.
             cpuCount: stateDataBuf.readUInt16BE(HOST_CPU_COUNT_OFFSET),
             cpuMHz: stateDataBuf.readUInt16BE(HOST_CPU_SPEED_OFFSET),
             cpuMicrosec: stateDataBuf.readUInt32BE(HOST_CPU_MICROSEC_OFFSET),
@@ -13795,6 +13830,26 @@ class StateHelpers {
         const stateKeyBuf = Buffer.concat([Buffer.from(EVERNODE_PREFIX, "utf-8"), buf, addrBuf]);
         return stateKeyBuf.toString('hex').toUpperCase();
     }
+
+    static  getHookStateIndex(hookAccount, stateKey, hookNamespace = EvernodeConstants.HOOK_NAMESPACE) {
+        const typeBuf = Buffer.allocUnsafe(2);
+        typeBuf.writeInt16BE(HOOK_STATE_LEDGER_TYPE_PREFIX);
+
+        const accIdBuf = codec.decodeAccountID(hookAccount);
+        const stateKeyBuf = Buffer.from(stateKey, 'hex');
+        const namespaceBuf = Buffer.from(hookNamespace, 'hex');
+
+        let hash = crypto.createHash('sha512');
+
+        let data = hash.update(typeBuf);
+        data = hash.update(accIdBuf);
+        data = hash.update(stateKeyBuf);
+        data = hash.update(namespaceBuf);
+
+        const digest = data.digest('hex');
+        // Get the first 32 bytes of hash.
+        return digest.substring(0, 64).toUpperCase();
+    }
 }
 
 module.exports = {
@@ -14757,6 +14812,11 @@ class XrplApi {
         return [];
     }
 
+    async getLedgerEntry(index, options) {
+        const resp = (await this.#client.request({ command: 'ledger_entry', index: index, ledger_index: "validated", ...options }));
+        return resp?.result?.node;
+    }
+
     async submitAndVerify(tx, options) {
         return await this.#client.submitAndWait(tx, options);
     }

package/package.json

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