Skip to content

Backport #7625 #8089

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.

Sign up for GitHub

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

Closed
athei wants to merge 8 commits into from
Closed

Backport #7625 #8089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5afedf5
Update to Rust stable 1.84.1 (#7625)
athei Feb 20, 2025
67bb16a
Revert added types that don't exist on stable2503
athei Mar 28, 2025
e08027d
Remove code that uses non existent feature
athei Mar 28, 2025
c62f51c
Fix broken code in on-offense
athei Mar 28, 2025
a3b4180
Update from github-actions[bot] running command 'fmt'
github-actions[bot] Mar 28, 2025
25437d9
fix(bridge-hub-westend-integration-tests): change to BoundedVec
franciscoaguirre Mar 28, 2025
3327578
Remove bandersnatch-experimental feature from cI scripts
athei Apr 1, 2025
d651a7d
Remoe capture_test_logs
raymondkfcheung Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
IMAGE="docker.io/paritytech/ci-unified:bullseye-1.81.0-2024-11-19-v202411281558"
IMAGE="docker.io/paritytech/ci-unified:bullseye-1.84.1-2025-01-28-v202502131220"
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ workflow:

variables:
# CI_IMAGE: !reference [ .ci-unified, variables, CI_IMAGE ]
CI_IMAGE: "docker.io/paritytech/ci-unified:bullseye-1.81.0-2024-11-19-v202411281558"
CI_IMAGE: "docker.io/paritytech/ci-unified:bullseye-1.84.1-2025-01-28-v202502131220"
# BUILDAH_IMAGE is defined in group variables
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
RELENG_SCRIPTS_BRANCH: "master"
Expand Down Expand Up @@ -125,18 +125,18 @@ default:
- cat .forklift/config-gitlab.toml > .forklift/config.toml
- >
if [ "$FORKLIFT_BYPASS" != "true" ]; then
echo "FORKLIFT_BYPASS not set";
echo "FORKLIFT_BYPASS not set";
if command -v forklift >/dev/null 2>&1; then
echo "forklift already exists";
echo "forklift already exists";
forklift version
else
echo "forklift does not exist, downloading";
curl --header "PRIVATE-TOKEN: $FL_CI_GROUP_TOKEN" -o forklift -L "${CI_API_V4_URL}/projects/676/packages/generic/forklift/${FL_FORKLIFT_VERSION}/forklift_${FL_FORKLIFT_VERSION}_linux_amd64";
curl --header "PRIVATE-TOKEN: $FL_CI_GROUP_TOKEN" -o forklift -L "${CI_API_V4_URL}/projects/676/packages/generic/forklift/${FL_FORKLIFT_VERSION}/forklift_${FL_FORKLIFT_VERSION}_linux_amd64";
chmod +x forklift;
export PATH=$PATH:$(pwd);
echo ${FL_FORKLIFT_VERSION};
fi
echo "Creating alias cargo='forklift cargo'";
echo "Creating alias cargo='forklift cargo'";
shopt -s expand_aliases;
alias cargo="forklift cargo";
fi
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@ trie-bench = { version = "0.40.0" }
trie-db = { version = "0.30.0", default-features = false }
trie-root = { version = "0.18.0", default-features = false }
trie-standardmap = { version = "0.16.0" }
trybuild = { version = "1.0.89" }
trybuild = { version = "1.0.103" }
tt-call = { version = "1.0.8" }
tuplex = { version = "0.1", default-features = false }
twox-hash = { version = "1.6.3", default-features = false }
Expand Down
14 changes: 7 additions & 7 deletions bridges/bin/runtime-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
workspace = true

[dependencies]
codec = { features = ["derive"], workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
static_assertions = { optional = true, workspace = true, default-features = true }
tuplex = { workspace = true }
bp-header-chain.workspace = true
bp-messages.workspace = true
bp-parachains.workspace = true
bp-polkadot-core.workspace = true
bp-relayers.workspace = true
bp-runtime.workspace = true
codec = { features = ["derive"], workspace = true }
frame-support.workspace = true
frame-system.workspace = true
log = { workspace = true }
pallet-bridge-grandpa.workspace = true
pallet-bridge-messages.workspace = true
pallet-bridge-parachains.workspace = true
pallet-bridge-relayers.workspace = true
frame-support.workspace = true
frame-system.workspace = true
pallet-transaction-payment.workspace = true
pallet-utility.workspace = true
scale-info = { features = ["derive"], workspace = true }
sp-io.workspace = true
sp-runtime.workspace = true
sp-std.workspace = true
sp-trie = { optional = true, workspace = true }
sp-weights.workspace = true
static_assertions = { optional = true, workspace = true, default-features = true }
tuplex = { workspace = true }
xcm.workspace = true

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions bridges/chains/chain-asset-hub-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ exclude-from-umbrella = true
workspace = true

[dependencies]
bp-xcm-bridge-hub-router.workspace = true
codec = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
frame-support.workspace = true
scale-info = { features = ["derive"], workspace = true }
sp-core.workspace = true
bp-xcm-bridge-hub-router.workspace = true
testnet-parachains-constants = { features = ["rococo"], workspace = true }
xcm.workspace = true

Expand Down
4 changes: 2 additions & 2 deletions bridges/chains/chain-asset-hub-westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ exclude-from-umbrella = true
workspace = true

[dependencies]
bp-xcm-bridge-hub-router.workspace = true
codec = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
frame-support.workspace = true
scale-info = { features = ["derive"], workspace = true }
sp-core.workspace = true
bp-xcm-bridge-hub-router.workspace = true
testnet-parachains-constants = { features = ["westend"], workspace = true }
xcm.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ bp-polkadot-core.workspace = true
bp-runtime.workspace = true
frame-support.workspace = true
frame-system.workspace = true
polkadot-primitives.workspace = true
sp-api.workspace = true
sp-std.workspace = true
polkadot-primitives.workspace = true

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ exclude-from-umbrella = true
workspace = true

[dependencies]
codec = { features = ["derive"], workspace = true }
bp-bridge-hub-cumulus.workspace = true
bp-messages.workspace = true
bp-runtime.workspace = true
bp-xcm-bridge-hub.workspace = true
codec = { features = ["derive"], workspace = true }
frame-support.workspace = true
sp-api.workspace = true
sp-runtime.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ exclude-from-umbrella = true
workspace = true

[dependencies]
codec = { features = ["derive"], workspace = true }
bp-bridge-hub-cumulus.workspace = true
bp-messages.workspace = true
bp-runtime.workspace = true
bp-xcm-bridge-hub.workspace = true
codec = { features = ["derive"], workspace = true }
frame-support.workspace = true
sp-api.workspace = true
sp-runtime.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions bridges/chains/chain-polkadot-bulletin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ exclude-from-umbrella = true
workspace = true

[dependencies]
codec = { features = ["derive"], workspace = true }
scale-info = { features = ["derive"], workspace = true }
bp-header-chain.workspace = true
bp-messages.workspace = true
bp-polkadot-core.workspace = true
bp-runtime.workspace = true
codec = { features = ["derive"], workspace = true }
frame-support.workspace = true
frame-system.workspace = true
scale-info = { features = ["derive"], workspace = true }
sp-api.workspace = true
sp-runtime.workspace = true
sp-std.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions bridges/modules/beefy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ publish = false
workspace = true

[dependencies]
codec = { workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
serde = { optional = true, workspace = true }
bp-beefy.workspace = true
bp-runtime.workspace = true
codec = { workspace = true }
frame-support.workspace = true
frame-system.workspace = true
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
serde = { optional = true, workspace = true }
sp-core.workspace = true
sp-runtime.workspace = true
sp-std.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions bridges/modules/grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
codec = { workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
bp-header-chain.workspace = true
bp-runtime.workspace = true
bp-test-utils = { optional = true, workspace = true }
codec = { workspace = true }
frame-benchmarking = { optional = true, workspace = true }
frame-support.workspace = true
frame-system.workspace = true
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
sp-consensus-grandpa = { features = ["serde"], workspace = true }
sp-runtime = { features = ["serde"], workspace = true }
sp-std.workspace = true
bp-test-utils = { optional = true, workspace = true }
frame-benchmarking = { optional = true, workspace = true }

[dev-dependencies]
bp-runtime = { features = ["test-helpers"], path = "../../primitives/runtime", default-features = false }
Expand Down
9 changes: 3 additions & 6 deletions bridges/modules/grandpa/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,12 +789,9 @@ where
pub fn synced_headers_grandpa_info() -> Vec<StoredHeaderGrandpaInfo<BridgedHeader<T, I>>> {
frame_system::Pallet::<T>::read_events_no_consensus()
.filter_map(|event| {
if let Event::<T, I>::UpdatedBestFinalizedHeader { grandpa_info, .. } =
event.event.try_into().ok()?
{
return Some(grandpa_info)
}
None
let Event::<T, I>::UpdatedBestFinalizedHeader { grandpa_info, .. } =
event.event.try_into().ok()?;
Some(grandpa_info)
})
.collect()
}
Expand Down
6 changes: 3 additions & 3 deletions bridges/modules/messages/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ repository.workspace = true
workspace = true

[dependencies]
codec = { workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
bp-header-chain.workspace = true
bp-messages.workspace = true
bp-runtime.workspace = true
codec = { workspace = true }
frame-benchmarking = { optional = true, workspace = true }
frame-support.workspace = true
frame-system.workspace = true
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
sp-runtime.workspace = true
sp-std.workspace = true
sp-trie = { optional = true, workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions bridges/modules/parachains/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ repository.workspace = true
workspace = true

[dependencies]
codec = { workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
bp-header-chain.workspace = true
bp-parachains.workspace = true
bp-polkadot-core.workspace = true
bp-runtime.workspace = true
pallet-bridge-grandpa.workspace = true
codec = { workspace = true }
frame-benchmarking = { optional = true, workspace = true }
frame-support.workspace = true
frame-system.workspace = true
log = { workspace = true }
pallet-bridge-grandpa.workspace = true
scale-info = { features = ["derive"], workspace = true }
sp-runtime.workspace = true
sp-std.workspace = true

Expand Down
12 changes: 6 additions & 6 deletions bridges/modules/relayers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ repository.workspace = true
workspace = true

[dependencies]
codec = { workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
bp-header-chain.workspace = true
bp-messages.workspace = true
bp-relayers.workspace = true
bp-runtime.workspace = true
pallet-bridge-grandpa.workspace = true
pallet-bridge-messages.workspace = true
pallet-bridge-parachains.workspace = true
codec = { workspace = true }
frame-benchmarking = { optional = true, workspace = true }
frame-support.workspace = true
frame-system.workspace = true
log = { workspace = true }
pallet-bridge-grandpa.workspace = true
pallet-bridge-messages.workspace = true
pallet-bridge-parachains.workspace = true
pallet-transaction-payment.workspace = true
scale-info = { features = ["derive"], workspace = true }
sp-arithmetic.workspace = true
sp-runtime.workspace = true

Expand Down
8 changes: 4 additions & 4 deletions bridges/modules/xcm-bridge-hub-router/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ repository.workspace = true
workspace = true

[dependencies]
codec = { workspace = true }
log = { workspace = true }
scale-info = { features = ["bit-vec", "derive", "serde"], workspace = true }
bp-xcm-bridge-hub-router.workspace = true
codec = { workspace = true }
frame-benchmarking = { optional = true, workspace = true }
frame-support.workspace = true
frame-system.workspace = true
log = { workspace = true }
scale-info = { features = ["bit-vec", "derive", "serde"], workspace = true }
sp-core.workspace = true
sp-runtime.workspace = true
sp-std.workspace = true
xcm.workspace = true
xcm-builder.workspace = true
xcm.workspace = true

[dev-dependencies]
sp-io = { default-features = true, path = "../../../substrate/primitives/io" }
Expand Down
10 changes: 5 additions & 5 deletions bridges/modules/xcm-bridge-hub/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ repository.workspace = true
workspace = true

[dependencies]
codec = { workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
bp-messages.workspace = true
bp-runtime.workspace = true
bp-xcm-bridge-hub.workspace = true
pallet-bridge-messages.workspace = true
codec = { workspace = true }
frame-support.workspace = true
frame-system.workspace = true
log = { workspace = true }
pallet-bridge-messages.workspace = true
scale-info = { features = ["derive"], workspace = true }
sp-core.workspace = true
sp-runtime.workspace = true
sp-std.workspace = true
xcm.workspace = true
xcm-builder.workspace = true
xcm-executor.workspace = true
xcm.workspace = true

[dev-dependencies]
bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
Expand Down
8 changes: 4 additions & 4 deletions bridges/primitives/beefy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ publish = false
workspace = true

[dependencies]
codec = { features = ["bit-vec", "derive"], workspace = true }
scale-info = { features = ["bit-vec", "derive"], workspace = true }
serde = { features = ["alloc", "derive"], workspace = true }
bp-runtime.workspace = true
binary-merkle-tree.workspace = true
bp-runtime.workspace = true
codec = { features = ["bit-vec", "derive"], workspace = true }
frame-support.workspace = true
pallet-beefy-mmr.workspace = true
pallet-mmr.workspace = true
scale-info = { features = ["bit-vec", "derive"], workspace = true }
serde = { features = ["alloc", "derive"], workspace = true }
sp-consensus-beefy.workspace = true
sp-runtime.workspace = true
sp-std.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions bridges/primitives/header-chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ repository.workspace = true
workspace = true

[dependencies]
bp-runtime.workspace = true
codec = { workspace = true }
finality-grandpa = { workspace = true }
frame-support.workspace = true
scale-info = { features = ["derive"], workspace = true }
serde = { features = ["alloc", "derive"], workspace = true }
bp-runtime.workspace = true
frame-support.workspace = true
sp-consensus-grandpa = { features = ["serde"], workspace = true }
sp-core = { features = ["serde"], workspace = true }
sp-runtime = { features = ["serde"], workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions bridges/primitives/messages/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ repository.workspace = true
workspace = true

[dependencies]
codec = { features = ["bit-vec", "derive"], workspace = true }
scale-info = { features = ["bit-vec", "derive"], workspace = true }
serde = { features = ["alloc", "derive"], workspace = true }
bp-header-chain.workspace = true
bp-runtime.workspace = true
codec = { features = ["bit-vec", "derive"], workspace = true }
frame-support.workspace = true
scale-info = { features = ["bit-vec", "derive"], workspace = true }
serde = { features = ["alloc", "derive"], workspace = true }
sp-core.workspace = true
sp-io.workspace = true
sp-std.workspace = true
Expand Down
Loading
Loading