From c800880420890a6116e9a492114cda44daa5bceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Senart?= Date: Tue, 20 Sep 2022 12:25:17 +0100 Subject: [PATCH] Update to tendermint v0.34.21-mekatek.1 --- Cargo.lock | 12 ++++++------ Cargo.toml | 37 +++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12ed392e..c6f3ea93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2458,7 +2458,7 @@ dependencies = [ [[package]] name = "tendermint" version = "0.23.9" -source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.19-mekatek.1#7cfc6e148f57d5e729e7d4314426af9f55804b91" +source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.21-mekatek.1#b4b7d317ca1c04e2fe6b21d47783715999c49401" dependencies = [ "async-trait", "bytes 1.2.1", @@ -2488,7 +2488,7 @@ dependencies = [ [[package]] name = "tendermint-config" version = "0.23.9" -source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.19-mekatek.1#7cfc6e148f57d5e729e7d4314426af9f55804b91" +source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.21-mekatek.1#b4b7d317ca1c04e2fe6b21d47783715999c49401" dependencies = [ "flex-error", "serde", @@ -2501,7 +2501,7 @@ dependencies = [ [[package]] name = "tendermint-p2p" version = "0.23.9" -source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.19-mekatek.1#7cfc6e148f57d5e729e7d4314426af9f55804b91" +source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.21-mekatek.1#b4b7d317ca1c04e2fe6b21d47783715999c49401" dependencies = [ "aead 0.4.3", "chacha20poly1305", @@ -2527,7 +2527,7 @@ dependencies = [ [[package]] name = "tendermint-proto" version = "0.23.9" -source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.19-mekatek.1#7cfc6e148f57d5e729e7d4314426af9f55804b91" +source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.21-mekatek.1#b4b7d317ca1c04e2fe6b21d47783715999c49401" dependencies = [ "bytes 1.2.1", "flex-error", @@ -2544,7 +2544,7 @@ dependencies = [ [[package]] name = "tendermint-rpc" version = "0.23.9" -source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.19-mekatek.1#7cfc6e148f57d5e729e7d4314426af9f55804b91" +source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.21-mekatek.1#b4b7d317ca1c04e2fe6b21d47783715999c49401" dependencies = [ "async-trait", "bytes 1.2.1", @@ -2576,7 +2576,7 @@ dependencies = [ [[package]] name = "tendermint-std-ext" version = "0.23.9" -source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.19-mekatek.1#7cfc6e148f57d5e729e7d4314426af9f55804b91" +source = "git+https://github.com/meka-dev/tendermint-rs?tag=v0.34.21-mekatek.1#b4b7d317ca1c04e2fe6b21d47783715999c49401" [[package]] name = "termcolor" diff --git a/Cargo.toml b/Cargo.toml index bbada2cd..c46b0f58 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,10 @@ signing key management for Tendermint applications including validators, oracles, IBC relayers, and other transaction signing applications """ version = "0.12.2-mekatek.1" -authors = ["Tony Arcieri ", "Ismail Khoffi "] +authors = [ + "Tony Arcieri ", + "Ismail Khoffi ", +] license = "Apache-2.0" repository = "https://github.com/iqlusioninc/tmkms/" readme = "README.md" @@ -30,7 +33,9 @@ getrandom = "0.2" hkd32 = { version = "0.7", default-features = false, features = ["mnemonic"] } hkdf = "0.12" hyper = { version = "0.14", optional = true } -hyper-rustls = { version = "0.23", optional = true, features = ["webpki-roots"] } +hyper-rustls = { version = "0.23", optional = true, features = [ + "webpki-roots", +] } k256 = { version = "0.11", features = ["ecdsa", "sha256"] } ledger = { version = "0.2", optional = true } once_cell = "1.5" @@ -51,14 +56,20 @@ subtle-encoding = { version = "0.5", features = ["bech32-preview"] } tempfile = "3" tendermint = { version = "0.23.9", features = ["secp256k1"] } tendermint-config = "0.23.9" -tendermint-rpc = { version = "0.23.9", optional = true, features = ["http-client"] } +tendermint-rpc = { version = "0.23.9", optional = true, features = [ + "http-client", +] } tendermint-proto = "0.23.9" tendermint-p2p = { version = "0.23.9", features = ["amino"] } thiserror = "1" url = { version = "2.2.2", features = ["serde"], optional = true } uuid = { version = "1", features = ["serde"], optional = true } wait-timeout = "0.2" -yubihsm = { version = "0.41", features = ["secp256k1", "setup", "usb"], optional = true } +yubihsm = { version = "0.41", features = [ + "secp256k1", + "setup", + "usb", +], optional = true } zeroize = "1" [dev-dependencies] @@ -67,15 +78,21 @@ byteorder = "1" rand = "0.7" [patch.crates-io] -tendermint = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.19-mekatek.1" } -tendermint-config = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.19-mekatek.1" } -tendermint-rpc = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.19-mekatek.1" } -tendermint-proto = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.19-mekatek.1" } -tendermint-p2p = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.19-mekatek.1" } +tendermint = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.21-mekatek.1" } +tendermint-config = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.21-mekatek.1" } +tendermint-rpc = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.21-mekatek.1" } +tendermint-proto = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.21-mekatek.1" } +tendermint-p2p = { git = "https://github.com/meka-dev/tendermint-rs", tag = "v0.34.21-mekatek.1" } [features] softsign = [] -tx-signer = ["abscissa_tokio", "hyper", "hyper-rustls", "stdtx", "tendermint-rpc"] +tx-signer = [ + "abscissa_tokio", + "hyper", + "hyper-rustls", + "stdtx", + "tendermint-rpc", +] yubihsm-mock = ["yubihsm/mockhsm"] yubihsm-server = ["yubihsm/http-server", "rpassword"] fortanixdsm = ["elliptic-curve", "sdkms", "url", "uuid"]