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.

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

Jump to bottom

Update bridges subtree #2996

Merged
merged 6 commits into from
Jan 19, 2024
Merged

Update bridges subtree #2996

merged 6 commits into from
Jan 19, 2024

Conversation

serban300
Copy link
Contributor

Update bridges subtree

@serban300
diener workspacify bridges dir
0eca9d9
@serban300
Squashed 'bridges/' changes from 277f0d5..2755d51
450e59b 
2755d51 [polkadot-staging] Backport polkadot-sdk changes + update refs (#2798)
dfec8bc [`polkadot-staging`] Separate `send_message()` validations (#2795)
c3e469e Bump thiserror from 1.0.55 to 1.0.56
8fb8fdd Port safe commits from master to polkadot-staging (#2761)
6e526c3 [polkadot-staging] Bump sysinfo from 0.29.11 to 0.30.5 (#2790)
c3436b2 Bump anyhow from 1.0.78 to 1.0.79
d618416 Bump async-trait from 0.1.76 to 0.1.77
d3f97a4 Bump serde_json from 1.0.109 to 1.0.111
688281f Bump thiserror from 1.0.53 to 1.0.55
d26dd51 get rid of LaneMessageVerifier (#2168) (#2764)
e189156 Bump serde_json from 1.0.108 to 1.0.109
e816e13 Bump tempfile from 3.8.1 to 3.9.0
1cd5db7 Bump async-trait from 0.1.75 to 0.1.76
d9cf492 Bump anyhow from 1.0.76 to 1.0.78
eabed3f Bump thiserror from 1.0.51 to 1.0.53
5011481 Bump async-trait from 0.1.74 to 0.1.75
64e635d Bump tokio from 1.35.0 to 1.35.1
c68b2a2 Bump futures from 0.3.29 to 0.3.30
114ad74 Bump anyhow from 1.0.75 to 1.0.76
afd1787 Bump time from 0.3.30 to 0.3.31
ea3d0cd Pokladot sdk backport to staging (#2746)
68d8650 Bump thiserror from 1.0.50 to 1.0.51
009c989 remove no longer valid check from the ensure_weights_are_correct (#2740)
94c44a7 Added Rococo BH <> Rococo Bulletin bridge (#2724)
5fe0f2f Bump tokio from 1.34.0 to 1.35.0
25f8251 Grafana update stuff (#2733)
06fbe8b Improved `ExportXcm::validate` implementation for BridgeHubs - step 1 (#2727)
390e836 Select header that will be fully refunded in on-demand batch finality relay (#2729)
ce701dd separate constants for average and worst case relay headers (#2728)
09215c5 Backport from `polkadot-sdk` + bump (#2725)
6327261 Bump serde from 1.0.192 to 1.0.193
fff9ddd Bump sysinfo from 0.29.10 to 0.29.11
4be99fe Monitoring and alerts for Rococo/Westend (#2710)
67a683a Bump ed25519-dalek from 2.0.0 to 2.1.0
8e0e794 quick and dirty fix for the `wait -p` and older distros (#2712)
3ab6562 Add withdraw reserve assets to zombienet tests (#2711)
c2c409b increase init timeouts in zombienet tests (#2706)
a8c60b4 fix lane id and bridged chain id (#2705)
9ac0f26 removed bp-asset-hub-kusama and bp-asset-hub-polkadot (#2703)
4916475 Some fixes for zombienet tests (polkadot-staging) (#2704)
6f9a147 zombienet from Wococo to Westend (#2699)
3ba7910 Porting changes from polkadot-sdk to polkadot-staging - before update subtree with removed wococo stuff (#2696)
653448f Remove Woococo related stuff (#2692)
03aaab2 Gitspiegel polkadot staging (#2695)
702a4c1 Drop Rialto <> Millau bridges (#2663) (#2694)
6a63b5f Start version guards for the ED loop (#2678)
896b9a9 typo (#2690)
671d27c Bump serde from 1.0.190 to 1.0.192
991b229 Bump clap from 4.4.7 to 4.4.8
ec267ec Bump env_logger from 0.10.0 to 0.10.1
592e407 Bump tokio from 1.33.0 to 1.34.0
c49ce3d Bump serde_json from 1.0.107 to 1.0.108
04b3319 Update subxt-codegen version (#2674)
03f9804 backport #2139 (#2673)
49245dd removed unused PARACHAINS_FINALITY_PALLET_NAME constant (#2670)
658a3f5 BHR/BHWE spec_version according to the `polkadot-sdk` (#2668)
7666b94 Nit from `polkadot-sdk` (#2665)
b5c43bb Adjusted constant because for measuring we used mistakenly rococo constants (#2664)
062449d Add Rococo<>Westend bridge support/relay (#2647)
55eb44e Add basic zombienet test to be used in the future (#2649) (#2660)
93b6b3f Bump clap from 4.4.6 to 4.4.7
4c01ab0 Bump futures from 0.3.28 to 0.3.29
a31a6c0 Bump tempfile from 3.8.0 to 3.8.1
bcdfe83 Bump serde from 1.0.189 to 1.0.190
f7433b0 Port #2648 to polkadot-staging (#2651)
3896738 Bump scale-info from 2.9.0 to 2.10.0
12d62c5 Bump thiserror from 1.0.49 to 1.0.50
1d78aa1 Backport from `polkadot-sdk` with actual master (#2633)
ab4de94 Grandpa justifications: Avoid duplicate vote ancestries (#2634) (#2635)
465562a add missing crate descriptions (#2629)
28d3680 Bump fixed-hash
67528c4 Bump serde from 1.0.188 to 1.0.189
d450c47 Bump time from 0.3.29 to 0.3.30
6a19f83 Bump async-trait from 0.1.73 to 0.1.74
a92d213 Millau, Rialto: accept equivocation reports (#2614) (#2617)
a61f777 Bump tokio from 1.32.0 to 1.33.0
0052f64 Bump subxt from 0.32.0 to 0.32.1
ccc849d Bump num-traits from 0.2.16 to 0.2.17
22f2752 apply late suggestions for #2600 (#2603)
0320172 actualize check_obsolete_call comment (#2601)
5cbbd25 Reject transactions if bridge pallets are halted (#2600)
ca4dfe3 Bump subxt from 0.31.0 to 0.32.0
8bf7b58 Bump clap from 4.4.4 to 4.4.6
88b0b99 Bump thiserror from 1.0.48 to 1.0.49
263833b https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/3833103 (#2589)
4f44968 Backport changes from polkadot-sdk (#2588)
7200ed1 fiox overflow when computing priority boost (#2587)
e02cbd3 Bump time from 0.3.28 to 0.3.29
a097dd2 Bump clap from 4.4.3 to 4.4.4
801ce88 Merge bulletin chain changes into polkadot staging (#2574)
a3803ce Add unit tests for the equivocation detection loop (#2571)
26dfc31 Bump clap from 4.4.2 to 4.4.3
66a8beb Bump serde_json from 1.0.106 to 1.0.107
18c50da Bump trie-db from 0.27.1 to 0.28.0
4c4fa92 Equivocation detection loop: Reorganize block checking logic as state machine (#2555) (#2557)
6bd317a Bump serde_json from 1.0.105 to 1.0.106
a7e6bfd Backport for polkadot-sdk#1446 (#2546)
d9f8050 Bump sysinfo from 0.29.9 to 0.29.10
901f44c Bump thiserror from 1.0.47 to 1.0.48
82eeb50 Bump sysinfo from 0.29.8 to 0.29.9
a0c934b Bump strum from 0.24.1 to 0.25.0
1064fbf Bump subxt from 0.28.0 to 0.31.0
e50398d bridges subtree fixes (#2528)
99af075 Markdown linter (#1309) (#2526)
733ff0f `polkadot-staging` branch: Use polkadot-sdk dependencies (#2524)
e8a59f1 Fix benchmark with new XCM::V3 `MAX_INSTRUCTIONS_TO_DECODE` (#2514)
62b185d Backport `polkadot-sdk` changes to `polkadot-staging` (#2518)
d9658f4 Fix equivocation detection containers startup (#2516) (#2517)
d65db28 Backport: building images from locally built binaries (#2513)
5fdbaf4 Start the equivocation detection loop from the complex relayer (#2507) (#2512)
7fbb67d Backport: Implement basic equivocations detection loop (#2375)
cb7efe2 Manually update deps in polkadot staging (#2371)
d17981f #2351 to polkadot-staging (#2359)

git-subtree-dir: bridges
git-subtree-split: 2755d51
@serban300
Merge commit '450e59b31620c007cba41f166fd62a28478e488c' into bridges-…
d9e3808 
…update
@serban300
Adjustments
e275387
@serban300 serban300 self-assigned this Jan 19, 2024
@paritytech-review-bot paritytech-review-bot bot requested a review from a team January 19, 2024 11:10
@serban300 serban300 added R0-silent Changes should not be mentioned in any release notes T15-bridges This PR/Issue is related to bridges. labels Jan 19, 2024
svyatonik
svyatonik approved these changes Jan 19, 2024
View reviewed changes
Copy link
Contributor

@svyatonik svyatonik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't know if we need to add the prdoc for that - we have removed type LaneMessageVerifier from messages pallet configuration, so we may add that to the release notes.

bridges/snowbridge/parachain/pallets/ethereum-client/Cargo.toml
@@ -38,7 +38,7 @@ snowbridge-core = { path = "../../primitives/core", default-features = false }
snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false }
primitives = { package = "snowbridge-beacon-primitives", path = "../../primitives/beacon", default-features = false }
static_assertions = { version = "1.1.0", default-features = false }
bp-runtime = { path = "../../../../../bridges/primitives/runtime", default-features = false }
bp-runtime = { path = "../../../../primitives/runtime", default-features = false }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(this change won't beak anything in Snowbridge repo @claravanstaden ?)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(also see similar changes below)

Copy link
Contributor Author

@serban300 serban300 Jan 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn't break anything. In the end it's the same path. Just optimized.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but just wanted to double check :)

@serban300
Copy link
Contributor Author

Don't know if we need to add the prdoc for that - we have removed type LaneMessageVerifier from messages pallet configuration, so we may add that to the release notes.

I'm not sure if we should do this since the bridges are not used in production yet.

@paritytech-cicd-pr
Copy link

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: cargo-clippy
Logs: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/4968711

bkontur
bkontur approved these changes Jan 19, 2024
View reviewed changes
Copy link
Contributor

@bkontur bkontur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgmt

claravanstaden
claravanstaden approved these changes Jan 19, 2024
View reviewed changes
bridges/snowbridge/parachain/primitives/router/Cargo.toml
@@ -28,7 +28,7 @@ xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-f
xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }

snowbridge-core = { path = "../../primitives/core", default-features = false }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch 😅

@acatangiu acatangiu enabled auto-merge January 19, 2024 15:09
@acatangiu acatangiu added this pull request to the merge queue Jan 19, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jan 19, 2024
@serban300
Update bridges subtree (#2996)
f993f97 
Update bridges subtree
@serban300 serban300 mentioned this pull request Jan 19, 2024
Closed
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 19, 2024
@serban300 serban300 added this pull request to the merge queue Jan 19, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 19, 2024
@serban300 serban300 added this pull request to the merge queue Jan 19, 2024
Merged via the queue into paritytech:master with commit 320b528 Jan 19, 2024
128 checks passed
@serban300 serban300 deleted the bridges-update branch January 19, 2024 17:41
bkontur added a commit to bkontur/runtimes that referenced this pull request Feb 15, 2024
@bkontur
[bridges] adapt paritytech/polkadot-sdk#2996
38ca491
@github-actions github-actions bot mentioned this pull request Mar 13, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@svyatonik svyatonik svyatonik approved these changes

@acatangiu acatangiu acatangiu approved these changes

@bkontur bkontur bkontur approved these changes

@claravanstaden claravanstaden claravanstaden approved these changes

Assignees

@serban300 serban300

Labels
R0-silent Changes should not be mentioned in any release notes T15-bridges This PR/Issue is related to bridges.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@serban300 @paritytech-cicd-pr @svyatonik @claravanstaden @bkontur @acatangiu