Stage onto release/v0.24.0 (#1999)

* Set SignedBlocksWindow back to 1000

* Merge PR #1995: upgrading ledger goclient lib

* Update version/version.go
This commit is contained in:
Christopher Goes 2018-08-13 15:41:53 +02:00 committed by Ethan Buchman
parent 59acfe857f
commit a56117ee74
4 changed files with 8 additions and 8 deletions

4
Gopkg.lock generated
View File

@ -490,11 +490,11 @@
version = "v0.23.0"
[[projects]]
digest = "1:5bd938386bd1f61a581bf8cd6ff2b7b2f79c542929176db4ceb44965440dae07"
digest = "1:2ea7665579c64cda1873a395de97a2af02df1d06f4cb52128caf57f13249303c"
name = "github.com/zondax/ledger-goclient"
packages = ["."]
pruneopts = "UT"
revision = "39ba4728c137c75718a21f9b4b3280fa31b9139b"
revision = "a05312e1c998ad831b70eea41d009654f7f95985"
[[projects]]
branch = "master"

View File

@ -65,7 +65,7 @@
[[constraint]]
name = "github.com/zondax/ledger-goclient"
revision = "39ba4728c137c75718a21f9b4b3280fa31b9139b"
revision = "a05312e1c998ad831b70eea41d009654f7f95985"
[prune]
go-tests = true

View File

@ -2,10 +2,10 @@
package version
const Maj = "0"
const Min = "23"
const Fix = "1"
const Min = "24"
const Fix = "0"
const Version = "0.23.1"
const Version = "0.24.0"
// GitCommit set by build flags
var GitCommit = ""

View File

@ -66,8 +66,8 @@ var (
// TODO Temporarily set to five minutes for testnets
defaultDoubleSignUnbondDuration int64 = 60 * 5
// TODO Temporarily set to 100 blocks for testnets
defaultSignedBlocksWindow int64 = 100
// TODO Temporarily set to 1000 blocks for testnets
defaultSignedBlocksWindow int64 = 1000
// TODO Temporarily set to 10 minutes for testnets
defaultDowntimeUnbondDuration int64 = 60 * 10