From 9e4417037f515479f2c1e041aff953fb056b4cb0 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Wed, 18 Mar 2020 19:35:13 +0800 Subject: [PATCH 01/12] move mmr digest from sytem to darwinia pallet --- Cargo.lock | 24 ++++---- frame/mmr-digest/Cargo.toml | 38 +++++++++++++ frame/mmr-digest/src/lib.rs | 109 ++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 12 deletions(-) create mode 100644 frame/mmr-digest/Cargo.toml create mode 100644 frame/mmr-digest/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index aa1b9c0fd..f1fae952b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1193,9 +1193,9 @@ dependencies = [ [[package]] name = "doc-comment" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "807e5847c39ad6a11eac66de492ed1406f76a260eb8656e8740cad9eabc69c27" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "ed25519-dalek" @@ -1586,9 +1586,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" +checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" dependencies = [ "cfg-if", "crc32fast", @@ -2735,9 +2735,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.67" +version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" +checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" [[package]] name = "libloading" @@ -3720,9 +3720,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ "autocfg 1.0.0", "num-bigint", @@ -4574,9 +4574,9 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" +checksum = "f918f2b601f93baa836c1c2945faef682ba5b6d4828ecb45eeb7cc3c71b811b4" dependencies = [ "proc-macro2", "quote", @@ -4585,9 +4585,9 @@ dependencies = [ [[package]] name = "proc-macro-nested" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" +checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" [[package]] name = "proc-macro2" diff --git a/frame/mmr-digest/Cargo.toml b/frame/mmr-digest/Cargo.toml new file mode 100644 index 000000000..8799443ba --- /dev/null +++ b/frame/mmr-digest/Cargo.toml @@ -0,0 +1,38 @@ +[package] +name = "darwinia-mmr-digest" +version = "0.0.1" +authors = ["Darwinia Network "] +edition = "2018" +license = "GPL-3.0" +homepage = "https://darwinia.network/" +repository = "https://github.com/darwinia-network/darwinia/" +description = "Pallet for logging MMR into header digest" + +[dependencies] +serde = { version = "1.0.101", optional = true } +codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false } +frame-benchmarking = { version = "2.0.0-alpha.2", default-features = false, path = "../benchmarking" } +frame-support = { version = "2.0.0-alpha.2", default-features = false, path = "../support" } +frame-system = { version = "2.0.0-alpha.2", default-features = false, path = "../system" } +sp-runtime = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/runtime" } +sp-std = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/std" } +sp-io = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/io" } + +merkle-mountain-range = { package = "ckb-merkle-mountain-range", git = "https://github.com/nervosnetwork/merkle-mountain-range.git", default-features = false } + +[dev-dependencies] +sp-core = { version = "2.0.0-alpha.2", path = "../../primitives/core" } + +[features] +default = ["std"] +std = [ + "serde", + "codec/std", + "sp-runtime/std", + "frame-benchmarking/std", + "frame-support/std", + "frame-system/std", + "sp-io/std", + "sp-std/std", + "merkle-mountain-range/std", +] diff --git a/frame/mmr-digest/src/lib.rs b/frame/mmr-digest/src/lib.rs new file mode 100644 index 000000000..6a30ee870 --- /dev/null +++ b/frame/mmr-digest/src/lib.rs @@ -0,0 +1,109 @@ +//! # MMR Digest Pallet + +#![cfg_attr(not(feature = "std"), no_std)] + +use sp_std::marker::PhantomData; +use frame_support::{decl_module, decl_storage}; +use sp_std::prelude::*; +//use frame_benchmarking::{benchmarks, account}; +//use frame_system::{self as system, ensure_signed, ensure_root, RawOrigin}; + +//use codec::{Encode, Decode}; +use sp_runtime::{ + traits::Hash, + generic::{DigestItem}, +}; + +use merkle_mountain_range::{MMR, MMRStore}; + +pub trait Trait: frame_system::Trait { +} + +decl_storage! { + trait Store for Module as MMRDigest { + /// MMR struct of the previous blocks, from first(genesis) to parent hash. + pub MMRList get(fn mmr_list): map hasher(twox_64_concat) u64 => T::Hash; + pub MMRCounter get(fn mmr_counter): u64; + } +} + +//decl_event!( +//); +// `ensure_root` and `ensure_none`. + +pub struct MMRMerge(PhantomData); + +impl merkle_mountain_range::Merge for MMRMerge { + type Item = ::Hash; + fn merge(lhs: &Self::Item, rhs: &Self::Item) -> Self::Item { + let encoded_vec = vec![lhs, rhs]; + ::Hashing::hash_of(&encoded_vec) + } +} + +pub struct ModuleMMRStore(PhantomData); +impl Default for ModuleMMRStore { + fn default() -> Self { + ModuleMMRStore(sp_std::marker::PhantomData) + } +} + +impl MMRStore for ModuleMMRStore { + fn get_elem(&self, pos: u64) -> merkle_mountain_range::Result> { + Ok(Some(Module::::mmr_list(pos))) + } + + fn append(&mut self, pos: u64, elems: Vec) -> merkle_mountain_range::Result<()> { + let mmr_count = ::get(); + if pos != mmr_count { + // Must be append only. + return Err(merkle_mountain_range::Error::InconsistentStore) + } + + let elems_len = elems.len() as u64; + + for (i, elem) in elems.into_iter().enumerate() { + >::insert(mmr_count + i as u64, elem); + } + + // increment counter + ::put(mmr_count + elems_len); + + Ok(()) + } +} + +decl_module! { + // Simple declaration of the `Module` type. Lets the macro know what its working on. + pub struct Module for enum Call where origin: T::Origin { + /// Deposit one of this pallet's events by using the default implementation. + /// It is also possible to provide a custom implementation. + /// For non-generic events, the generic parameter just needs to be dropped, so that it + /// looks like: `fn deposit_event() = default;`. +// fn deposit_event() = default; + + fn on_finalize(_block_number: T::BlockNumber) { + let store = ModuleMMRStore::::default(); + + let mut mmr = MMR::<_, MMRMerge, _>::new(::get(), store); + + let parent_hash = >::parent_hash(); + // Update MMR and add mmr root to digest of block header + mmr.push(parent_hash).expect("Failed to push parent hash to mmr."); + + let mmr_root = mmr.get_root().expect("Failed to calculate merkle mountain range; qed"); + + mmr.commit().expect("Failed to push parent hash to mmr."); + + let mmr_item = DigestItem::MerkleMountainRangeRoot( + mmr_root.into() + ); + + >::deposit_log(mmr_item.into()); + } + } +} + +impl Module { + // Nothing +} \ No newline at end of file From f2384407e1b8118cbc86146c50e5b2b984969c67 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Wed, 18 Mar 2020 20:17:10 +0800 Subject: [PATCH 02/12] fix compile --- Cargo.lock | 406 +++++++++++---------- bin/node/cli/Cargo.toml | 106 +++--- bin/node/executor/Cargo.toml | 42 +-- bin/node/rpc/Cargo.toml | 30 +- bin/node/runtime/Cargo.toml | 93 ++--- bin/node/runtime/src/lib.rs | 3 + bin/node/testing/Cargo.toml | 56 +-- frame/balances/kton/Cargo.toml | 12 +- frame/balances/ring/Cargo.toml | 16 +- frame/chain-mmr/Cargo.toml | 39 ++ frame/{mmr-digest => chain-mmr}/src/lib.rs | 22 +- frame/chainrelay/eth/backing/Cargo.toml | 18 +- frame/chainrelay/eth/relay/Cargo.toml | 12 +- frame/claims/Cargo.toml | 12 +- frame/elections-phragmen/Cargo.toml | 16 +- frame/mmr-digest/Cargo.toml | 38 -- frame/staking/Cargo.toml | 22 +- frame/support/Cargo.toml | 6 +- frame/treasury/Cargo.toml | 12 +- frame/vesting/Cargo.toml | 14 +- primitives/eth-primitives/Cargo.toml | 6 +- primitives/merkle-patricia-trie/Cargo.toml | 2 +- primitives/phragmen/Cargo.toml | 8 +- 23 files changed, 509 insertions(+), 482 deletions(-) create mode 100644 frame/chain-mmr/Cargo.toml rename frame/{mmr-digest => chain-mmr}/src/lib.rs (88%) delete mode 100644 frame/mmr-digest/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index f1fae952b..ae8d9aa55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -538,6 +538,14 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ckb-merkle-mountain-range" +version = "0.3.0" +source = "git+https://github.com/nervosnetwork/merkle-mountain-range.git#ea232474496bdf072d7de33297fd54f1ef8df599" +dependencies = [ + "cfg-if", +] + [[package]] name = "clang-sys" version = "0.29.2" @@ -924,6 +932,21 @@ dependencies = [ "zeroize 1.1.0", ] +[[package]] +name = "darwinia-chain-mmr" +version = "0.0.1" +dependencies = [ + "ckb-merkle-mountain-range", + "frame-support", + "frame-system", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", +] + [[package]] name = "darwinia-claims" version = "0.5.0" @@ -942,7 +965,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "tiny-keccak 1.5.0", ] @@ -961,7 +984,7 @@ dependencies = [ "sp-io", "sp-phragmen", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "substrate-test-utils", ] @@ -989,7 +1012,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] @@ -1010,7 +1033,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] @@ -1025,7 +1048,7 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] @@ -1037,7 +1060,7 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "substrate-test-utils", ] @@ -1055,7 +1078,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] @@ -1077,7 +1100,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "substrate-test-utils", ] @@ -1089,7 +1112,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] @@ -1106,7 +1129,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] @@ -1123,7 +1146,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-storage", ] @@ -1329,7 +1352,7 @@ dependencies = [ "rustc-hex", "serde", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "triehash", ] @@ -1606,7 +1629,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fork-tree" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", ] @@ -1614,7 +1637,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -1623,13 +1646,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-runtime-interface", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "frame-benchmarking-cli" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1647,31 +1670,31 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "serde", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "frame-metadata" version = "11.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "serde", "sp-core", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "frame-support" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "bitmask", "frame-metadata", @@ -1688,14 +1711,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "tracing", ] [[package]] name = "frame-support-procedural" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -1706,7 +1729,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1718,7 +1741,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "proc-macro2", "quote", @@ -1728,7 +1751,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1737,14 +1760,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-version", ] [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sp-api", @@ -3309,7 +3332,7 @@ dependencies = [ "keccak-hash", "rand 0.6.5", "rlp 0.4.4", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "uuid 0.7.4", ] @@ -3536,7 +3559,7 @@ dependencies = [ [[package]] name = "node-inspect" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "log", @@ -3553,7 +3576,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "sp-core", "sp-runtime", @@ -3586,6 +3609,7 @@ dependencies = [ name = "node-runtime" version = "0.5.0" dependencies = [ + "darwinia-chain-mmr", "darwinia-claims", "darwinia-elections-phragmen", "darwinia-eth-backing", @@ -3640,7 +3664,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-transaction-pool", "sp-version", "substrate-wasm-builder-runner", @@ -3649,7 +3673,7 @@ dependencies = [ [[package]] name = "node-transaction-factory" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "log", "parity-scale-codec", @@ -3806,7 +3830,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -3818,13 +3842,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-authorship" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -3835,13 +3859,13 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-babe" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -3855,14 +3879,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-timestamp", ] [[package]] name = "pallet-balances" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3871,13 +3895,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-collective" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -3886,13 +3910,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-contracts" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -3905,24 +3929,24 @@ dependencies = [ "sp-io", "sp-runtime", "sp-sandbox", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "wasmi-validation", ] [[package]] name = "pallet-contracts-primitives" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-contracts-rpc" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3941,19 +3965,19 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-finality-tracker" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -3963,13 +3987,13 @@ dependencies = [ "sp-finality-tracker", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-grandpa" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -3981,13 +4005,13 @@ dependencies = [ "sp-finality-grandpa", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-identity" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3997,13 +4021,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-im-online" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -4016,13 +4040,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-indices" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -4032,13 +4056,13 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-membership" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -4046,13 +4070,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-offences" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -4061,26 +4085,26 @@ dependencies = [ "serde", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "safe-mix", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-recovery" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "enumflags2", "frame-support", @@ -4089,13 +4113,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-session" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -4106,14 +4130,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-trie", ] [[package]] name = "pallet-society" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -4122,13 +4146,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-sudo" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -4136,13 +4160,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-timestamp" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4152,27 +4176,27 @@ dependencies = [ "serde", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-timestamp", ] [[package]] name = "pallet-transaction-payment" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4190,20 +4214,20 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "parity-scale-codec", "serde", "sp-api", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "pallet-utility" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-support", "frame-system", @@ -4212,7 +4236,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] @@ -5206,7 +5230,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "bytes 0.5.4", "derive_more", @@ -5233,7 +5257,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "futures 0.3.4", "log", @@ -5254,7 +5278,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5270,7 +5294,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5285,7 +5309,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5296,7 +5320,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "ansi_term 0.12.1", "app_dirs", @@ -5335,7 +5359,7 @@ dependencies = [ [[package]] name = "sc-client" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "fnv", @@ -5359,7 +5383,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-trie", "sp-version", "substrate-prometheus-endpoint", @@ -5369,7 +5393,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "fnv", @@ -5391,7 +5415,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-storage", "sp-transaction-pool", "sp-trie", @@ -5401,7 +5425,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "hash-db", "kvdb", @@ -5429,7 +5453,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "fork-tree", @@ -5470,7 +5494,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "futures 0.3.4", @@ -5492,7 +5516,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5505,7 +5529,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5526,7 +5550,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "log", "sc-client-api", @@ -5540,7 +5564,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "lazy_static", @@ -5567,7 +5591,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "log", @@ -5583,7 +5607,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "log", "parity-scale-codec", @@ -5599,7 +5623,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "log", "parity-scale-codec", @@ -5616,7 +5640,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "assert_matches", "finality-grandpa", @@ -5651,7 +5675,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "ansi_term 0.12.1", "futures 0.3.4", @@ -5668,7 +5692,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "hex 0.4.2", @@ -5683,7 +5707,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "bitflags", "bytes 0.5.4", @@ -5734,7 +5758,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5749,7 +5773,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "bytes 0.5.4", "fnv", @@ -5775,7 +5799,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "futures 0.3.4", "libp2p", @@ -5787,7 +5811,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "futures 0.3.4", "hash-db", @@ -5818,7 +5842,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "futures 0.3.4", @@ -5841,7 +5865,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5856,7 +5880,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "exit-future", @@ -5905,7 +5929,7 @@ dependencies = [ [[package]] name = "sc-service-test" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "env_logger 0.7.1", "fdlimit", @@ -5926,7 +5950,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "log", "parity-scale-codec", @@ -5940,7 +5964,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "bytes 0.5.4", "futures 0.3.4", @@ -5962,7 +5986,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "erased-serde", "log", @@ -5977,7 +6001,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "futures 0.3.4", @@ -5996,7 +6020,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "futures 0.3.4", @@ -6346,19 +6370,19 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "log", "sp-core", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-wasm-interface", ] [[package]] name = "sp-api" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "hash-db", "parity-scale-codec", @@ -6366,14 +6390,14 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-version", ] [[package]] name = "sp-api-proc-macro" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6385,67 +6409,67 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "serde", "sp-core", "sp-io", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-arithmetic" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "serde", "sp-debug-derive", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-authority-discovery" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-authorship" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-block-builder" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-blockchain" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "log", @@ -6461,7 +6485,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "futures 0.3.4", @@ -6476,14 +6500,14 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-version", ] [[package]] name = "sp-consensus-babe" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6492,14 +6516,14 @@ dependencies = [ "sp-consensus", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-timestamp", ] [[package]] name = "sp-core" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "base58", "blake2-rfc", @@ -6527,7 +6551,7 @@ dependencies = [ "sp-debug-derive", "sp-externalities", "sp-runtime-interface", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-storage", "substrate-bip39", "tiny-bip39", @@ -6540,7 +6564,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "proc-macro2", "quote", @@ -6550,52 +6574,52 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "environmental", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-storage", ] [[package]] name = "sp-finality-grandpa" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "serde", "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-finality-tracker" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sp-inherents", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-inherents" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "parity-scale-codec", "parking_lot 0.10.0", "sp-core", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-io" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "hash-db", "libsecp256k1", @@ -6605,7 +6629,7 @@ dependencies = [ "sp-externalities", "sp-runtime-interface", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-trie", "sp-wasm-interface", ] @@ -6613,7 +6637,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "lazy_static", "sp-core", @@ -6624,7 +6648,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "sp-api", "sp-runtime", @@ -6633,7 +6657,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "backtrace", "log", @@ -6642,17 +6666,17 @@ dependencies = [ [[package]] name = "sp-phragmen" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "serde", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-rpc" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "serde", "sp-core", @@ -6661,7 +6685,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -6676,19 +6700,19 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-runtime-interface" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "primitive-types 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "sp-externalities", "sp-runtime-interface-proc-macro", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-wasm-interface", "static_assertions 1.1.0", ] @@ -6696,7 +6720,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "Inflector", "proc-macro-crate", @@ -6708,12 +6732,12 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sp-core", "sp-io", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "sp-wasm-interface", "wasmi", ] @@ -6721,7 +6745,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "serde", "serde_json", @@ -6730,28 +6754,28 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "sp-api", "sp-core", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-staking" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "parity-scale-codec", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-state-machine" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "hash-db", "log", @@ -6770,42 +6794,42 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=darwinia-develop#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" [[package]] name = "sp-std" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=darwinia-develop#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" [[package]] name = "sp-storage" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "impl-serde 0.2.3", "serde", "sp-debug-derive", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-timestamp" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "wasm-timer", ] [[package]] name = "sp-transaction-pool" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "derive_more", "futures 0.3.4", @@ -6819,13 +6843,13 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", "sp-core", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "trie-db", "trie-root", ] @@ -6833,23 +6857,23 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", "serde", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] [[package]] name = "sp-wasm-interface" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", "wasmi", ] @@ -6970,7 +6994,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "chrono", "clear_on_drop", @@ -6996,12 +7020,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.4", @@ -7022,7 +7046,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" dependencies = [ "async-std", "derive_more", @@ -7036,12 +7060,12 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" [[package]] name = "substrate-wasm-builder-runner" version = "1.0.5" -source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.1#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" [[package]] name = "subtle" diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index dbd91c923..b0a76b902 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -43,72 +43,72 @@ structopt = { version = "0.3.8", optional = true } tracing = "0.1.10" # primitives -grandpa-primitives = { package = "sp-finality-grandpa", git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } - -sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +grandpa-primitives = { package = "sp-finality-grandpa", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } + +sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # client dependencies -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } - -sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-client-db = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-offchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-service = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-telemetry = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-tracing = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } - -sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } + +sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-client-db = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-network = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-offchain = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-service = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-telemetry = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-tracing = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } + +sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # frame dependencies -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } pallet-claims = { package = "darwinia-claims", path = "../../../frame/claims" } # node-specific dependencies -node-primitives = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +node-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } node-executor = { path = "../executor" } node-rpc = { path = "../rpc" } node-runtime = { path = "../runtime" } # CLI-specific dependencies -frame-benchmarking-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-benchmarking-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -node-inspect = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -node-transaction-factory = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +node-inspect = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-transaction-factory = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # TODO https://github.com/darwinia-network/darwinia/issues/26 #sc-cli = { package = "darwinia-cli", optional = true, path = "../../../client/cli" } # WASM-specific dependencies -browser-utils = { package = "substrate-browser-utils", optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +browser-utils = { package = "substrate-browser-utils", optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen-futures = { version = "0.4.7", optional = true } @@ -119,25 +119,25 @@ futures = "0.3.1" nix = "0.17" tempfile = "3.1.0" -sc-consensus-babe = { features = ["test-helpers"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-service-test = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sc-consensus-babe = { features = ["test-helpers"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-service-test = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [build-dependencies] structopt = { version = "0.3.8", optional = true } vergen = { version = "3.0.4", optional =true } -build-script-utils = { package = "substrate-build-script-utils", git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-benchmarking-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +build-script-utils = { package = "substrate-build-script-utils", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-benchmarking-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # TODO https://github.com/darwinia-network/darwinia/issues/26 #sc-cli = { package = "darwinia-cli", optional = true, path = "../../../client/cli" } -node-inspect = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -node-transaction-factory = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +node-inspect = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-transaction-factory = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [features] default = ["cli", "wasmtime"] diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml index 99f33d5ab..e694f34a7 100644 --- a/bin/node/executor/Cargo.toml +++ b/bin/node/executor/Cargo.toml @@ -15,15 +15,15 @@ trie-root = "0.16.0" # github.com # TODO benchmarking -#frame-benchmarking = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +#frame-benchmarking = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -node-primitives = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +node-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-state-machine = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-trie = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-executor = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-state-machine = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-trie = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia node-runtime = { path = "../runtime" } @@ -33,23 +33,23 @@ node-runtime = { path = "../runtime" } #criterion = "0.3.0" #wabt = "0.9.2" # -#frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +#frame-support = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#frame-system = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # -#pallet-balances = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-im-online = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-treasury = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +#pallet-balances = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-grandpa = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-im-online = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-session = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-treasury = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # -#sp-application-crypto = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +#sp-application-crypto = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # -#substrate-test-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +#substrate-test-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # #node-testing = { path = "../testing" } diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index 49c07c413..66bff3130 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -13,25 +13,25 @@ repository = "https://github.com/darwinia-network/darwinia/" jsonrpc-core = "14.0.3" # github.com -node-primitives = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +node-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-contracts-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-transaction-payment-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-contracts-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-transaction-payment-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-consensus= { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-consensus-babe-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sc-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-consensus= { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-consensus-babe-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -substrate-frame-rpc-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +substrate-frame-rpc-system = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia node-runtime = { path = "../runtime" } diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 6e9a89381..7ea0f5f84 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -17,54 +17,54 @@ rustc-hex = { version = "2.0", optional = true } serde = { version = "1.0.102", optional = true } # primitives -sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-block-builder = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-consensus-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-inherents = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-keyring = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-offchain = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-session = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-transaction-pool = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-version = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-block-builder = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-consensus-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-inherents = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-keyring = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-offchain = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-session = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-transaction-pool = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-version = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -node-primitives = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +node-primitives = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # frame dependencies -frame-benchmarking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-executive = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-benchmarking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-executive = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-collective = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-contracts = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-contracts-primitives = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-contracts-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -#pallet-democracy = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-indices = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-identity = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-membership = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-collective = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-contracts = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-contracts-primitives = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-contracts-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-democracy = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-indices = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-identity = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-membership = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } pallet-claims = { package = "darwinia-claims", default-features = false, path = "../../../frame/claims" } pallet-elections-phragmen = { package = "darwinia-elections-phragmen", default-features = false, path = "../../../frame/elections-phragmen" } @@ -76,9 +76,10 @@ pallet-staking = { package = "darwinia-staking", default-features = false, featu pallet-support = { package = "darwinia-support", default-features = false, path = "../../../frame/support" } pallet-treasury = { package = "darwinia-treasury", default-features = false, path = "../../../frame/treasury" } pallet-vesting = { package = "darwinia-vesting", default-features = false, path = "../../../frame/vesting" } +pallet-chain-mmr = { package = "darwinia-chain-mmr", default-features = false, path = "../../../frame/chain-mmr" } [build-dependencies] -wasm-builder-runner = { package = "substrate-wasm-builder-runner", git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +wasm-builder-runner = { package = "substrate-wasm-builder-runner", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [features] default = ["std"] @@ -118,6 +119,7 @@ std = [ "pallet-utility/std", "pallet-vesting/std", + "pallet-claims/std", "pallet-elections-phragmen/std", "pallet-eth-backing/std", @@ -127,6 +129,7 @@ std = [ "pallet-staking/std", "pallet-support/std", "pallet-treasury/std", + "pallet-chain-mmr/std", "node-primitives/std", diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index be7ade0e9..e0f9a5cc6 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -632,6 +632,8 @@ impl pallet_vesting::Trait for Runtime { type MinVestedTransfer = MinVestedTransfer; } +impl pallet_chain_mmr::Trait for Runtime {} + construct_runtime!( pub enum Runtime where Block = Block, @@ -671,6 +673,7 @@ construct_runtime!( Staking: pallet_staking::{Module, Call, Storage, Config, Event}, Treasury: pallet_treasury::{Module, Call, Storage, Config, Event}, Vesting: pallet_vesting::{Module, Call, Storage, Config, Event}, + ChainMMR: pallet_chain_mmr::{Module, Call, Storage}, } ); diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index b465476e0..a29fac878 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -17,37 +17,37 @@ tempfile = "3.1.0" wabt = "0.9.2" # githun.com -frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -node-primitives = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +node-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-society = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-grandpa = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-session = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-society = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-client-db = { features = ["kvdb-rocksdb"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-executor = { features = ["wasmtime"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sc-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-client-db = { features = ["kvdb-rocksdb"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-executor = { features = ["wasmtime"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -substrate-test-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +substrate-test-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia pallet-kton = { package = "darwinia-kton", path = "../../../frame/balances/kton" } @@ -61,8 +61,8 @@ node-runtime = { path = "../runtime" } [dev-dependencies] criterion = "0.3.0" -sc-cli = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sc-service = { features = ["rocksdb"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sc-cli = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-service = { features = ["rocksdb"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # TODO https://github.com/darwinia-network/darwinia/issues/26 #sc-cli = { package = "darwinia-cli", path = "../../../client/cli" } diff --git a/frame/balances/kton/Cargo.toml b/frame/balances/kton/Cargo.toml index ab0701101..bd2015e28 100644 --- a/frame/balances/kton/Cargo.toml +++ b/frame/balances/kton/Cargo.toml @@ -14,19 +14,19 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia darwinia-support = { default-features = false, path = "../../support" } [dev-dependencies] -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [features] default = ["std"] diff --git a/frame/balances/ring/Cargo.toml b/frame/balances/ring/Cargo.toml index 0ed15d7af..c445db6b0 100644 --- a/frame/balances/ring/Cargo.toml +++ b/frame/balances/ring/Cargo.toml @@ -14,21 +14,21 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia darwinia-support = { default-features = false, path = "../../support" } [dev-dependencies] -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [features] default = ["std"] diff --git a/frame/chain-mmr/Cargo.toml b/frame/chain-mmr/Cargo.toml new file mode 100644 index 000000000..a6072682c --- /dev/null +++ b/frame/chain-mmr/Cargo.toml @@ -0,0 +1,39 @@ +[package] +name = "darwinia-chain-mmr" +version = "0.0.1" +authors = ["Darwinia Network "] +edition = "2018" +license = "GPL-3.0" +homepage = "https://darwinia.network/" +repository = "https://github.com/darwinia-network/darwinia/" +description = "Pallet for logging MMR into header digest" + +[dependencies] +serde = { version = "1.0.101", optional = true } +codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false } +#frame-benchmarking = { version = "2.0.0-alpha.2", default-features = false, path = "../benchmarking" } +frame-support = { default-features = false , git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } + +sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } + +merkle-mountain-range = { package = "ckb-merkle-mountain-range", git = "https://github.com/nervosnetwork/merkle-mountain-range.git", default-features = false } + +[dev-dependencies] +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } + +[features] +default = ["std"] +std = [ + "serde", + "codec/std", + "sp-runtime/std", +# "frame-benchmarking/std", + "frame-support/std", + "frame-system/std", + "sp-io/std", + "sp-std/std", + "merkle-mountain-range/std", +] diff --git a/frame/mmr-digest/src/lib.rs b/frame/chain-mmr/src/lib.rs similarity index 88% rename from frame/mmr-digest/src/lib.rs rename to frame/chain-mmr/src/lib.rs index 6a30ee870..45bd4264b 100644 --- a/frame/mmr-digest/src/lib.rs +++ b/frame/chain-mmr/src/lib.rs @@ -2,28 +2,24 @@ #![cfg_attr(not(feature = "std"), no_std)] -use sp_std::marker::PhantomData; use frame_support::{decl_module, decl_storage}; +use sp_std::marker::PhantomData; use sp_std::prelude::*; //use frame_benchmarking::{benchmarks, account}; //use frame_system::{self as system, ensure_signed, ensure_root, RawOrigin}; //use codec::{Encode, Decode}; -use sp_runtime::{ - traits::Hash, - generic::{DigestItem}, -}; +use sp_runtime::{generic::DigestItem, traits::Hash}; -use merkle_mountain_range::{MMR, MMRStore}; +use merkle_mountain_range::{MMRStore, MMR}; -pub trait Trait: frame_system::Trait { -} +pub trait Trait: frame_system::Trait {} decl_storage! { - trait Store for Module as MMRDigest { + trait Store for Module as ChainMMR { /// MMR struct of the previous blocks, from first(genesis) to parent hash. pub MMRList get(fn mmr_list): map hasher(twox_64_concat) u64 => T::Hash; - pub MMRCounter get(fn mmr_counter): u64; + pub MMRCounter get(fn mmr_counter): u64; } } @@ -33,7 +29,7 @@ decl_storage! { pub struct MMRMerge(PhantomData); -impl merkle_mountain_range::Merge for MMRMerge { +impl merkle_mountain_range::Merge for MMRMerge { type Item = ::Hash; fn merge(lhs: &Self::Item, rhs: &Self::Item) -> Self::Item { let encoded_vec = vec![lhs, rhs]; @@ -57,7 +53,7 @@ impl MMRStore for ModuleMMRStore { let mmr_count = ::get(); if pos != mmr_count { // Must be append only. - return Err(merkle_mountain_range::Error::InconsistentStore) + return Err(merkle_mountain_range::Error::InconsistentStore); } let elems_len = elems.len() as u64; @@ -106,4 +102,4 @@ decl_module! { impl Module { // Nothing -} \ No newline at end of file +} diff --git a/frame/chainrelay/eth/backing/Cargo.toml b/frame/chainrelay/eth/backing/Cargo.toml index 70177a546..e8c67014b 100644 --- a/frame/chainrelay/eth/backing/Cargo.toml +++ b/frame/chainrelay/eth/backing/Cargo.toml @@ -16,12 +16,12 @@ serde = { version = "1.0.101", optional = true } # github.com ethabi = { default-features = false, git = "https://github.com/darwinia-network/ethabi.git", branch = "with_no_std" } -frame-support = { default-features = false , git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false , git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia darwinia-eth-relay = { default-features = false, path = "../relay" } @@ -35,11 +35,11 @@ rustc-hex = "2.0" rlp = { package = "rlp", git = "https://github.com/darwinia-network/parity-common.git" } -pallet-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-session = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-staking = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-staking = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } pallet-ring = { package = "darwinia-ring", path = "../../../../frame/balances/ring" } pallet-kton = { package = "darwinia-kton", path = "../../../../frame/balances/kton" } diff --git a/frame/chainrelay/eth/relay/Cargo.toml b/frame/chainrelay/eth/relay/Cargo.toml index ee1643185..cba0a1a31 100644 --- a/frame/chainrelay/eth/relay/Cargo.toml +++ b/frame/chainrelay/eth/relay/Cargo.toml @@ -14,11 +14,11 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } rlp = { default-features = false, git = "https://github.com/darwinia-network/parity-common.git" } @@ -32,8 +32,8 @@ hex-literal = "0.2.1" keccak-hasher = "0.15.2" rustc-hex = "2.0" -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [features] default = ["std"] diff --git a/frame/claims/Cargo.toml b/frame/claims/Cargo.toml index ad53234a9..fda8ef8e6 100644 --- a/frame/claims/Cargo.toml +++ b/frame/claims/Cargo.toml @@ -15,12 +15,12 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [dev-dependencies] hex-literal = "0.2.1" @@ -28,7 +28,7 @@ libsecp256k1 = "0.3.2" serde_json = "1.0.41" tiny-keccak = "1.5.0" -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } pallet-support = { package = "darwinia-support", path = "../support" } pallet-ring = { package = "darwinia-ring", path = "../balances/ring" } diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml index 2992ef752..9da1c60d7 100644 --- a/frame/elections-phragmen/Cargo.toml +++ b/frame/elections-phragmen/Cargo.toml @@ -13,12 +13,12 @@ repository = "https://github.com/darwinia-network/darwinia/" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-phragmen = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-phragmen = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia darwinia-support = { default-features = false, path = "../support" } @@ -29,10 +29,10 @@ serde = { version = "1.0.101" } pallet-ring = { package = "darwinia-ring", path = "../balances/ring" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [features] default = ["std"] diff --git a/frame/mmr-digest/Cargo.toml b/frame/mmr-digest/Cargo.toml deleted file mode 100644 index 8799443ba..000000000 --- a/frame/mmr-digest/Cargo.toml +++ /dev/null @@ -1,38 +0,0 @@ -[package] -name = "darwinia-mmr-digest" -version = "0.0.1" -authors = ["Darwinia Network "] -edition = "2018" -license = "GPL-3.0" -homepage = "https://darwinia.network/" -repository = "https://github.com/darwinia-network/darwinia/" -description = "Pallet for logging MMR into header digest" - -[dependencies] -serde = { version = "1.0.101", optional = true } -codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false } -frame-benchmarking = { version = "2.0.0-alpha.2", default-features = false, path = "../benchmarking" } -frame-support = { version = "2.0.0-alpha.2", default-features = false, path = "../support" } -frame-system = { version = "2.0.0-alpha.2", default-features = false, path = "../system" } -sp-runtime = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/runtime" } -sp-std = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/std" } -sp-io = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/io" } - -merkle-mountain-range = { package = "ckb-merkle-mountain-range", git = "https://github.com/nervosnetwork/merkle-mountain-range.git", default-features = false } - -[dev-dependencies] -sp-core = { version = "2.0.0-alpha.2", path = "../../primitives/core" } - -[features] -default = ["std"] -std = [ - "serde", - "codec/std", - "sp-runtime/std", - "frame-benchmarking/std", - "frame-support/std", - "frame-system/std", - "sp-io/std", - "sp-std/std", - "merkle-mountain-range/std", -] diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml index 09cd59408..90442479e 100644 --- a/frame/staking/Cargo.toml +++ b/frame/staking/Cargo.toml @@ -14,26 +14,26 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-io ={ default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io ={ default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia darwinia-phragmen = { default-features = false, path = "../../primitives/phragmen" } darwinia-support = { default-features = false, path = "../support" } [dev-dependencies] -substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } pallet-ring = { package = "darwinia-ring", path = "../../frame/balances/ring" } pallet-kton = { package = "darwinia-kton", path = "../../frame/balances/kton" } diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml index b331b552a..372fcb58c 100644 --- a/frame/support/Cargo.toml +++ b/frame/support/Cargo.toml @@ -14,9 +14,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = num-traits = { version = "0.2.8", default-features = false } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [features] default = ["std"] diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml index 9ebdc47c8..417e59cd8 100644 --- a/frame/treasury/Cargo.toml +++ b/frame/treasury/Cargo.toml @@ -14,18 +14,18 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true, features = ["derive"] } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia darwinia-support = { default-features = false, path = "../support" } [dev-dependencies] -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-io ={ git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io ={ git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } pallet-kton = { package = "darwinia-kton", path = "../balances/kton" } pallet-ring = { package = "darwinia-ring", path = "../balances/ring" } diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml index ea86fcd49..eecb6a208 100644 --- a/frame/vesting/Cargo.toml +++ b/frame/vesting/Cargo.toml @@ -14,12 +14,12 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia darwinia-support = { default-features = false, path = "../support" } @@ -27,8 +27,8 @@ darwinia-support = { default-features = false, path = "../support" } [dev-dependencies] hex-literal = "0.2.1" -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-storage = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-storage = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } pallet-balances = { package = "darwinia-ring", path = "../balances/ring" } diff --git a/primitives/eth-primitives/Cargo.toml b/primitives/eth-primitives/Cargo.toml index a50309837..bd68dfd8f 100644 --- a/primitives/eth-primitives/Cargo.toml +++ b/primitives/eth-primitives/Cargo.toml @@ -24,15 +24,15 @@ primitive-types = { default-features = false, features = ["codec", "rlp"], git = rlp = { default-features = false, git = "https://github.com/darwinia-network/parity-common.git" } rlp-derive = { git = "https://github.com/darwinia-network/parity-common.git" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [dev-dependencies] hex-literal = "0.2.1" keccak-hasher = "0.15.2" rustc-hex = "2.0" -frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +frame-support = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } triehash = { git = "https://github.com/darwinia-network/parity-common.git" } diff --git a/primitives/merkle-patricia-trie/Cargo.toml b/primitives/merkle-patricia-trie/Cargo.toml index 0135cd32c..572832abd 100644 --- a/primitives/merkle-patricia-trie/Cargo.toml +++ b/primitives/merkle-patricia-trie/Cargo.toml @@ -16,7 +16,7 @@ hashbrown = { version = "0.6.0" } hash = { package = "keccak-hash", default-features = false, git = "https://github.com/darwinia-network/parity-common.git" } rlp = { default-features = false, git = "https://github.com/darwinia-network/parity-common.git" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [dev-dependencies] criterion = "0.2.10" diff --git a/primitives/phragmen/Cargo.toml b/primitives/phragmen/Cargo.toml index 75574c764..2d66b2cde 100644 --- a/primitives/phragmen/Cargo.toml +++ b/primitives/phragmen/Cargo.toml @@ -13,8 +13,8 @@ repository = "https://github.com/darwinia-network/darwinia/" serde = { version = "1.0.101", optional = true, features = ["derive"] } # github.com -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } # darwinia darwinia-support = { default-features = false, path = "../../frame/support" } @@ -22,8 +22,8 @@ darwinia-support = { default-features = false, path = "../../frame/support" } [dev-dependencies] rand = "0.7.2" -sp-io ={ git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } -substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.1" } +sp-io ={ git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } [features] default = ["std"] From 8adc591ba3d38a0a77a6c2deea62a359d1bd0325 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Thu, 19 Mar 2020 00:20:07 +0800 Subject: [PATCH 03/12] using tuple instead of vec --- frame/chain-mmr/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frame/chain-mmr/src/lib.rs b/frame/chain-mmr/src/lib.rs index 45bd4264b..7fd0be54f 100644 --- a/frame/chain-mmr/src/lib.rs +++ b/frame/chain-mmr/src/lib.rs @@ -32,8 +32,8 @@ pub struct MMRMerge(PhantomData); impl merkle_mountain_range::Merge for MMRMerge { type Item = ::Hash; fn merge(lhs: &Self::Item, rhs: &Self::Item) -> Self::Item { - let encoded_vec = vec![lhs, rhs]; - ::Hashing::hash_of(&encoded_vec) + let encodable = (lhs, rhs); + ::Hashing::hash_of(&encodable) } } From efbe36dce447e54c706ac4cfbea597c4a1dc1454 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Thu, 19 Mar 2020 10:59:57 +0800 Subject: [PATCH 04/12] update the map hasher --- frame/chain-mmr/src/lib.rs | 2 +- frame/chainrelay/eth/relay/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frame/chain-mmr/src/lib.rs b/frame/chain-mmr/src/lib.rs index 7fd0be54f..304581060 100644 --- a/frame/chain-mmr/src/lib.rs +++ b/frame/chain-mmr/src/lib.rs @@ -18,7 +18,7 @@ pub trait Trait: frame_system::Trait {} decl_storage! { trait Store for Module as ChainMMR { /// MMR struct of the previous blocks, from first(genesis) to parent hash. - pub MMRList get(fn mmr_list): map hasher(twox_64_concat) u64 => T::Hash; + pub MMRList get(fn mmr_list): map hasher(identity) u64 => T::Hash; pub MMRCounter get(fn mmr_counter): u64; } } diff --git a/frame/chainrelay/eth/relay/src/lib.rs b/frame/chainrelay/eth/relay/src/lib.rs index 41b6e2585..eeee6ad68 100644 --- a/frame/chainrelay/eth/relay/src/lib.rs +++ b/frame/chainrelay/eth/relay/src/lib.rs @@ -58,11 +58,11 @@ decl_storage! { /// Hash of best block header pub BestHeaderHash get(fn best_header_hash): H256; - pub CanonicalHeaderHashOf get(fn canonical_header_hash_of): map hasher(blake2_128_concat) u64 => H256; + pub CanonicalHeaderHashOf get(fn canonical_header_hash_of): map hasher(identity) u64 => H256; - pub HeaderOf get(fn header_of): map hasher(blake2_128_concat) H256 => Option; + pub HeaderOf get(fn header_of): map hasher(identity) H256 => Option; - pub HeaderInfoOf get(fn header_info_of): map hasher(blake2_128_concat) H256 => Option; + pub HeaderInfoOf get(fn header_info_of): map hasher(identity) H256 => Option; /// Number of blocks finality pub NumberOfBlocksFinality get(fn number_of_blocks_finality) config(): u64; From f17bf291b68676deb16906b91387912dd2d9c900 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Thu, 19 Mar 2020 13:16:27 +0800 Subject: [PATCH 05/12] add positions for leaves and prepare for later get_proof and verify functions --- frame/chain-mmr/src/lib.rs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/frame/chain-mmr/src/lib.rs b/frame/chain-mmr/src/lib.rs index 304581060..88aec1119 100644 --- a/frame/chain-mmr/src/lib.rs +++ b/frame/chain-mmr/src/lib.rs @@ -9,7 +9,10 @@ use sp_std::prelude::*; //use frame_system::{self as system, ensure_signed, ensure_root, RawOrigin}; //use codec::{Encode, Decode}; -use sp_runtime::{generic::DigestItem, traits::Hash}; +use sp_runtime::{ + generic::DigestItem, + traits::{Hash, One}, +}; use merkle_mountain_range::{MMRStore, MMR}; @@ -18,8 +21,11 @@ pub trait Trait: frame_system::Trait {} decl_storage! { trait Store for Module as ChainMMR { /// MMR struct of the previous blocks, from first(genesis) to parent hash. - pub MMRList get(fn mmr_list): map hasher(identity) u64 => T::Hash; + pub MMRNodeList get(fn mmr_node_list): map hasher(identity) u64 => T::Hash; pub MMRCounter get(fn mmr_counter): u64; + + /// The positions of header numbers in the MMR Node List + pub Positions get(fn position_of): map hasher(identity) T::BlockNumber => u64; } } @@ -46,7 +52,7 @@ impl Default for ModuleMMRStore { impl MMRStore for ModuleMMRStore { fn get_elem(&self, pos: u64) -> merkle_mountain_range::Result> { - Ok(Some(Module::::mmr_list(pos))) + Ok(Some(Module::::mmr_node_list(pos))) } fn append(&mut self, pos: u64, elems: Vec) -> merkle_mountain_range::Result<()> { @@ -59,7 +65,7 @@ impl MMRStore for ModuleMMRStore { let elems_len = elems.len() as u64; for (i, elem) in elems.into_iter().enumerate() { - >::insert(mmr_count + i as u64, elem); + >::insert(mmr_count + i as u64, elem); } // increment counter @@ -85,10 +91,15 @@ decl_module! { let parent_hash = >::parent_hash(); // Update MMR and add mmr root to digest of block header - mmr.push(parent_hash).expect("Failed to push parent hash to mmr."); + let pos = mmr.push(parent_hash).expect("Failed to push parent hash to mmr."); - let mmr_root = mmr.get_root().expect("Failed to calculate merkle mountain range; qed"); + // The first block number should start with 1 and parent block should be (T::BlockNumber::zero(), hash69()) + // Checking just in case custom changes in system gensis config + if >::block_number() >= T::BlockNumber::one() { + >::insert(>::block_number() - T::BlockNumber::one(), pos); + } + let mmr_root = mmr.get_root().expect("Failed to calculate merkle mountain range; qed"); mmr.commit().expect("Failed to push parent hash to mmr."); let mmr_item = DigestItem::MerkleMountainRangeRoot( From fbfb91e4a506822c54528d68a36ff5dc9f02eaa8 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Thu, 19 Mar 2020 19:17:42 +0800 Subject: [PATCH 06/12] add docs and add get proof function --- frame/chain-mmr/Cargo.toml | 3 +- frame/chain-mmr/src/lib.rs | 99 +++++++++++++++++++++++++++++++++++--- 2 files changed, 94 insertions(+), 8 deletions(-) diff --git a/frame/chain-mmr/Cargo.toml b/frame/chain-mmr/Cargo.toml index a6072682c..7d00b85f9 100644 --- a/frame/chain-mmr/Cargo.toml +++ b/frame/chain-mmr/Cargo.toml @@ -18,11 +18,12 @@ frame-system = { default-features = false, git = "https://github.com/darwinia-ne sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } merkle-mountain-range = { package = "ckb-merkle-mountain-range", git = "https://github.com/nervosnetwork/merkle-mountain-range.git", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } + [features] default = ["std"] diff --git a/frame/chain-mmr/src/lib.rs b/frame/chain-mmr/src/lib.rs index 88aec1119..dc33d6074 100644 --- a/frame/chain-mmr/src/lib.rs +++ b/frame/chain-mmr/src/lib.rs @@ -1,27 +1,73 @@ -//! # MMR Digest Pallet +//! # Chain MMR Pallet +//! +//! \## Overview +//! This is the pallet to maintain accumulate headers Merkle Mountain Range +//! and push the mmr root in to the digest of block headers on finalize. +//! MMR can be used for light client to implement super light clients, +//! and can also be used in other chains to implement chain relay for +//! cross-chain verification purpose. +//! +//! \## Terminology +//! +//! \### Merkle Moutain Range +//! For more details about the MMR struct, refer https://github.com/mimblewimble/grin/blob/master/doc/mmr.md#structure +//! +//! \### MMR Proof +//! Using the MMR Store Storage, MMR Proof can be generated for specific +//! block header hash. Proofs can be used to verify block inclusion together with +//! the mmr root in the header digest. +//! +//! \### Positions +//! The index position of the nodes(and hash leave nodes) in the mmr node list +//! constructed using MMR struct +//! +//! \### Digest Item +//! The is a ```MerkleMountainRangeRoot(Hash)``` digest item pre-subscribed in Digest. +//! This is implemented in Darwinia's fork of substrate: https://github.com/darwinia-network/substrate +//! The Pull request link is https://github.com/darwinia-network/substrate/pull/1 +//! +//! \## Implementation +//! We are using the MMR library from https://github.com/nervosnetwork/merkle-mountain-range +//! Pull request: https://github.com/darwinia-network/darwinia/pull/358 +//! +//! \## References +//! Darwinia Relay's Technical Paper: +//! https://github.com/darwinia-network/rfcs/blob/master/paper/Darwinia_Relay_Sublinear_Optimistic_Relay_for_Interoperable_Blockchains_v0.7.pdf +//! +//! https://github.com/mimblewimble/grin/blob/master/doc/mmr.md#structure +//! https://github.com/mimblewimble/grin/blob/0ff6763ee64e5a14e70ddd4642b99789a1648a32/core/src/core/pmmr.rs#L606 +//! https://github.com/nervosnetwork/merkle-mountain-range/blob/master/src/tests/test_accumulate_headers.rs +//! https://eprint.iacr.org/2019/226.pdf +//! #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::{decl_module, decl_storage}; +use frame_support::{decl_error, decl_module, decl_storage, ensure}; +use sp_std::convert::TryFrom; use sp_std::marker::PhantomData; use sp_std::prelude::*; //use frame_benchmarking::{benchmarks, account}; -//use frame_system::{self as system, ensure_signed, ensure_root, RawOrigin}; +//use frame_system::{self as system, ensure_root, ensure_signed, RawOrigin}; //use codec::{Encode, Decode}; use sp_runtime::{ - generic::DigestItem, + generic::{DigestItem, Header}, traits::{Hash, One}, + DispatchError, }; -use merkle_mountain_range::{MMRStore, MMR}; +use merkle_mountain_range::{MMRStore, MerkleProof, MMR}; -pub trait Trait: frame_system::Trait {} +pub trait Trait: frame_system::Trait { + // Nothing +} decl_storage! { trait Store for Module as ChainMMR { /// MMR struct of the previous blocks, from first(genesis) to parent hash. pub MMRNodeList get(fn mmr_node_list): map hasher(identity) u64 => T::Hash; + + /// The MMR size and length of the mmr node list pub MMRCounter get(fn mmr_counter): u64; /// The positions of header numbers in the MMR Node List @@ -75,6 +121,13 @@ impl MMRStore for ModuleMMRStore { } } +decl_error! { + pub enum Error for Module { + /// Proof - GET FAILED + ProofGF, + } +} + decl_module! { // Simple declaration of the `Module` type. Lets the macro know what its working on. pub struct Module for enum Call where origin: T::Origin { @@ -112,5 +165,37 @@ decl_module! { } impl Module { - // Nothing + // TODO: Add rpc call for this + fn _get_proof( + block_number: T::BlockNumber, + mmr_header: &Header, + ) -> Result>, DispatchError> + where + T::BlockNumber: Into + TryFrom, + T::Hash: sp_runtime::traits::Hash, + { + ensure!(block_number < mmr_header.number, "Block number too large"); + + let store = ModuleMMRStore::::default(); + + let pos = Self::position_of(block_number); + let mmr_header_pos = Self::position_of(&mmr_header.number); + let mmr = MMR::<_, MMRMerge, _>::new(mmr_header_pos, store); + + // find the first consensus digest with the right ID which converts to + // the right kind of consensus log. + let header_mmr_root = mmr_header + .digest + .convert_first(|l| l.as_merkle_mountain_range_root().cloned()) + .expect("Header mmr get failed"); + + assert!( + mmr.get_root().expect("Get Root Failed") == header_mmr_root, + "MMR root not match" + ); + + let proof = mmr.gen_proof(vec![pos]).map_err(|_| >::ProofGF)?; + + Ok(proof) + } } From 4a44fda6609c4b912929128d9da6b8cfe5ac5a04 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Fri, 20 Mar 2020 13:03:49 +0800 Subject: [PATCH 07/12] add tests and refactor codes --- .maintain/ci/travis.local.sh | 1 + Cargo.lock | 32 ++--- Cargo.toml | 1 + bin/node/runtime/Cargo.toml | 4 +- bin/node/runtime/src/lib.rs | 6 +- frame/{chain-mmr => header-mmr}/Cargo.toml | 2 +- frame/{chain-mmr => header-mmr}/src/lib.rs | 134 +++++++++------------ frame/header-mmr/src/mock.rs | 75 ++++++++++++ frame/header-mmr/src/tests.rs | 96 +++++++++++++++ 9 files changed, 256 insertions(+), 95 deletions(-) rename frame/{chain-mmr => header-mmr}/Cargo.toml (98%) rename frame/{chain-mmr => header-mmr}/src/lib.rs (79%) create mode 100644 frame/header-mmr/src/mock.rs create mode 100644 frame/header-mmr/src/tests.rs diff --git a/.maintain/ci/travis.local.sh b/.maintain/ci/travis.local.sh index ac2d94ce5..ae2ec730c 100644 --- a/.maintain/ci/travis.local.sh +++ b/.maintain/ci/travis.local.sh @@ -5,6 +5,7 @@ readonly TEST_CRATES=( 'treasury' 'eth-relay' 'eth-backing' + 'header-mmr' ); function main() { diff --git a/Cargo.lock b/Cargo.lock index ae8d9aa55..bee778cc7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -932,21 +932,6 @@ dependencies = [ "zeroize 1.1.0", ] -[[package]] -name = "darwinia-chain-mmr" -version = "0.0.1" -dependencies = [ - "ckb-merkle-mountain-range", - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", -] - [[package]] name = "darwinia-claims" version = "0.5.0" @@ -1036,6 +1021,21 @@ dependencies = [ "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", ] +[[package]] +name = "darwinia-header-mmr" +version = "0.0.1" +dependencies = [ + "ckb-merkle-mountain-range", + "frame-support", + "frame-system", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", +] + [[package]] name = "darwinia-kton" version = "0.5.0" @@ -3609,11 +3609,11 @@ dependencies = [ name = "node-runtime" version = "0.5.0" dependencies = [ - "darwinia-chain-mmr", "darwinia-claims", "darwinia-elections-phragmen", "darwinia-eth-backing", "darwinia-eth-relay", + "darwinia-header-mmr", "darwinia-kton", "darwinia-ring", "darwinia-staking", diff --git a/Cargo.toml b/Cargo.toml index b362493f2..f4ce4f3b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,7 @@ members = [ "frame/support", "frame/treasury", "frame/vesting", + "frame/header-mmr", "primitives/ethash", "primitives/eth-primitives", "primitives/merkle-patricia-trie", diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 7ea0f5f84..009dafa66 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -76,7 +76,7 @@ pallet-staking = { package = "darwinia-staking", default-features = false, featu pallet-support = { package = "darwinia-support", default-features = false, path = "../../../frame/support" } pallet-treasury = { package = "darwinia-treasury", default-features = false, path = "../../../frame/treasury" } pallet-vesting = { package = "darwinia-vesting", default-features = false, path = "../../../frame/vesting" } -pallet-chain-mmr = { package = "darwinia-chain-mmr", default-features = false, path = "../../../frame/chain-mmr" } +pallet-header-mmr = { package = "darwinia-header-mmr", default-features = false, path = "../../../frame/header-mmr" } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } @@ -129,7 +129,7 @@ std = [ "pallet-staking/std", "pallet-support/std", "pallet-treasury/std", - "pallet-chain-mmr/std", + "pallet-header-mmr/std", "node-primitives/std", diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index e0f9a5cc6..8a06751ba 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -632,7 +632,9 @@ impl pallet_vesting::Trait for Runtime { type MinVestedTransfer = MinVestedTransfer; } -impl pallet_chain_mmr::Trait for Runtime {} +impl pallet_header_mmr::Trait for Runtime { + type Event = Event; +} construct_runtime!( pub enum Runtime where @@ -673,7 +675,7 @@ construct_runtime!( Staking: pallet_staking::{Module, Call, Storage, Config, Event}, Treasury: pallet_treasury::{Module, Call, Storage, Config, Event}, Vesting: pallet_vesting::{Module, Call, Storage, Config, Event}, - ChainMMR: pallet_chain_mmr::{Module, Call, Storage}, + HeaderMMR: pallet_header_mmr::{Module, Call, Storage, Event}, } ); diff --git a/frame/chain-mmr/Cargo.toml b/frame/header-mmr/Cargo.toml similarity index 98% rename from frame/chain-mmr/Cargo.toml rename to frame/header-mmr/Cargo.toml index 7d00b85f9..05a5f0f56 100644 --- a/frame/chain-mmr/Cargo.toml +++ b/frame/header-mmr/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "darwinia-chain-mmr" +name = "darwinia-header-mmr" version = "0.0.1" authors = ["Darwinia Network "] edition = "2018" diff --git a/frame/chain-mmr/src/lib.rs b/frame/header-mmr/src/lib.rs similarity index 79% rename from frame/chain-mmr/src/lib.rs rename to frame/header-mmr/src/lib.rs index dc33d6074..04c84ffbf 100644 --- a/frame/chain-mmr/src/lib.rs +++ b/frame/header-mmr/src/lib.rs @@ -42,28 +42,30 @@ #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::{decl_error, decl_module, decl_storage, ensure}; -use sp_std::convert::TryFrom; +use frame_support::{decl_error, decl_event, decl_module, decl_storage, ensure}; use sp_std::marker::PhantomData; use sp_std::prelude::*; //use frame_benchmarking::{benchmarks, account}; -//use frame_system::{self as system, ensure_root, ensure_signed, RawOrigin}; +use frame_system::{self as system}; // , ensure_root, ensure_signed, RawOrigin //use codec::{Encode, Decode}; use sp_runtime::{ - generic::{DigestItem, Header}, + generic::DigestItem, traits::{Hash, One}, DispatchError, }; use merkle_mountain_range::{MMRStore, MerkleProof, MMR}; +mod mock; +mod tests; + pub trait Trait: frame_system::Trait { - // Nothing + type Event: From> + Into<::Event>; } decl_storage! { - trait Store for Module as ChainMMR { + trait Store for Module as HeaderMMR { /// MMR struct of the previous blocks, from first(genesis) to parent hash. pub MMRNodeList get(fn mmr_node_list): map hasher(identity) u64 => T::Hash; @@ -75,10 +77,53 @@ decl_storage! { } } -//decl_event!( -//); +decl_event! { + pub enum Event where H = ::Hash { + /// New mmr root log hash been deposited. + NewMMRRoot(H), + } +} // `ensure_root` and `ensure_none`. +decl_error! { + pub enum Error for Module { + /// Proof - GET FAILED + ProofGF, + } +} + +decl_module! { + pub struct Module for enum Call where origin: T::Origin { + fn deposit_event() = default; + + fn on_finalize(_block_number: T::BlockNumber) { + let store = ModuleMMRStore::::default(); + + let mut mmr = MMR::<_, MMRMerge, _>::new(::get(), store); + + let parent_hash = >::parent_hash(); + // Update MMR and add mmr root to digest of block header + let pos = mmr.push(parent_hash).expect("Failed to push parent hash to mmr."); + + // The first block number should start with 1 and parent block should be (T::BlockNumber::zero(), hash69()) + // Checking just in case custom changes in system gensis config + if >::block_number() >= T::BlockNumber::one() { + >::insert(>::block_number() - T::BlockNumber::one(), pos); + } + + let mmr_root = mmr.get_root().expect("Failed to calculate merkle mountain range; qed"); + mmr.commit().expect("Failed to push parent hash to mmr."); + + let mmr_item = DigestItem::MerkleMountainRangeRoot( + mmr_root.into() + ); + + >::deposit_log(mmr_item.into()); + Self::deposit_event(Event::::NewMMRRoot(mmr_root)); + } + } +} + pub struct MMRMerge(PhantomData); impl merkle_mountain_range::Merge for MMRMerge { @@ -121,78 +166,19 @@ impl MMRStore for ModuleMMRStore { } } -decl_error! { - pub enum Error for Module { - /// Proof - GET FAILED - ProofGF, - } -} - -decl_module! { - // Simple declaration of the `Module` type. Lets the macro know what its working on. - pub struct Module for enum Call where origin: T::Origin { - /// Deposit one of this pallet's events by using the default implementation. - /// It is also possible to provide a custom implementation. - /// For non-generic events, the generic parameter just needs to be dropped, so that it - /// looks like: `fn deposit_event() = default;`. -// fn deposit_event() = default; - - fn on_finalize(_block_number: T::BlockNumber) { - let store = ModuleMMRStore::::default(); - - let mut mmr = MMR::<_, MMRMerge, _>::new(::get(), store); - - let parent_hash = >::parent_hash(); - // Update MMR and add mmr root to digest of block header - let pos = mmr.push(parent_hash).expect("Failed to push parent hash to mmr."); - - // The first block number should start with 1 and parent block should be (T::BlockNumber::zero(), hash69()) - // Checking just in case custom changes in system gensis config - if >::block_number() >= T::BlockNumber::one() { - >::insert(>::block_number() - T::BlockNumber::one(), pos); - } - - let mmr_root = mmr.get_root().expect("Failed to calculate merkle mountain range; qed"); - mmr.commit().expect("Failed to push parent hash to mmr."); - - let mmr_item = DigestItem::MerkleMountainRangeRoot( - mmr_root.into() - ); - - >::deposit_log(mmr_item.into()); - } - } -} - impl Module { // TODO: Add rpc call for this - fn _get_proof( + fn _gen_proof( block_number: T::BlockNumber, - mmr_header: &Header, - ) -> Result>, DispatchError> - where - T::BlockNumber: Into + TryFrom, - T::Hash: sp_runtime::traits::Hash, - { - ensure!(block_number < mmr_header.number, "Block number too large"); - - let store = ModuleMMRStore::::default(); + mmr_block_number: T::BlockNumber, + ) -> Result>, DispatchError> { + ensure!(block_number < mmr_block_number, "Block number too large"); let pos = Self::position_of(block_number); - let mmr_header_pos = Self::position_of(&mmr_header.number); - let mmr = MMR::<_, MMRMerge, _>::new(mmr_header_pos, store); + let mmr_header_pos = Self::position_of(mmr_block_number); - // find the first consensus digest with the right ID which converts to - // the right kind of consensus log. - let header_mmr_root = mmr_header - .digest - .convert_first(|l| l.as_merkle_mountain_range_root().cloned()) - .expect("Header mmr get failed"); - - assert!( - mmr.get_root().expect("Get Root Failed") == header_mmr_root, - "MMR root not match" - ); + let store = ModuleMMRStore::::default(); + let mmr = MMR::<_, MMRMerge, _>::new(mmr_header_pos, store); let proof = mmr.gen_proof(vec![pos]).map_err(|_| >::ProofGF)?; diff --git a/frame/header-mmr/src/mock.rs b/frame/header-mmr/src/mock.rs new file mode 100644 index 000000000..c281d7754 --- /dev/null +++ b/frame/header-mmr/src/mock.rs @@ -0,0 +1,75 @@ +//! Test utilities + +#![cfg(test)] + +use crate::{Module, Trait}; +use codec::{Decode, Encode}; +use frame_support::{impl_outer_event, impl_outer_origin, parameter_types, weights::Weight}; +use sp_core::H256; +use sp_io; +use sp_runtime::{testing::Header, traits::IdentityLookup, DigestItem, Perbill}; + +use frame_system as system; +impl_outer_origin! { + pub enum Origin for Test where system = frame_system {} +} + +pub fn header_mmr_log(hash: H256) -> DigestItem { + DigestItem::MerkleMountainRangeRoot(hash) +} + +// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. +#[derive(Clone, PartialEq, Eq, Debug, Decode, Encode)] +pub struct Test; + +impl Trait for Test { + type Event = TestEvent; +} +parameter_types! { + pub const BlockHashCount: u64 = 250; + pub const MaximumBlockWeight: Weight = 1024; + pub const MaximumBlockLength: u32 = 2 * 1024; + pub const AvailableBlockRatio: Perbill = Perbill::one(); +} +impl frame_system::Trait for Test { + type Origin = Origin; + type Index = u64; + type BlockNumber = u64; + type Call = (); + type Hash = H256; + type Hashing = sp_runtime::traits::BlakeTwo256; + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; + type Event = TestEvent; + type BlockHashCount = BlockHashCount; + type MaximumBlockWeight = MaximumBlockWeight; + type MaximumBlockLength = MaximumBlockLength; + type AvailableBlockRatio = AvailableBlockRatio; + type Version = (); + type ModuleToIndex = (); + type AccountData = (); + type MigrateAccount = (); + type OnNewAccount = (); + type OnKilledAccount = (); +} + +mod headermmr { + pub use crate::Event; +} + +impl_outer_event! { + pub enum TestEvent for Test { + system, + headermmr, + } +} + +pub fn new_test_ext() -> sp_io::TestExternalities { + let t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + // GenesisConfig {}.assimilate_storage::(&mut t).unwrap(); + t.into() +} + +pub type System = frame_system::Module; +pub type HeaderMMR = Module; diff --git a/frame/header-mmr/src/tests.rs b/frame/header-mmr/src/tests.rs new file mode 100644 index 000000000..4984ac670 --- /dev/null +++ b/frame/header-mmr/src/tests.rs @@ -0,0 +1,96 @@ +//! Tests for the module. + +#![cfg(test)] + +use super::*; +use crate::mock::*; +//use codec::{Decode, Encode}; +use frame_system::{EventRecord, Phase}; +use sp_runtime::{ + testing::{Digest, H256}, + traits::{Header, OnFinalize}, +}; + +fn initialize_block(number: u64, parent_hash: H256) { + System::initialize( + &number, + &parent_hash, + &Default::default(), + &Default::default(), + Default::default(), + ); +} + +#[test] +fn first_header_mmr() { + new_test_ext().execute_with(|| { + let parent_hash: H256 = Default::default(); + initialize_block(1, parent_hash); + + System::note_finished_extrinsics(); + HeaderMMR::on_finalize(1); + + let header = System::finalize(); + assert_eq!( + header.digest, + Digest { + logs: vec![header_mmr_log(parent_hash)] + } + ); + + assert_eq!( + System::events(), + vec![EventRecord { + phase: Phase::Finalization, + event: Event::::NewMMRRoot(parent_hash).into(), + topics: vec![], + },] + ); + }); +} + +#[test] +fn test_insert_header() { + new_test_ext().execute_with(|| { + initialize_block(1, Default::default()); + + HeaderMMR::on_finalize(1); + + let mut headers = vec![]; + + let mut header = System::finalize(); + headers.push(header.clone()); + + for i in 2..30 { + initialize_block(i, header.hash()); + + HeaderMMR::on_finalize(i); + header = System::finalize(); + headers.push(header.clone()); + } + + let h1 = 11 as u64; + let h2 = 19 as u64; + + let prove_elem = headers[h1 as usize - 1].hash(); + + let pos = 19; + assert_eq!(pos, HeaderMMR::position_of(h1)); + assert_eq!(prove_elem, HeaderMMR::mmr_node_list(pos)); + + let mmr_root = headers[h2 as usize - 1] + .digest + .convert_first(|l| l.as_merkle_mountain_range_root().cloned()) + .expect("Header mmr get failed"); + + let store = ModuleMMRStore::::default(); + let mmr = MMR::<_, MMRMerge, _>::new(HeaderMMR::position_of(h2), store); + + assert_eq!(mmr.get_root().expect("Get Root Failed"), mmr_root); + + let proof = HeaderMMR::_gen_proof(h1, h2).expect("gen proof"); + + let result = proof.verify(mmr_root, vec![(pos, prove_elem)]).expect("verify"); + assert!(result); + }); +} From ab1cc4eaedc43d39ce514f8619379efac7c774d1 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Fri, 20 Mar 2020 16:58:15 +0800 Subject: [PATCH 08/12] update substrate dep and add header-mmr tests in travis --- .travis.yml | 4 + Cargo.lock | 384 ++++++++++----------- bin/node/cli/Cargo.toml | 106 +++--- bin/node/executor/Cargo.toml | 42 +-- bin/node/rpc/Cargo.toml | 30 +- bin/node/runtime/Cargo.toml | 90 ++--- bin/node/testing/Cargo.toml | 56 +-- frame/balances/kton/Cargo.toml | 12 +- frame/balances/ring/Cargo.toml | 16 +- frame/chainrelay/eth/backing/Cargo.toml | 18 +- frame/chainrelay/eth/relay/Cargo.toml | 12 +- frame/claims/Cargo.toml | 12 +- frame/elections-phragmen/Cargo.toml | 16 +- frame/header-mmr/Cargo.toml | 12 +- frame/staking/Cargo.toml | 22 +- frame/support/Cargo.toml | 6 +- frame/treasury/Cargo.toml | 12 +- frame/vesting/Cargo.toml | 14 +- primitives/eth-primitives/Cargo.toml | 6 +- primitives/merkle-patricia-trie/Cargo.toml | 2 +- primitives/phragmen/Cargo.toml | 8 +- 21 files changed, 442 insertions(+), 438 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35fa3c144..67044999c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,10 @@ jobs: env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native ETHBACKING script: .maintain/ci/darwinia_test_script.sh eth-backing + - stage: Darwinia Test + env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native HEADERMMR + script: .maintain/ci/darwinia_test_script.sh header-mmr + # TODO: remove this when overall test case ready allow_failures: - stage: Overall Test diff --git a/Cargo.lock b/Cargo.lock index bee778cc7..f4b10c8cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -950,7 +950,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "tiny-keccak 1.5.0", ] @@ -969,7 +969,7 @@ dependencies = [ "sp-io", "sp-phragmen", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "substrate-test-utils", ] @@ -997,7 +997,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] @@ -1018,7 +1018,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] @@ -1033,7 +1033,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] @@ -1048,7 +1048,7 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] @@ -1060,7 +1060,7 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "substrate-test-utils", ] @@ -1078,7 +1078,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] @@ -1100,7 +1100,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "substrate-test-utils", ] @@ -1112,7 +1112,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] @@ -1129,7 +1129,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] @@ -1146,7 +1146,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-storage", ] @@ -1352,7 +1352,7 @@ dependencies = [ "rustc-hex", "serde", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "triehash", ] @@ -1629,7 +1629,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fork-tree" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", ] @@ -1637,7 +1637,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -1646,13 +1646,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-runtime-interface", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "frame-benchmarking-cli" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1670,31 +1670,31 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "serde", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "frame-metadata" version = "11.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "serde", "sp-core", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "frame-support" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "bitmask", "frame-metadata", @@ -1711,14 +1711,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "tracing", ] [[package]] name = "frame-support-procedural" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -1729,7 +1729,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1741,7 +1741,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "proc-macro2", "quote", @@ -1751,7 +1751,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1760,14 +1760,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-version", ] [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sp-api", @@ -3332,7 +3332,7 @@ dependencies = [ "keccak-hash", "rand 0.6.5", "rlp 0.4.4", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "uuid 0.7.4", ] @@ -3559,7 +3559,7 @@ dependencies = [ [[package]] name = "node-inspect" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "log", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "sp-core", "sp-runtime", @@ -3664,7 +3664,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-transaction-pool", "sp-version", "substrate-wasm-builder-runner", @@ -3673,7 +3673,7 @@ dependencies = [ [[package]] name = "node-transaction-factory" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "log", "parity-scale-codec", @@ -3830,7 +3830,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -3842,13 +3842,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-authorship" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -3859,13 +3859,13 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-babe" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -3879,14 +3879,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-timestamp", ] [[package]] name = "pallet-balances" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-benchmarking", "frame-support", @@ -3895,13 +3895,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-collective" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -3910,13 +3910,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-contracts" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -3929,24 +3929,24 @@ dependencies = [ "sp-io", "sp-runtime", "sp-sandbox", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "wasmi-validation", ] [[package]] name = "pallet-contracts-primitives" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-contracts-rpc" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3965,19 +3965,19 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-finality-tracker" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -3987,13 +3987,13 @@ dependencies = [ "sp-finality-tracker", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-grandpa" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4005,13 +4005,13 @@ dependencies = [ "sp-finality-grandpa", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-identity" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4021,13 +4021,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-im-online" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4040,13 +4040,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-indices" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4056,13 +4056,13 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-membership" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4070,13 +4070,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-offences" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4085,26 +4085,26 @@ dependencies = [ "serde", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "safe-mix", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-recovery" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "enumflags2", "frame-support", @@ -4113,13 +4113,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-session" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4130,14 +4130,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-trie", ] [[package]] name = "pallet-society" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4146,13 +4146,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-sudo" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4160,13 +4160,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-timestamp" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-benchmarking", "frame-support", @@ -4176,27 +4176,27 @@ dependencies = [ "serde", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-timestamp", ] [[package]] name = "pallet-transaction-payment" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4214,20 +4214,20 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "parity-scale-codec", "serde", "sp-api", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "pallet-utility" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-support", "frame-system", @@ -4236,7 +4236,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] @@ -5230,7 +5230,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "bytes 0.5.4", "derive_more", @@ -5257,7 +5257,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "futures 0.3.4", "log", @@ -5278,7 +5278,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5294,7 +5294,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5309,7 +5309,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5320,7 +5320,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "ansi_term 0.12.1", "app_dirs", @@ -5359,7 +5359,7 @@ dependencies = [ [[package]] name = "sc-client" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "fnv", @@ -5383,7 +5383,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-trie", "sp-version", "substrate-prometheus-endpoint", @@ -5393,7 +5393,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "fnv", @@ -5415,7 +5415,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-storage", "sp-transaction-pool", "sp-trie", @@ -5425,7 +5425,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "hash-db", "kvdb", @@ -5453,7 +5453,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "fork-tree", @@ -5494,7 +5494,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "futures 0.3.4", @@ -5516,7 +5516,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5529,7 +5529,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5550,7 +5550,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "log", "sc-client-api", @@ -5564,7 +5564,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "lazy_static", @@ -5591,7 +5591,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "log", @@ -5607,7 +5607,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "log", "parity-scale-codec", @@ -5623,7 +5623,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "log", "parity-scale-codec", @@ -5640,7 +5640,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "assert_matches", "finality-grandpa", @@ -5675,7 +5675,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "ansi_term 0.12.1", "futures 0.3.4", @@ -5692,7 +5692,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "hex 0.4.2", @@ -5707,7 +5707,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "bitflags", "bytes 0.5.4", @@ -5758,7 +5758,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5773,7 +5773,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "bytes 0.5.4", "fnv", @@ -5799,7 +5799,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "futures 0.3.4", "libp2p", @@ -5811,7 +5811,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "futures 0.3.4", "hash-db", @@ -5842,7 +5842,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "futures 0.3.4", @@ -5865,7 +5865,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5880,7 +5880,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "exit-future", @@ -5929,7 +5929,7 @@ dependencies = [ [[package]] name = "sc-service-test" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "env_logger 0.7.1", "fdlimit", @@ -5950,7 +5950,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "log", "parity-scale-codec", @@ -5964,7 +5964,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "bytes 0.5.4", "futures 0.3.4", @@ -5986,7 +5986,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "erased-serde", "log", @@ -6001,7 +6001,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "futures 0.3.4", @@ -6020,7 +6020,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "futures 0.3.4", @@ -6370,19 +6370,19 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "log", "sp-core", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-wasm-interface", ] [[package]] name = "sp-api" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "hash-db", "parity-scale-codec", @@ -6390,14 +6390,14 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-version", ] [[package]] name = "sp-api-proc-macro" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6409,67 +6409,67 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "serde", "sp-core", "sp-io", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-arithmetic" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "serde", "sp-debug-derive", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-authority-discovery" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-authorship" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-block-builder" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-blockchain" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "log", @@ -6485,7 +6485,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "futures 0.3.4", @@ -6500,14 +6500,14 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-version", ] [[package]] name = "sp-consensus-babe" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6516,14 +6516,14 @@ dependencies = [ "sp-consensus", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-timestamp", ] [[package]] name = "sp-core" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "base58", "blake2-rfc", @@ -6551,7 +6551,7 @@ dependencies = [ "sp-debug-derive", "sp-externalities", "sp-runtime-interface", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-storage", "substrate-bip39", "tiny-bip39", @@ -6564,7 +6564,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "proc-macro2", "quote", @@ -6574,52 +6574,52 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "environmental", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-storage", ] [[package]] name = "sp-finality-grandpa" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "serde", "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-finality-tracker" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sp-inherents", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-inherents" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "parity-scale-codec", "parking_lot 0.10.0", "sp-core", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-io" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "hash-db", "libsecp256k1", @@ -6629,7 +6629,7 @@ dependencies = [ "sp-externalities", "sp-runtime-interface", "sp-state-machine", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-trie", "sp-wasm-interface", ] @@ -6637,7 +6637,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "lazy_static", "sp-core", @@ -6648,7 +6648,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "sp-api", "sp-runtime", @@ -6657,7 +6657,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "backtrace", "log", @@ -6666,17 +6666,17 @@ dependencies = [ [[package]] name = "sp-phragmen" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "serde", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-rpc" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "serde", "sp-core", @@ -6685,7 +6685,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -6700,19 +6700,19 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-runtime-interface" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "primitive-types 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "sp-externalities", "sp-runtime-interface-proc-macro", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-wasm-interface", "static_assertions 1.1.0", ] @@ -6720,7 +6720,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "Inflector", "proc-macro-crate", @@ -6732,12 +6732,12 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sp-core", "sp-io", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "sp-wasm-interface", "wasmi", ] @@ -6745,7 +6745,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "serde", "serde_json", @@ -6754,28 +6754,28 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "sp-api", "sp-core", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-staking" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "parity-scale-codec", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-state-machine" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "hash-db", "log", @@ -6794,42 +6794,42 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=darwinia-develop#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" [[package]] name = "sp-std" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?branch=darwinia-develop#dd97b1478b31a4715df7e88a5ebc6664425fb6c6" [[package]] name = "sp-storage" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "impl-serde 0.2.3", "serde", "sp-debug-derive", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-timestamp" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "wasm-timer", ] [[package]] name = "sp-transaction-pool" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "derive_more", "futures 0.3.4", @@ -6843,13 +6843,13 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", "sp-core", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "trie-db", "trie-root", ] @@ -6857,23 +6857,23 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", "serde", "sp-runtime", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", ] [[package]] name = "sp-wasm-interface" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header)", + "sp-std 2.0.0-alpha.3 (git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2)", "wasmi", ] @@ -6994,7 +6994,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "chrono", "clear_on_drop", @@ -7020,12 +7020,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.4", @@ -7046,7 +7046,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" dependencies = [ "async-std", "derive_more", @@ -7060,12 +7060,12 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0-alpha.3" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" [[package]] name = "substrate-wasm-builder-runner" version = "1.0.5" -source = "git+https://github.com/darwinia-network/substrate.git?branch=denny_support_mmr_header#4bf592865e17ace0bb9e76a0266d320a9c6bdb4c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=v2.0.0-alpha.darwinia.2#ef2ab12d7d0b050546698433b4a34dc7ddc0e475" [[package]] name = "subtle" diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index b0a76b902..d7742f4a5 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -43,72 +43,72 @@ structopt = { version = "0.3.8", optional = true } tracing = "0.1.10" # primitives -grandpa-primitives = { package = "sp-finality-grandpa", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } - -sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +grandpa-primitives = { package = "sp-finality-grandpa", git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } + +sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # client dependencies -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } - -sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-client-db = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-network = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-offchain = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-service = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-telemetry = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-tracing = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } - -sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } + +sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-client-db = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-offchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-service = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-telemetry = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-tracing = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } + +sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # frame dependencies -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -pallet-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } pallet-claims = { package = "darwinia-claims", path = "../../../frame/claims" } # node-specific dependencies -node-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-primitives = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } node-executor = { path = "../executor" } node-rpc = { path = "../rpc" } node-runtime = { path = "../runtime" } # CLI-specific dependencies -frame-benchmarking-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-benchmarking-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -node-inspect = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -node-transaction-factory = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-inspect = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +node-transaction-factory = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # TODO https://github.com/darwinia-network/darwinia/issues/26 #sc-cli = { package = "darwinia-cli", optional = true, path = "../../../client/cli" } # WASM-specific dependencies -browser-utils = { package = "substrate-browser-utils", optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +browser-utils = { package = "substrate-browser-utils", optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen-futures = { version = "0.4.7", optional = true } @@ -119,25 +119,25 @@ futures = "0.3.1" nix = "0.17" tempfile = "3.1.0" -sc-consensus-babe = { features = ["test-helpers"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-service-test = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-consensus-babe = { features = ["test-helpers"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-service-test = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [build-dependencies] structopt = { version = "0.3.8", optional = true } vergen = { version = "3.0.4", optional =true } -build-script-utils = { package = "substrate-build-script-utils", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-benchmarking-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +build-script-utils = { package = "substrate-build-script-utils", git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-benchmarking-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # TODO https://github.com/darwinia-network/darwinia/issues/26 #sc-cli = { package = "darwinia-cli", optional = true, path = "../../../client/cli" } -node-inspect = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -node-transaction-factory = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-inspect = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +node-transaction-factory = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [features] default = ["cli", "wasmtime"] diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml index e694f34a7..0bf111597 100644 --- a/bin/node/executor/Cargo.toml +++ b/bin/node/executor/Cargo.toml @@ -15,15 +15,15 @@ trie-root = "0.16.0" # github.com # TODO benchmarking -#frame-benchmarking = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#frame-benchmarking = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -node-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-primitives = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-executor = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-state-machine = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-trie = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-state-machine = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-trie = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia node-runtime = { path = "../runtime" } @@ -33,23 +33,23 @@ node-runtime = { path = "../runtime" } #criterion = "0.3.0" #wabt = "0.9.2" # -#frame-support = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#frame-system = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # -#pallet-balances = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-grandpa = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-im-online = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-session = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-treasury = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#pallet-balances = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-im-online = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-treasury = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # -#sp-application-crypto = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#sp-application-crypto = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # -#substrate-test-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +#substrate-test-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # #node-testing = { path = "../testing" } diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index 66bff3130..b01884f4c 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -13,25 +13,25 @@ repository = "https://github.com/darwinia-network/darwinia/" jsonrpc-core = "14.0.3" # github.com -node-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-primitives = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -pallet-contracts-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-transaction-payment-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-contracts-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-transaction-payment-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sc-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-consensus= { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-consensus-babe-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-consensus= { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-consensus-babe-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -substrate-frame-rpc-system = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +substrate-frame-rpc-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia node-runtime = { path = "../runtime" } diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 009dafa66..f731a9806 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -17,54 +17,54 @@ rustc-hex = { version = "2.0", optional = true } serde = { version = "1.0.102", optional = true } # primitives -sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-block-builder = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-consensus-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-inherents = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-keyring = { optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-offchain = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-session = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-transaction-pool = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-version = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-block-builder = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-consensus-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-inherents = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-keyring = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-offchain = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-session = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-transaction-pool = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-version = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -node-primitives = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-primitives = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # frame dependencies -frame-benchmarking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-executive = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-benchmarking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-executive = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-collective = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-contracts = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-contracts-primitives = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-contracts-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -#pallet-democracy = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-indices = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-identity = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-membership = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-collective = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-contracts = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-contracts-primitives = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-contracts-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +#pallet-democracy = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-indices = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-identity = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-membership = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } pallet-claims = { package = "darwinia-claims", default-features = false, path = "../../../frame/claims" } pallet-elections-phragmen = { package = "darwinia-elections-phragmen", default-features = false, path = "../../../frame/elections-phragmen" } @@ -79,7 +79,7 @@ pallet-vesting = { package = "darwinia-vesting", default-features = false, path pallet-header-mmr = { package = "darwinia-header-mmr", default-features = false, path = "../../../frame/header-mmr" } [build-dependencies] -wasm-builder-runner = { package = "substrate-wasm-builder-runner", git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +wasm-builder-runner = { package = "substrate-wasm-builder-runner", git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [features] default = ["std"] diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index a29fac878..a4fb56cb0 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -17,37 +17,37 @@ tempfile = "3.1.0" wabt = "0.9.2" # githun.com -frame-support = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -node-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +node-primitives = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-grandpa = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-session = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-society = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-contracts = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-society = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sc-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-client-db = { features = ["kvdb-rocksdb"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-executor = { features = ["wasmtime"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-client-db = { features = ["kvdb-rocksdb"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-executor = { features = ["wasmtime"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-finality-tracker = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -substrate-test-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +substrate-test-client = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia pallet-kton = { package = "darwinia-kton", path = "../../../frame/balances/kton" } @@ -61,8 +61,8 @@ node-runtime = { path = "../runtime" } [dev-dependencies] criterion = "0.3.0" -sc-cli = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sc-service = { features = ["rocksdb"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sc-cli = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sc-service = { features = ["rocksdb"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # TODO https://github.com/darwinia-network/darwinia/issues/26 #sc-cli = { package = "darwinia-cli", path = "../../../client/cli" } diff --git a/frame/balances/kton/Cargo.toml b/frame/balances/kton/Cargo.toml index bd2015e28..55d070dbe 100644 --- a/frame/balances/kton/Cargo.toml +++ b/frame/balances/kton/Cargo.toml @@ -14,19 +14,19 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia darwinia-support = { default-features = false, path = "../../support" } [dev-dependencies] -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [features] default = ["std"] diff --git a/frame/balances/ring/Cargo.toml b/frame/balances/ring/Cargo.toml index c445db6b0..82cfe7898 100644 --- a/frame/balances/ring/Cargo.toml +++ b/frame/balances/ring/Cargo.toml @@ -14,21 +14,21 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia darwinia-support = { default-features = false, path = "../../support" } [dev-dependencies] -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [features] default = ["std"] diff --git a/frame/chainrelay/eth/backing/Cargo.toml b/frame/chainrelay/eth/backing/Cargo.toml index e8c67014b..7a589c2bc 100644 --- a/frame/chainrelay/eth/backing/Cargo.toml +++ b/frame/chainrelay/eth/backing/Cargo.toml @@ -16,12 +16,12 @@ serde = { version = "1.0.101", optional = true } # github.com ethabi = { default-features = false, git = "https://github.com/darwinia-network/ethabi.git", branch = "with_no_std" } -frame-support = { default-features = false , git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false , git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia darwinia-eth-relay = { default-features = false, path = "../relay" } @@ -35,11 +35,11 @@ rustc-hex = "2.0" rlp = { package = "rlp", git = "https://github.com/darwinia-network/parity-common.git" } -pallet-session = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-staking = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-staking = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } pallet-ring = { package = "darwinia-ring", path = "../../../../frame/balances/ring" } pallet-kton = { package = "darwinia-kton", path = "../../../../frame/balances/kton" } diff --git a/frame/chainrelay/eth/relay/Cargo.toml b/frame/chainrelay/eth/relay/Cargo.toml index cba0a1a31..925038ec9 100644 --- a/frame/chainrelay/eth/relay/Cargo.toml +++ b/frame/chainrelay/eth/relay/Cargo.toml @@ -14,11 +14,11 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } rlp = { default-features = false, git = "https://github.com/darwinia-network/parity-common.git" } @@ -32,8 +32,8 @@ hex-literal = "0.2.1" keccak-hasher = "0.15.2" rustc-hex = "2.0" -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [features] default = ["std"] diff --git a/frame/claims/Cargo.toml b/frame/claims/Cargo.toml index fda8ef8e6..60eb78dfc 100644 --- a/frame/claims/Cargo.toml +++ b/frame/claims/Cargo.toml @@ -15,12 +15,12 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [dev-dependencies] hex-literal = "0.2.1" @@ -28,7 +28,7 @@ libsecp256k1 = "0.3.2" serde_json = "1.0.41" tiny-keccak = "1.5.0" -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } pallet-support = { package = "darwinia-support", path = "../support" } pallet-ring = { package = "darwinia-ring", path = "../balances/ring" } diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml index 9da1c60d7..ac51788db 100644 --- a/frame/elections-phragmen/Cargo.toml +++ b/frame/elections-phragmen/Cargo.toml @@ -13,12 +13,12 @@ repository = "https://github.com/darwinia-network/darwinia/" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-phragmen = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-phragmen = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia darwinia-support = { default-features = false, path = "../support" } @@ -29,10 +29,10 @@ serde = { version = "1.0.101" } pallet-ring = { package = "darwinia-ring", path = "../balances/ring" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-io = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [features] default = ["std"] diff --git a/frame/header-mmr/Cargo.toml b/frame/header-mmr/Cargo.toml index 05a5f0f56..9643592b2 100644 --- a/frame/header-mmr/Cargo.toml +++ b/frame/header-mmr/Cargo.toml @@ -12,13 +12,13 @@ description = "Pallet for logging MMR into header digest" serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false } #frame-benchmarking = { version = "2.0.0-alpha.2", default-features = false, path = "../benchmarking" } -frame-support = { default-features = false , git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false , git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } merkle-mountain-range = { package = "ckb-merkle-mountain-range", git = "https://github.com/nervosnetwork/merkle-mountain-range.git", default-features = false } diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml index 90442479e..c1e235ee5 100644 --- a/frame/staking/Cargo.toml +++ b/frame/staking/Cargo.toml @@ -14,26 +14,26 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io ={ default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-io ={ default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia darwinia-phragmen = { default-features = false, path = "../../primitives/phragmen" } darwinia-support = { default-features = false, path = "../support" } [dev-dependencies] -substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +pallet-timestamp = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } pallet-ring = { package = "darwinia-ring", path = "../../frame/balances/ring" } pallet-kton = { package = "darwinia-kton", path = "../../frame/balances/kton" } diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml index 372fcb58c..a9c817b9f 100644 --- a/frame/support/Cargo.toml +++ b/frame/support/Cargo.toml @@ -14,9 +14,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = num-traits = { version = "0.2.8", default-features = false } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [features] default = ["std"] diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml index 417e59cd8..35621945f 100644 --- a/frame/treasury/Cargo.toml +++ b/frame/treasury/Cargo.toml @@ -14,18 +14,18 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true, features = ["derive"] } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia darwinia-support = { default-features = false, path = "../support" } [dev-dependencies] -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io ={ git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-io ={ git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } pallet-kton = { package = "darwinia-kton", path = "../balances/kton" } pallet-ring = { package = "darwinia-ring", path = "../balances/ring" } diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml index eecb6a208..e6cb888fc 100644 --- a/frame/vesting/Cargo.toml +++ b/frame/vesting/Cargo.toml @@ -14,12 +14,12 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = serde = { version = "1.0.101", optional = true } # github.com -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia darwinia-support = { default-features = false, path = "../support" } @@ -27,8 +27,8 @@ darwinia-support = { default-features = false, path = "../support" } [dev-dependencies] hex-literal = "0.2.1" -sp-core = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-storage = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-storage = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } pallet-balances = { package = "darwinia-ring", path = "../balances/ring" } diff --git a/primitives/eth-primitives/Cargo.toml b/primitives/eth-primitives/Cargo.toml index bd68dfd8f..320994831 100644 --- a/primitives/eth-primitives/Cargo.toml +++ b/primitives/eth-primitives/Cargo.toml @@ -24,15 +24,15 @@ primitive-types = { default-features = false, features = ["codec", "rlp"], git = rlp = { default-features = false, git = "https://github.com/darwinia-network/parity-common.git" } rlp-derive = { git = "https://github.com/darwinia-network/parity-common.git" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [dev-dependencies] hex-literal = "0.2.1" keccak-hasher = "0.15.2" rustc-hex = "2.0" -frame-support = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } triehash = { git = "https://github.com/darwinia-network/parity-common.git" } diff --git a/primitives/merkle-patricia-trie/Cargo.toml b/primitives/merkle-patricia-trie/Cargo.toml index 572832abd..42dca18eb 100644 --- a/primitives/merkle-patricia-trie/Cargo.toml +++ b/primitives/merkle-patricia-trie/Cargo.toml @@ -16,7 +16,7 @@ hashbrown = { version = "0.6.0" } hash = { package = "keccak-hash", default-features = false, git = "https://github.com/darwinia-network/parity-common.git" } rlp = { default-features = false, git = "https://github.com/darwinia-network/parity-common.git" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [dev-dependencies] criterion = "0.2.10" diff --git a/primitives/phragmen/Cargo.toml b/primitives/phragmen/Cargo.toml index 2d66b2cde..92bbecbd4 100644 --- a/primitives/phragmen/Cargo.toml +++ b/primitives/phragmen/Cargo.toml @@ -13,8 +13,8 @@ repository = "https://github.com/darwinia-network/darwinia/" serde = { version = "1.0.101", optional = true, features = ["derive"] } # github.com -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } # darwinia darwinia-support = { default-features = false, path = "../../frame/support" } @@ -22,8 +22,8 @@ darwinia-support = { default-features = false, path = "../../frame/support" } [dev-dependencies] rand = "0.7.2" -sp-io ={ git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } -substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", branch = "denny_support_mmr_header" } +sp-io ={ git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } +substrate-test-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "v2.0.0-alpha.darwinia.2" } [features] default = ["std"] From 25e07d24d122d38d03b5ee995bfcc26fe51773e5 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Fri, 20 Mar 2020 17:00:44 +0800 Subject: [PATCH 09/12] fix format issue --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67044999c..f25685e35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,8 +54,8 @@ jobs: script: .maintain/ci/darwinia_test_script.sh eth-backing - stage: Darwinia Test - env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native HEADERMMR - script: .maintain/ci/darwinia_test_script.sh header-mmr + env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native HEADERMMR + script: .maintain/ci/darwinia_test_script.sh header-mmr # TODO: remove this when overall test case ready allow_failures: From 2aba98874e05a7c4ea591a6cf346574ca3d35a86 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Fri, 20 Mar 2020 17:25:47 +0800 Subject: [PATCH 10/12] travis says can not parse, try again --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f25685e35..d97aabe6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,31 +29,31 @@ jobs: env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=wasm script: .maintain/ci/build_script.sh - - stage: Darwinia Test + - stage: Darwinia KTON Test env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native KTON script: .maintain/ci/darwinia_test_script.sh kton - - stage: Darwinia Test + - stage: Darwinia RING Test env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native RING script: .maintain/ci/darwinia_test_script.sh ring - - stage: Darwinia Test + - stage: Darwinia STAKING Test env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native STAKING script: .maintain/ci/darwinia_test_script.sh staking - - stage: Darwinia Test + - stage: Darwinia TREASURY Test env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native TREASURY script: .maintain/ci/darwinia_test_script.sh treasury - - stage: Darwinia Test + - stage: Darwinia ETHRELAY Test env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native ETHRELAY script: .maintain/ci/darwinia_test_script.sh eth-relay - - stage: Darwinia Test + - stage: Darwinia ETHBACKING Test env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native ETHBACKING script: .maintain/ci/darwinia_test_script.sh eth-backing - - stage: Darwinia Test + - stage: Darwinia HEADERMMR Test env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native HEADERMMR script: .maintain/ci/darwinia_test_script.sh header-mmr From 46bc31e64ed7dfdaebcdc3fdffcebe7c099c9e59 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Mon, 23 Mar 2020 12:55:10 +0800 Subject: [PATCH 11/12] update decl error, and keep using panic when encoutering error in on_finalize, related to #384 --- frame/header-mmr/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frame/header-mmr/src/lib.rs b/frame/header-mmr/src/lib.rs index 04c84ffbf..0e25bb654 100644 --- a/frame/header-mmr/src/lib.rs +++ b/frame/header-mmr/src/lib.rs @@ -87,6 +87,8 @@ decl_event! { decl_error! { pub enum Error for Module { + /// Proof block nubmer TOO LARGE + ProofBlockNumberTL, /// Proof - GET FAILED ProofGF, } @@ -172,7 +174,7 @@ impl Module { block_number: T::BlockNumber, mmr_block_number: T::BlockNumber, ) -> Result>, DispatchError> { - ensure!(block_number < mmr_block_number, "Block number too large"); + ensure!(block_number < mmr_block_number, >::ProofBlockNumberTL); let pos = Self::position_of(block_number); let mmr_header_pos = Self::position_of(mmr_block_number); From 51b2b71ac9df3e173e10f567c5b9abde96532ce3 Mon Sep 17 00:00:00 2001 From: HackFisher Date: Mon, 23 Mar 2020 23:20:37 +0800 Subject: [PATCH 12/12] remove miss typing \ which should be used in
 code

---
 frame/header-mmr/src/lib.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frame/header-mmr/src/lib.rs b/frame/header-mmr/src/lib.rs
index 0e25bb654..b0a537bd4 100644
--- a/frame/header-mmr/src/lib.rs
+++ b/frame/header-mmr/src/lib.rs
@@ -1,36 +1,36 @@
 //! # Chain MMR Pallet
 //!
-//! \## Overview
+//! ## Overview
 //! This is the pallet to maintain accumulate headers Merkle Mountain Range
 //! and push the mmr root in to the digest of block headers on finalize.
 //! MMR can be used for light client to implement super light clients,
 //! and can also be used in other chains to implement chain relay for
 //! cross-chain verification purpose.
 //!
-//! \## Terminology
+//! ## Terminology
 //!
-//! \### Merkle Moutain Range
+//! ### Merkle Moutain Range
 //! For more details about the MMR struct, refer https://github.com/mimblewimble/grin/blob/master/doc/mmr.md#structure
 //!
-//! \### MMR Proof
+//! ### MMR Proof
 //! Using the MMR Store Storage, MMR Proof can be generated for specific
 //! block header hash. Proofs can be used to verify block inclusion together with
 //! the mmr root in the header digest.
 //!
-//! \### Positions
+//! ### Positions
 //! The index position of the nodes(and hash leave nodes) in the mmr node list
 //! constructed using MMR struct
 //!
-//! \### Digest Item
+//! ### Digest Item
 //! The is a ```MerkleMountainRangeRoot(Hash)``` digest item pre-subscribed in Digest.
 //! This is implemented in Darwinia's fork of substrate: https://github.com/darwinia-network/substrate
 //! The Pull request link is https://github.com/darwinia-network/substrate/pull/1
 //!
-//! \## Implementation
+//! ## Implementation
 //! We are using the MMR library from https://github.com/nervosnetwork/merkle-mountain-range
 //! Pull request: https://github.com/darwinia-network/darwinia/pull/358
 //!
-//! \## References
+//! ## References
 //! Darwinia Relay's Technical Paper:
 //! https://github.com/darwinia-network/rfcs/blob/master/paper/Darwinia_Relay_Sublinear_Optimistic_Relay_for_Interoperable_Blockchains_v0.7.pdf
 //!