From 1b876f7a5838646a5ed3290704e04fdbf51fb42f Mon Sep 17 00:00:00 2001 From: MOZGIII Date: Wed, 25 Aug 2021 11:31:20 +0300 Subject: [PATCH 1/6] Switch to aura-hack substrate branch --- Cargo.lock | 195 ++++++++++++----------- crates/bioauth-consensus/Cargo.toml | 28 ++-- crates/humanode-peer/Cargo.toml | 36 ++--- crates/humanode-rpc/Cargo.toml | 16 +- crates/humanode-runtime/Cargo.toml | 50 +++--- crates/pallet-bioauth/Cargo.toml | 16 +- crates/primitives-auth-ticket/Cargo.toml | 2 +- crates/robonode-server/Cargo.toml | 2 +- 8 files changed, 173 insertions(+), 172 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6b6f1a585..8486d2cf8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1538,7 +1538,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", ] @@ -1562,7 +1562,7 @@ checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support", "frame-system", @@ -1581,7 +1581,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "Inflector", "chrono", @@ -1607,7 +1607,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support", "frame-system", @@ -1622,7 +1622,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "serde", @@ -1633,7 +1633,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "bitflags", "frame-metadata", @@ -1659,7 +1659,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1671,7 +1671,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -1683,7 +1683,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "proc-macro2", "quote", @@ -1693,7 +1693,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1710,7 +1710,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-benchmarking", "frame-support", @@ -1724,7 +1724,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "sp-api", @@ -4075,7 +4075,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-system", "parity-scale-codec", @@ -4282,7 +4282,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support", "frame-system", @@ -4298,7 +4298,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-benchmarking", "frame-support", @@ -4316,6 +4316,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-aura", "parity-scale-codec", "primitives-auth-ticket", "serde", @@ -4330,7 +4331,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support", "frame-system", @@ -4343,7 +4344,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support", "frame-system", @@ -4362,7 +4363,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support", "frame-system", @@ -4375,7 +4376,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-benchmarking", "frame-support", @@ -4392,7 +4393,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-support", "frame-system", @@ -4408,7 +4409,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4425,7 +4426,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5622,7 +5623,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "log", "sp-core", @@ -5633,7 +5634,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -5656,7 +5657,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5672,7 +5673,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5688,7 +5689,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -5699,7 +5700,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "chrono", "fdlimit", @@ -5737,7 +5738,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "derive_more", "fnv", @@ -5771,7 +5772,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "blake2-rfc", "hash-db", @@ -5800,7 +5801,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "futures 0.3.16", @@ -5825,7 +5826,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "derive_more", @@ -5857,7 +5858,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "futures 0.3.16", @@ -5886,7 +5887,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "derive_more", "lazy_static", @@ -5914,7 +5915,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "derive_more", "parity-scale-codec", @@ -5931,7 +5932,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "log", "parity-scale-codec", @@ -5946,7 +5947,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "ansi_term 0.12.1", "futures 0.3.16", @@ -5964,7 +5965,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "derive_more", @@ -5984,7 +5985,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "hash-db", "lazy_static", @@ -6003,7 +6004,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-std", "async-trait", @@ -6058,7 +6059,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "bytes 0.5.6", "fnv", @@ -6086,7 +6087,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "futures 0.3.16", "libp2p 0.37.1", @@ -6099,7 +6100,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6108,7 +6109,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "futures 0.3.16", "hash-db", @@ -6143,7 +6144,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "derive_more", "futures 0.3.16", @@ -6168,7 +6169,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "futures 0.1.31", "jsonrpc-core", @@ -6186,7 +6187,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "directories", @@ -6254,7 +6255,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "log", "parity-scale-codec", @@ -6292,7 +6293,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "chrono", "futures 0.3.16", @@ -6341,7 +6342,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6390,7 +6391,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -6401,7 +6402,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "derive_more", "futures 0.3.16", @@ -6430,7 +6431,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "derive_more", "futures 0.3.16", @@ -6890,7 +6891,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "hash-db", "log", @@ -6907,7 +6908,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -6919,7 +6920,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "serde", @@ -6931,7 +6932,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "integer-sqrt", "num-traits", @@ -6945,7 +6946,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "sp-api", @@ -6957,7 +6958,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "futures 0.3.16", "log", @@ -6975,7 +6976,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "futures 0.3.16", @@ -7001,7 +7002,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "parity-scale-codec", @@ -7018,7 +7019,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -7028,7 +7029,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "base58", "blake2-rfc", @@ -7072,7 +7073,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -7081,7 +7082,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "proc-macro2", "quote", @@ -7091,7 +7092,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "environmental", "parity-scale-codec", @@ -7102,7 +7103,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "finality-grandpa", "log", @@ -7119,7 +7120,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -7133,7 +7134,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "futures 0.3.16", "hash-db", @@ -7158,7 +7159,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "lazy_static", "sp-core", @@ -7169,7 +7170,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "derive_more", @@ -7186,7 +7187,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "ruzstd", "zstd", @@ -7195,7 +7196,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "sp-api", "sp-core", @@ -7205,7 +7206,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "backtrace", ] @@ -7213,7 +7214,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "rustc-hash", "serde", @@ -7224,7 +7225,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "either", "hash256-std-hasher", @@ -7245,7 +7246,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7262,7 +7263,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -7274,7 +7275,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "serde", "serde_json", @@ -7283,7 +7284,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "sp-api", @@ -7296,7 +7297,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7306,7 +7307,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "hash-db", "log", @@ -7335,12 +7336,12 @@ checksum = "35391ea974fa5ee869cb094d5b437688fbf3d8127d64d1b9fed5822a1ed39b12" [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7353,7 +7354,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "log", "sp-core", @@ -7366,7 +7367,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -7397,7 +7398,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "erased-serde", "log", @@ -7415,7 +7416,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "sp-api", "sp-runtime", @@ -7424,7 +7425,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-trait", "log", @@ -7439,7 +7440,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "hash-db", "memory-db", @@ -7466,7 +7467,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "futures 0.3.16", "futures-core", @@ -7478,7 +7479,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7493,7 +7494,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "parity-scale-codec", "proc-macro-crate 1.0.0", @@ -7505,7 +7506,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7630,7 +7631,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.16", @@ -7653,7 +7654,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "async-std", "derive_more", @@ -7667,7 +7668,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" +source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" dependencies = [ "ansi_term 0.12.1", "atty", diff --git a/crates/bioauth-consensus/Cargo.toml b/crates/bioauth-consensus/Cargo.toml index da37684a8..2589e09fe 100644 --- a/crates/bioauth-consensus/Cargo.toml +++ b/crates/bioauth-consensus/Cargo.toml @@ -10,24 +10,24 @@ humanode-runtime = { version = "0.1", path = "../humanode-runtime" } pallet-bioauth = { version = "0.1", path = "../pallet-bioauth" } async-trait = "0.1.42" -pallet-aura = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-tracing = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-consensus-slots = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-aura = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-tracing = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-consensus-slots = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } thiserror = "1" [dev-dependencies] mockall = "0.10" -node-primitives = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-service = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-core = { git = "https://github.com/humanode-network/substrate", branch = "master" } +node-primitives = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-service = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-core = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } tokio = { version = "1", features = ["full"] } [features] diff --git a/crates/humanode-peer/Cargo.toml b/crates/humanode-peer/Cargo.toml index eaff56ab9..e56091d5a 100644 --- a/crates/humanode-peer/Cargo.toml +++ b/crates/humanode-peer/Cargo.toml @@ -15,28 +15,28 @@ robonode-client = { version = "0.1", path = "../robonode-client" } async-trait = "0.1" codec = { package = "parity-scale-codec", version = "2.0.0" } -frame-benchmarking-cli = { git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-benchmarking-cli = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } futures = "0.3" hex-literal = "0.3" qr2term = "0.2" reqwest = "0.11" -sc-basic-authorship = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-cli = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-executor = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-network = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-service = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-tracing = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-keystore = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-utils = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-basic-authorship = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-cli = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-executor = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-network = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-service = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-tracing = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-transaction-pool = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-keystore = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-utils = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } structopt = "0.3.8" thiserror = "1" tokio = { version = "1", features = ["full"] } diff --git a/crates/humanode-rpc/Cargo.toml b/crates/humanode-rpc/Cargo.toml index 4a8c64711..8cfdfabed 100644 --- a/crates/humanode-rpc/Cargo.toml +++ b/crates/humanode-rpc/Cargo.toml @@ -11,11 +11,11 @@ humanode-runtime = { version = "0.1", path = "../humanode-runtime" } robonode-client = { version = "0.1", path = "../robonode-client" } jsonrpc-core = "15" # TODO: update when `sc-service` bumps it's version -pallet-transaction-payment-rpc = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-rpc-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-block-builder = { git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "master" } -substrate-frame-rpc-system = { git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-transaction-payment-rpc = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-rpc = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-rpc-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-block-builder = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +substrate-frame-rpc-system = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } diff --git a/crates/humanode-runtime/Cargo.toml b/crates/humanode-runtime/Cargo.toml index 61ad9aad4..ab1184a86 100644 --- a/crates/humanode-runtime/Cargo.toml +++ b/crates/humanode-runtime/Cargo.toml @@ -6,39 +6,39 @@ authors = ["Humanode Team "] publish = false [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/humanode-network/substrate", branch = "master" } +substrate-wasm-builder = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } [dependencies] pallet-bioauth = { version = "0.1", path = "../pallet-bioauth", default-features = false } robonode-crypto = { version = "0.1", path = "../robonode-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/humanode-network/substrate", branch = "master" } -frame-executive = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -frame-system-benchmarking = { default-features = false, optional = true, git = "https://github.com/humanode-network/substrate", branch = "master" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-executive = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-system-benchmarking = { default-features = false, optional = true, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } hex-literal = { version = "0.3", optional = true } -pallet-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -pallet-balances = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -pallet-sudo = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -pallet-timestamp = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-balances = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-sudo = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-timestamp = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } serde = { version = "1", features = ["derive"], optional = true } -sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-block-builder = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-consensus-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-inherents = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-offchain = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-session = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-transaction-pool = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-version = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-block-builder = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-consensus-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-inherents = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-offchain = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-session = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-transaction-pool = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-version = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } [features] default = ["std"] diff --git a/crates/pallet-bioauth/Cargo.toml b/crates/pallet-bioauth/Cargo.toml index d246fac66..19938525d 100644 --- a/crates/pallet-bioauth/Cargo.toml +++ b/crates/pallet-bioauth/Cargo.toml @@ -10,17 +10,17 @@ primitives-auth-ticket = { version = "0.1", path = "../primitives-auth-ticket", serde-nostd = { version = "0.1", path = "../serde-nostd", default-features = false } codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -frame-benchmarking = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master", optional = true } -frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-benchmarking = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack", optional = true } +frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } serde = { version = "1", features = ["derive"], optional = true } -sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } [dev-dependencies] -sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } -sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } [features] default = ["std"] diff --git a/crates/primitives-auth-ticket/Cargo.toml b/crates/primitives-auth-ticket/Cargo.toml index f60828960..a4a3e45e8 100644 --- a/crates/primitives-auth-ticket/Cargo.toml +++ b/crates/primitives-auth-ticket/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } serde = { version = "1", features = ["derive"], optional = true } -sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } [features] default = ["std"] diff --git a/crates/robonode-server/Cargo.toml b/crates/robonode-server/Cargo.toml index 5a7e2997b..d25a4ce8c 100644 --- a/crates/robonode-server/Cargo.toml +++ b/crates/robonode-server/Cargo.toml @@ -17,7 +17,7 @@ rand = "0.7" reqwest = "0.11" sc-tracing = "3" serde = { version = "1", features = ["derive"] } -sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } tokio = { version = "1", features = ["full"] } tracing = "0.1" uuid = { version = "0.8", features = ["v4"] } From 68b2768ce57ab4a30b08d4ddfd1e002d173b16d6 Mon Sep 17 00:00:00 2001 From: MOZGIII Date: Wed, 25 Aug 2021 12:43:41 +0300 Subject: [PATCH 2/6] Implement updating aura authories --- crates/humanode-runtime/src/lib.rs | 7 +++++++ crates/pallet-bioauth/Cargo.toml | 2 ++ crates/pallet-bioauth/src/lib.rs | 19 ++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/crates/humanode-runtime/src/lib.rs b/crates/humanode-runtime/src/lib.rs index e29afe582..5c87a5437 100644 --- a/crates/humanode-runtime/src/lib.rs +++ b/crates/humanode-runtime/src/lib.rs @@ -297,6 +297,13 @@ impl pallet_sudo::Config for Runtime { type Call = Call; } +impl<'a> sp_runtime::traits::Convert<&'a [u8], AuraId> for Runtime { + fn convert(a: &[u8]) -> AuraId { + use core::convert::TryInto; + a.try_into().unwrap() + } +} + impl pallet_bioauth::Config for Runtime { type Event = Event; type RobonodePublicKey = RobonodePublicKeyWrapper; diff --git a/crates/pallet-bioauth/Cargo.toml b/crates/pallet-bioauth/Cargo.toml index 19938525d..448f2d8a2 100644 --- a/crates/pallet-bioauth/Cargo.toml +++ b/crates/pallet-bioauth/Cargo.toml @@ -13,6 +13,7 @@ codec = { package = "parity-scale-codec", version = "2", default-features = fals frame-benchmarking = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack", optional = true } frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } serde = { version = "1", features = ["derive"], optional = true } sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } @@ -33,6 +34,7 @@ std = [ "frame-system/std", "frame-benchmarking/std", "sp-std/std", + "pallet-aura/std", ] runtime-benchmarks = ["frame-benchmarking"] try-runtime = ["frame-support/try-runtime"] diff --git a/crates/pallet-bioauth/src/lib.rs b/crates/pallet-bioauth/src/lib.rs index 28e30a115..dbe9d9309 100644 --- a/crates/pallet-bioauth/src/lib.rs +++ b/crates/pallet-bioauth/src/lib.rs @@ -101,11 +101,16 @@ pub mod pallet { use frame_support::{dispatch::DispatchResult, pallet_prelude::*, storage::types::ValueQuery}; use frame_system::pallet_prelude::*; use primitives_auth_ticket::{AuthTicket, OpaqueAuthTicket}; + use sp_runtime::traits::Convert; use sp_std::prelude::*; /// Configure the pallet by specifying the parameters and types on which it depends. #[pallet::config] - pub trait Config: frame_system::Config { + pub trait Config: + frame_system::Config + + pallet_aura::Config + + for<'a> Convert<&'a [u8], ::AuthorityId> + { /// Because this pallet emits events, it depends on the runtime's definition of an event. type Event: From> + IsType<::Event>; @@ -233,6 +238,7 @@ pub mod pallet { Ok(()) => { // Authentication was successfull, add the incoming auth ticket to the list. list.push(stored_auth_ticket); + Self::update_aura(list.as_slice()); Ok(()) } } @@ -307,6 +313,17 @@ pub mod pallet { .propagate(true) .build() } + + fn update_aura(list: &[StoredAuthTicket]) + where + T: pallet_aura::Config, + { + let authorities = list + .iter() + .map(|ticket| T::convert(ticket.public_key.as_slice())) + .collect::>(); + pallet_aura::Authorities::::set(authorities); + } } #[pallet::validate_unsigned] From 511a788a66b47db8d8b9726c605820105706e2f9 Mon Sep 17 00:00:00 2001 From: MOZGIII Date: Wed, 25 Aug 2021 13:06:57 +0300 Subject: [PATCH 3/6] Fix the mock to fix tests and validate that they pass as expected --- Cargo.lock | 2 ++ crates/pallet-bioauth/Cargo.toml | 2 ++ crates/pallet-bioauth/src/mock.rs | 35 ++++++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 8486d2cf8..3a7771463 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4317,11 +4317,13 @@ dependencies = [ "frame-support", "frame-system", "pallet-aura", + "pallet-timestamp", "parity-scale-codec", "primitives-auth-ticket", "serde", "serde-nostd", "sp-api", + "sp-application-crypto", "sp-core", "sp-io", "sp-runtime", diff --git a/crates/pallet-bioauth/Cargo.toml b/crates/pallet-bioauth/Cargo.toml index 448f2d8a2..8fd67c20e 100644 --- a/crates/pallet-bioauth/Cargo.toml +++ b/crates/pallet-bioauth/Cargo.toml @@ -20,6 +20,8 @@ sp-runtime = { default-features = false, git = "https://github.com/humanode-netw sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } [dev-dependencies] +pallet-timestamp = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-application-crypto = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } diff --git a/crates/pallet-bioauth/src/mock.rs b/crates/pallet-bioauth/src/mock.rs index bdfe503c4..6ed275377 100644 --- a/crates/pallet-bioauth/src/mock.rs +++ b/crates/pallet-bioauth/src/mock.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; use sp_core::{crypto::Infallible, H256}; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, Convert, IdentityLookup}, }; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; @@ -21,6 +21,8 @@ frame_support::construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic, { System: frame_system::{Pallet, Call, Config, Storage, Event}, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + Aura: pallet_aura::{Pallet, Config}, Bioauth: pallet_bioauth::{Pallet, Call, Storage, Event}, } ); @@ -71,6 +73,37 @@ impl system::Config for Test { type OnSetCode = (); } +parameter_types! { + pub const MinimumPeriod: u64 = 1; +} + +impl pallet_timestamp::Config for Test { + type Moment = u64; + type OnTimestampSet = Aura; + type MinimumPeriod = MinimumPeriod; + type WeightInfo = (); +} + +pub mod sr25519 { + mod app_sr25519 { + use sp_application_crypto::{app_crypto, key_types::AURA, sr25519}; + app_crypto!(sr25519, AURA); + } + pub type AuthorityId = app_sr25519::Public; +} +use sr25519::AuthorityId as AuraId; + +impl pallet_aura::Config for Test { + type AuthorityId = AuraId; + type DisabledValidators = (); +} + +impl<'a> Convert<&'a [u8], AuraId> for Test { + fn convert(_a: &'a [u8]) -> AuraId { + AuraId::default() + } +} + impl pallet_bioauth::Config for Test { type Event = Event; type RobonodePublicKey = MockVerifier; From 37b52081713c9bf14fca084baa64e0771a650011 Mon Sep 17 00:00:00 2001 From: MOZGIII Date: Wed, 25 Aug 2021 14:49:56 +0300 Subject: [PATCH 4/6] Get rid of injecting aura into bioauth pallet --- Cargo.lock | 3 -- crates/humanode-runtime/src/lib.rs | 13 +++++++-- crates/pallet-bioauth/Cargo.toml | 4 --- crates/pallet-bioauth/src/lib.rs | 31 ++++++++++---------- crates/pallet-bioauth/src/mock.rs | 47 +++++++++--------------------- 5 files changed, 39 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a7771463..991dd2b8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4316,14 +4316,11 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "pallet-aura", - "pallet-timestamp", "parity-scale-codec", "primitives-auth-ticket", "serde", "serde-nostd", "sp-api", - "sp-application-crypto", "sp-core", "sp-io", "sp-runtime", diff --git a/crates/humanode-runtime/src/lib.rs b/crates/humanode-runtime/src/lib.rs index 5c87a5437..3687e884c 100644 --- a/crates/humanode-runtime/src/lib.rs +++ b/crates/humanode-runtime/src/lib.rs @@ -297,16 +297,23 @@ impl pallet_sudo::Config for Runtime { type Call = Call; } -impl<'a> sp_runtime::traits::Convert<&'a [u8], AuraId> for Runtime { - fn convert(a: &[u8]) -> AuraId { +pub struct AuraValidatorSetUpdater; + +impl pallet_bioauth::ValidatorSetUpdater for AuraValidatorSetUpdater { + fn update_validators_set(validator_public_keys: &[&[u8]]) { use core::convert::TryInto; - a.try_into().unwrap() + let authorities = validator_public_keys + .iter() + .map(|&public_key| public_key.try_into().expect("key has to be aura id")) + .collect::>(); + pallet_aura::Authorities::::set(authorities); } } impl pallet_bioauth::Config for Runtime { type Event = Event; type RobonodePublicKey = RobonodePublicKeyWrapper; + type ValidatorSetUpdater = AuraValidatorSetUpdater; } // Create the runtime by composing the FRAME pallets that were previously diff --git a/crates/pallet-bioauth/Cargo.toml b/crates/pallet-bioauth/Cargo.toml index 8fd67c20e..19938525d 100644 --- a/crates/pallet-bioauth/Cargo.toml +++ b/crates/pallet-bioauth/Cargo.toml @@ -13,15 +13,12 @@ codec = { package = "parity-scale-codec", version = "2", default-features = fals frame-benchmarking = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack", optional = true } frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -pallet-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } serde = { version = "1", features = ["derive"], optional = true } sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } [dev-dependencies] -pallet-timestamp = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-application-crypto = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } @@ -36,7 +33,6 @@ std = [ "frame-system/std", "frame-benchmarking/std", "sp-std/std", - "pallet-aura/std", ] runtime-benchmarks = ["frame-benchmarking"] try-runtime = ["frame-support/try-runtime"] diff --git a/crates/pallet-bioauth/src/lib.rs b/crates/pallet-bioauth/src/lib.rs index dbe9d9309..1911e0994 100644 --- a/crates/pallet-bioauth/src/lib.rs +++ b/crates/pallet-bioauth/src/lib.rs @@ -75,6 +75,12 @@ pub trait Verifier { D: AsRef<[u8]> + Send + 'a; } +/// Provides the capability to update the current validators set. +pub trait ValidatorSetUpdater { + /// Updated the validators set for the of consensus. + fn update_validators_set(validator_public_keys: &[&[u8]]); +} + sp_api::decl_runtime_apis! { /// We need to provide a trait using decl_runtime_apis! macro to be able to call required methods @@ -97,25 +103,23 @@ sp_api::decl_runtime_apis! { pub mod pallet { use core::convert::TryInto; - use super::{Authenticate, StoredAuthTicket, Verifier}; + use super::{Authenticate, StoredAuthTicket, ValidatorSetUpdater, Verifier}; use frame_support::{dispatch::DispatchResult, pallet_prelude::*, storage::types::ValueQuery}; use frame_system::pallet_prelude::*; use primitives_auth_ticket::{AuthTicket, OpaqueAuthTicket}; - use sp_runtime::traits::Convert; use sp_std::prelude::*; /// Configure the pallet by specifying the parameters and types on which it depends. #[pallet::config] - pub trait Config: - frame_system::Config - + pallet_aura::Config - + for<'a> Convert<&'a [u8], ::AuthorityId> - { + pub trait Config: frame_system::Config { /// Because this pallet emits events, it depends on the runtime's definition of an event. type Event: From> + IsType<::Event>; /// The public key of the robonode. type RobonodePublicKey: Verifier> + codec::FullCodec + Default + serde_nostd::SerDe; + + /// The validator set updater to invoke at auth the ticket acceptace. + type ValidatorSetUpdater: ValidatorSetUpdater; } #[pallet::pallet] @@ -238,7 +242,7 @@ pub mod pallet { Ok(()) => { // Authentication was successfull, add the incoming auth ticket to the list. list.push(stored_auth_ticket); - Self::update_aura(list.as_slice()); + Self::issue_validators_set_update(list.as_slice()); Ok(()) } } @@ -314,15 +318,12 @@ pub mod pallet { .build() } - fn update_aura(list: &[StoredAuthTicket]) - where - T: pallet_aura::Config, - { - let authorities = list + fn issue_validators_set_update(stored_auth_tickets: &[StoredAuthTicket]) { + let validator_public_keys = stored_auth_tickets .iter() - .map(|ticket| T::convert(ticket.public_key.as_slice())) + .map(|ticket| ticket.public_key.as_slice()) .collect::>(); - pallet_aura::Authorities::::set(authorities); + T::ValidatorSetUpdater::update_validators_set(validator_public_keys.as_slice()); } } diff --git a/crates/pallet-bioauth/src/mock.rs b/crates/pallet-bioauth/src/mock.rs index 6ed275377..00bad8cd7 100644 --- a/crates/pallet-bioauth/src/mock.rs +++ b/crates/pallet-bioauth/src/mock.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; use sp_core::{crypto::Infallible, H256}; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, Convert, IdentityLookup}, + traits::{BlakeTwo256, IdentityLookup}, }; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; @@ -21,8 +21,6 @@ frame_support::construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic, { System: frame_system::{Pallet, Call, Config, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Aura: pallet_aura::{Pallet, Config}, Bioauth: pallet_bioauth::{Pallet, Call, Storage, Event}, } ); @@ -42,6 +40,17 @@ impl super::Verifier> for MockVerifier { } } +pub struct MockValidatorSetUpdater; + +impl super::ValidatorSetUpdater for MockValidatorSetUpdater { + fn update_validators_set(validator_public_keys: &[&[u8]]) { + assert!( + !validator_public_keys.is_empty(), + "We should get non-empty set every time at each of the test cases" + ); + } +} + parameter_types! { pub const BlockHashCount: u64 = 250; pub const SS58Prefix: u8 = 42; @@ -73,40 +82,10 @@ impl system::Config for Test { type OnSetCode = (); } -parameter_types! { - pub const MinimumPeriod: u64 = 1; -} - -impl pallet_timestamp::Config for Test { - type Moment = u64; - type OnTimestampSet = Aura; - type MinimumPeriod = MinimumPeriod; - type WeightInfo = (); -} - -pub mod sr25519 { - mod app_sr25519 { - use sp_application_crypto::{app_crypto, key_types::AURA, sr25519}; - app_crypto!(sr25519, AURA); - } - pub type AuthorityId = app_sr25519::Public; -} -use sr25519::AuthorityId as AuraId; - -impl pallet_aura::Config for Test { - type AuthorityId = AuraId; - type DisabledValidators = (); -} - -impl<'a> Convert<&'a [u8], AuraId> for Test { - fn convert(_a: &'a [u8]) -> AuraId { - AuraId::default() - } -} - impl pallet_bioauth::Config for Test { type Event = Event; type RobonodePublicKey = MockVerifier; + type ValidatorSetUpdater = MockValidatorSetUpdater; } // Build genesis storage according to the mock runtime. From 8e5642c58c5b503e3ae6fceee2bd0e2c007d1c7b Mon Sep 17 00:00:00 2001 From: MOZGIII Date: Wed, 25 Aug 2021 15:06:41 +0300 Subject: [PATCH 5/6] Invoke the OneSessionHandler instead of directly setting the pallet_aura::Authorities --- crates/humanode-runtime/src/lib.rs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/crates/humanode-runtime/src/lib.rs b/crates/humanode-runtime/src/lib.rs index 3687e884c..67ac152ad 100644 --- a/crates/humanode-runtime/src/lib.rs +++ b/crates/humanode-runtime/src/lib.rs @@ -301,12 +301,25 @@ pub struct AuraValidatorSetUpdater; impl pallet_bioauth::ValidatorSetUpdater for AuraValidatorSetUpdater { fn update_validators_set(validator_public_keys: &[&[u8]]) { - use core::convert::TryInto; + let dummy = ::AccountId::default(); + + // clippy is just too dumb here, but we need two iterators passed to `on_new_session` to be + // the same type. The easiest is to use Vec's iter for both. + #[allow(clippy::needless_collect)] let authorities = validator_public_keys .iter() - .map(|&public_key| public_key.try_into().expect("key has to be aura id")) + .map(|&public_key| { + use core::convert::TryInto; + ( + &dummy, + public_key.try_into().expect("key has to be aura id"), + ) + }) .collect::>(); - pallet_aura::Authorities::::set(authorities); + + as frame_support::traits::OneSessionHandler< + ::AccountId, + >>::on_new_session(true, authorities.into_iter(), Vec::new().into_iter()) } } From 7b49e5deb62df86cc0840c005bdd8c1faf25d741 Mon Sep 17 00:00:00 2001 From: MOZGIII Date: Wed, 25 Aug 2021 15:07:54 +0300 Subject: [PATCH 6/6] Revert "Switch to aura-hack substrate branch" This reverts commit 1b876f7a5838646a5ed3290704e04fdbf51fb42f. --- Cargo.lock | 194 +++++++++++------------ crates/bioauth-consensus/Cargo.toml | 28 ++-- crates/humanode-peer/Cargo.toml | 36 ++--- crates/humanode-rpc/Cargo.toml | 16 +- crates/humanode-runtime/Cargo.toml | 50 +++--- crates/pallet-bioauth/Cargo.toml | 16 +- crates/primitives-auth-ticket/Cargo.toml | 2 +- crates/robonode-server/Cargo.toml | 2 +- 8 files changed, 172 insertions(+), 172 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 991dd2b8a..6b6f1a585 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1538,7 +1538,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", ] @@ -1562,7 +1562,7 @@ checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support", "frame-system", @@ -1581,7 +1581,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "Inflector", "chrono", @@ -1607,7 +1607,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support", "frame-system", @@ -1622,7 +1622,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "serde", @@ -1633,7 +1633,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "bitflags", "frame-metadata", @@ -1659,7 +1659,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1671,7 +1671,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -1683,7 +1683,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "proc-macro2", "quote", @@ -1693,7 +1693,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1710,7 +1710,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-benchmarking", "frame-support", @@ -1724,7 +1724,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "sp-api", @@ -4075,7 +4075,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-system", "parity-scale-codec", @@ -4282,7 +4282,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support", "frame-system", @@ -4298,7 +4298,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-benchmarking", "frame-support", @@ -4330,7 +4330,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support", "frame-system", @@ -4343,7 +4343,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support", "frame-system", @@ -4362,7 +4362,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support", "frame-system", @@ -4375,7 +4375,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-benchmarking", "frame-support", @@ -4392,7 +4392,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-support", "frame-system", @@ -4408,7 +4408,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4425,7 +4425,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5622,7 +5622,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "log", "sp-core", @@ -5633,7 +5633,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -5656,7 +5656,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5672,7 +5672,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5688,7 +5688,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -5699,7 +5699,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "chrono", "fdlimit", @@ -5737,7 +5737,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "derive_more", "fnv", @@ -5771,7 +5771,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "blake2-rfc", "hash-db", @@ -5800,7 +5800,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "futures 0.3.16", @@ -5825,7 +5825,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "derive_more", @@ -5857,7 +5857,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "futures 0.3.16", @@ -5886,7 +5886,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "derive_more", "lazy_static", @@ -5914,7 +5914,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "derive_more", "parity-scale-codec", @@ -5931,7 +5931,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "log", "parity-scale-codec", @@ -5946,7 +5946,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "ansi_term 0.12.1", "futures 0.3.16", @@ -5964,7 +5964,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "derive_more", @@ -5984,7 +5984,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "hash-db", "lazy_static", @@ -6003,7 +6003,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-std", "async-trait", @@ -6058,7 +6058,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "bytes 0.5.6", "fnv", @@ -6086,7 +6086,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "futures 0.3.16", "libp2p 0.37.1", @@ -6099,7 +6099,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6108,7 +6108,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "futures 0.3.16", "hash-db", @@ -6143,7 +6143,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "derive_more", "futures 0.3.16", @@ -6168,7 +6168,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "futures 0.1.31", "jsonrpc-core", @@ -6186,7 +6186,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "directories", @@ -6254,7 +6254,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "log", "parity-scale-codec", @@ -6292,7 +6292,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "chrono", "futures 0.3.16", @@ -6341,7 +6341,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6390,7 +6390,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -6401,7 +6401,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "derive_more", "futures 0.3.16", @@ -6430,7 +6430,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "derive_more", "futures 0.3.16", @@ -6890,7 +6890,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "hash-db", "log", @@ -6907,7 +6907,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -6919,7 +6919,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "serde", @@ -6931,7 +6931,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "integer-sqrt", "num-traits", @@ -6945,7 +6945,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "sp-api", @@ -6957,7 +6957,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "futures 0.3.16", "log", @@ -6975,7 +6975,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "futures 0.3.16", @@ -7001,7 +7001,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "parity-scale-codec", @@ -7018,7 +7018,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -7028,7 +7028,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "base58", "blake2-rfc", @@ -7072,7 +7072,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -7081,7 +7081,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "proc-macro2", "quote", @@ -7091,7 +7091,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "environmental", "parity-scale-codec", @@ -7102,7 +7102,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "finality-grandpa", "log", @@ -7119,7 +7119,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -7133,7 +7133,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "futures 0.3.16", "hash-db", @@ -7158,7 +7158,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "lazy_static", "sp-core", @@ -7169,7 +7169,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "derive_more", @@ -7186,7 +7186,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "ruzstd", "zstd", @@ -7195,7 +7195,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "sp-api", "sp-core", @@ -7205,7 +7205,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "backtrace", ] @@ -7213,7 +7213,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "rustc-hash", "serde", @@ -7224,7 +7224,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "either", "hash256-std-hasher", @@ -7245,7 +7245,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7262,7 +7262,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -7274,7 +7274,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "serde", "serde_json", @@ -7283,7 +7283,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "sp-api", @@ -7296,7 +7296,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7306,7 +7306,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "hash-db", "log", @@ -7335,12 +7335,12 @@ checksum = "35391ea974fa5ee869cb094d5b437688fbf3d8127d64d1b9fed5822a1ed39b12" [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7353,7 +7353,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "log", "sp-core", @@ -7366,7 +7366,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -7397,7 +7397,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "erased-serde", "log", @@ -7415,7 +7415,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "sp-api", "sp-runtime", @@ -7424,7 +7424,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-trait", "log", @@ -7439,7 +7439,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "hash-db", "memory-db", @@ -7466,7 +7466,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "futures 0.3.16", "futures-core", @@ -7478,7 +7478,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7493,7 +7493,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "parity-scale-codec", "proc-macro-crate 1.0.0", @@ -7505,7 +7505,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7630,7 +7630,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.16", @@ -7653,7 +7653,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "async-std", "derive_more", @@ -7667,7 +7667,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/humanode-network/substrate?branch=aura-hack#0c46c68a6c9bd0168a6f318d05b652516db169db" +source = "git+https://github.com/humanode-network/substrate?branch=master#b7409a2257c7c231b485ee827daa73d05d303047" dependencies = [ "ansi_term 0.12.1", "atty", diff --git a/crates/bioauth-consensus/Cargo.toml b/crates/bioauth-consensus/Cargo.toml index 2589e09fe..da37684a8 100644 --- a/crates/bioauth-consensus/Cargo.toml +++ b/crates/bioauth-consensus/Cargo.toml @@ -10,24 +10,24 @@ humanode-runtime = { version = "0.1", path = "../humanode-runtime" } pallet-bioauth = { version = "0.1", path = "../pallet-bioauth" } async-trait = "0.1.42" -pallet-aura = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-tracing = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-consensus-slots = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-aura = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-tracing = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-consensus-slots = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "master" } thiserror = "1" [dev-dependencies] mockall = "0.10" -node-primitives = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-service = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-core = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +node-primitives = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-service = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-core = { git = "https://github.com/humanode-network/substrate", branch = "master" } tokio = { version = "1", features = ["full"] } [features] diff --git a/crates/humanode-peer/Cargo.toml b/crates/humanode-peer/Cargo.toml index e56091d5a..eaff56ab9 100644 --- a/crates/humanode-peer/Cargo.toml +++ b/crates/humanode-peer/Cargo.toml @@ -15,28 +15,28 @@ robonode-client = { version = "0.1", path = "../robonode-client" } async-trait = "0.1" codec = { package = "parity-scale-codec", version = "2.0.0" } -frame-benchmarking-cli = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-benchmarking-cli = { git = "https://github.com/humanode-network/substrate", branch = "master" } futures = "0.3" hex-literal = "0.3" qr2term = "0.2" reqwest = "0.11" -sc-basic-authorship = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-cli = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-executor = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-network = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-service = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-tracing = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-transaction-pool = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-keystore = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-utils = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sc-basic-authorship = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-cli = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-executor = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-network = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-service = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-tracing = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-transaction-pool = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-consensus-aura = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-keystore = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-utils = { git = "https://github.com/humanode-network/substrate", branch = "master" } structopt = "0.3.8" thiserror = "1" tokio = { version = "1", features = ["full"] } diff --git a/crates/humanode-rpc/Cargo.toml b/crates/humanode-rpc/Cargo.toml index 8cfdfabed..4a8c64711 100644 --- a/crates/humanode-rpc/Cargo.toml +++ b/crates/humanode-rpc/Cargo.toml @@ -11,11 +11,11 @@ humanode-runtime = { version = "0.1", path = "../humanode-runtime" } robonode-client = { version = "0.1", path = "../robonode-client" } jsonrpc-core = "15" # TODO: update when `sc-service` bumps it's version -pallet-transaction-payment-rpc = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-rpc = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-rpc-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-api = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-block-builder = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -substrate-frame-rpc-system = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-transaction-payment-rpc = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-rpc = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-rpc-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-api = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-block-builder = { git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "master" } +substrate-frame-rpc-system = { git = "https://github.com/humanode-network/substrate", branch = "master" } diff --git a/crates/humanode-runtime/Cargo.toml b/crates/humanode-runtime/Cargo.toml index ab1184a86..61ad9aad4 100644 --- a/crates/humanode-runtime/Cargo.toml +++ b/crates/humanode-runtime/Cargo.toml @@ -6,39 +6,39 @@ authors = ["Humanode Team "] publish = false [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +substrate-wasm-builder = { git = "https://github.com/humanode-network/substrate", branch = "master" } [dependencies] pallet-bioauth = { version = "0.1", path = "../pallet-bioauth", default-features = false } robonode-crypto = { version = "0.1", path = "../robonode-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -frame-executive = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -frame-system-benchmarking = { default-features = false, optional = true, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-executive = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-system-benchmarking = { default-features = false, optional = true, git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } hex-literal = { version = "0.3", optional = true } -pallet-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -pallet-balances = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -pallet-sudo = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -pallet-timestamp = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +pallet-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-balances = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-sudo = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-timestamp = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } serde = { version = "1", features = ["derive"], optional = true } -sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-block-builder = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-consensus-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-inherents = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-offchain = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-session = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-transaction-pool = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-version = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-block-builder = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-consensus-aura = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-inherents = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-offchain = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-session = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-transaction-pool = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-version = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } [features] default = ["std"] diff --git a/crates/pallet-bioauth/Cargo.toml b/crates/pallet-bioauth/Cargo.toml index 19938525d..d246fac66 100644 --- a/crates/pallet-bioauth/Cargo.toml +++ b/crates/pallet-bioauth/Cargo.toml @@ -10,17 +10,17 @@ primitives-auth-ticket = { version = "0.1", path = "../primitives-auth-ticket", serde-nostd = { version = "0.1", path = "../serde-nostd", default-features = false } codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -frame-benchmarking = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack", optional = true } -frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +frame-benchmarking = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master", optional = true } +frame-support = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +frame-system = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } serde = { version = "1", features = ["derive"], optional = true } -sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-runtime = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } [dev-dependencies] -sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } -sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-core = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } +sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } [features] default = ["std"] diff --git a/crates/primitives-auth-ticket/Cargo.toml b/crates/primitives-auth-ticket/Cargo.toml index a4a3e45e8..f60828960 100644 --- a/crates/primitives-auth-ticket/Cargo.toml +++ b/crates/primitives-auth-ticket/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } serde = { version = "1", features = ["derive"], optional = true } -sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "master" } [features] default = ["std"] diff --git a/crates/robonode-server/Cargo.toml b/crates/robonode-server/Cargo.toml index d25a4ce8c..5a7e2997b 100644 --- a/crates/robonode-server/Cargo.toml +++ b/crates/robonode-server/Cargo.toml @@ -17,7 +17,7 @@ rand = "0.7" reqwest = "0.11" sc-tracing = "3" serde = { version = "1", features = ["derive"] } -sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "aura-hack" } +sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "master" } tokio = { version = "1", features = ["full"] } tracing = "0.1" uuid = { version = "0.8", features = ["v4"] }