From 496853ca72b298159de7994fcf9f4ccd48874907 Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 17 Nov 2021 20:32:46 +0300 Subject: [PATCH] fix dhc config --- src/dhtservers_observer/DHTserversObserver.js | 8 +++++--- src/wsserver.js | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/dhtservers_observer/DHTserversObserver.js b/src/dhtservers_observer/DHTserversObserver.js index 497bb5f..a3f6e70 100644 --- a/src/dhtservers_observer/DHTserversObserver.js +++ b/src/dhtservers_observer/DHTserversObserver.js @@ -27,9 +27,11 @@ class DHTserverObserver { get_dhtservers(config) { let ip_arr = [] let hexString - for (const dhtserver of config.data.dht) { - hexString = dhtserver.ip.toString(16); - ip_arr.push({ip: this.hex2dotted(hexString), port: dhtserver.port, time:0}) + for (const dhtserver of config.data.dht.static_nodes.nodes) { + for (const address of dhtserver.addr_list.addrs) { + hexString = address.ip.toString(16); + ip_arr.push({ip: this.hex2dotted(hexString), port: address.port, time:0}) + } } return ip_arr; } diff --git a/src/wsserver.js b/src/wsserver.js index e12b4d9..c4d14c8 100644 --- a/src/wsserver.js +++ b/src/wsserver.js @@ -2,6 +2,7 @@ const dotenv = require('dotenv').config() const WebSocket = require('ws'); var ServicesObserver = require('./services_observer/ServicesObserver'); var LiteserverObserver = require('./liteservers_observer/LiteserversObserver'); +var DHTserversObserver = require('./dhtservers_Observer/DHTserversObserver'); let {get_elections_data} = require('./request/validator/index') let {get_bsc_status, get_eth_status} = require('./request/bridge/index') @@ -11,10 +12,12 @@ module.exports = async function start_wsserver() let servicesObserver = new ServicesObserver() let liteserversObserver = await LiteserverObserver.build(dotenv.parsed.LITESERVER_CONFIG_URL) + let dhtserversObserver = await DHTserversObserver.build(dotenv.parsed.LITESERVER_CONFIG_URL) let lastData = JSON.stringify({ services: await servicesObserver.checkServices(), liteservers: liteserversObserver.liteservers, + dhtservers: dhtserversObserver.dhtservers, elections: get_elections_data(), bridge:{ eth:get_eth_status(), @@ -44,10 +47,12 @@ module.exports = async function start_wsserver() console.log("fetching data..."); await liteserversObserver.check_liteservers() + await dhtserversObserver.check_dhtservers() lastData = JSON.stringify({ services: await servicesObserver.checkServices(), liteservers: liteserversObserver.liteservers, + dhtservers: dhtserversObserver.dhtservers, elections: get_elections_data(), bridge:{ eth:get_eth_status(),