Merge pull request #318 from wavesplatform/set-version-0.7.1

Version was set to 0.7.1.
wavesplatform · May 19, 2017 · 7dd95df · 7dd95df
2 parents bad7871 + 2f12ddd
commit 7dd95df
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ enablePlugins(sbtdocker.DockerPlugin, JavaServerAppPackaging, JDebPackaging, Sys
 
 name := "waves"
 organization := "com.wavesplatform"
-version := "0.7.0"
+version := "0.7.1"
 scalaVersion := "2.12.1"
 crossPaths := false
 publishArtifact in (Compile, packageDoc) := false

diff --git a/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala b/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala
@@ -60,10 +60,10 @@ object FunctionalitySettings {
     allowExchangeTransactionAfterTimestamp = 1483228800000L,
     allowInvalidReissueInSameBlockUntilTimestamp = 1492560000000L,
     allowCreateAliasTransactionAfterTimestamp = 1493596800000L,
-    allowMakeAssetNameUniqueTransactionAfterTimestamp = Long.MaxValue,
+    allowMakeAssetNameUniqueTransactionAfterTimestamp = 1495238400000L,
     allowMultipleLeaseCancelTransactionUntilTimestamp = 1492560000000L,
     resetEffectiveBalancesAtHeight = 51500,
-    allowLeasedBalanceTransferUntil = Long.MaxValue)
+    allowLeasedBalanceTransferUntil = 1495238400000L)
 
   val configPath = "waves.blockchain.custom.functionality"
 

diff --git a/src/main/scala/scorex/network/BlockchainSynchronizer.scala b/src/main/scala/scorex/network/BlockchainSynchronizer.scala
@@ -39,11 +39,14 @@ class BlockchainSynchronizer(protected val networkControllerRef: ActorRef, coord
       start(GettingExtension) { _ =>
 
         val lastIds = history.lastBlockIds(synchronizationSettings.maxRollback)
-
         val msg = Message(GetSignaturesSpec, Right(lastIds), None)
-        networkControllerRef ! NetworkController.SendToNetwork(msg, SendToChosen(peerScores.keys.toSeq))
 
-        gettingExtension(lastIds.map(InnerId), peerScores.map(peer => peer._1 -> Peer(peer._2)))
+        val max = peerScores.maxBy(_._2)
+        val maxPeers = peerScores.filter(_._2 == max._2)
+
+        networkControllerRef ! NetworkController.SendToNetwork(msg, SendToChosen(maxPeers.keys.toSeq))
+
+        gettingExtension(lastIds.map(InnerId), maxPeers.map(peer => peer._1 -> Peer(peer._2)))
       }
   }
 

diff --git a/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala b/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala
@@ -123,8 +123,8 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers {
     settings.functionalitySettings.allowExchangeTransactionAfterTimestamp should be(1483228800000L)
     settings.functionalitySettings.resetEffectiveBalancesAtHeight should be(51500)
     settings.functionalitySettings.allowCreateAliasTransactionAfterTimestamp should be(1493596800000L)
-    settings.functionalitySettings.allowMakeAssetNameUniqueTransactionAfterTimestamp should be(Long.MaxValue)
-    settings.functionalitySettings.allowLeasedBalanceTransferUntil should be(Long.MaxValue)
+    settings.functionalitySettings.allowMakeAssetNameUniqueTransactionAfterTimestamp should be(1495238400000L)
+    settings.functionalitySettings.allowLeasedBalanceTransferUntil should be(1495238400000L)
     settings.genesisSettings.blockTimestamp should be(1460678400000L)
     settings.genesisSettings.transactionsTimestamp should be(1478000000000L)
     settings.genesisSettings.signature should be("5uqnLK3Z9eiot6FyYBfwUnbyid3abicQbAZjz38GQ1Q8XigQMxTK4C1zNkqS1SVw7FqSidbZKxWAKLVoEsp4nNqa")