DEX-478 Prepare to release 1.1.0 (#132)

* Supported NODE 1.1.6
wavesplatform · Dec 20, 2019 · 6730971 · 6730971
1 parent 90ea18c
commit 6730971
Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ import sbt.internal.inc.ReflectUtilities
 
 addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
 
-def nodeVersionTag: String = "v1.1.5"
+def nodeVersionTag: String = "v1.1.6"
 
 lazy val node = ProjectRef(uri(s"git://github.com/wavesplatform/Waves.git#$nodeVersionTag"), "node")
 

diff --git a/dex-it/src/test/resources/template.conf b/dex-it/src/test/resources/template.conf
@@ -103,6 +103,7 @@ waves {
   }
   utx {
     allow-rebroadcasting = true
+    reject-transactions-when-blockchain-is-stale = false
   }
 }
 

diff --git a/dex/src/main/scala/com/wavesplatform/dex/smart/MatcherContext.scala b/dex/src/main/scala/com/wavesplatform/dex/smart/MatcherContext.scala
@@ -105,6 +105,8 @@ object MatcherContext {
     override def accountScriptWithComplexity(address: Address): Option[(Script, Long)]                               = kill("accountScriptWithComplexity")
     override def assetScriptWithComplexity(id: Asset.IssuedAsset): Option[(Script, Long)]                            = kill("assetScriptWithComplexity")
     override def collectActiveLeases(from: Int, to: Int)(filter: LeaseTransaction => Boolean): Seq[LeaseTransaction] = kill("collectActiveLeases")
+
+    override def balanceOnlySnapshots(address: Address, height: Int, assetId: Asset): Option[(Int, Long)] = kill("balanceOnlySnapshots")
   }
 
 }
-Original file line number
+Diff line change
@@ @@ -103,6 +103,7 @@ waves { @@
       }
       utx {
         allow-rebroadcasting = true
+        reject-transactions-when-blockchain-is-stale = false
       }
     }