Skip to content

Commit

Permalink
Merge branch 'master' into anton/webrtc-transport
Browse files Browse the repository at this point in the history
  • Loading branch information
@melekes
melekes authored May 31, 2023
2 parents 2b37e04 + 655b81c commit 8347be8
Show file tree
Hide file tree
Showing 318 changed files with 3,258 additions and 1,596 deletions.
183 changes: 129 additions & 54 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ members = [
"client/network/sync",
"client/network/test",
"client/offchain",
"client/peerset",
"client/allocator",
"client/proposer-metrics",
"client/rpc",
Expand Down Expand Up @@ -110,6 +109,7 @@ members = [
"frame/examples/basic",
"frame/examples/offchain-worker",
"frame/examples/dev-mode",
"frame/examples/default-config",
"frame/executive",
"frame/nis",
"frame/grandpa",
Expand Down
11 changes: 4 additions & 7 deletions bin/node-template/node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ clap = { version = "4.2.5", features = ["derive"] }
futures = { version = "0.3.21", features = ["thread-pool"]}

sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
sp-core = { version = "8.0.0", path = "../../../primitives/core" }
sp-core = { version = "21.0.0", path = "../../../primitives/core" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
sc-network = { version = "0.10.0-dev", path = "../../../client/network" }
sc-service = { version = "0.10.0-dev", path = "../../../client/service" }
Expand All @@ -37,11 +37,11 @@ sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/commo
sc-consensus-grandpa = { version = "0.10.0-dev", path = "../../../client/consensus/grandpa" }
sp-consensus-grandpa = { version = "4.0.0-dev", path = "../../../primitives/consensus/grandpa" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
sp-runtime = { version = "8.0.0", path = "../../../primitives/runtime" }
sp-io = { version = "8.0.0", path = "../../../primitives/io" }
sp-runtime = { version = "24.0.0", path = "../../../primitives/runtime" }
sp-io = { version = "23.0.0", path = "../../../primitives/io" }
sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
sp-keyring = { version = "8.0.0", path = "../../../primitives/keyring" }
sp-keyring = { version = "24.0.0", path = "../../../primitives/keyring" }
frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, path = "../../../frame/transaction-payment" }

Expand All @@ -66,9 +66,6 @@ node-template-runtime = { version = "4.0.0-dev", path = "../runtime" }
# CLI-specific dependencies
try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../utils/frame/try-runtime/cli" }

# Workaround until https://github.com/bluejekyll/enum-as-inner/issues/98 is fixed.
enum-as-inner = "=0.5.1"

[build-dependencies]
substrate-build-script-utils = { version = "3.0.0", path = "../../../utils/build-script-utils" }

Expand Down
6 changes: 3 additions & 3 deletions bin/node-template/pallets/template/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../..
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../../frame/system" }

[dev-dependencies]
sp-core = { version = "8.0.0", path = "../../../../primitives/core" }
sp-io = { version = "8.0.0", path = "../../../../primitives/io" }
sp-runtime = { version = "8.0.0", path = "../../../../primitives/runtime" }
sp-core = { version = "21.0.0", path = "../../../../primitives/core" }
sp-io = { version = "23.0.0", path = "../../../../primitives/io" }
sp-runtime = { version = "24.0.0", path = "../../../../primitives/runtime" }

[features]
default = ["std"]
Expand Down
8 changes: 4 additions & 4 deletions bin/node-template/runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../pri
sp-block-builder = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/block-builder"}
sp-consensus-aura = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/consensus/aura" }
sp-consensus-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/consensus/grandpa" }
sp-core = { version = "8.0.0", default-features = false, path = "../../../primitives/core" }
sp-core = { version = "21.0.0", default-features = false, path = "../../../primitives/core" }
sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/inherents"}
sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/offchain" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/session" }
sp-std = { version = "6.0.0", default-features = false, path = "../../../primitives/std" }
sp-std = { version = "8.0.0", default-features = false, path = "../../../primitives/std" }
sp-transaction-pool = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/transaction-pool" }
sp-version = { version = "6.0.0", default-features = false, path = "../../../primitives/version" }
sp-version = { version = "22.0.0", default-features = false, path = "../../../primitives/version" }

# Used for the node template's RPCs
frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
Expand Down
10 changes: 5 additions & 5 deletions bin/node/bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ node-primitives = { version = "2.0.0", path = "../primitives" }
node-testing = { version = "3.0.0-dev", path = "../testing" }
kitchensink-runtime = { version = "3.0.0-dev", path = "../runtime" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
sp-runtime = { version = "8.0.0", path = "../../../primitives/runtime" }
sp-state-machine = { version = "0.14.0", path = "../../../primitives/state-machine" }
sp-runtime = { version = "24.0.0", path = "../../../primitives/runtime" }
sp-state-machine = { version = "0.28.0", path = "../../../primitives/state-machine" }
serde = "1.0.136"
serde_json = "1.0.85"
derive_more = { version = "0.99.17", default-features = false, features = ["display"] }
kvdb = "0.13.0"
kvdb-rocksdb = "0.19.0"
sp-trie = { version = "8.0.0", path = "../../../primitives/trie" }
sp-core = { version = "8.0.0", path = "../../../primitives/core" }
sp-trie = { version = "22.0.0", path = "../../../primitives/trie" }
sp-core = { version = "21.0.0", path = "../../../primitives/core" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/timestamp" }
sp-tracing = { version = "7.0.0", path = "../../../primitives/tracing" }
sp-tracing = { version = "10.0.0", path = "../../../primitives/tracing" }
hash-db = "0.16.0"
tempfile = "3.1.0"
fs_extra = "1"
Expand Down
10 changes: 5 additions & 5 deletions bin/node/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ sp-authority-discovery = { version = "4.0.0-dev", path = "../../../primitives/au
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
grandpa-primitives = { version = "4.0.0-dev", package = "sp-consensus-grandpa", path = "../../../primitives/consensus/grandpa" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-core = { version = "8.0.0", path = "../../../primitives/core" }
sp-runtime = { version = "8.0.0", path = "../../../primitives/runtime" }
sp-core = { version = "21.0.0", path = "../../../primitives/core" }
sp-runtime = { version = "24.0.0", path = "../../../primitives/runtime" }
sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
sp-keyring = { version = "8.0.0", path = "../../../primitives/keyring" }
sp-keystore = { version = "0.14.0", path = "../../../primitives/keystore" }
sp-keyring = { version = "24.0.0", path = "../../../primitives/keyring" }
sp-keystore = { version = "0.27.0", path = "../../../primitives/keystore" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
sp-transaction-storage-proof = { version = "4.0.0-dev", path = "../../../primitives/transaction-storage-proof" }
Expand Down Expand Up @@ -114,7 +114,7 @@ sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/
sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensus/epochs" }
sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
sp-tracing = { version = "7.0.0", path = "../../../primitives/tracing" }
sp-tracing = { version = "10.0.0", path = "../../../primitives/tracing" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
futures = "0.3.21"
tempfile = "3.1.0"
Expand Down
18 changes: 9 additions & 9 deletions bin/node/executor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarkin
node-primitives = { version = "2.0.0", path = "../primitives" }
kitchensink-runtime = { version = "3.0.0-dev", path = "../runtime" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
sp-core = { version = "8.0.0", path = "../../../primitives/core" }
sp-keystore = { version = "0.14.0", path = "../../../primitives/keystore" }
sp-state-machine = { version = "0.14.0", path = "../../../primitives/state-machine" }
sp-tracing = { version = "7.0.0", path = "../../../primitives/tracing" }
sp-trie = { version = "8.0.0", path = "../../../primitives/trie" }
sp-core = { version = "21.0.0", path = "../../../primitives/core" }
sp-keystore = { version = "0.27.0", path = "../../../primitives/keystore" }
sp-state-machine = { version = "0.28.0", path = "../../../primitives/state-machine" }
sp-tracing = { version = "10.0.0", path = "../../../primitives/tracing" }
sp-trie = { version = "22.0.0", path = "../../../primitives/trie" }
sp-statement-store = { version = "4.0.0-dev", path = "../../../primitives/statement-store" }

[dev-dependencies]
Expand All @@ -41,12 +41,12 @@ pallet-sudo = { version = "4.0.0-dev", path = "../../../frame/sudo" }
pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" }
pallet-treasury = { version = "4.0.0-dev", path = "../../../frame/treasury" }
pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
sp-application-crypto = { version = "8.0.0", path = "../../../primitives/application-crypto" }
sp-application-crypto = { version = "23.0.0", path = "../../../primitives/application-crypto" }
pallet-root-testing = { version = "1.0.0-dev", path = "../../../frame/root-testing" }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
sp-externalities = { version = "0.14.0", path = "../../../primitives/externalities" }
sp-keyring = { version = "8.0.0", path = "../../../primitives/keyring" }
sp-runtime = { version = "8.0.0", path = "../../../primitives/runtime" }
sp-externalities = { version = "0.19.0", path = "../../../primitives/externalities" }
sp-keyring = { version = "24.0.0", path = "../../../primitives/keyring" }
sp-runtime = { version = "24.0.0", path = "../../../primitives/runtime" }

[features]
stress-test = []
Expand Down
4 changes: 2 additions & 2 deletions bin/node/inspect/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-core = { version = "8.0.0", path = "../../../primitives/core" }
sp-runtime = { version = "8.0.0", path = "../../../primitives/runtime" }
sp-core = { version = "21.0.0", path = "../../../primitives/core" }
sp-runtime = { version = "24.0.0", path = "../../../primitives/runtime" }
6 changes: 3 additions & 3 deletions bin/node/primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ codec = { package = "parity-scale-codec", version = "3.2.2", default-features =
] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
sp-application-crypto = { version = "8.0.0", default-features = false, path = "../../../primitives/application-crypto" }
sp-core = { version = "8.0.0", default-features = false, path = "../../../primitives/core" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-application-crypto = { version = "23.0.0", default-features = false, path = "../../../primitives/application-crypto" }
sp-core = { version = "21.0.0", default-features = false, path = "../../../primitives/core" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../../primitives/runtime" }

[features]
default = ["std"]
Expand Down
4 changes: 2 additions & 2 deletions bin/node/rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-bu
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
sp-keystore = { version = "0.14.0", path = "../../../primitives/keystore" }
sp-runtime = { version = "8.0.0", path = "../../../primitives/runtime" }
sp-keystore = { version = "0.27.0", path = "../../../primitives/keystore" }
sp-runtime = { version = "24.0.0", path = "../../../primitives/runtime" }
sp-statement-store = { version = "4.0.0-dev", path = "../../../primitives/statement-store" }
substrate-frame-rpc-system = { version = "4.0.0-dev", path = "../../../utils/frame/rpc/system" }
substrate-state-trie-migration-rpc = { version = "4.0.0-dev", path = "../../../utils/frame/rpc/state-trie-migration-rpc/" }
10 changes: 5 additions & 5 deletions bin/node/runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ sp-block-builder = { path = "../../../primitives/block-builder", default-feature
sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/inherents" }
node-primitives = { version = "2.0.0", default-features = false, path = "../primitives" }
sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/offchain" }
sp-core = { version = "8.0.0", default-features = false, path = "../../../primitives/core" }
sp-std = { version = "6.0.0", default-features = false, path = "../../../primitives/std" }
sp-core = { version = "21.0.0", default-features = false, path = "../../../primitives/core" }
sp-std = { version = "8.0.0", default-features = false, path = "../../../primitives/std" }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/staking" }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/session" }
sp-transaction-pool = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/transaction-pool" }
sp-statement-store = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/statement-store" }
sp-version = { version = "6.0.0", default-features = false, path = "../../../primitives/version" }
sp-io = { version = "8.0.0", default-features = false, path = "../../../primitives/io" }
sp-version = { version = "22.0.0", default-features = false, path = "../../../primitives/version" }
sp-io = { version = "23.0.0", default-features = false, path = "../../../primitives/io" }

# frame dependencies
frame-executive = { version = "4.0.0-dev", default-features = false, path = "../../../frame/executive" }
Expand Down
8 changes: 4 additions & 4 deletions bin/node/testing/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sp-core = { version = "8.0.0", path = "../../../primitives/core" }
sp-core = { version = "21.0.0", path = "../../../primitives/core" }
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
sp-io = { version = "8.0.0", path = "../../../primitives/io" }
sp-keyring = { version = "8.0.0", path = "../../../primitives/keyring" }
sp-runtime = { version = "8.0.0", path = "../../../primitives/runtime" }
sp-io = { version = "23.0.0", path = "../../../primitives/io" }
sp-keyring = { version = "24.0.0", path = "../../../primitives/keyring" }
sp-runtime = { version = "24.0.0", path = "../../../primitives/runtime" }
sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/timestamp" }
substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
4 changes: 2 additions & 2 deletions bin/utils/chain-spec-builder/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ rand = "0.8"
node-cli = { version = "3.0.0-dev", path = "../../node/cli" }
sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
sp-core = { version = "8.0.0", path = "../../../primitives/core" }
sp-keystore = { version = "0.14.0", path = "../../../primitives/keystore" }
sp-core = { version = "21.0.0", path = "../../../primitives/core" }
sp-keystore = { version = "0.27.0", path = "../../../primitives/keystore" }
4 changes: 2 additions & 2 deletions client/allocator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
log = "0.4.17"
thiserror = "1.0.30"
sp-core = { version = "8.0.0", path = "../../primitives/core" }
sp-wasm-interface = { version = "8.0.0", path = "../../primitives/wasm-interface" }
sp-core = { version = "21.0.0", path = "../../primitives/core" }
sp-wasm-interface = { version = "14.0.0", path = "../../primitives/wasm-interface" }
12 changes: 6 additions & 6 deletions client/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ sc-utils = { version = "4.0.0-dev", path = "../utils" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
sp-core = { version = "8.0.0", default-features = false, path = "../../primitives/core" }
sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core" }
sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
sp-externalities = { version = "0.14.0", path = "../../primitives/externalities" }
sp-keystore = { version = "0.14.0", default-features = false, path = "../../primitives/keystore" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime" }
sp-state-machine = { version = "0.14.0", path = "../../primitives/state-machine" }
sp-externalities = { version = "0.19.0", path = "../../primitives/externalities" }
sp-keystore = { version = "0.27.0", default-features = false, path = "../../primitives/keystore" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime" }
sp-state-machine = { version = "0.28.0", path = "../../primitives/state-machine" }
sp-statement-store = { version = "4.0.0-dev", path = "../../primitives/statement-store" }
sp-storage = { version = "8.0.0", path = "../../primitives/storage" }
sp-storage = { version = "13.0.0", path = "../../primitives/storage" }

[dev-dependencies]
thiserror = "1.0.30"
Expand Down
Loading

0 comments on commit 8347be8

Please sign in to comment.