diff --git a/Cargo.lock b/Cargo.lock index b11af51..e110e80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -156,6 +156,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" + [[package]] name = "asn1_der" version = "0.6.3" @@ -1601,6 +1607,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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c29b0f7ece4ac0afa32edd8ab1c1c8fec9f0ea1d8c92107e829150ae156854e" dependencies = [ "either", "futures 0.3.13", @@ -1783,7 +1804,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 +2758,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 +3758,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 +4706,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 +5127,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", @@ -5297,24 +5318,25 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd3dab59b5cf4bc81069ade0fc470341a1ef3ad5fa73e5a8943bed2ec12b2e8" +checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.1", "bitvec", "byte-slice-cast", + "impl-trait-for-tuples", "parity-scale-codec-derive", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa04976a81fde04924b40cc4036c4d12841e8bb04325a5cf2ada75731a150a7d" +checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -5804,6 +5826,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 +6596,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 +7051,7 @@ version = "0.9.0" dependencies = [ "assert_matches", "derive_more", - "finality-grandpa", + "finality-grandpa 0.14.2", "fork-tree", "futures 0.3.13", "futures-timer 3.0.2", @@ -7064,7 +7096,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 +7644,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", @@ -8086,7 +8118,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 +8431,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 +8524,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 +8617,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 +9195,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..cdbfe8b 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.2", 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.2", 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" }