Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

DO NOT MERGE: Testing new prometheus v0.10.0-rc.1 #1649

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@ 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/mxinden/substrate", branch = "update-prometheus" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-runtime = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sc-client-api = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sc-client-db = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sc-executor = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
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/mxinden/substrate", branch = "update-prometheus", optional = true }
sc-cli = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus", optional = true }
sc-service = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus", 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/mxinden/substrate", branch = "update-prometheus", optional = true }
# this crate is used only to enable `trie-memory-tracker` feature
# see https://github.com/paritytech/substrate/pull/6745
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
# see https://github.com/mxinden/substrate/pull/6745
sp-trie = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus", default-features = false }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-build-script-utils = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }

[features]
default = [ "wasmtime", "db", "cli", "service-old", "trie-memory-tracker" ]
Expand Down
6 changes: 3 additions & 3 deletions core-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/mxinden/substrate", branch = "update-prometheus", default-features = false }
sp-std = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus", default-features = false }
sp-runtime = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = [ "derive" ] }

[features]
Expand Down
4 changes: 2 additions & 2 deletions erasure-coding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4", 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/mxinden/substrate", branch = "update-prometheus" }
trie = { package = "sp-trie", git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
derive_more = "0.15.0"
2 changes: 1 addition & 1 deletion node/collation-generation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ polkadot-node-primitives = { path = "../primitives" }
polkadot-node-subsystem = { path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-primitives = { path = "../../primitives" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }

[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
2 changes: 1 addition & 1 deletion node/core/av-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ log = "0.4.8"
derive_more = "0.99.9"

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
futures = { version = "0.3.5", features = ["thread-pool"] }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
kvdb-memorydb = "0.7.0"
Expand Down
12 changes: 6 additions & 6 deletions node/core/backing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ edition = "2018"

[dependencies]
futures = "0.3.5"
sp-api = { 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" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sc-client-api = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
keystore = { package = "sc-keystore", git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
Expand All @@ -21,8 +21,8 @@ bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
log = "0.4.8"

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-keyring = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
futures = { version = "0.3.5", features = ["thread-pool"] }
assert_matches = "1.3.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
2 changes: 1 addition & 1 deletion node/core/bitfield-signing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ log = "0.4.8"
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" }
keystore = { package = "sc-keystore", git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
wasm-timer = "0.2.4"
6 changes: 3 additions & 3 deletions node/core/candidate-validation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2018"

[dependencies]
futures = "0.3.5"
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-core = { package = "sp-core", git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] }

polkadot-primitives = { path = "../../../primitives" }
Expand All @@ -18,7 +18,7 @@ derive_more = "0.99.9"
log = "0.4.8"

[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
futures = { version = "0.3.5", features = ["thread-pool"] }
assert_matches = "1.3.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
4 changes: 2 additions & 2 deletions node/core/chain-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ edition = "2018"

[dependencies]
futures = { version = "0.3.5" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }

[dev-dependencies]
futures = { version = "0.3.5", features = ["thread-pool"] }
maplit = "1.0.2"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
22 changes: 11 additions & 11 deletions node/core/proposer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ parity-scale-codec = "1.3.4"
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/mxinden/substrate", branch = "update-prometheus" }
sc-block-builder = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sc-client-api = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sc-telemetry = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-api = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-consensus = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-inherents = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-runtime = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-transaction-pool = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] }
wasm-timer = "0.2.4"
2 changes: 1 addition & 1 deletion node/core/provisioner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }

[dev-dependencies]
lazy_static = "1.4"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
tokio = "0.2"
6 changes: 3 additions & 3 deletions node/core/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ edition = "2018"

[dependencies]
futures = "0.3.5"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }

polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
futures = { version = "0.3.5", features = ["thread-pool"] }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
8 changes: 4 additions & 4 deletions node/network/availability-distribution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ polkadot-erasure-coding = { path = "../../../erasure-coding" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-network-bridge = { path = "../../network/bridge" }
polkadot-node-network-protocol = { path = "../../network/protocol" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
derive_more = "0.99.9"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus", features = ["std"] }

[dev-dependencies]
polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus", features = ["std"] }
sp-keyring = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
parking_lot = "0.11.0"
futures-timer = "3.0.2"
env_logger = "0.7.1"
Expand Down
4 changes: 2 additions & 2 deletions node/network/bitfield-distribution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-network-bridge = { path = "../../network/bridge" }
polkadot-node-network-protocol = { path = "../../network/protocol" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }

[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
parking_lot = "0.11.0"
maplit = "1.0.2"
smol = "0.3.3"
Expand Down
8 changes: 4 additions & 4 deletions node/network/bridge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ futures-timer = "3.0.2"
streamunordered = "0.5.1"
polkadot-primitives = { path = "../../../primitives" }
parity-scale-codec = "1.3.4"
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/mxinden/substrate", branch = "update-prometheus" }
sp-runtime = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-network-protocol = { path = "../protocol" }

[dev-dependencies]
assert_matches = "1.3.0"
parking_lot = "0.10.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-keyring = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
4 changes: 2 additions & 2 deletions node/network/pov-distribution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ streamunordered = "0.5.1"
polkadot-primitives = { path = "../../../primitives" }
node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" }
parity-scale-codec = "1.3.4"
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-network-protocol = { path = "../../network/protocol" }

[dev-dependencies]
parking_lot = "0.10.0"
assert_matches = "1.3.0"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
6 changes: 3 additions & 3 deletions node/network/protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ description = "Primitives types for the Node-side"
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
parity-scale-codec = { version = "1.3.4", default-features = false, features = ["derive"] }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/mxinden/substrate", branch = "update-prometheus", default-features = false }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sc-network = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
8 changes: 4 additions & 4 deletions node/network/statement-distribution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"
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/mxinden/substrate", branch = "update-prometheus" }
sp-staking = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus", default-features = false }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-network-protocol = { path = "../../network/protocol" }
arrayvec = "0.5.1"
Expand All @@ -24,5 +24,5 @@ indexmap = "1.4.0"
parking_lot = "0.10.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.3.0"
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
sp-core = { git = "https://github.com/mxinden/substrate", branch = "update-prometheus" }
Loading