Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix polkadot-sdk CI failures #2901

Merged
merged 4 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
13 changes: 10 additions & 3 deletions modules/beefy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ description = "Module implementing BEEFY on-chain light client used for bridging
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
publish = false

[lints]
workspace = true
Expand Down Expand Up @@ -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",
Expand All @@ -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",
]
6 changes: 4 additions & 2 deletions primitives/beefy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
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 }

Expand All @@ -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",
Expand Down
1 change: 1 addition & 0 deletions relays/client-substrate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
publish = false

[lints]
workspace = true
Expand Down
1 change: 1 addition & 0 deletions relays/equivocation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
description = "Equivocation detector"
publish = false

[lints]
workspace = true
Expand Down
1 change: 1 addition & 0 deletions relays/finality/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
description = "Finality proofs relay"
publish = false

[lints]
workspace = true
Expand Down
22 changes: 12 additions & 10 deletions relays/finality/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
1 change: 1 addition & 0 deletions relays/lib-substrate-relay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
publish = false

[lints]
workspace = true
Expand Down
1 change: 1 addition & 0 deletions relays/messages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
publish = false

[lints]
workspace = true
Expand Down
1 change: 1 addition & 0 deletions relays/parachains/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
publish = false

[lints]
workspace = true
Expand Down
13 changes: 7 additions & 6 deletions relays/parachains/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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.
1 change: 1 addition & 0 deletions relays/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
publish = false

[lints]
workspace = true
Expand Down