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

Commit

Permalink
Merge branch 'master' into js/uniques-v2-main-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsidorenko
jsidorenko committed Nov 16, 2022
2 parents 3c12fed + 108d8ee commit 1813960
Show file tree
Hide file tree
Showing 241 changed files with 2,144 additions and 1,096 deletions.
1 change: 1 addition & 0 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ variables:
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
CI_IMAGE: "paritytech/ci-linux:production"
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
RUSTY_CACHIER_SINGLE_BRANCH: master
RUSTY_CACHIER_DONT_OPERATE_ON_MAIN_BRANCH: "true"

Expand Down
75 changes: 45 additions & 30 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bin/node-template/node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ name = "node-template"
clap = { version = "4.0.9", features = ["derive"] }

sc-cli = { version = "0.10.0-dev", path = "../../../client/cli", features = ["wasmtime"] }
sp-core = { version = "6.0.0", path = "../../../primitives/core" }
sp-core = { version = "7.0.0", path = "../../../primitives/core" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", features = ["wasmtime"] }
sc-service = { version = "0.10.0-dev", path = "../../../client/service", features = ["wasmtime"] }
sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
Expand All @@ -34,7 +34,7 @@ sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/commo
sc-finality-grandpa = { version = "0.10.0-dev", path = "../../../client/finality-grandpa" }
sp-finality-grandpa = { version = "4.0.0-dev", path = "../../../primitives/finality-grandpa" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" }
sp-runtime = { version = "7.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 = "6.0.0", path = "../../../primitives/keyring" }
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 = "6.0.0", default-features = false, path = "../../../../primitives/core" }
sp-io = { version = "6.0.0", default-features = false, path = "../../../../primitives/io" }
sp-runtime = { version = "6.0.0", default-features = false, path = "../../../../primitives/runtime" }
sp-core = { version = "7.0.0", default-features = false, path = "../../../../primitives/core" }
sp-io = { version = "7.0.0", default-features = false, path = "../../../../primitives/io" }
sp-runtime = { version = "7.0.0", default-features = false, path = "../../../../primitives/runtime" }

[features]
default = ["std"]
Expand Down
6 changes: 3 additions & 3 deletions bin/node-template/runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ frame-executive = { version = "4.0.0-dev", default-features = false, path = "../
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
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-core = { version = "6.0.0", default-features = false, path = "../../../primitives/core" }
sp-core = { version = "7.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 = "6.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-runtime = { version = "7.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/session" }
sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
sp-std = { version = "5.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 = "5.0.0", default-features = false, path = "../../../primitives/version" }

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 @@ -18,20 +18,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 = "6.0.0", path = "../../../primitives/runtime" }
sp-state-machine = { version = "0.12.0", path = "../../../primitives/state-machine" }
sp-runtime = { version = "7.0.0", path = "../../../primitives/runtime" }
sp-state-machine = { version = "0.13.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.12.0"
kvdb-rocksdb = "0.16.0"
sp-trie = { version = "6.0.0", path = "../../../primitives/trie" }
sp-core = { version = "6.0.0", path = "../../../primitives/core" }
sp-trie = { version = "7.0.0", path = "../../../primitives/trie" }
sp-core = { version = "7.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 = "5.0.0", path = "../../../primitives/tracing" }
sp-tracing = { version = "6.0.0", path = "../../../primitives/tracing" }
hash-db = "0.15.2"
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 @@ -48,13 +48,13 @@ 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-finality-grandpa", path = "../../../primitives/finality-grandpa" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-core = { version = "6.0.0", path = "../../../primitives/core" }
sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" }
sp-core = { version = "7.0.0", path = "../../../primitives/core" }
sp-runtime = { version = "7.0.0", path = "../../../primitives/runtime" }
sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
sp-authorship = { version = "4.0.0-dev", path = "../../../primitives/authorship" }
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
sp-keyring = { version = "6.0.0", path = "../../../primitives/keyring" }
sp-keystore = { version = "0.12.0", path = "../../../primitives/keystore" }
sp-keystore = { version = "0.13.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 @@ -106,7 +106,7 @@ sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli"
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service", features = [
"wasmtime",
] }
sp-trie = { version = "6.0.0", default-features = false, path = "../../../primitives/trie", features = [
sp-trie = { version = "7.0.0", default-features = false, path = "../../../primitives/trie", features = [
"memory-tracker",
] }

Expand All @@ -118,7 +118,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 = "5.0.0", path = "../../../primitives/tracing" }
sp-tracing = { version = "6.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
Loading

0 comments on commit 1813960

Please sign in to comment.