Merge pull request #596 from wavesplatform/node-271-increased-defalul…

…t-blacklist-time Node 271 increased defalult blacklist time
wavesplatform · Oct 13, 2017 · f2b18ce · f2b18ce
2 parents fe2ae1f + 2aa2120
commit f2b18ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -48,7 +48,7 @@ waves {
     peers-data-residence-time = 1d
 
     # How long peer stays in blacklist after getting in it
-    black-list-residence-time = 1m
+    black-list-residence-time = 10m
 
     # How many network inbound network connections can be made
     max-inbound-connections = 30

diff --git a/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala b/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala
@@ -66,7 +66,7 @@ object FunctionalitySettings {
     allowMultipleLeaseCancelTransactionUntilTimestamp = 1492560000000L,
     resetEffectiveBalancesAtHeight = 51500,
     allowLeasedBalanceTransferUntil = 1495238400000L,
-    blockVersion3After = 1507899600000L,
+    blockVersion3After = 1508144400000L,
     preActivatedFeatures = Map.empty)
 
   val configPath = "waves.blockchain.custom.functionality"