Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEX-478 Prepare to release 1.1.0 #132

Merged
merged 1 commit into from
Dec 20, 2019
Merged

DEX-478 Prepare to release 1.1.0 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
1 change: 1 addition & 0 deletions dex-it/src/test/resources/template.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ waves {
}
utx {
allow-rebroadcasting = true
reject-transactions-when-blockchain-is-stale = false
}
}

Expand Down
2 changes: 2 additions & 0 deletions dex/src/main/scala/com/wavesplatform/dex/smart/MatcherContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

}