Unverified Commit 7c7900c0 authored by Ashley Ruglys's avatar Ashley Ruglys
Browse files

Revert branch switch

parent d06942b4
This diff is collapsed.
......@@ -15,14 +15,14 @@ futures = "0.3.4"
tokio = { version = "0.2.13", features = ["rt-core"] }
exit-future = "0.2.0"
codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
kvdb = "0.6.0"
kvdb-memorydb = "0.6.0"
......
......@@ -17,26 +17,26 @@ crate-type = ["cdylib", "rlib"]
log = "0.4.8"
futures = { version = "0.3.4", features = ["compat"] }
structopt = "0.3.8"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
service = { package = "polkadot-service", path = "../service", default-features = false, optional = true }
service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true }
tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
wasm-bindgen = { version = "0.2.57", optional = true }
wasm-bindgen-futures = { version = "0.4.7", optional = true }
browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
[features]
default = [ "wasmtime", "db", "cli", "service-old" ]
......
......@@ -7,16 +7,16 @@ edition = "2018"
[dependencies]
futures = "0.3.4"
sc-service = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../primitives" }
polkadot-cli = { path = "../cli" }
polkadot-network = { path = "../network" }
......@@ -29,7 +29,7 @@ futures-timer = "2.0"
codec = { package = "parity-scale-codec", version = "1.3.0" }
[dev-dependencies]
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
[features]
default = ["service-old"]
......
......@@ -8,6 +8,6 @@ edition = "2018"
primitives = { package = "polkadot-primitives", path = "../primitives" }
reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2"}
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
derive_more = "0.15.0"
......@@ -15,18 +15,18 @@ polkadot-validation = { path = "../validation" }
polkadot-primitives = { path = "../primitives" }
polkadot-erasure-coding = { path = "../erasure-coding" }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = "0.3.4"
log = "0.4.8"
exit-future = "0.2.0"
futures-timer = "2.0"
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
wasm-timer = "0.2.4"
[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
......@@ -10,14 +10,14 @@ log = "0.4.8"
parking_lot = "0.10.0"
futures = "0.3.1"
rand = "0.7.2"
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "ashley-chainops" }
sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "master" }
sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" }
......@@ -12,8 +12,8 @@ streamunordered = "0.5.1"
polkadot-primitives = { path = "../../../primitives" }
node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" }
parity-scale-codec = "1.3.0"
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
[dev-dependencies]
......
......@@ -10,7 +10,7 @@ log = "0.4.8"
futures-timer = "3.0.2"
streamunordered = "0.5.1"
polkadot-primitives = { path = "../../primitives" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" }
async-trait = "0.1"
......
......@@ -9,5 +9,5 @@ description = "Primitives types for the Node-side"
polkadot-primitives = { path = "../../primitives" }
polkadot-statement-table = { path = "../../statement-table" }
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
async-trait = "0.1"
......@@ -20,48 +20,48 @@ kusama-runtime = { path = "../../runtime/kusama" }
westend-runtime = { path = "../../runtime/westend" }
polkadot-network = { path = "../../network", optional = true }
polkadot-rpc = { path = "../../rpc" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" }
service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "master" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" }
im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master" }
authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" }
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" }
babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master" }
codec = { package = "parity-scale-codec", version = "1.3.0" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
[dev-dependencies]
polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
env_logger = "0.7.0"
[features]
......
......@@ -9,6 +9,6 @@ description = "Subsystem traits and message definitions"
polkadot-primitives = { path = "../../primitives" }
polkadot-statement-table = { path = "../../statement-table" }
polkadot-node-primitives = { path = "../primitives" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = "0.3.5"
async-trait = "0.1"
......@@ -10,17 +10,17 @@ edition = "2018"
# this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing
# various unnecessary Substrate-specific endpoints.
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = [ "derive" ] }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
# all optional crates.
derive_more = { version = "0.99.2", optional = true }
serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true }
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true, default-features = false }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true, default-features = false }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
parking_lot = { version = "0.10.0", optional = true }
log = { version = "0.4.8", optional = true }
......
......@@ -13,7 +13,7 @@ tiny-keccak = "1.5.0"
dlmalloc = { version = "0.1.3", features = [ "global" ] }
# We need to make sure the global allocator is disabled until we have support of full substrate externalities
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false, features = [ "disable_allocator" ] }
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] }
[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" }
......
......@@ -9,8 +9,8 @@ adder = { package = "test-parachain-adder", path = ".." }
parachain = { package = "polkadot-parachain", path = "../../.." }
collator = { package = "polkadot-collator", path = "../../../../collator" }
primitives = { package = "polkadot-primitives", path = "../../../../primitives" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
parking_lot = "0.10.0"
codec = { package = "parity-scale-codec", version = "1.2.0" }
futures = "0.3.4"
......@@ -13,7 +13,7 @@ tiny-keccak = "1.5.0"
dlmalloc = { version = "0.1.3", features = [ "global" ] }
# We need to make sure the global allocator is disabled until we have support of full substrate externalities
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false, features = [ "disable_allocator" ] }
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] }
[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" }
......
......@@ -7,21 +7,21 @@ edition = "2018"
[dependencies]
serde = { version = "1.0.102", optional = true, features = ["derive"] }
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] }
primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-version = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
polkadot-parachain = { path = "../parachain", default-features = false }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
[dev-dependencies]
sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" }
pretty_assertions = "0.5.1"
[features]
......
......@@ -7,21 +7,21 @@ edition = "2018"
[dependencies]
jsonrpc-core = "14.0.3"
polkadot-primitives = { path = "../primitives" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops"}
sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops"}
sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops"}
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops"}
txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master"}
sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "master"}
sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master"}
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master"}
txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" }
frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
......@@ -13,39 +13,39 @@ serde = { version = "1.0.102", default-features = false }
serde_derive = { version = "1.0.102", optional = true }
static_assertions = "1.1.0"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false, optional = true }
authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
libsecp256k1 = { version = "0.3.2", default-features = false, optional = true }
[dev-dependencies]
hex-literal = "0.2.1"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" }
trie-db = "0.21.0"
serde_json = "1.0.41"
libsecp256k1 = "0.3.2"
......
......@@ -15,60 +15,60 @@ serde_derive = { version = "1.0.102", optional = true }
static_assertions = "1.1.0"
smallvec = "1.4.0"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
transaction-payment-rpc-runtime-api = {