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.

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

Stage onto release/v0.24.0 #1999

Merged
merged 3 commits into from
Aug 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

[[constraint]]
name = "github.com/zondax/ledger-goclient"
revision = "39ba4728c137c75718a21f9b4b3280fa31b9139b"
revision = "a05312e1c998ad831b70eea41d009654f7f95985"

[prune]
go-tests = true
Expand Down
6 changes: 3 additions & 3 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
4 changes: 2 additions & 2 deletions x/slashing/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down