diff --git a/Cargo.lock b/Cargo.lock index b11af51..2cb4d8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1601,6 +1601,21 @@ name = "finality-grandpa" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cd795898c348a8ec9edc66ec9e014031c764d4c88cc26d09b492cd93eb41339" +dependencies = [ + "either", + "futures 0.3.13", + "futures-timer 3.0.2", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot 0.11.1", +] + +[[package]] +name = "finality-grandpa" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c832d0ed507622c7cb98e9b7f10426850fc9d38527ab8071778dcc3a81d45875" dependencies = [ "either", "futures 0.3.13", @@ -1610,6 +1625,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "rand 0.8.3", + "scale-info", ] [[package]] @@ -1783,7 +1799,7 @@ name = "frame-support-procedural-tools" version = "3.0.0" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -2737,7 +2753,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -3737,7 +3753,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2", "quote", @@ -4685,7 +4701,7 @@ dependencies = [ name = "pallet-grandpa" version = "3.0.0" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.13.0", "frame-benchmarking", "frame-support", "frame-system", @@ -5106,7 +5122,7 @@ dependencies = [ name = "pallet-staking-reward-curve" version = "3.0.0" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "sp-runtime", @@ -5314,7 +5330,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa04976a81fde04924b40cc4036c4d12841e8bb04325a5cf2ada75731a150a7d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -5804,6 +5820,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -6564,7 +6590,7 @@ dependencies = [ name = "sc-chain-spec-derive" version = "3.0.0" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -7019,7 +7045,7 @@ version = "0.9.0" dependencies = [ "assert_matches", "derive_more", - "finality-grandpa", + "finality-grandpa 0.14.3", "fork-tree", "futures 0.3.13", "futures-timer 3.0.2", @@ -7064,7 +7090,7 @@ name = "sc-finality-grandpa-rpc" version = "0.9.0" dependencies = [ "derive_more", - "finality-grandpa", + "finality-grandpa 0.13.0", "futures 0.3.13", "jsonrpc-core", "jsonrpc-core-client", @@ -7612,7 +7638,7 @@ dependencies = [ name = "sc-tracing-proc-macro" version = "3.0.0" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -7675,6 +7701,31 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "scale-info" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e62ff266e136db561a007c84569985805f84a1d5a08278e52c36aacb6e061b" +dependencies = [ + "bitvec", + "cfg-if 1.0.0", + "derive_more", + "parity-scale-codec", + "scale-info-derive", +] + +[[package]] +name = "scale-info-derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b648fa291891a4c80187a25532f6a7d96b82c70353e30b868b14632b8fe043d6" +dependencies = [ + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "schannel" version = "0.1.19" @@ -8086,7 +8137,7 @@ name = "sp-api-proc-macro" version = "3.0.0" dependencies = [ "blake2-rfc", - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -8399,7 +8450,7 @@ dependencies = [ name = "sp-finality-grandpa" version = "3.0.0" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.13.0", "log", "parity-scale-codec", "serde", @@ -8492,7 +8543,7 @@ dependencies = [ name = "sp-npos-elections-compact" version = "3.0.0" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -8585,7 +8636,7 @@ name = "sp-runtime-interface-proc-macro" version = "3.0.0" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -9163,7 +9214,7 @@ dependencies = [ name = "substrate-test-utils-derive" version = "0.9.0" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "quote", "syn", ] diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index 38f6acd..f319b15 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -43,13 +43,13 @@ sc-network-gossip = { version = "0.9.0", path = "../network-gossip" } sp-finality-grandpa = { version = "3.0.0", path = "../../primitives/finality-grandpa" } prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"} sc-block-builder = { version = "0.9.0", path = "../block-builder" } -finality-grandpa = { version = "0.13.0", features = ["derive-codec"] } +finality-grandpa = { version = "0.14.3", features = ["derive-codec"] } pin-project = "1.0.4" linked-hash-map = "0.5.2" [dev-dependencies] assert_matches = "1.3.0" -finality-grandpa = { version = "0.13.0", features = ["derive-codec", "test-helpers"] } +finality-grandpa = { version = "0.14.3", features = ["derive-codec", "test-helpers"] } sc-network = { version = "0.9.0", path = "../network" } sc-network-test = { version = "0.8.0", path = "../network/test" } sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }