Apply plan

paritytech · Feb 26, 2024 · 9797cc2 · 9797cc2
1 parent 5b3530e
commit 9797cc2
Show file tree

Hide file tree

Showing 479 changed files with 5,833 additions and 6,609 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -377,7 +377,6 @@ members = [
 	"substrate/frame/root-testing",
 	"substrate/frame/safe-mode",
 	"substrate/frame/salary",
-	"substrate/frame/sassafras",
 	"substrate/frame/scheduler",
 	"substrate/frame/scored-pool",
 	"substrate/frame/session",
@@ -433,7 +432,6 @@ members = [
 	"substrate/primitives/consensus/common",
 	"substrate/primitives/consensus/grandpa",
 	"substrate/primitives/consensus/pow",
-	"substrate/primitives/consensus/sassafras",
 	"substrate/primitives/consensus/slots",
 	"substrate/primitives/core",
 	"substrate/primitives/core/fuzz",

diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bridge-runtime-common"
-version = "0.7.0"
+version = "0.9.0"
 description = "Common types and functions that may be used by substrate-based runtimes of all bridged chains"
 authors.workspace = true
 edition.workspace = true
@@ -19,35 +19,35 @@ static_assertions = { version = "1.1", optional = true }
 
 # Bridge dependencies
 
-bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
-bp-messages = { path = "../../primitives/messages", default-features = false }
-bp-parachains = { path = "../../primitives/parachains", default-features = false }
-bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
-bp-relayers = { path = "../../primitives/relayers", default-features = false }
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
-bp-xcm-bridge-hub = { path = "../../primitives/xcm-bridge-hub", default-features = false }
-bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false }
-pallet-bridge-grandpa = { path = "../../modules/grandpa", default-features = false }
-pallet-bridge-messages = { path = "../../modules/messages", default-features = false }
-pallet-bridge-parachains = { path = "../../modules/parachains", default-features = false }
-pallet-bridge-relayers = { path = "../../modules/relayers", default-features = false }
+bp-header-chain = { path = "../../primitives/header-chain", default-features = false, version = "0.9.0" }
+bp-messages = { path = "../../primitives/messages", default-features = false, version = "0.9.0" }
+bp-parachains = { path = "../../primitives/parachains", default-features = false, version = "0.9.0" }
+bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false, version = "0.9.0" }
+bp-relayers = { path = "../../primitives/relayers", default-features = false, version = "0.9.0" }
+bp-runtime = { path = "../../primitives/runtime", default-features = false, version = "0.9.0" }
+bp-xcm-bridge-hub = { path = "../../primitives/xcm-bridge-hub", default-features = false, version = "0.2.0" }
+bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false, version = "0.8.0" }
+pallet-bridge-grandpa = { path = "../../modules/grandpa", default-features = false, version = "0.9.0" }
+pallet-bridge-messages = { path = "../../modules/messages", default-features = false, version = "0.9.0" }
+pallet-bridge-parachains = { path = "../../modules/parachains", default-features = false, version = "0.9.0" }
+pallet-bridge-relayers = { path = "../../modules/relayers", default-features = false, version = "0.9.0" }
 
 # Substrate dependencies
 
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../substrate/frame/system", default-features = false }
-pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
-pallet-utility = { path = "../../../substrate/frame/utility", default-features = false }
-sp-api = { path = "../../../substrate/primitives/api", default-features = false }
-sp-core = { path = "../../../substrate/primitives/core", default-features = false }
-sp-io = { path = "../../../substrate/primitives/io", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
-sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, version = "30.0.0" }
+frame-system = { path = "../../../substrate/frame/system", default-features = false, version = "30.0.0" }
+pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false, version = "30.0.0" }
+pallet-utility = { path = "../../../substrate/frame/utility", default-features = false, version = "30.0.0" }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false, version = "28.0.0" }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false, version = "30.0.0" }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false, version = "32.0.0" }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, version = "33.0.0" }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false, version = "14.0.0" }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false, version = "31.0.0" }
 
 # Polkadot dependencies
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false, version = "9.0.0" }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false, version = "9.0.0" }
 
 [dev-dependencies]
 bp-test-utils = { path = "../../primitives/test-utils" }
@@ -88,7 +88,6 @@ std = [
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
 	"pallet-bridge-grandpa/runtime-benchmarks",
 	"pallet-bridge-messages/runtime-benchmarks",
 	"pallet-bridge-parachains/runtime-benchmarks",

diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-bridge-grandpa"
-version = "0.7.0"
+version = "0.9.0"
 description = "Module implementing GRANDPA on-chain light client used for bridging consensus of substrate-based chains."
 authors.workspace = true
 edition.workspace = true
@@ -19,21 +19,21 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 
 # Bridge Dependencies
 
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
-bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
+bp-runtime = { path = "../../primitives/runtime", default-features = false, version = "0.9.0" }
+bp-header-chain = { path = "../../primitives/header-chain", default-features = false, version = "0.9.0" }
 
 # Substrate Dependencies
 
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../substrate/frame/system", default-features = false }
-sp-consensus-grandpa = { path = "../../../substrate/primitives/consensus/grandpa", default-features = false, features = ["serde"] }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
-sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, version = "30.0.0" }
+frame-system = { path = "../../../substrate/frame/system", default-features = false, version = "30.0.0" }
+sp-consensus-grandpa = { path = "../../../substrate/primitives/consensus/grandpa", default-features = false, features = ["serde"], version = "15.0.0" }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, features = ["serde"], version = "33.0.0" }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false, version = "14.0.0" }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false, version = "31.0.0" }
 
 # Optional Benchmarking Dependencies
-bp-test-utils = { path = "../../primitives/test-utils", default-features = false, optional = true }
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+bp-test-utils = { path = "../../primitives/test-utils", default-features = false, optional = true, version = "0.9.0" }
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true, version = "30.0.0" }
 
 [dev-dependencies]
 sp-core = { path = "../../../substrate/primitives/core" }

diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pallet-bridge-messages"
 description = "Module that allows bridged chains to exchange messages using lane concept."
-version = "0.7.0"
+version = "0.9.0"
 authors.workspace = true
 edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -17,16 +17,16 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 
 # Bridge dependencies
 
-bp-messages = { path = "../../primitives/messages", default-features = false }
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
+bp-messages = { path = "../../primitives/messages", default-features = false, version = "0.9.0" }
+bp-runtime = { path = "../../primitives/runtime", default-features = false, version = "0.9.0" }
 
 # Substrate Dependencies
 
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../substrate/frame/system", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true, version = "30.0.0" }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, version = "30.0.0" }
+frame-system = { path = "../../../substrate/frame/system", default-features = false, version = "30.0.0" }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, version = "33.0.0" }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false, version = "14.0.0" }
 
 [dev-dependencies]
 bp-test-utils = { path = "../../primitives/test-utils" }
@@ -52,12 +52,10 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"pallet-balances/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/bridges/modules/parachains/Cargo.toml b/bridges/modules/parachains/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-bridge-parachains"
-version = "0.7.0"
+version = "0.9.0"
 description = "Module that allows bridged relay chains to exchange information on their parachains' heads."
 authors.workspace = true
 edition.workspace = true
@@ -16,20 +16,20 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 
 # Bridge Dependencies
 
-bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
-bp-parachains = { path = "../../primitives/parachains", default-features = false }
-bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
-pallet-bridge-grandpa = { path = "../grandpa", default-features = false }
+bp-header-chain = { path = "../../primitives/header-chain", default-features = false, version = "0.9.0" }
+bp-parachains = { path = "../../primitives/parachains", default-features = false, version = "0.9.0" }
+bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false, version = "0.9.0" }
+bp-runtime = { path = "../../primitives/runtime", default-features = false, version = "0.9.0" }
+pallet-bridge-grandpa = { path = "../grandpa", default-features = false, version = "0.9.0" }
 
 # Substrate Dependencies
 
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../substrate/frame/system", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
-sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true, version = "30.0.0" }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, version = "30.0.0" }
+frame-system = { path = "../../../substrate/frame/system", default-features = false, version = "30.0.0" }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, version = "33.0.0" }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false, version = "14.0.0" }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false, version = "31.0.0" }
 
 [dev-dependencies]
 bp-header-chain = { path = "../../primitives/header-chain" }

diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pallet-bridge-relayers"
 description = "Module used to store relayer rewards and coordinate relayers set."
-version = "0.7.0"
+version = "0.9.0"
 authors.workspace = true
 edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -16,19 +16,19 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 
 # Bridge dependencies
 
-bp-messages = { path = "../../primitives/messages", default-features = false }
-bp-relayers = { path = "../../primitives/relayers", default-features = false }
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
-pallet-bridge-messages = { path = "../messages", default-features = false }
+bp-messages = { path = "../../primitives/messages", default-features = false, version = "0.9.0" }
+bp-relayers = { path = "../../primitives/relayers", default-features = false, version = "0.9.0" }
+bp-runtime = { path = "../../primitives/runtime", default-features = false, version = "0.9.0" }
+pallet-bridge-messages = { path = "../messages", default-features = false, version = "0.9.0" }
 
 # Substrate Dependencies
 
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../substrate/frame/system", default-features = false }
-sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true, version = "30.0.0" }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, version = "30.0.0" }
+frame-system = { path = "../../../substrate/frame/system", default-features = false, version = "30.0.0" }
+sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false, version = "25.0.0" }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, version = "33.0.0" }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false, version = "14.0.0" }
 
 [dev-dependencies]
 bp-runtime = { path = "../../primitives/runtime" }
@@ -57,14 +57,12 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
 	"pallet-bridge-messages/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"pallet-balances/try-runtime",
 	"pallet-bridge-messages/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/bridges/modules/xcm-bridge-hub-router/Cargo.toml b/bridges/modules/xcm-bridge-hub-router/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pallet-xcm-bridge-hub-router"
 description = "Bridge hub interface for sibling/parent chains with dynamic fees support."
-version = "0.5.0"
+version = "0.7.0"
 authors.workspace = true
 edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -16,21 +16,21 @@ scale-info = { version = "2.10.0", default-features = false, features = ["bit-ve
 
 # Bridge dependencies
 
-bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false }
+bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false, version = "0.8.0" }
 
 # Substrate Dependencies
 
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true, version = "30.0.0" }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, version = "30.0.0" }
+frame-system = { path = "../../../substrate/frame/system", default-features = false, version = "30.0.0" }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false, version = "30.0.0" }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, version = "33.0.0" }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false, version = "14.0.0" }
 
 # Polkadot Dependencies
 
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false, version = "9.0.0" }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false, version = "9.0.0" }
 
 [dev-dependencies]
 sp-io = { path = "../../../substrate/primitives/io" }