From cb7ed8a1266a42b9cf9a75e73f4819a832b6e92d Mon Sep 17 00:00:00 2001 From: Serban Iorga Date: Wed, 27 Mar 2024 17:05:13 +0100 Subject: [PATCH] Fix polkadot-sdk CI failures (#2901) * taplo * markdown * publish = false * feature propagation --- bridges/modules/beefy/Cargo.toml | 13 ++++++++--- bridges/primitives/beefy/Cargo.toml | 6 +++-- bridges/relays/client-substrate/Cargo.toml | 1 + bridges/relays/equivocation/Cargo.toml | 1 + bridges/relays/finality/Cargo.toml | 1 + bridges/relays/finality/README.md | 22 ++++++++++--------- bridges/relays/lib-substrate-relay/Cargo.toml | 1 + bridges/relays/messages/Cargo.toml | 1 + bridges/relays/parachains/Cargo.toml | 1 + bridges/relays/parachains/README.md | 13 ++++++----- bridges/relays/utils/Cargo.toml | 1 + 11 files changed, 40 insertions(+), 21 deletions(-) diff --git a/bridges/modules/beefy/Cargo.toml b/bridges/modules/beefy/Cargo.toml index 4ead33c44314..53c8006f878a 100644 --- a/bridges/modules/beefy/Cargo.toml +++ b/bridges/modules/beefy/Cargo.toml @@ -5,6 +5,7 @@ description = "Module implementing BEEFY on-chain light client used for bridging authors = ["Parity Technologies "] edition = "2021" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +publish = false [lints] workspace = true @@ -38,7 +39,7 @@ sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" bp-test-utils = { path = "../../primitives/test-utils" } [features] -default = [ "std" ] +default = ["std"] std = [ "bp-beefy/std", "bp-runtime/std", @@ -47,9 +48,15 @@ std = [ "frame-system/std", "log/std", "scale-info/std", - "serde", + "serde/std", "sp-core/std", "sp-runtime/std", "sp-std/std", ] -try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ] +try-runtime = [ + "frame-support/try-runtime", + "frame-system/try-runtime", + "pallet-beefy-mmr/try-runtime", + "pallet-mmr/try-runtime", + "sp-runtime/try-runtime", +] diff --git a/bridges/primitives/beefy/Cargo.toml b/bridges/primitives/beefy/Cargo.toml index b6bb2698689b..0a282090f7f2 100644 --- a/bridges/primitives/beefy/Cargo.toml +++ b/bridges/primitives/beefy/Cargo.toml @@ -5,12 +5,13 @@ version = "0.1.0" authors = ["Parity Technologies "] edition = "2021" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +publish = false [lints] workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "bit-vec"] } +codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] } scale-info = { version = "2.11.0", default-features = false, features = ["bit-vec", "derive"] } serde = { default-features = false, features = ["alloc", "derive"], workspace = true } @@ -29,8 +30,9 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false } [features] -default = [ "std" ] +default = ["std"] std = [ + "binary-merkle-tree/std", "bp-runtime/std", "codec/std", "frame-support/std", diff --git a/bridges/relays/client-substrate/Cargo.toml b/bridges/relays/client-substrate/Cargo.toml index 9240af7b59c5..3049d8350b70 100644 --- a/bridges/relays/client-substrate/Cargo.toml +++ b/bridges/relays/client-substrate/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors = ["Parity Technologies "] edition = "2021" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +publish = false [lints] workspace = true diff --git a/bridges/relays/equivocation/Cargo.toml b/bridges/relays/equivocation/Cargo.toml index 6f65d40fcbe7..3b99e4349e03 100644 --- a/bridges/relays/equivocation/Cargo.toml +++ b/bridges/relays/equivocation/Cargo.toml @@ -5,6 +5,7 @@ authors = ["Parity Technologies "] edition = "2021" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" description = "Equivocation detector" +publish = false [lints] workspace = true diff --git a/bridges/relays/finality/Cargo.toml b/bridges/relays/finality/Cargo.toml index 8cf3d409cfe9..53d2ce579f6b 100644 --- a/bridges/relays/finality/Cargo.toml +++ b/bridges/relays/finality/Cargo.toml @@ -5,6 +5,7 @@ authors = ["Parity Technologies "] edition = "2021" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" description = "Finality proofs relay" +publish = false [lints] workspace = true diff --git a/bridges/relays/finality/README.md b/bridges/relays/finality/README.md index 0a8d6a4c8b12..92e765cea0e5 100644 --- a/bridges/relays/finality/README.md +++ b/bridges/relays/finality/README.md @@ -3,7 +3,7 @@ The finality relay is able to work with different finality engines. In the modern Substrate world they are GRANDPA and BEEFY. Let's talk about GRANDPA here, because BEEFY relay and bridge BEEFY pallet are in development. -In general, the relay works as follows: it connects to the source and target chain. The source chain must have the +In general, the relay works as follows: it connects to the source and target chain. The source chain must have the [GRANDPA gadget](https://github.com/paritytech/finality-grandpa) running (so it can't be a parachain). The target chain must have the [bridge GRANDPA pallet](../../modules/grandpa/) deployed at its runtime. The relay subscribes to the GRANDPA finality notifications at the source chain and when the new justification is received, it is submitted @@ -41,18 +41,20 @@ Finality relay provides several metrics. Metrics names depend on names of source shows metrics names for Rococo (source chain) to BridgeHubWestend (target chain) finality relay. For other chains, simply change chain names. So the metrics are: -- `Rococo_to_BridgeHubWestend_Sync_best_source_block_number` - returns best finalized source chain (Rococo) block number, known - to the relay. If relay is running in [on-demand mode](../bin-substrate/src/cli/relay_headers_and_messages/), the +- `Rococo_to_BridgeHubWestend_Sync_best_source_block_number` - returns best finalized source chain (Rococo) block + number, known to the relay. + If relay is running in [on-demand mode](../bin-substrate/src/cli/relay_headers_and_messages/), the number may not match (it may be far behind) the actual best finalized number; -- `Rococo_to_BridgeHubWestend_Sync_best_source_at_target_block_number` - returns best finalized source chain (Rococo) block - number that is known to the bridge GRANDPA pallet at the target chain. +- `Rococo_to_BridgeHubWestend_Sync_best_source_at_target_block_number` - returns best finalized source chain (Rococo) + block number that is known to the bridge GRANDPA pallet at the target chain. -- `Rococo_to_BridgeHubWestend_Sync_is_source_and_source_at_target_using_different_forks` - if this metrics is set to `1`, then - the best source chain header, known to the target chain doesn't match the same-number-header at the source chain. - It means that the GRANDPA validators set has crafted the duplicate justification and it has been submitted to the - target chain. Normally (if majority of validators are honest and if you're running finality relay without large - breaks) this shall not happen and the metric will have `0` value. +- `Rococo_to_BridgeHubWestend_Sync_is_source_and_source_at_target_using_different_forks` - if this metrics is set + to `1`, then the best source chain header known to the target chain doesn't match the same-number-header + at the source chain. It means that the GRANDPA validators set has crafted the duplicate justification + and it has been submitted to the target chain. + Normally (if majority of validators are honest and if you're running finality relay without large breaks) + this shall not happen and the metric will have `0` value. If relay operates properly, you should see that the `Rococo_to_BridgeHubWestend_Sync_best_source_at_target_block_number` tries to reach the `Rococo_to_BridgeHubWestend_Sync_best_source_block_number`. And the latter one always increases. diff --git a/bridges/relays/lib-substrate-relay/Cargo.toml b/bridges/relays/lib-substrate-relay/Cargo.toml index c064f11b22eb..76be5a92a794 100644 --- a/bridges/relays/lib-substrate-relay/Cargo.toml +++ b/bridges/relays/lib-substrate-relay/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors = ["Parity Technologies "] edition = "2021" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +publish = false [lints] workspace = true diff --git a/bridges/relays/messages/Cargo.toml b/bridges/relays/messages/Cargo.toml index 1233c8af741a..b3f0a9fd1918 100644 --- a/bridges/relays/messages/Cargo.toml +++ b/bridges/relays/messages/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors = ["Parity Technologies "] edition = "2021" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +publish = false [lints] workspace = true diff --git a/bridges/relays/parachains/Cargo.toml b/bridges/relays/parachains/Cargo.toml index 05a995b8514a..f37e636a9c59 100644 --- a/bridges/relays/parachains/Cargo.toml +++ b/bridges/relays/parachains/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +publish = false [lints] workspace = true diff --git a/bridges/relays/parachains/README.md b/bridges/relays/parachains/README.md index bacd28594d80..9043b0b0a9cd 100644 --- a/bridges/relays/parachains/README.md +++ b/bridges/relays/parachains/README.md @@ -1,7 +1,7 @@ # Parachains Finality Relay The parachains finality relay works with two chains - source relay chain and target chain (which may be standalone -chain, relay chain or a parachain). The source chain must have the +chain, relay chain or a parachain). The source chain must have the [`paras` pallet](https://github.com/paritytech/polkadot/tree/master/runtime/parachains/src/paras) deployed at its runtime. The target chain must have the [bridge parachains pallet](../../modules/parachains/) deployed at its runtime. @@ -39,11 +39,12 @@ Rococo (source relay chain) to BridgeHubWestend (target chain) parachains finali change chain names. So the metrics are: - `Rococo_to_BridgeHubWestend_Parachains_best_parachain_block_number_at_source` - returns best known parachain block - number, registered in the `paras` pallet at the source relay chain (Rococo in our example); + number, registered in the `paras` pallet at the source relay chain (Rococo in our example); - `Rococo_to_BridgeHubWestend_Parachains_best_parachain_block_number_at_target` - returns best known parachain block - number, registered in the bridge parachains pallet at the target chain (BridgeHubWestend in our example). + number, registered in the bridge parachains pallet at the target chain (BridgeHubWestend in our example). -If relay operates properly, you should see that the `Rococo_to_BridgeHubWestend_Parachains_best_parachain_block_number_at_target` -tries to reach the `Rococo_to_BridgeHubWestend_Parachains_best_parachain_block_number_at_source`. And the latter one -always increases. +If relay operates properly, you should see that +the `Rococo_to_BridgeHubWestend_Parachains_best_parachain_block_number_at_target` tries to reach +the `Rococo_to_BridgeHubWestend_Parachains_best_parachain_block_number_at_source`. +And the latter one always increases. diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml index d1eeba2b8fd1..bc894b34e471 100644 --- a/bridges/relays/utils/Cargo.toml +++ b/bridges/relays/utils/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors = ["Parity Technologies "] edition = "2021" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +publish = false [lints] workspace = true