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

Update bridges subtree #1392

Merged
merged 8 commits into from
Sep 11, 2023
Merged

Conversation

serban300
Copy link
Contributor

@serban300 serban300 commented Sep 4, 2023

@serban300 serban300 added A3-backport Pull request is already reviewed well in another branch. T15-bridges This PR/Issue is related to bridges. labels Sep 4, 2023
@serban300 serban300 self-assigned this Sep 4, 2023
@acatangiu
Copy link
Contributor

acatangiu commented Sep 4, 2023

We were actually talking that bridges dir could be moved from under cumulus directly into root: cumulus/bridges -> bridges.
When we’ll migrate parity-bridges-common repo to monorepo bridges dir, it’ll contain other components too not just bridge-hub pallets and primitives.

@bkchr @ggwpez wdyt?

@bkchr
Copy link
Member

bkchr commented Sep 4, 2023

Sounds like a good idea to also move the bridges stuff over! Having it on the top level also sounds about right to me!

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.

Shall we also change the bridges subtree rule here?

@serban300
Copy link
Contributor Author

Sounds like a good idea to also move the bridges stuff over! Having it on the top level also sounds about right to me!

Ok, I will adjust the PR then and move the subtree under root.

Shall we also change the bridges subtree rule here?

Good point. Will do.

e50398d bridges subtree fixes (paritytech#2528)
99af075 Markdown linter (paritytech#1309) (paritytech#2526)
733ff0f `polkadot-staging` branch: Use polkadot-sdk dependencies (paritytech#2524)
e8a59f1 Fix benchmark with new XCM::V3 `MAX_INSTRUCTIONS_TO_DECODE` (paritytech#2514)
62b185d Backport `polkadot-sdk` changes to `polkadot-staging` (paritytech#2518)
d9658f4 Fix equivocation detection containers startup (paritytech#2516) (paritytech#2517)
d65db28 Backport: building images from locally built binaries (paritytech#2513)
5fdbaf4 Start the equivocation detection loop from the complex relayer (paritytech#2507) (paritytech#2512)
7fbb67d Backport: Implement basic equivocations detection loop (paritytech#2375)
cb7efe2 Manually update deps in polkadot staging (paritytech#2371)
d17981f paritytech#2351 to polkadot-staging (paritytech#2359)

git-subtree-dir: bridges
git-subtree-split: e50398d
@serban300
Copy link
Contributor Author

Updated the PR in order to move the bridges subtree under root. Sorry, I had to force push.

@svyatonik @acatangiu @bkchr PTAL when you have time.

Copy link
Contributor

@acatangiu acatangiu left a comment

Choose a reason for hiding this comment

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

Looks good!

One more thing we should do is rename bridges/modules/ -> bridges/pallets/. We could do that in this PR (and also do it in our repo), or postpone renaming to when we migrate full repo here.

bridges/scripts/verify-pallets-build.sh Show resolved Hide resolved
@serban300
Copy link
Contributor Author

Looks good!

One more thing we should do is rename bridges/modules/ -> bridges/pallets/. We could do that in this PR (and also do it in our repo), or postpone renaming to when we migrate full repo here.

I would do it in a future PR. We might also need to rename some traits and structs. It might require more attention.

@acatangiu
Copy link
Contributor

FYI: this is where we're tracking parity-bridges-common migration: paritytech/parity-bridges-common#2538

@serban300
Copy link
Contributor Author

@paritytech/release-engineering , @paritytech/ci can you please take a look on this PR ?

@paritytech-ci paritytech-ci requested a review from a team September 6, 2023 07:50
@ggwpez ggwpez mentioned this pull request Sep 6, 2023
@acatangiu acatangiu merged commit 142a11a into paritytech:master Sep 11, 2023
111 checks passed
Daanvdplas pushed a commit that referenced this pull request Sep 11, 2023
* Move the bridges subtree under root

* Squashed 'bridges/' changes from 277f0d5..e50398d

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: e50398d

* Reapply diener workspacify

* Fix Cargo.toml

* Fix test

* Adjustments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A3-backport Pull request is already reviewed well in another branch. T15-bridges This PR/Issue is related to bridges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants