evernode-js-client 0.6.49 → 0.6.51

package/index.js

@@ -59620,6 +59620,9 @@ class BaseEvernodeClient {
         if (!options.xrplApi && !Defaults.values.xrplApi)
             this.#ownsXrplApi = true;
 
+        if (options.config)
+            this.config = options.config;
+
         this.xrplAcc = new XrplAccount(xrpAddress, xrpSecret, { xrplApi: this.xrplApi });
         this.accKeyPair = xrpSecret && this.xrplAcc.deriveKeypair();
         this.messagePrivateKey = options.messagePrivateKey || (this.accKeyPair ? this.accKeyPair.privateKey : null);
@@ -59665,7 +59668,7 @@ class BaseEvernodeClient {
      * Connects the client to xrpl server and do the config loading and subscriptions. 'subscribe' is called inside this.
      * @returns boolean value, 'true' if success.
      */
-    async connect() {
+    async connect(options = {}) {
         if (this.connected)
             return true;
 
@@ -59675,7 +59678,9 @@ class BaseEvernodeClient {
         // identify a network reset from XRPL. 
         await this.xrplAcc.getInfo();
 
-        this.config = await this.#getEvernodeConfig();
+        if (!this.config && !options.skipConfigs)
+            this.config = await this.#getEvernodeConfig();
+
         this.connected = true;
 
         if (this.#autoSubscribe)
@@ -59764,7 +59769,6 @@ class BaseEvernodeClient {
      * @returns An object with all the configuration and their values.
      */
     async #getEvernodeConfig() {
-        let states = await this.getHookStates();
         const configStateKeys = {
             registryAddress: HookStateKeys.REGISTRY_ADDR,
             heartbeatAddress: HookStateKeys.HEARTBEAT_ADDR,
@@ -59788,12 +59792,12 @@ class BaseEvernodeClient {
         }
         let config = {};
         for (const [key, value] of Object.entries(configStateKeys)) {
-            const stateKey = Buffer.from(value, 'hex');
-            const stateDataBin = StateHelpers.getStateData(states, value);
-            if (stateDataBin) {
-                const stateData = Buffer.from(StateHelpers.getStateData(states, value), 'hex');
-                const decoded = StateHelpers.decodeStateData(stateKey, stateData);
-                config[key] = decoded.value;
+            const index = StateHelpers.getHookStateIndex(this.governorAddress, value);
+            const ledgerEntry = await this.xrplApi.getLedgerEntry(index);
+            const stateData = ledgerEntry?.HookStateData;
+            if (stateData) {
+                const stateDecoded = StateHelpers.decodeStateData(Buffer.from(value, 'hex'), Buffer.from(stateData, 'hex'));
+                config[key] = stateDecoded.value;
             }
         }
         return config;
@@ -60485,13 +60489,63 @@ class BaseEvernodeClient {
         return null;
     }
 
+    async getReputationAddressByOrderId(hostReputationOrderedId, moment = null) {
+        try {
+            const repMoment = moment ?? await this.getMoment();
+            const orderedIdStateKey = StateHelpers.generateHostReputationOrderedIdStateKey(hostReputationOrderedId, repMoment);
+            const orderedIdStateIndex = StateHelpers.getHookStateIndex(this.xrplAcc.address, orderedIdStateKey);
+            const orderedIdLedgerEntry = await this.xrplApi.getLedgerEntry(orderedIdStateIndex);
+            const orderedIdStateData = orderedIdLedgerEntry?.HookStateData;
+
+            if (orderedIdStateData) {
+                const orderedIdStateDecoded = StateHelpers.decodeHostReputationOrderedIdState(Buffer.from(orderedIdStateKey, 'hex'), Buffer.from(orderedIdStateData, 'hex'));
+                return orderedIdStateDecoded;
+            }
+        }
+        catch (e) {
+            // If the exception is entryNotFound from Rippled there's no entry for the host, So return null.
+            if (e?.data?.error !== 'entryNotFound')
+                throw e;
+        }
+
+        return null;
+    }
+
     /**
      * Get reputation info of given host.
      * @param {string} hostReputationAddress Host's reputation address.
      * @param {number} moment (optional) Moment to get reputation info for.
      * @returns Reputation info object.
      */
-    async _getReputationInfoByAddress(hostReputationAddress, moment = null) {
+    async getReputationOrderByAddress(hostReputationAddress, moment = null) {
+        try {
+            const repMoment = moment ?? await this.getMoment();
+            const orderedAddrStateKey = StateHelpers.generateHostReputationOrderAddressStateKey(hostReputationAddress, repMoment);
+            const orderedAddrStateIndex = StateHelpers.getHookStateIndex(this.config.reputationAddress, orderedAddrStateKey);
+            const orderedAddrLedgerEntry = await this.xrplApi.getLedgerEntry(orderedAddrStateIndex);
+            const orderedAddrStateData = orderedAddrLedgerEntry?.HookStateData;
+
+            if (orderedAddrStateData) {
+                const orderedAddrStateDecoded = StateHelpers.decodeHostReputationOrderAddressState(Buffer.from(orderedAddrStateKey, 'hex'), Buffer.from(orderedAddrStateData, 'hex'));
+                return orderedAddrStateDecoded;
+            }
+        }
+        catch (e) {
+            // If the exception is entryNotFound from Rippled there's no entry for the host, So return null.
+            if (e?.data?.error !== 'entryNotFound')
+                throw e;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get reputation info of given host.
+     * @param {string} hostReputationAddress Host's reputation address.
+     * @param {number} moment (optional) Moment to get reputation info for.
+     * @returns Reputation info object.
+     */
+    async getReputationInfoByAddress(hostReputationAddress, moment = null) {
         try {
             const addrStateKey = StateHelpers.generateHostReputationAddrStateKey(hostReputationAddress);
             const addrStateIndex = StateHelpers.getHookStateIndex(this.config.reputationAddress, addrStateKey);
@@ -60505,15 +60559,6 @@ class BaseEvernodeClient {
             }
 
             const repMoment = moment ?? await this.getMoment();
-            const orderedAddrStateKey = StateHelpers.generateHostReputationOrderAddressStateKey(hostReputationAddress, repMoment);
-            const orderedAddrStateIndex = StateHelpers.getHookStateIndex(this.config.reputationAddress, orderedAddrStateKey);
-            const orderedAddrLedgerEntry = await this.xrplApi.getLedgerEntry(orderedAddrStateIndex);
-            const orderedAddrStateData = orderedAddrLedgerEntry?.HookStateData;
-
-            if (orderedAddrStateData) {
-                const orderedAddrStateDecoded = StateHelpers.decodeHostReputationOrderAddressState(Buffer.from(orderedAddrStateKey, 'hex'), Buffer.from(orderedAddrStateData, 'hex'));
-                data = { ...data, ...orderedAddrStateDecoded };
-            }
 
             const hostRepAcc = new XrplAccount(hostReputationAddress, null, { xrplApi: this.xrplApi });
             const [wl, rep] = await Promise.all([
@@ -60922,26 +60967,39 @@ class HookClientFactory {
      * @param {string} hookType Type of the Required Hook. (Supported Hook types 'GOVERNOR', 'REGISTRY' and 'HEARTBEAT')
      * @returns Instance of requested HookClient type.
      */
-    static async create(hookType) {
+    static async create(hookType, options = {}) {
+        let governorClient;
+        if (hookType !== HookTypes.governor && !options.config) {
+            governorClient = new GovernorClient(options);
+            try {
+                await governorClient.connect();
+                options.config = governorClient.config;
+            } catch (error) {
+                throw (error)
+            } finally {
+                await governorClient.disconnect();
+            }
+        }
+
         let hookClient;
         switch (hookType) {
             case HookTypes.governor: {
-                hookClient = new GovernorClient();
+                hookClient = new GovernorClient(options);
                 break;
             }
             case HookTypes.registry: {
-                const registryAddress = await HookClientFactory.#getAccountAddress(hookType);
-                hookClient = new RegistryClient({ registryAddress: registryAddress });
+                const registryAddress = await HookClientFactory.#getAccountAddress(hookType, options.config);
+                hookClient = new RegistryClient({ ...options, registryAddress: registryAddress });
                 break;
             }
             case HookTypes.heartbeat: {
-                const heartbeatAddress = await HookClientFactory.#getAccountAddress(hookType);
-                hookClient = new HeartbeatClient({ heartbeatAddress: heartbeatAddress });
+                const heartbeatAddress = await HookClientFactory.#getAccountAddress(hookType, options.config);
+                hookClient = new HeartbeatClient({ ...options, heartbeatAddress: heartbeatAddress });
                 break;
             }
             case HookTypes.reputation: {
-                const reputationAddress = await HookClientFactory.#getAccountAddress(hookType);
-                hookClient = new ReputationClient({ reputationAddress: reputationAddress });
+                const reputationAddress = await HookClientFactory.#getAccountAddress(hookType, options.config);
+                hookClient = new ReputationClient({ ...options, reputationAddress: reputationAddress });
                 break;
             }
             default: {
@@ -60953,25 +61011,13 @@ class HookClientFactory {
         return hookClient;
     }
 
-    static async #getAccountAddress(hookType) {
-        const governorHook = await HookClientFactory.create(HookTypes.governor);
-
-        let configs;
-        try {
-            await governorHook.connect();
-            configs = governorHook.config;
-        } catch (error) {
-            throw (error)
-        } finally {
-            await governorHook.disconnect();
-        }
-
+    static async #getAccountAddress(hookType, config) {
         if (hookType == HookTypes.registry)
-            return configs.registryAddress;
+            return config.registryAddress;
         else if (hookType == HookTypes.heartbeat)
-            return configs.heartbeatAddress;
+            return config.heartbeatAddress;
         else if (hookType == HookTypes.reputation)
-            return configs.reputationAddress;
+            return config.reputationAddress;
     }
 }
 
@@ -61024,8 +61070,11 @@ module.exports = {
 /***/ 7541:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+const codec = __nccwpck_require__(597);
 const { StateHelpers } = __nccwpck_require__(3860);
+const { XrplAccount } = __nccwpck_require__(9329);
 const { BaseEvernodeClient } = __nccwpck_require__(6263);
+const { ReputationConstants } = __nccwpck_require__(9849);
 
 const ReputationEvents = {}
 
@@ -61035,6 +61084,53 @@ class ReputationClient extends BaseEvernodeClient {
         super(options.reputationAddress, null, Object.values(ReputationEvents), false, options);
     }
 
+    async getReputationContractInfoByOrderedId(hostReputationOrderedId, moment = null) {
+        try {
+            const repMoment = moment ?? await this.getMoment();
+            const addressInfo = await this.getReputationAddressByOrderId(hostReputationOrderedId, repMoment);
+            if (addressInfo?.address) {
+                let data = addressInfo;
+
+                const hostRepAcc = new XrplAccount(addressInfo?.address, null, { xrplApi: this.xrplApi });
+                const [wl, rep] = await Promise.all([
+                    hostRepAcc.getWalletLocator(),
+                    hostRepAcc.getDomain()]);
+
+                if (wl && rep && rep.length > 0) {
+                    const hostReputationAccId = wl.slice(0, 40);
+                    const hostAddress = codec.encodeAccountID(Buffer.from(hostReputationAccId, 'hex'));
+                    const hostAcc = new XrplAccount(hostAddress, null, { xrplApi: this.xrplApi });
+
+                    const repBuf = Buffer.from(rep, 'hex');
+                    const publicKey = repBuf.slice(0, ReputationConstants.REP_INFO_PEER_PORT_OFFSET).toString('hex').toLocaleLowerCase();
+                    const peerPort = repBuf.readUInt16LE(ReputationConstants.REP_INFO_PEER_PORT_OFFSET);
+                    const instanceMoment = (repBuf.length > ReputationConstants.REP_INFO_MOMENT_OFFSET) ? Number(repBuf.readBigUInt64LE(ReputationConstants.REP_INFO_MOMENT_OFFSET)) : null;
+                    const domain = await hostAcc.getDomain();
+
+                    if (instanceMoment === repMoment) {
+                        data = {
+                            ...data,
+                            contract: {
+                                domain: domain,
+                                pubkey: publicKey,
+                                peerPort: peerPort
+                            }
+                        }
+                    }
+                }
+                return data;
+            }
+
+        }
+        catch (e) {
+            // If the exception is entryNotFound from Rippled there's no entry for the host, So return null.
+            if (e?.data?.error !== 'entryNotFound')
+                throw e;
+        }
+
+        return null;
+    }
+
     /**
      * Get reputation info of given host reputation orderId.
      * @param {number} hostReputationOrderedId Reputation order id of the host.
@@ -61044,14 +61140,11 @@ class ReputationClient extends BaseEvernodeClient {
     async getReputationInfoByOrderedId(hostReputationOrderedId, moment = null) {
         try {
             const repMoment = moment ?? await this.getMoment();
-            const orderedIdStateKey = StateHelpers.generateHostReputationOrderedIdStateKey(hostReputationOrderedId, repMoment);
-            const orderedIdStateIndex = StateHelpers.getHookStateIndex(this.xrplAcc.address, orderedIdStateKey);
-            const orderedIdLedgerEntry = await this.xrplApi.getLedgerEntry(orderedIdStateIndex);
-            const orderedIdStateData = orderedIdLedgerEntry?.HookStateData;
+            const addressInfo = this.getReputationAddressByOrderId(hostReputationOrderedId, repMoment);
 
-            if (orderedIdStateData) {
-                const orderedIdStateDecoded = StateHelpers.decodeHostReputationOrderedIdState(Buffer.from(orderedIdStateKey, 'hex'), Buffer.from(orderedIdStateData, 'hex'));
-                return await this._getReputationInfoByAddress(orderedIdStateDecoded.address, moment);
+            if (addressInfo?.address) {
+                const info = await this.getReputationInfoByAddress(addressInfo?.address, repMoment);
+                return info ? { ...addressInfo, ...info } : addressInfo;
             }
         }
         catch (e) {
@@ -61162,7 +61255,7 @@ class HostClient extends BaseEvernodeClient {
     }
 
     async connect(options = {}) {
-        const res = await super.connect();
+        const res = await super.connect(options);
         await this.setReputationAcc(options.reputationAddress, options.reputationSecret);
         return res;
     }
@@ -61398,7 +61491,22 @@ class HostClient extends BaseEvernodeClient {
         if (!this.reputationAcc)
             return null;
 
-        return await this._getReputationInfoByAddress(this.reputationAcc.address, moment);
+        try {
+            const repMoment = moment ?? await this.getMoment();
+            const orderInfo = await this.getReputationOrderByAddress(this.reputationAcc.address, repMoment);
+
+            if (orderInfo?.orderedId) {
+                const info = await this.getReputationInfoByAddress(this.reputationAcc.address, repMoment);
+                return info ? { ...orderInfo, ...info } : orderInfo;
+            }
+        }
+        catch (e) {
+            // If the exception is entryNotFound from Rippled there's no entry for the host, So return null.
+            if (e?.data?.error !== 'entryNotFound')
+                throw e;
+        }
+
+        return null;
     }
 
     /**
@@ -61407,7 +61515,10 @@ class HostClient extends BaseEvernodeClient {
      * @returns Unified reputation score array.
      */
     async prepareHostReputationScores(collectedScores = {}) {
-        const myReputationInfo = await this.getReputationInfo();
+        const myReputationInfo = await this.getReputationOrderByAddress(this.reputationAcc.address);
+        if (!myReputationInfo?.orderedId)
+            throw 'You are not registered for reputation for this moment.';
+
         const myOrderId = myReputationInfo.orderedId;
 
         // Deciding universe.
@@ -61418,7 +61529,7 @@ class HostClient extends BaseEvernodeClient {
         let data = {};
         await Promise.all(Array.from({ length: 64 }, (_, i) => i + universeStartIndex).map(async (i) => {
             try {
-                const hostReputationInfo = await reputationClient.getReputationInfoByOrderedId(i);
+                const hostReputationInfo = await reputationClient.getReputationContractInfoByOrderedId(i);
                 if (!hostReputationInfo)
                     throw 'No reputation info for this order id';
                 data[i.toString()] = {
@@ -65484,7 +65595,6 @@ const { TransactionHelper } = __nccwpck_require__(7071);
 const { XrplApiEvents } = __nccwpck_require__(3307);
 const { XrplAccount } = __nccwpck_require__(9329);
 const { XrplHelpers } = __nccwpck_require__(3189);
-const { UtilHelpers } = __nccwpck_require__(6687);
 
 const MAX_PAGE_LIMIT = 400;
 const API_REQ_TYPE = {
@@ -65535,7 +65645,7 @@ class XrplApi {
     }
 
     async #acquireClient() {
-        while (!(this.#isPrimaryServerConnected || this.#isFallbackServerConnected) && this.#isClientAcquired || this.#isConnectionAcquired) {
+        while (!(this.#isPrimaryServerConnected || this.#isFallbackServerConnected) && this.#isClientAcquired) {
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
         this.#isClientAcquired = true;
@@ -65546,7 +65656,7 @@ class XrplApi {
     }
 
     async #acquireConnection() {
-        while (this.#isClientAcquired) {
+        while (this.#isConnectionAcquired) {
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
         this.#isConnectionAcquired = true;
@@ -65581,8 +65691,6 @@ class XrplApi {
 
         if (!FUNCTIONING_SERVER_STATES.includes(serverState))
             throw "Client might have functioning issues."
-
-        await this.#setXrplClient(client);
     }
 
     async #initEventListeners(client) {
@@ -65597,6 +65705,10 @@ class XrplApi {
             console.log(errorCode + ': ' + errorMessage);
         });
 
+        client.on('connected', async () => {
+            await this.#setXrplClient(client)
+        });
+
         client.on('disconnected', async (code) => {
             this.#events.emit(XrplApiEvents.DISCONNECTED, code);
 
@@ -65698,50 +65810,51 @@ class XrplApi {
         });
     }
 
-    async #attemptFallbackServerReconnect(maxAttempts = null) {
+    async #attemptFallbackServerReconnect(maxRounds, attemptsPerServer = 3) {
         if (!this.#fallbackServers || this.#fallbackServers?.length == 0)
             return;
 
         await this.#acquireClient();
 
-        let errors = {};
-        let attempt = 0;
-        retryIterator:
-        while (!this.#isPermanentlyDisconnected && !this.#isPrimaryServerConnected && !this.#isFallbackServerConnected) { // Keep attempting until consumer calls disconnect() manually or if the primary server is disconnected.
-            ++attempt;
-            for (const server of this.#fallbackServers) {
-                const client = new xrpl.Client(server, this.#xrplClientOptions);
-                try {
-                    if (!this.#isPrimaryServerConnected) {
-                        await this.#handleClientConnect(client);
-                        this.#isFallbackServerConnected = true;
+        const fallbackServers = this.#fallbackServers;
+        let round = 0;
+        while (!this.#isPermanentlyDisconnected && !this.#isPrimaryServerConnected && !this.#isFallbackServerConnected && (!maxRounds || round < maxRounds)) { // Keep attempting until consumer calls disconnect() manually or if the primary server is disconnected.
+            ++round;
+            serverIterator:
+            for (let serverIndex in fallbackServers) {
+                const server = fallbackServers[serverIndex];
+                for (let attempt = 0; attempt < attemptsPerServer;) {
+                    if (this.#isPrimaryServerConnected || this.#isPermanentlyDisconnected) {
+                        break serverIterator;
                     }
-                    break retryIterator;
-                }
-                catch (e) {
-                    this.#releaseClient();
-                    console.log(`Error occurred while connecting to fallback server ${server}`);
-                    await new Promise(resolve => setTimeout(resolve, 1000));
-                    if (client.isConnected()) {
-                        console.log('Connection closure already handled');
-                        await client.disconnect();
+                    ++attempt;
+                    const client = new xrpl.Client(server, this.#xrplClientOptions);
+                    try {
+                        if (!this.#isPrimaryServerConnected) {
+                            await this.#handleClientConnect(client);
+                            this.#isFallbackServerConnected = true;
+                        }
+                        break serverIterator;
                     }
-
-                    if (!this.#isPermanentlyDisconnected) {
-                        const delaySec = 2 * attempt; // Retry with backoff delay.
-                        if (!maxAttempts || attempt < maxAttempts)
-                            console.log(`Fallback server ${server} connection attempt ${attempt} failed. Retrying in ${delaySec}s...`);
-                        else {
-                            errors[server] = { error: `Fallback server ${server} connection max attempts failed.`, exception: e };
+                    catch (e) {
+                        this.#releaseClient();
+                        console.log(`Error occurred while connecting to fallback server ${server}`);
+                        await new Promise(resolve => setTimeout(resolve, 1000));
+                        if (client.isConnected()) {
+                            console.log('Connection closure already handled');
+                            await client.disconnect();
                         }
 
-                        await new Promise(resolve => setTimeout(resolve, delaySec * 1000));
+                        if (!this.#isPermanentlyDisconnected) {
+                            if (!maxRounds || round < maxRounds)
+                                console.log(`Fallback server ${server} connection attempt ${attempt} failed. Retrying in ${2 * round}s...`);
+                            else
+                                return { error: `Fallback server ${server} connection max attempts failed.`, exception: e };
+                            await new Promise(resolve => setTimeout(resolve, 2 * round * 1000));
+                        }
                     }
                 }
             }
-
-            if (maxAttempts && attempt >= maxAttempts)
-                return { error: Object.values(errors) };
         }
 
         return {};
@@ -65793,9 +65906,9 @@ class XrplApi {
         }
         else {
             if (this.#primaryServer) {
-                res = await Promise.all([this.#attemptPrimaryServerReconnect(1), this.#attemptFallbackServerReconnect(1)]);
+                res = await Promise.all([this.#attemptPrimaryServerReconnect(1), this.#attemptFallbackServerReconnect(1, 1)]);
             } else {
-                res = [await this.#attemptFallbackServerReconnect(1)];
+                res = [await this.#attemptFallbackServerReconnect(1, 1)];
             }
         }
 
@@ -65925,7 +66038,7 @@ class XrplApi {
         const info = await this.getAccountInfo(address);
         const accountFlags = xrpl.parseAccountRootFlags(info.Flags);
         const regularKey = info.RegularKey;
-        const derivedPubKeyAddress = UtilHelpers.deriveAddress(publicKey);
+        const derivedPubKeyAddress = kp.deriveAddress(publicKey);
 
         // If the master key is disabled the derived pubkey address should be the regular key.
         // Otherwise it could be account address or the regular key

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.49",
+    "version": "0.6.51",
     "dependencies": {
         "elliptic": "6.5.4",
         "libsodium-wrappers": "0.7.10",