feat(core-p2p): allow to configure peer discovery (#1325)

ArkEcosystem · Nov 8, 2018 · 0b3f514 · 0b3f514
1 parent e9bf187
commit 0b3f514
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 25 deletions.
diff --git a/packages/core-config/__tests__/__stubs__/peers.json b/packages/core-config/__tests__/__stubs__/peers.json
@@ -1,4 +1,5 @@
 {
+  "discover": true,
   "blackList": [],
   "list": [{
     "ip": "127.0.0.1",

diff --git a/packages/core-error-tracker-sentry/jsdoc.json b/packages/core-error-tracker-sentry/jsdoc.json
diff --git a/packages/core-p2p/CHANGELOG.md b/packages/core-p2p/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Reject forgers as peers
 - Recovery after a fork
 - Enabled rate-limiting
+- Enable/Disable peer discovery
 
 ### Changed
 - Network state calculation (new internal/networkState) taking PBFT into account

diff --git a/packages/core-p2p/lib/monitor.js b/packages/core-p2p/lib/monitor.js
@@ -58,7 +58,7 @@ class Monitor {
   async updateNetworkStatus () {
     try {
       // TODO: for tests that involve peers we need to sync them
-      if (process.env.ARK_ENV !== 'test') {
+      if (process.env.ARK_ENV !== 'test' && config.peers.discover) {
         await this.discoverPeers()
         await this.cleanPeers()
       }
@@ -84,6 +84,11 @@ class Monitor {
    * @throws {Error} If invalid peer
    */
   async acceptNewPeer (peer) {
+    if (!config.peers.discover) {
+      logger.warn(`Rejected ${peer.ip} because the relay is in non-discovery mode.`)
+      return
+    }
+
     if (this.guard.isSuspended(peer) || this.guard.isMyself(peer) || process.env.ARK_ENV === 'test') {
       return
     }

diff --git a/packages/core-test-utils/config/testnet/peers.json b/packages/core-test-utils/config/testnet/peers.json
@@ -1,4 +1,5 @@
 {
+  "discover": true,
   "minimumVersion": ">=1.3.3",
   "minimumNetworkReach": 5,
   "globalTimeout": 5000,

diff --git a/packages/core/lib/config/devnet/peers.json b/packages/core/lib/config/devnet/peers.json
@@ -1,4 +1,5 @@
 {
+  "discover": true,
   "minimumVersion": ">=1.3.3",
   "minimumNetworkReach": 5,
   "globalTimeout": 5000,

diff --git a/packages/core/lib/config/mainnet/peers.json b/packages/core/lib/config/mainnet/peers.json
@@ -1,4 +1,5 @@
 {
+  "discover": true,
   "minimumVersion": ">=1.3.3",
   "minimumNetworkReach": 20,
   "globalTimeout": 5000,

diff --git a/packages/core/lib/config/testnet.1/peers.json b/packages/core/lib/config/testnet.1/peers.json
@@ -1,4 +1,5 @@
 {
+  "discover": true,
   "minimumVersion": ">=1.3.3",
   "minimumNetworkReach": 20,
   "globalTimeout": 5000,

diff --git a/packages/core/lib/config/testnet.2/peers.json b/packages/core/lib/config/testnet.2/peers.json
@@ -1,4 +1,5 @@
 {
+  "discover": true,
   "minimumVersion": ">=1.3.3",
   "minimumNetworkReach": 20,
   "globalTimeout": 5000,

diff --git a/packages/core/lib/config/testnet.live/peers.json b/packages/core/lib/config/testnet.live/peers.json
@@ -1,4 +1,5 @@
 {
+  "discover": true,
   "minimumVersion": ">=1.3.3",
   "minimumNetworkReach": 10,
   "blackList": [],

diff --git a/packages/core/lib/config/testnet/peers.json b/packages/core/lib/config/testnet/peers.json
@@ -1,4 +1,5 @@
 {
+  "discover": true,
   "minimumVersion": ">=1.3.3",
   "minimumNetworkReach": 5,
   "globalTimeout": 5000,