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

Commit

Permalink
Switch to Substrate branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@bkchr
bkchr committed Jun 9, 2022
1 parent 016dc72 commit cbbab74
Show file tree
Hide file tree
Showing 117 changed files with 1,369 additions and 1,343 deletions.
377 changes: 198 additions & 179 deletions Cargo.lock
View file

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ assert_cmd = "2.0.4"
nix = "0.24.1"
tempfile = "3.2.0"
tokio = "1.18.2"
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "bkchr-state-access-benchmark" }
polkadot-core-primitives = { path = "core-primitives" }

[workspace]
Expand Down Expand Up @@ -237,3 +237,10 @@ polkadot = { path = "/usr/bin/polkadot" }

[package.metadata.spellcheck]
config = "./scripts/ci/gitlab/spellcheck.toml"

[patch.crates-io]
trie-db = { git = "https://github.com/paritytech/trie", branch = "bkchr-funny-branch" }
hash-db = { git = "https://github.com/paritytech/trie", branch = "bkchr-funny-branch" }
memory-db = { git = "https://github.com/paritytech/trie", branch = "bkchr-funny-branch" }
trie-root = { git = "https://github.com/paritytech/trie", branch = "bkchr-funny-branch" }
trie-bench = { git = "https://github.com/paritytech/trie", branch = "bkchr-funny-branch" }
60 changes: 30 additions & 30 deletions bridges/bin/millau/node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,38 @@ pallet-bridge-messages = { path = "../../../modules/messages" }

# Substrate Dependencies

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

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "bkchr-state-access-benchmark" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "bkchr-state-access-benchmark" }

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

# Substrate Dependencies

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

[dev-dependencies]
bridge-runtime-common = { path = "../../runtime-common", features = ["integrity-test"] }
static_assertions = "1.1"

[build-dependencies]
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-state-access-benchmark" }

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit cbbab74

Please sign in to comment.