Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into mku-serde-pulled-in…
…to-frame
  • Loading branch information
michalkucharczyk committed May 31, 2023
commit 6e2fddf8f4bc8ea3bd8f9d428830fccbc8de41cf
10 changes: 5 additions & 5 deletions frame/babe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../timestamp" }
sp-application-crypto = { version = "8.0.0", default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
sp-application-crypto = { version = "23.0.0", default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
sp-consensus-babe = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/babe", features = ["serde"] }
sp-core = { version = "8.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "8.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "23.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking", features = ["serde"] }
sp-std = { version = "6.0.0", default-features = false, path = "../../primitives/std" }
sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }

[dev-dependencies]
frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
Expand Down
4 changes: 2 additions & 2 deletions frame/beefy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
sp-consensus-beefy = { version = "4.0.0-dev", default-features = false, path = "../../primitives/consensus/beefy", features = ["serde"] }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking", features = ["serde"] }
sp-std = { version = "6.0.0", default-features = false, path = "../../primitives/std" }
sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }

[dev-dependencies]
frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
Expand Down
10 changes: 5 additions & 5 deletions frame/grandpa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
sp-application-crypto = { version = "8.0.0", default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
sp-core = { version = "8.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-application-crypto = { version = "23.0.0", default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
sp-consensus-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../primitives/consensus/grandpa", features = ["serde"] }
sp-io = { version = "8.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "23.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking", features = ["serde"] }
sp-std = { version = "6.0.0", default-features = false, path = "../../primitives/std" }
sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }

[dev-dependencies]
grandpa = { package = "finality-grandpa", version = "0.16.2", features = ["derive-codec"] }
Expand Down
10 changes: 5 additions & 5 deletions frame/im-online/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
sp-application-crypto = { version = "8.0.0", default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
sp-core = { version = "8.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "8.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-application-crypto = { version = "23.0.0", default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "23.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking", features = ["serde"] }
sp-std = { version = "6.0.0", default-features = false, path = "../../primitives/std" }
sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }

[dev-dependencies]
pallet-session = { version = "4.0.0-dev", path = "../session" }
Expand Down
8 changes: 4 additions & 4 deletions frame/membership/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ scale-info = { version = "2.5.0", default-features = false, features = ["derive"
frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true, path = "../benchmarking" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
sp-core = { version = "8.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "8.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-std = { version = "6.0.0", default-features = false, path = "../../primitives/std" }
sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "23.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }

[features]
default = ["std"]
Expand Down
10 changes: 5 additions & 5 deletions frame/session/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ scale-info = { version = "2.5.0", default-features = false, features = ["derive"
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../timestamp" }
sp-core = { version = "8.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "8.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "23.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking", features = ["serde"] }
sp-std = { version = "6.0.0", default-features = false, path = "../../primitives/std" }
sp-trie = { version = "8.0.0", default-features = false, optional = true, path = "../../primitives/trie" }
sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
sp-trie = { version = "22.0.0", default-features = false, optional = true, path = "../../primitives/trie" }

[features]
default = ["historical", "std"]
Expand Down
8 changes: 4 additions & 4 deletions frame/staking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ codec = { package = "parity-scale-codec", version = "3.2.2", default-features =
"derive",
] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive", "serde"] }
sp-std = { version = "6.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "8.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-io = { version = "23.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking", features = ["serde"] }
sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-session = { version = "4.0.0-dev", default-features = false, features = [
"historical",
], path = "../session" }
pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
sp-application-crypto = { version = "8.0.0", default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
sp-application-crypto = { version = "23.0.0", default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
frame-election-provider-support = { version = "4.0.0-dev", default-features = false, path = "../election-provider-support" }
log = { version = "0.4.17", default-features = false }

Expand Down
12 changes: 6 additions & 6 deletions frame/system/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.5.0", default-features = false, features = ["derive", "serde"] }
serde = { version = "1.0.136", default-features = false, features = ["derive", "alloc"] }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
sp-core = { version = "8.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "8.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "8.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-std = { version = "6.0.0", default-features = false, path = "../../primitives/std" }
sp-version = { version = "6.0.0", default-features = false, path = "../../primitives/version", features = ["serde"] }
sp-weights = { version = "5.0.0", default-features = false, path = "../../primitives/weights", features = ["serde"] }
sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core", features = ["serde"] }
sp-io = { version = "23.0.0", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime", features = ["serde"] }
sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
sp-version = { version = "22.0.0", default-features = false, path = "../../primitives/version", features = ["serde"] }
sp-weights = { version = "20.0.0", default-features = false, path = "../../primitives/weights", features = ["serde"] }

[dev-dependencies]
criterion = "0.4.0"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.