Skip to content
This repository has been archived by the owner on Jul 27, 2022. It is now read-only.

Commit

Permalink
Merge #1524
Browse files Browse the repository at this point in the history
1524: Problem (Fix #1523): sync state deserialization fails when nil vote happens r=tomtau a=yihuang

Solution:
- Make parse_non_empty_id parse null in tendermint-rs

Related upstream PR: informalsystems/tendermint-rs#98

Co-authored-by: yihuang <[email protected]>
  • Loading branch information
bors[bot] and yihuang authored May 2, 2020
2 parents 02a2241 + 3db19f6 commit 37c8db6
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
### Bug Fixes

- *chain-abci* [1516](https://github.com/crypto-com/chain/pull/1516): Fix unbond tx didn't subtract fee from bonded
- *client-core* [1524](https://github.com/crypto-com/chain/pull/1524): Fix the decoding issue of trusted state when nil
vote happens during wallet synchronization.

*Unreleased*

Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion client-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ secstr = { version = "0.4.0", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sled = { version = "0.31.0", optional = true }
tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "e3c131a35936da7fc1928c3231db70e603f82fd3" }
tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "e8d350960726b242fdaa67d293d71ba8cfdb8024" }
tokio = { version = "0.2", features = ["rt-threaded", "sync", "time", "tcp"], optional = true }
tokio-tungstenite = { version = "0.10", features = ["tls"], optional = true }
zeroize = "1.1"
Expand Down
2 changes: 1 addition & 1 deletion client-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tiny-bip39 = { version = "0.7", default-features = false }
unicase = "2.6.0"
lazy_static = "1.4.0"
ring = "0.16.12"
tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "e3c131a35936da7fc1928c3231db70e603f82fd3" }
tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "e8d350960726b242fdaa67d293d71ba8cfdb8024" }
thiserror = { version = "1.0", default-features = false }
non-empty-vec = "0.1"
zxcvbn = "2.0"
Expand Down
2 changes: 1 addition & 1 deletion client-network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ chrono = { version = "0.4", features = ["serde"] }
parity-scale-codec = { features = ["derive"], version = "1.3" }
hex = "0.4.2"
secp256k1zkp = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "f8759809f6e3fed793b37166f7cd91c57cdb2eab", features = ["recovery"] }
tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "e3c131a35936da7fc1928c3231db70e603f82fd3" }
tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "e8d350960726b242fdaa67d293d71ba8cfdb8024" }

[dev-dependencies]
secp256k1zkp = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "f8759809f6e3fed793b37166f7cd91c57cdb2eab", features = ["serde", "zeroize", "rand", "recovery", "endomorphism"] }
1 change: 1 addition & 0 deletions integration-tests/multinode/join_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
assert len(rpc.chain.validators()['validators']) == 2

addr = rpc.address.list(enckey=enckey, name='target')[0]
rpc.wallet.sync(enckey=enckey, name='target')
state = rpc.staking.state(addr)
punishment = state['last_slash']
print('punishment', punishment)
Expand Down
2 changes: 1 addition & 1 deletion test-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ parity-scale-codec = { features = ["derive"], version = "1.3" }
base64 = "0.11"
hex = "0.4"

tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "e3c131a35936da7fc1928c3231db70e603f82fd3" }
tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "e8d350960726b242fdaa67d293d71ba8cfdb8024" }
chain-core = { path = "../chain-core" }
chain-abci = { path = "../chain-abci" }
chain-storage = { path = "../chain-storage" }
Expand Down

0 comments on commit 37c8db6

Please sign in to comment.