From 5c86af251f6e76c7278090b3a6a79b977119e2c8 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 30 Sep 2020 15:26:13 +0300 Subject: [PATCH] Get substrate dependencies from crates io (#387) * get Substrate dependencies from crates.io * removing unused dependencies * cargo fmt --all * remove commented dependencies * remove commented dependencies again * try to fix compilation --- bridges/bin/millau-runtime/Cargo.toml | 246 +++------------ bridges/bin/node/Cargo.toml | 163 ++-------- bridges/bin/node/src/chain_spec.rs | 2 +- bridges/bin/rialto-runtime/Cargo.toml | 287 +++--------------- bridges/modules/call-dispatch/Cargo.toml | 47 +-- bridges/modules/currency-exchange/Cargo.toml | 57 ++-- .../ethereum-contract/builtin/Cargo.toml | 33 +- bridges/modules/ethereum/Cargo.toml | 54 +--- bridges/modules/message-lane/Cargo.toml | 46 +-- bridges/modules/message-lane/rpc/Cargo.toml | 48 +-- bridges/modules/message-lane/rpc/src/lib.rs | 72 ----- .../modules/shift-session-manager/Cargo.toml | 52 +--- bridges/modules/substrate/Cargo.toml | 83 +---- .../primitives/currency-exchange/Cargo.toml | 24 +- bridges/primitives/ethereum-poa/Cargo.toml | 69 ++--- bridges/primitives/message-lane/Cargo.toml | 22 +- bridges/primitives/millau/Cargo.toml | 6 +- bridges/primitives/rialto/Cargo.toml | 6 +- bridges/primitives/runtime/Cargo.toml | 8 +- bridges/primitives/substrate/Cargo.toml | 36 --- bridges/relays/ethereum/Cargo.toml | 60 ++-- bridges/relays/millau-client/Cargo.toml | 4 +- bridges/relays/rialto-client/Cargo.toml | 12 +- bridges/relays/substrate-client/Cargo.toml | 15 +- bridges/relays/substrate/Cargo.toml | 2 +- bridges/relays/utils/Cargo.toml | 3 +- 26 files changed, 284 insertions(+), 1173 deletions(-) delete mode 100644 bridges/primitives/substrate/Cargo.toml diff --git a/bridges/bin/millau-runtime/Cargo.toml b/bridges/bin/millau-runtime/Cargo.toml index fd24613039d84..85db10f4dcb0e 100644 --- a/bridges/bin/millau-runtime/Cargo.toml +++ b/bridges/bin/millau-runtime/Cargo.toml @@ -8,211 +8,45 @@ repository = "https://github.com/paritytech/parity-bridges-common/" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -bp-millau = { path = "../../primitives/millau", default-features = false } -hex-literal = "0.3" +codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] } +serde = { version = "1.0.115", optional = true, features = ["derive"] } -[dependencies.codec] -package = "parity-scale-codec" -version = "1.3.1" -default-features = false -features = ["derive"] +# Bridge dependencies -[dependencies.serde] -version = "1.0.115" -optional = true -features = ["derive"] +bp-message-lane = { path = "../../primitives/message-lane", default-features = false } +bp-millau = { path = "../../primitives/millau", default-features = false } +pallet-bridge-call-dispatch = { path = "../../modules/call-dispatch", default-features = false } +pallet-message-lane = { path = "../../modules/message-lane", default-features = false } +pallet-shift-session-manager = { path = "../../modules/shift-session-manager", default-features = false } # Substrate Dependencies -[dependencies.pallet-aura] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-balances] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-bridge-call-dispatch] -version = "0.1.0" -default-features = false -path = "../../modules/call-dispatch" - -[dependencies.pallet-message-lane] -version = "0.1.0" -default-features = false -path = "../../modules/message-lane" - -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-grandpa] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-randomness-collective-flip] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-sudo] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-shift-session-manager] -version = "0.1.0" -default-features = false -path = "../../modules/shift-session-manager" - -[dependencies.pallet-session] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-system-rpc-runtime-api] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-timestamp] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-transaction-payment] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-executive] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -# Substrate Primitives -[dependencies.sp-api] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-block-builder] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" -[dependencies.sp-consensus-aura] -version = "0.8.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-inherents] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-offchain] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-session] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-staking] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-transaction-pool] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-version] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-benchmarking] -optional = true -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.bp-header-chain] -version = "0.1.0" -default-features = false -path = "../../primitives/header-chain" - -[dependencies.bp-message-lane] -version = "0.1.0" -default-features = false -path = "../../primitives/message-lane" - -# Dev Dependencies - -[build-dependencies.wasm-builder-runner] -version = "1.0.5" -tag = 'v2.0.0' -package = "substrate-wasm-builder-runner" -git = "https://github.com/paritytech/substrate/" +frame-executive = { version = "2.0", default-features = false } +frame-support = { version = "2.0", default-features = false } +frame-system = { version = "2.0", default-features = false } +frame-system-rpc-runtime-api = { version = "2.0", default-features = false } +pallet-aura = { version = "2.0", default-features = false } +pallet-balances = { version = "2.0", default-features = false } +pallet-grandpa = { version = "2.0", default-features = false } +pallet-randomness-collective-flip = { version = "2.0", default-features = false } +pallet-session = { version = "2.0", default-features = false } +pallet-sudo = { version = "2.0", default-features = false } +pallet-timestamp = { version = "2.0", default-features = false } +pallet-transaction-payment = { version = "2.0", default-features = false } +sp-api = { version = "2.0", default-features = false } +sp-block-builder = { version = "2.0", default-features = false } +sp-consensus-aura = { version = "0.8", default-features = false } +sp-core = { version = "2.0", default-features = false } +sp-inherents = { version = "2.0", default-features = false } +sp-offchain = { version = "2.0", default-features = false } +sp-runtime = { version = "2.0", default-features = false } +sp-session = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } +sp-transaction-pool = { version = "2.0", default-features = false } +sp-version = { version = "2.0", default-features = false } + +[build-dependencies] +wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } [features] default = ["std"] @@ -220,17 +54,18 @@ std = [ "bp-message-lane/std", "bp-millau/std", "codec/std", - "frame-benchmarking/std", "frame-executive/std", "frame-support/std", - "frame-system-rpc-runtime-api/std", "frame-system/std", + "frame-system-rpc-runtime-api/std", "pallet-aura/std", "pallet-balances/std", "pallet-bridge-call-dispatch/std", "pallet-grandpa/std", + "pallet-message-lane/std", "pallet-randomness-collective-flip/std", "pallet-shift-session-manager/std", + "pallet-session/std", "pallet-sudo/std", "pallet-timestamp/std", "pallet-transaction-payment/std", @@ -240,7 +75,6 @@ std = [ "sp-consensus-aura/std", "sp-core/std", "sp-inherents/std", - "sp-io/std", "sp-offchain/std", "sp-runtime/std", "sp-session/std", @@ -248,9 +82,3 @@ std = [ "sp-transaction-pool/std", "sp-version/std", ] -runtime-benchmarks = [ - "frame-benchmarking", - "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", -] diff --git a/bridges/bin/node/Cargo.toml b/bridges/bin/node/Cargo.toml index 72770e0db7c32..628ba7552568d 100644 --- a/bridges/bin/node/Cargo.toml +++ b/bridges/bin/node/Cargo.toml @@ -9,147 +9,42 @@ repository = "https://github.com/paritytech/parity-bridges-common/" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -futures = "0.3.5" jsonrpc-core = "15.0.0" -log = "0.4.11" -pallet-message-lane-rpc = { version = "0.1.0", path = "../../modules/message-lane/rpc" } structopt = "0.3.17" -[dependencies.millau-runtime] -optional = true -version = "0.1.0" -path = "../millau-runtime" -default-features = false -features = ["std"] - -[dependencies.rialto-runtime] -optional = true -version = "0.1.0" -path = "../rialto-runtime" -default-features = false -features = ["std"] - -[dependencies.sc-cli] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-rpc] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-executor] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-service] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-inherents] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-transaction-pool] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-transaction-pool] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-network] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-consensus-aura] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-consensus-aura] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-consensus] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-finality-grandpa] -package = "sc-finality-grandpa" -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.grandpa-primitives] -package = "sp-finality-grandpa" -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-consensus] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-client-api] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sc-basic-authorship] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.substrate-frame-rpc-system] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.frame-benchmarking] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.frame-benchmarking-cli] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" +# Bridge dependencies + +millau-runtime = { path = "../millau-runtime", optional = true } +pallet-message-lane-rpc = { path = "../../modules/message-lane/rpc" } +rialto-runtime = { path = "../rialto-runtime", optional = true } + +# Substrate Dependencies + +frame-benchmarking = "2.0" +frame-benchmarking-cli = "2.0" +sc-basic-authorship = "0.8" +sc-cli = "0.8" +sc-client-api = "2.0" +sc-consensus = "0.8" +sc-consensus-aura = "0.8" +sc-executor = "0.8" +sc-finality-grandpa = "0.8" +sc-service = "0.8" +sc-rpc = "2.0" +sc-transaction-pool = "2.0" +sp-consensus = "0.8" +sp-consensus-aura = "0.8" +sp-core = "2.0" +sp-inherents = "2.0" +sp-finality-grandpa = "2.0" +sp-runtime = "2.0" +substrate-frame-rpc-system = "2.0" [build-dependencies] +build-script-utils = { package = "substrate-build-script-utils", version = "2.0" } +frame-benchmarking-cli = "2.0" vergen = "3.1.0" -[build-dependencies.build-script-utils] -package = "substrate-build-script-utils" -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[build-dependencies.frame-benchmarking-cli] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - [features] default = [] millau = [ diff --git a/bridges/bin/node/src/chain_spec.rs b/bridges/bin/node/src/chain_spec.rs index 2aac990331903..62f28fb49a885 100644 --- a/bridges/bin/node/src/chain_spec.rs +++ b/bridges/bin/node/src/chain_spec.rs @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with Parity Bridges Common. If not, see . -use grandpa_primitives::AuthorityId as GrandpaId; use rialto_runtime::{ AccountId, AuraConfig, BalancesConfig, BridgeKovanConfig, BridgeRialtoConfig, GenesisConfig, GrandpaConfig, SessionConfig, SessionKeys, Signature, SudoConfig, SystemConfig, WASM_BINARY, }; use sp_consensus_aura::sr25519::AuthorityId as AuraId; use sp_core::{sr25519, Pair, Public}; +use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_runtime::traits::{IdentifyAccount, Verify}; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. diff --git a/bridges/bin/rialto-runtime/Cargo.toml b/bridges/bin/rialto-runtime/Cargo.toml index 495948486cbe2..878dfc01b873e 100644 --- a/bridges/bin/rialto-runtime/Cargo.toml +++ b/bridges/bin/rialto-runtime/Cargo.toml @@ -8,255 +8,65 @@ repository = "https://github.com/paritytech/parity-bridges-common/" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -bp-millau = { path = "../../primitives/millau", default-features = false } -bp-rialto = { path = "../../primitives/rialto", default-features = false } +codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] } hex-literal = "0.3" +libsecp256k1 = { version = "0.3.4", optional = true, default-features = false, features = ["hmac"] } +serde = { version = "1.0.115", optional = true, features = ["derive"] } -[dependencies.codec] -package = "parity-scale-codec" -version = "1.3.1" -default-features = false -features = ["derive"] +# Bridge dependencies -[dependencies.libsecp256k1] -optional = true -version = "0.3.4" -default-features = false -features = ["hmac"] - -[dependencies.serde] -version = "1.0.116" -optional = true -features = ["derive"] +bp-currency-exchange = { path = "../../primitives/currency-exchange", default-features = false } +bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false } +bp-header-chain = { path = "../../primitives/header-chain", default-features = false } +bp-message-lane = { path = "../../primitives/message-lane", default-features = false } +bp-millau = { path = "../../primitives/millau", default-features = false } +bp-rialto = { path = "../../primitives/rialto", default-features = false } +pallet-bridge-eth-poa = { path = "../../modules/ethereum", default-features = false } +pallet-bridge-call-dispatch = { path = "../../modules/call-dispatch", default-features = false } +pallet-bridge-currency-exchange = { path = "../../modules/currency-exchange", default-features = false } +pallet-message-lane = { path = "../../modules/message-lane", default-features = false } +pallet-shift-session-manager = { path = "../../modules/shift-session-manager", default-features = false } # Substrate Dependencies -[dependencies.pallet-aura] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-balances] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-bridge-eth-poa] -version = "0.1.0" -default-features = false -path = "../../modules/ethereum" - -[dependencies.pallet-bridge-call-dispatch] -version = "0.1.0" -default-features = false -path = "../../modules/call-dispatch" - -[dependencies.pallet-bridge-currency-exchange] -version = "0.1.0" -default-features = false -path = "../../modules/currency-exchange" - -[dependencies.pallet-message-lane] -version = "0.1.0" -default-features = false -path = "../../modules/message-lane" - -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-grandpa] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-randomness-collective-flip] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-shift-session-manager] -version = "0.1.0" -default-features = false -path = "../../modules/shift-session-manager" - -[dependencies.pallet-sudo] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-session] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-system-rpc-runtime-api] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-timestamp] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-transaction-payment] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-executive] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -# Substrate Primitives -[dependencies.sp-api] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" -[dependencies.sp-block-builder] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-consensus-aura] -version = "0.8.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-inherents] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-offchain] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-session] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-staking] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-transaction-pool] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-version] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-benchmarking] -optional = true -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.bp-currency-exchange] -version = "0.1.0" -default-features = false -path = "../../primitives/currency-exchange" - -[dependencies.bp-eth-poa] -version = "0.1.0" -default-features = false -path = "../../primitives/ethereum-poa" - -[dependencies.bp-header-chain] -version = "0.1.0" -default-features = false -path = "../../primitives/header-chain" - -[dependencies.bp-message-lane] -version = "0.1.0" -default-features = false -path = "../../primitives/message-lane" - -# Dev Dependencies - -[dev-dependencies.libsecp256k1] -version = "0.3.4" -default-features = false -features = ["hmac"] - -[dev-dependencies.bp-eth-poa] -version = "0.1.0" -default-features = false -features = ["std"] -path = "../../primitives/ethereum-poa" - -[build-dependencies.wasm-builder-runner] -version = "1.0.5" -tag = 'v2.0.0' -package = "substrate-wasm-builder-runner" -git = "https://github.com/paritytech/substrate/" +frame-benchmarking = { version = "2.0", default-features = false, optional = true } +frame-executive = { version = "2.0", default-features = false } +frame-support = { version = "2.0", default-features = false } +frame-system = { version = "2.0", default-features = false } +frame-system-rpc-runtime-api = { version = "2.0", default-features = false } +pallet-aura = { version = "2.0", default-features = false } +pallet-balances = { version = "2.0", default-features = false } +pallet-grandpa = { version = "2.0", default-features = false } +pallet-randomness-collective-flip = { version = "2.0", default-features = false } +pallet-session = { version = "2.0", default-features = false } +pallet-sudo = { version = "2.0", default-features = false } +pallet-timestamp = { version = "2.0", default-features = false } +pallet-transaction-payment = { version = "2.0", default-features = false } +sp-api = { version = "2.0", default-features = false } +sp-block-builder = { version = "2.0", default-features = false } +sp-consensus-aura = { version = "0.8", default-features = false } +sp-core = { version = "2.0", default-features = false } +sp-inherents = { version = "2.0", default-features = false } +sp-io = { version = "2.0", default-features = false } +sp-offchain = { version = "2.0", default-features = false } +sp-runtime = { version = "2.0", default-features = false } +sp-session = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } +sp-transaction-pool = { version = "2.0", default-features = false } +sp-version = { version = "2.0", default-features = false } + +[dev-dependencies] +libsecp256k1 = { version = "0.3.4", features = ["hmac"] } + +[build-dependencies] +wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } [features] default = ["std"] std = [ "bp-currency-exchange/std", "bp-eth-poa/std", + "bp-header-chain/std", "bp-message-lane/std", "bp-millau/std", "bp-rialto/std", @@ -268,10 +78,11 @@ std = [ "frame-system/std", "pallet-aura/std", "pallet-balances/std", + "pallet-bridge-eth-poa/std", "pallet-bridge-call-dispatch/std", "pallet-bridge-currency-exchange/std", - "pallet-bridge-eth-poa/std", "pallet-grandpa/std", + "pallet-message-lane/std", "pallet-randomness-collective-flip/std", "pallet-shift-session-manager/std", "pallet-sudo/std", diff --git a/bridges/modules/call-dispatch/Cargo.toml b/bridges/modules/call-dispatch/Cargo.toml index 83e86ba0e0b67..b60cf14d79229 100644 --- a/bridges/modules/call-dispatch/Cargo.toml +++ b/bridges/modules/call-dispatch/Cargo.toml @@ -8,45 +8,22 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false } -bp-message-dispatch = { path = "../../primitives/message-dispatch", default-features = false } -bp-runtime = { path = "../../primitives/runtime", default-features = false } - -# Substrate Based Dependencies -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +# Bridge dependencies -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +bp-message-dispatch = { path = "../../primitives/message-dispatch", default-features = false } +bp-runtime = { path = "../../primitives/runtime", default-features = false } -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +# Substrate Dependencies -[dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +frame-support = { version = "2.0", default-features = false } +frame-system = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } +sp-runtime = { version = "2.0", default-features = false } -[dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +[dev-dependencies] +sp-core = "2.0" +sp-io = "2.0" [features] default = ["std"] @@ -55,8 +32,6 @@ std = [ "bp-runtime/std", "frame-support/std", "frame-system/std", - "sp-core/std", - "sp-io/std", "sp-runtime/std", "sp-std/std", ] diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml index 5e3c980447c96..8d400e07bb215 100644 --- a/bridges/modules/currency-exchange/Cargo.toml +++ b/bridges/modules/currency-exchange/Cargo.toml @@ -7,57 +7,31 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -bp-currency-exchange = { path = "../../primitives/currency-exchange", default-features = false } -bp-header-chain = { path = "../../primitives/header-chain", default-features = false } codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false } serde = { version = "1.0", optional = true } -# Substrate Based Dependencies -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +# Bridge dependencies -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +bp-currency-exchange = { path = "../../primitives/currency-exchange", default-features = false } +bp-header-chain = { path = "../../primitives/header-chain", default-features = false } -[dependencies.frame-benchmarking] -optional = true -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +# Substrate Dependencies -[dev-dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +frame-benchmarking = { version = "2.0", default-features = false, optional = true } +frame-support = { version = "2.0", default-features = false } +frame-system = { version = "2.0", default-features = false } +sp-runtime = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false, optional = true } -[dev-dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +[dev-dependencies] +sp-core = "2.0" +sp-io = "2.0" [features] default = ["std"] std = [ "bp-currency-exchange/std", + "bp-header-chain/std", "codec/std", "frame-benchmarking/std", "frame-support/std", @@ -66,4 +40,7 @@ std = [ "sp-runtime/std", "sp-std/std", ] -runtime-benchmarks = ["frame-benchmarking"] +runtime-benchmarks = [ + "frame-benchmarking", + "sp-std", +] diff --git a/bridges/modules/ethereum-contract/builtin/Cargo.toml b/bridges/modules/ethereum-contract/builtin/Cargo.toml index 5ade9e6deb157..b2adcfbf49ecb 100644 --- a/bridges/modules/ethereum-contract/builtin/Cargo.toml +++ b/bridges/modules/ethereum-contract/builtin/Cargo.toml @@ -7,9 +7,6 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] - -# General dependencies - codec = { package = "parity-scale-codec", version = "1.3.4" } ethereum-types = "0.9.2" finality-grandpa = "0.12.3" @@ -20,30 +17,12 @@ log = "0.4.11" rialto-runtime = { path = "../../../bin/rialto-runtime" } -[dependencies.sp-blockchain] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-finality-grandpa] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +# Substrate Dependencies -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" - -[dependencies.sc-finality-grandpa] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +sc-finality-grandpa = "0.8" +sp-blockchain = "2.0" +sp-finality-grandpa = "2.0" +sp-runtime = "2.0" [dev-dependencies] -hex = "0.4" - -[dev-dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +sp-core = "2.0" diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml index 7c66ad26f74c6..eb8393f4905ae 100644 --- a/bridges/modules/ethereum/Cargo.toml +++ b/bridges/modules/ethereum/Cargo.toml @@ -7,58 +7,24 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false } codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false } -hex-literal = "0.3" +libsecp256k1 = { version = "0.3.4", default-features = false, features = ["hmac"], optional = true } serde = { version = "1.0", optional = true } -# Substrate Based Dependencies -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +# Bridge dependencies -[dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false } -[dependencies.frame-benchmarking] -optional = true -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +# Substrate Dependencies -[dependencies.libsecp256k1] -optional = true -version = "0.3.4" -default-features = false -features = ["hmac"] +frame-benchmarking = { version = "2.0", default-features = false, optional = true } +frame-support = { version = "2.0", default-features = false } +frame-system = { version = "2.0", default-features = false } +sp-io = { version = "2.0", default-features = false } +sp-runtime = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } -# Dev Dependencies [dev-dependencies] -bp-eth-poa = { path = "../../primitives/ethereum-poa", features = ["std"] } libsecp256k1 = { version = "0.3.4", features = ["hmac"] } [features] diff --git a/bridges/modules/message-lane/Cargo.toml b/bridges/modules/message-lane/Cargo.toml index c983b6cd99a55..0240d22250594 100644 --- a/bridges/modules/message-lane/Cargo.toml +++ b/bridges/modules/message-lane/Cargo.toml @@ -7,54 +7,30 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -bp-message-dispatch = { path = "../../primitives/message-dispatch", default-features = false } -bp-message-lane = { path = "../../primitives/message-lane", default-features = false } -bp-runtime = { path = "../../primitives/runtime", default-features = false } codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false } -# Substrate Based Dependencies - -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +# Bridge dependencies -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +bp-message-lane = { path = "../../primitives/message-lane", default-features = false } -[dev-dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +# Substrate Dependencies -[dev-dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +frame-support = { version = "2.0", default-features = false } +frame-system = { version = "2.0", default-features = false } +sp-runtime = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } -[dev-dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +[dev-dependencies] +sp-core = "2.0" +sp-io = "2.0" [features] default = ["std"] std = [ - "bp-message-dispatch/std", "bp-message-lane/std", - "bp-runtime/std", "codec/std", "frame-support/std", "frame-system/std", + "sp-runtime/std", "sp-std/std", ] diff --git a/bridges/modules/message-lane/rpc/Cargo.toml b/bridges/modules/message-lane/rpc/Cargo.toml index 2a374fd79363e..e9ef6c1cc6b2a 100644 --- a/bridges/modules/message-lane/rpc/Cargo.toml +++ b/bridges/modules/message-lane/rpc/Cargo.toml @@ -7,50 +7,22 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -bp-runtime = { path = "../../../primitives/runtime" } -bp-message-lane = { path = "../../../primitives/message-lane" } derive_more = "0.99.2" futures = { version = "0.3.5", features = ["compat"] } jsonrpc-core = "15.0.0" jsonrpc-core-client = "15.0.0" jsonrpc-derive = "15.0.0" -# Substrate Based Dependencies - -[dependencies.sc-client-api] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-blockchain] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +# Bridge dependencies -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-state-machine] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-trie] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +bp-runtime = { path = "../../../primitives/runtime" } +bp-message-lane = { path = "../../../primitives/message-lane" } -[dev-dependencies] -async-std = "1.6.5" +# Substrate Dependencies -[dev-dependencies.substrate-test-runtime-client] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" +sc-client-api = "2.0" +sp-blockchain = "2.0" +sp-core = "2.0" +sp-runtime = "2.0" +sp-state-machine = "0.8" +sp-trie = "2.0" diff --git a/bridges/modules/message-lane/rpc/src/lib.rs b/bridges/modules/message-lane/rpc/src/lib.rs index ff3ab1507ad8a..28aeb66ab15e5 100644 --- a/bridges/modules/message-lane/rpc/src/lib.rs +++ b/bridges/modules/message-lane/rpc/src/lib.rs @@ -175,75 +175,3 @@ fn unwrap_or_best(backend: &impl BackendT, block: Option Error { Error::Client(Box::new(err)) } - -#[cfg(test)] -mod tests { - use super::*; - use sp_core::Blake2Hasher; - use sp_runtime::{codec::Decode, traits::Header as HeaderT}; - use substrate_test_runtime_client::{ - runtime::Block, Backend, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt, - }; - - const TEST_INSTANCE: InstanceId = [0, 0, 0, 1]; - const TEST_LANE: LaneId = [0, 0, 0, 1]; - - fn test_key() -> StorageKey { - StorageKey(sp_core::storage::well_known_keys::CODE.to_vec()) - } - - struct TestRuntimeAdapter; - - impl Runtime for TestRuntimeAdapter { - fn message_key(&self, instance: &InstanceId, _lane: &LaneId, _nonce: MessageNonce) -> Option { - if *instance == TEST_INSTANCE { - Some(test_key()) - } else { - None - } - } - - fn inbound_lane_data_key(&self, instance: &InstanceId, _lane: &LaneId) -> Option { - if *instance == TEST_INSTANCE { - Some(test_key()) - } else { - None - } - } - } - - fn test_handler() -> MessageLaneRpcHandler { - let builder = TestClientBuilder::new(); - let (_, backend) = builder.build_with_backend(); - - MessageLaneRpcHandler::new(backend, Arc::new(TestRuntimeAdapter)) - } - - #[test] - fn storage_proof_is_actually_generated() { - // the only thing we actually care here is that RPC actually generates storage proof - // that can be verified from runtime - - // proof is generated by RPC - let handler = test_handler(); - let proof = handler - .prove_messages(TEST_INSTANCE, TEST_LANE, 1, 3, None) - .wait() - .unwrap(); - - // proof is then relayed + checked by runtime (sp_trie supports no_std) - // (storage root is known to underlying bridge pallet) - let root = *handler - .backend - .blockchain() - .header(BlockId::Number(0)) - .unwrap() - .unwrap() - .state_root(); - let proof = StorageProof::new(Decode::decode(&mut &proof[..]).unwrap()); - let trie_db = proof.into_memory_db::(); - let checked_storage_value = - sp_trie::read_trie_value::, _>(&trie_db, &root, &test_key().0).unwrap(); - assert!(checked_storage_value.is_some()); - } -} diff --git a/bridges/modules/shift-session-manager/Cargo.toml b/bridges/modules/shift-session-manager/Cargo.toml index 7684157380b6c..3f54df20dfe00 100644 --- a/bridges/modules/shift-session-manager/Cargo.toml +++ b/bridges/modules/shift-session-manager/Cargo.toml @@ -9,49 +9,17 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false } -# Substrate Based Dependencies +# Substrate Dependencies -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +frame-support = { version = "2.0", default-features = false } +frame-system = { version = "2.0", default-features = false } +pallet-session = { version = "2.0", default-features = false } +sp-staking = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-session] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-staking] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +[dev-dependencies] +sp-core = "2.0" +sp-runtime = "2.0" [features] default = ["std"] @@ -60,8 +28,6 @@ std = [ "frame-support/std", "frame-system/std", "pallet-session/std", - "sp-core/std", - "sp-runtime/std", "sp-staking/std", "sp-std/std", ] diff --git a/bridges/modules/substrate/Cargo.toml b/bridges/modules/substrate/Cargo.toml index ae70b54af409c..3b474e643fc75 100644 --- a/bridges/modules/substrate/Cargo.toml +++ b/bridges/modules/substrate/Cargo.toml @@ -8,79 +8,26 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bp-header-chain = { path = "../../primitives/header-chain", default-features = false } +codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false } finality-grandpa = { version = "0.12.3", default-features = false } hash-db = { version = "0.15.2", default-features = false } -serde = { version = "1.0", optional = true } num-traits = { version = "0.2", default-features = false } +serde = { version = "1.0", optional = true } -[dependencies.codec] -package = "parity-scale-codec" -version = "1.3.1" -default-features = false -features = ["derive"] - -# Substrate Based Dependencies - -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-finality-grandpa] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.sp-trie] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -# Dev Dependencies -[dev-dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" - -[dev-dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +# Substrate Dependencies -[dev-dependencies.sp-keyring] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +frame-support = { version = "2.0", default-features = false } +frame-system = { version = "2.0", default-features = false } +sp-finality-grandpa = { version = "2.0", default-features = false } +sp-runtime = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } +sp-trie = { version = "2.0", default-features = false } -[dev-dependencies.sp-state-machine] -version = "0.8.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +[dev-dependencies] +sp-core = "2.0" +sp-io = "2.0" +sp-keyring = "2.0" +sp-state-machine = "0.8" [features] default = ["std"] @@ -89,11 +36,11 @@ std = [ "finality-grandpa/std", "frame-support/std", "frame-system/std", + "hash-db/std", "num-traits/std", "serde", "sp-finality-grandpa/std", "sp-runtime/std", "sp-std/std", "sp-trie/std", - "sp-io/std", ] diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml index 6f70280f16dc1..aebde40e902f6 100644 --- a/bridges/primitives/currency-exchange/Cargo.toml +++ b/bridges/primitives/currency-exchange/Cargo.toml @@ -9,31 +9,17 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false } -# Substrate Based Dependencies +# Substrate Dependencies -[dependencies.sp-api] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" - -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" +frame-support = { version = "2.0", default-features = false } +sp-api = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } [features] default = ["std"] std = [ "codec/std", + "frame-support/std", "sp-api/std", "sp-std/std", - "frame-support/std", ] diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml index 6ff4c0481a3ca..49eab4f084362 100644 --- a/bridges/primitives/ethereum-poa/Cargo.toml +++ b/bridges/primitives/ethereum-poa/Cargo.toml @@ -7,49 +7,27 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -serde = { version = "1.0", optional = true } -serde-big-array = { version = "0.2", optional = true } +codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false } ethbloom = { version = "0.8", default-features = false } -parity-bytes = { version = "0.1", default-features = false } -primitive-types = { version = "0.7", default-features = false, features = ["codec", "rlp"] } fixed-hash = { version = "0.5", default-features = false } +hash-db = { version = "0.15.2", default-features = false } impl-rlp = { version = "0.2", default-features = false } impl-serde = { version = "0.2.3", optional = true } -codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false } +libsecp256k1 = { version = "0.3.4", default-features = false, features = ["hmac"] } +parity-bytes = { version = "0.1", default-features = false } +plain_hasher = { version = "0.2.2", default-features = false } +primitive-types = { version = "0.7", default-features = false, features = ["codec", "rlp"] } rlp = { version = "0.4", default-features = false } -hash-db = { version = "0.15.2", default-features = false } +serde = { version = "1.0", optional = true } +serde-big-array = { version = "0.2", optional = true } triehash = { version = "0.8.2", default-features = false } -plain_hasher = { version = "0.2.2", default-features = false } - -# Substrate Based Dependencies -[dependencies.sp-api] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" +# Substrate Dependencies -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" - -[dependencies.libsecp256k1] -version = "0.3.4" -default-features = false -features = ["hmac"] +sp-api = { version = "2.0", default-features = false } +sp-io = { version = "2.0", default-features = false } +sp-runtime = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } [dev-dependencies] hex-literal = "0.2" @@ -57,22 +35,23 @@ hex-literal = "0.2" [features] default = ["std"] std = [ - "serde/std", - "serde-big-array", + "codec/std", "ethbloom/std", - "parity-bytes/std", - "primitive-types/std", - "primitive-types/serde", "fixed-hash/std", + "hash-db/std", "impl-rlp/std", "impl-serde", - "codec/std", + "libsecp256k1/std", + "parity-bytes/std", + "plain_hasher/std", + "primitive-types/std", + "primitive-types/serde", "rlp/std", - "sp-std/std", - "sp-runtime/std", + "serde/std", + "serde-big-array", "sp-api/std", "sp-io/std", - "hash-db/std", + "sp-runtime/std", + "sp-std/std", "triehash/std", - "plain_hasher/std", ] diff --git a/bridges/primitives/message-lane/Cargo.toml b/bridges/primitives/message-lane/Cargo.toml index c551a11627cbc..d705c119fe5d0 100644 --- a/bridges/primitives/message-lane/Cargo.toml +++ b/bridges/primitives/message-lane/Cargo.toml @@ -9,25 +9,11 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] } -# Substrate Based Dependencies +# Substrate Dependencies -[dependencies.frame-support] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-api] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-std] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" +frame-support = { version = "2.0", default-features = false } +sp-api = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/millau/Cargo.toml b/bridges/primitives/millau/Cargo.toml index 8e787996f501a..831a33b0403ef 100644 --- a/bridges/primitives/millau/Cargo.toml +++ b/bridges/primitives/millau/Cargo.toml @@ -9,9 +9,9 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] # Substrate Based Dependencies -sp-api = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", tag = 'v2.0.0', default-features = false } -sp-core = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", tag = 'v2.0.0', default-features = false } -sp-std = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", tag = 'v2.0.0', default-features = false } +sp-api = { version = "2.0", default-features = false } +sp-core = { version = "2.0", default-features = false } +sp-std = { version = "2.0", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/rialto/Cargo.toml b/bridges/primitives/rialto/Cargo.toml index 42f56fdae00d8..e8a04907b8c37 100644 --- a/bridges/primitives/rialto/Cargo.toml +++ b/bridges/primitives/rialto/Cargo.toml @@ -9,9 +9,9 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] # Substrate Based Dependencies -sp-api = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", tag = 'v2.0.0', default-features = false } -sp-core = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", tag = 'v2.0.0', default-features = false } -sp-std = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", tag = 'v2.0.0', default-features = false } +sp-api = { version = "2.0.0", default-features = false } +sp-core = { version = "2.0.0", default-features = false } +sp-std = { version = "2.0.0", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml index 249e49f151e9b..b182f4e4e406a 100644 --- a/bridges/primitives/runtime/Cargo.toml +++ b/bridges/primitives/runtime/Cargo.toml @@ -9,13 +9,9 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false } -# Substrate Based Dependencies +# Substrate Dependencies -[dependencies.sp-io] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" +sp-io = { version = "2.0", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/substrate/Cargo.toml b/bridges/primitives/substrate/Cargo.toml deleted file mode 100644 index 3756bd7bf8048..0000000000000 --- a/bridges/primitives/substrate/Cargo.toml +++ /dev/null @@ -1,36 +0,0 @@ -[package] -name = "bp-substrate" -version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2018" -license = "GPL-3.0-or-later WITH Classpath-exception-2.0" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -serde = { version = "1.0", optional = true } - -[dependencies.sp-finality-grandpa] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -default-features = false -git = "https://github.com/paritytech/substrate/" - -[dependencies.parity-scale-codec] -version = "1.3.1" -default-features = false -features = ["derive"] - -[features] -default = ["std"] -std = [ - "serde/std", - "sp-runtime/std", - "sp-finality-grandpa/std", -] diff --git a/bridges/relays/ethereum/Cargo.toml b/bridges/relays/ethereum/Cargo.toml index 9a22379fa3f2e..4c840758fcbc9 100644 --- a/bridges/relays/ethereum/Cargo.toml +++ b/bridges/relays/ethereum/Cargo.toml @@ -9,64 +9,40 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" ansi_term = "0.12" async-std = "1.6.5" async-trait = "0.1.40" -bp-currency-exchange = { path = "../../primitives/currency-exchange" } -bp-eth-poa = { path = "../../primitives/ethereum-poa" } clap = { version = "2.33.3", features = ["yaml"] } codec = { package = "parity-scale-codec", version = "1.3.4" } env_logger = "0.7.0" ethabi = "12.0" ethabi-contract = "11.0" ethabi-derive = "12.0" -exchange-relay = { path = "../exchange-relay" } futures = "0.3.5" -headers-relay = { path = "../headers-relay" } hex = "0.4" hex-literal = "0.3" log = "0.4.11" -messages-relay = { path = "../messages-relay" } num-traits = "0.2" parity-crypto = { version = "0.6", features = ["publickey"] } -relay-ethereum-client = { path = "../ethereum-client" } -relay-rialto-client = { path = "../rialto-client" } -relay-substrate-client = { path = "../substrate-client" } -rialto-runtime = { path = "../../bin/rialto-runtime" } -relay-utils = { path = "../utils" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.57" time = "0.2" -# Substrate Based Dependencies -[dependencies.frame-system] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate/" - -[dependencies.pallet-transaction-payment] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.node-primitives] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" +# Bridge dependencies -[dependencies.sp-core] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" - -[dependencies.sp-keyring] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" +bp-currency-exchange = { path = "../../primitives/currency-exchange" } +bp-eth-poa = { path = "../../primitives/ethereum-poa" } +exchange-relay = { path = "../exchange-relay" } +headers-relay = { path = "../headers-relay" } +messages-relay = { path = "../messages-relay" } +relay-ethereum-client = { path = "../ethereum-client" } +relay-rialto-client = { path = "../rialto-client" } +relay-substrate-client = { path = "../substrate-client" } +relay-utils = { path = "../utils" } +rialto-runtime = { path = "../../bin/rialto-runtime" } -[dependencies.sp-runtime] -version = "2.0.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" +# Substrate Dependencies -[dependencies.substrate-prometheus-endpoint] -version = "0.8.0" -tag = 'v2.0.0' -git = "https://github.com/paritytech/substrate.git" +frame-system = "2.0" +pallet-transaction-payment = "2.0" +sp-core = "2.0" +sp-keyring = "2.0" +sp-runtime = "2.0" +substrate-prometheus-endpoint = "0.8" diff --git a/bridges/relays/millau-client/Cargo.toml b/bridges/relays/millau-client/Cargo.toml index 35b029ed3b7c8..cb98370d845a8 100644 --- a/bridges/relays/millau-client/Cargo.toml +++ b/bridges/relays/millau-client/Cargo.toml @@ -17,5 +17,5 @@ millau-runtime = { path = "../../bin/millau-runtime" } # Substrate Dependencies -frame-system = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -sp-runtime = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } +frame-system = "2.0" +sp-runtime = "2.0" diff --git a/bridges/relays/rialto-client/Cargo.toml b/bridges/relays/rialto-client/Cargo.toml index 5f5fef38c36e9..aec1262a00ec1 100644 --- a/bridges/relays/rialto-client/Cargo.toml +++ b/bridges/relays/rialto-client/Cargo.toml @@ -11,14 +11,14 @@ headers-relay = { path = "../headers-relay" } relay-substrate-client = { path = "../substrate-client" } relay-utils = { path = "../utils" } -# Supported Chains +# Bridge dependencies rialto-runtime = { path = "../../bin/rialto-runtime" } # Substrate Dependencies -frame-system = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -pallet-transaction-payment = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -sp-core = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -sp-keyring = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -sp-runtime = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } +frame-system = "2.0" +pallet-transaction-payment = "2.0" +sp-core = "2.0" +sp-keyring = "2.0" +sp-runtime = "2.0" diff --git a/bridges/relays/substrate-client/Cargo.toml b/bridges/relays/substrate-client/Cargo.toml index ae04b9dbeae70..0ffd702da6dbf 100644 --- a/bridges/relays/substrate-client/Cargo.toml +++ b/bridges/relays/substrate-client/Cargo.toml @@ -8,16 +8,19 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] async-trait = "0.1.40" codec = { package = "parity-scale-codec", version = "1.3.4" } -headers-relay = { path = "../headers-relay" } jsonrpsee = { git = "https://github.com/svyatonik/jsonrpsee.git", branch = "shared-client-in-rpc-api", default-features = false, features = ["http"] } log = "0.4.11" num-traits = "0.2" + +# Bridge dependencies + +headers-relay = { path = "../headers-relay" } relay-utils = { path = "../utils" } # Substrate Dependencies -frame-support = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -frame-system = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -sp-core = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -sp-runtime = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } -sp-std = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } +frame-support = "2.0" +frame-system = "2.0" +sp-core = "2.0" +sp-runtime = "2.0" +sp-std = "2.0" diff --git a/bridges/relays/substrate/Cargo.toml b/bridges/relays/substrate/Cargo.toml index 22809fc3c7ba4..8a740daa0e113 100644 --- a/bridges/relays/substrate/Cargo.toml +++ b/bridges/relays/substrate/Cargo.toml @@ -18,5 +18,5 @@ paste = "1.0" relay-millau-client = { path = "../millau-client" } relay-rialto-client = { path = "../rialto-client" } relay-substrate-client = { path = "../substrate-client" } -sp-runtime = { version = "2.0.0", tag = 'v2.0.0', git = "https://github.com/paritytech/substrate.git" } +sp-runtime = "2.0" structopt = "0.3" diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml index c456e5cc62319..04113bfdd1b85 100644 --- a/bridges/relays/utils/Cargo.toml +++ b/bridges/relays/utils/Cargo.toml @@ -13,4 +13,5 @@ log = "0.4.11" sysinfo = "0.15" # Substrate dependencies -substrate-prometheus-endpoint = { version = "0.8.0", git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0" } + +substrate-prometheus-endpoint = "0.8"