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

Backport for v0.8.31 #3285

Closed
wants to merge 4 commits into from
Closed

Backport for v0.8.31 #3285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2816e33
Companion PR for #8414 - Remove OffencesWeightSoftLimit (#2966)
Lohann May 3, 2021
49e72cd
companion for staking/election: prolonged era and emergency mode for …
gui1117 Jun 14, 2021
705c726
update substrate branch
shawntabrizi Jun 17, 2021
29ffb7c
Companion for #8920 (Control Staking) (#3260)
shawntabrizi Jun 16, 2021
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
1,368 changes: 825 additions & 543 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions bridges/bin/millau/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@ pallet-bridge-messages = { path = "../../../modules/messages" }

# Substrate Dependencies

frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
node-inspect = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { 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" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-finality-grandpa = { 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-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
node-inspect = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "shawntabrizi-v0.8.31" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }

[build-dependencies]
substrate-build-script-utils = "3.0.0"
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }

[features]
default = []
Expand Down
52 changes: 26 additions & 26 deletions bridges/bin/millau/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,32 @@ pallet-shift-session-manager = { path = "../../../modules/shift-session-manager"

# Substrate Dependencies

frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
pallet-transaction-payment-rpc-runtime-api = { 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-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
sp-consensus-aura = { 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-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
sp-offchain = { 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-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }

[build-dependencies]
substrate-wasm-builder = "3.0.0"
Expand Down
52 changes: 26 additions & 26 deletions bridges/bin/rialto/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,35 @@ rialto-runtime = { path = "../runtime" }
# Substrate Dependencies


frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
node-inspect = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { 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" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-finality-grandpa = { 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-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
node-inspect = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "shawntabrizi-v0.8.31" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }

[build-dependencies]
substrate-build-script-utils = "3.0.0"
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }

[features]
default = []
Expand Down
Loading