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

Add statemine #24

Merged
merged 169 commits into from
May 12, 2023
Merged

Add statemine #24

merged 169 commits into from
May 12, 2023

Conversation

alistair-singh
Copy link

@alistair-singh alistair-singh commented May 11, 2023

Merged in bko-transfer-asset-via-bridge statemine code.

Snowfork companion: Snowfork/snowbridge#829

Resolves: SNO-433

bkontur and others added 21 commits April 17, 2023 17:01
* update substrate

* update lockfile for {"polkadot", "substrate"}

---------

Co-authored-by: parity-processbot <>
* Optimize level monitor reconstruction

* Fix counter increment and test

* Struct comments as doc comments
Bumps [Swatinem/rust-cache](https://github.com/Swatinem/rust-cache) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/Swatinem/rust-cache/releases)
- [Changelog](https://github.com/Swatinem/rust-cache/blob/master/CHANGELOG.md)
- [Commits](Swatinem/rust-cache@359a70e...6fd3edf)

---
updated-dependencies:
- dependency-name: Swatinem/rust-cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* max proposal weight config

* update deps

---------

Co-authored-by: parity-processbot <>
* [Polkadot Companion] for 7101

PR: paritytech/polkadot#7101

* update lockfile for {"polkadot", "substrate"}

---------

Co-authored-by: parity-processbot <>
…eport native tokens + some nits (paritytech#2449)

* Align BridgeHub runtimes with other SP runtimes

* Reused `teleports_for_native_asset_works` test to all bridge-hub runtime

* Fix import vs doc

* Removed unnecessery deps

* DealWithFees + ToAuthor->ToStakingPot for BH according to the other runtimes

* Update parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs

Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>

* Update parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs

Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>

* Update parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs

Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>

* Align all desc

* Extract runtime_para_id for test

* Fix test

---------

Co-authored-by: parity-processbot <>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
msg_count: 10,
total_size: 10_000_000_u32,
msg_count: 5,
total_size: 5_000_000_u32,

Choose a reason for hiding this comment

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

Why was this doubled in the merge?

Copy link
Author

Choose a reason for hiding this comment

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

I made a mistake during the merge and chose the wrong conflict resolution. I have reverted this though in 94c880c.

This is master branch which is more recent and was updated during the wococo-rococo bridge work:
https://github.com/paritytech/cumulus/blame/master/pallets/parachain-system/src/lib.rs#L1042-L1065

In the bko-transfer-assets-via-bridge its two months old:
https://github.com/paritytech/cumulus/blame/bko-transfer-asset-via-bridge/pallets/parachain-system/src/lib.rs#L1045-L1068

Copy link

@vgeddes vgeddes left a comment

Choose a reason for hiding this comment

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

+1

Copy link

@yrong yrong left a comment

Choose a reason for hiding this comment

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

LGTM!

@alistair-singh alistair-singh merged commit c2ca46e into snowbridge May 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.