Unverified Commit 04afc509 authored by Ashley Ruglys's avatar Ashley Ruglys
Browse files

Switch branch again

parent efaebd27
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 = "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" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
kvdb = "0.7.0"
kvdb-memorydb = "0.7.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 = "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" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
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 = "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 }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", optional = true }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", optional = true }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", 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 = "master", optional = true }
browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", optional = true }
[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
[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 = "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" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
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 = "master" }
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
[features]
default = ["service-old"]
......
......@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { 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-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = [ "derive" ] }
[features]
......
......@@ -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 = "master" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
derive_more = "0.15.0"
......@@ -15,19 +15,19 @@ 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 = "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" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
futures = "0.3.5"
log = "0.4.8"
exit-future = "0.2.0"
futures-timer = "2.0"
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
wasm-timer = "0.2.4"
rand = "0.7.3"
[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
......@@ -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 = "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" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "ashley-txpool" }
sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" }
......@@ -12,16 +12,16 @@ parity-scale-codec = "1.3.0"
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-overseer = { path = "../../overseer" }
polkadot-primitives = { path = "../../../primitives" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] }
wasm-timer = "0.2.4"
......@@ -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 = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
[dev-dependencies]
......
......@@ -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 = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
[dev-dependencies]
......
......@@ -13,8 +13,8 @@ streamunordered = "0.5.1"
polkadot-primitives = { path = "../../../primitives" }
node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" }
parity-scale-codec = "1.3.0"
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
arrayvec = "0.5.1"
indexmap = "1.4.0"
......@@ -23,4 +23,4 @@ indexmap = "1.4.0"
parking_lot = "0.10.0"
subsystem-test = { package = "polkadot-subsystem-test-helpers", path = "../../test-helpers/subsystem" }
assert_matches = "1.3.0"
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
......@@ -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 = "master" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
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 = "master", default-features = false }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
async-trait = "0.1"
......@@ -21,47 +21,47 @@ westend-runtime = { path = "../../runtime/westend" }
polkadot-network = { path = "../../network", optional = true }
polkadot-rpc = { path = "../../rpc" }
polkadot-node-core-proposer = { path = "../core/proposer" }
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" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
codec = { package = "parity-scale-codec", version = "1.3.0" }
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" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
[dev-dependencies]
polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
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 = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
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 = "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 }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
polkadot-core-primitives = { path = "../core-primitives", 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-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 }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", optional = true }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", optional = true }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", optional = true }
parking_lot = { version = "0.10.0", optional = true }
log = { version = "0.4.8", optional = true }
......
......@@ -9,12 +9,12 @@ build = "build.rs"
[dependencies]
parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
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 = "master", default-features = false, features = [ "disable_allocator" ] }
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", 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 = "master" }
client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool" }
parking_lot = "0.10.0"
codec = { package = "parity-scale-codec", version = "1.2.0" }
futures = "0.3.4"
......@@ -9,12 +9,12 @@ build = "build.rs"
[dependencies]
parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false }
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 = "master", default-features = false, features = [ "disable_allocator" ] }
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "ashley-txpool", default-features = false, features = [ "disable_allocator" ] }
[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment