evernode-js-client 0.4.47 → 0.4.48

package/index.js

@@ -12062,17 +12062,26 @@ class BaseEvernodeClient {
     // To get Host details from Hook States.
     async getHostInfo(hostAddress = this.xrplAcc.address) {
         try {
-            const hostAddrStatekey = StateHelpers.generateHostAddrStateKey(hostAddress);
-            const stateLedgerIndex = StateHelpers.getHookStateIndex(this.registryAddress, hostAddrStatekey);
-            const ledgerEntry = await this.xrplApi.getLedgerEntry(stateLedgerIndex);
-            const curMomentStartIdx = await this.getMomentStartIndex();
-            if (ledgerEntry?.HookStateData) {
-                const hostAddrStateData = ledgerEntry.HookStateData;
-                const hostInfo = StateHelpers.decodeHostAddressState(Buffer.from(hostAddrStatekey, 'hex'), Buffer.from(hostAddrStateData, 'hex'));
-                hostInfo.active = (hostInfo.lastHeartbeatLedger > (this.config.hostHeartbeatFreq * this.config.momentSize) ?
-                    (hostInfo.lastHeartbeatLedger >= (curMomentStartIdx - (this.config.hostHeartbeatFreq * this.config.momentSize))) :
-                    (hostInfo.lastHeartbeatLedger > 0))
-                return hostInfo;
+            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) {
@@ -12628,9 +12637,9 @@ class TenantClient extends BaseEvernodeClient {
 
         // Check whether active.
         const hostInfo = await this.getHostInfo(host.address);
-        if (hostInfo)
+        if (!hostInfo)
             throw { reason: ErrorReasons.HOST_INVALID, error: "Host is not registered." };
-        else if (hostInfo.active)
+        else if (!hostInfo.active)
             throw { reason: ErrorReasons.HOST_INACTIVE, error: "Host is not active." };
 
         return host;
@@ -13615,7 +13624,7 @@ 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;
@@ -13671,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),

package/package.json

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