Merge #680

680: Problem:(CRO-641) signatory v0.17 fails to compile r=tomtau a=linfeng-crypto update the tendermint version Co-authored-by: linfeng <linfeng@crypto.com>
crypto-com · Dec 16, 2019 · 43718bd · 43718bd
2 parents 2325e1d + 720e29c
commit 43718bd
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client-common/Cargo.toml b/client-common/Cargo.toml
@@ -23,12 +23,8 @@ jsonrpc = { version = "0.11", optional = true }
 serde_json = { version = "1.0", optional = true }
 parity-scale-codec = { features = ["derive"], version = "1.1" }
 websocket = { version = "0.24", default-features = false, features = ["sync"], optional = true }
-tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "8e95731ee671777638ab2a3d5dfd7b35992b86aa" }
+tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "6fca043ec5ca48770fa9e7b95e207f7b0c88c97f" }
 itertools = "0.8"
-# Restrict transistive dependency `signatory-dalek` of `tendermint` to avoid compilation error
-# Remove when `signatory-dalek` is updated
-# https://github.com/tendermint/signatory/blob/develop/signatory-dalek/Cargo.toml
-ed25519-dalek = "= 1.0.0-pre.2"
 
 [features]
 default = ["sled", "websocket-rpc"]

diff --git a/client-core/Cargo.toml b/client-core/Cargo.toml
@@ -37,7 +37,7 @@ tiny-bip39 = { version = "0.6", default-features = false }
 unicase = "2.6.0"
 lazy_static = "1.4.0"
 ring = "0.16.9"
-tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "8e95731ee671777638ab2a3d5dfd7b35992b86aa" }
+tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "6fca043ec5ca48770fa9e7b95e207f7b0c88c97f" }
 
 [dev-dependencies]
 hex = "0.4.0"

diff --git a/client-network/Cargo.toml b/client-network/Cargo.toml
@@ -17,7 +17,7 @@ chrono = { version = "0.4", features = ["serde"] }
 parity-scale-codec = { features = ["derive"], version = "1.1" }
 hex = "0.4.0"
 secp256k1zkp = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "be445f29a96af31fe079611d26c07f1f596d1c5f", features = ["recovery"] }
-tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "8e95731ee671777638ab2a3d5dfd7b35992b86aa" }
+tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "6fca043ec5ca48770fa9e7b95e207f7b0c88c97f" }
 
 [dev-dependencies]
 secp256k1zkp = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "be445f29a96af31fe079611d26c07f1f596d1c5f", features = ["serde", "zeroize", "rand", "recovery", "endomorphism"] }