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

Merge develop into release branch #1347

Merged
merged 4 commits into from
Jul 22, 2024
Merged

Merge develop into release branch #1347

merged 4 commits into from
Jul 22, 2024

Conversation

maltekliemann
Copy link
Member

What does it do?

What important points should reviewers know?

Is there something left for follow-up PRs?

What alternative implementations were considered?

Are there relevant PRs or issues?

References

maltekliemann and others added 2 commits June 24, 2024 15:37
* Revert "New Asset System (#1295)"

This reverts commit a956877.

* Fix formatting

* Update copyright

* Remove pallet-assets dependency

* Fix fuzz tests
* Update dependencies to Polkadot v1.1.0 (#1331)

* Update dependencies (#1319)

* Update dependencies to polkadot-v1.1.0

* Format code

* Remove duplicate dependencies

* Update zrml-asset-router (#1321)

* Update zrml-primitives

* Partially update asset-router

* Finalize logic adjustments in asset-router

* Make asset-router tests compilable

* Correct Inspect routing for market assets in Currencies

* Directly invoke Inspect API for Currencies

* Add tests for remaining Unbalances functions

* Update remaining Zeitgeist pallets (#1322)

* Update zrml-asset-router (#1321)

* Upgrade zrml-market-commons

* Upgrade zrml-authorized && use MockBlock instead of MockBlockU32

* Upgrade zrml-court

* Upgrade zrml-global-disputes

* Upgrade liquidity mining

* Upgrade zrml-rikiddo

* Upgrade zrml-simple-disputes

* Upgrade zrml-styx

* Upgrade zrml-orderbook

* Upgrade zrml-parimutuel

* Upgrade zrml-swaps

* Upgrade zrml-prediction-markets

* Upgrade zrml-neo-swaps

* Upgrade zrml-hybrid-router

* Update license headers

* Update runtime (#1323)

* Update weight files & Runtime enum

* Use workspace metadata

* Always use serde serialization for asset types

* Make battery station standalone runtime compilable

* Make benchmark and try-runtime feature compilable

* Make BS build with all features

* Make parachain tests compile

* Partially fix xcm tests

* Use safe xcm version 2

* Update Zeitgeist runtime (except xcm tests)

* Format code

* Remove deprecated comment

* Integrate new xcm-emulator (#1324)

* Integrate new xcm-emulator environment

* Utilize new xcm-emulator interfaces

* Spawn relay-para network using patched xcm-emulator

* Use proper collator genesis config

* Fix Rococo tests

* Finalize Battery Station XCM tests

* Finalize Zeitgeist XCM tests

* Update client (#1327)

* Fix rpc and work on client update

* Finalize standalone client

* Update parachain client

* Use same try-runtime subcommand in every case

* Update node/src/cli.rs

Co-authored-by: Malte Kliemann <[email protected]>

* Update try-runtime* Makefile targets

---------

Co-authored-by: Malte Kliemann <[email protected]>

* Make CI succeed and add migrations (#1329)

* Fix rpc and work on client update

* Finalize standalone client

* Update parachain client

* Use same try-runtime subcommand in every case

* Satisfy Clippy

* Fix benchmarks

* Add migrations

* Satisfy Clippy

* Update moonkit depedencies

* Free disk space more aggressively

---------

Co-authored-by: Malte Kliemann <[email protected]>

* Update spec version, try-runtime Makefile

* Fix copyright notices

* Fix broken chain state (#1336)

* Add `StorageVersion` fix and contrats fix migrations

* Don't set pallet-balances' storage version

* Remove migrations from pallet-contracts config

* Clear storage tries of contracts

* Fix migration and info logs in try-runtime

* Fix licenses and comments

* Fix formatting

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

---------

Co-authored-by: Harald Heckmann <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* Merge

* Fix benchmark

* Fix compiler error

* Fix tests and imports

* Fix imports (again...)

* Fix orderbook benchmarks

* Fix fuzz tests

* Fix formatting

* Fix orderbook fuzz

---------

Co-authored-by: Harald Heckmann <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Copy link
Contributor

mergify bot commented Jul 8, 2024

This pull request is now in conflicts. Could you fix it @maltekliemann? 🙏

@mergify mergify bot added the s:revision-needed The pull requests must be revised label Jul 8, 2024
@maltekliemann maltekliemann changed the base branch from main to release-v0.5.3 July 8, 2024 18:34
@maltekliemann maltekliemann changed the base branch from release-v0.5.3 to release-v0.5.3-2 July 8, 2024 18:35
@maltekliemann maltekliemann added s:review-needed The pull request requires reviews and removed s:revision-needed The pull requests must be revised labels Jul 8, 2024
@mergify mergify bot added s:in-progress The pull requests is currently being worked on and removed s:review-needed The pull request requires reviews labels Jul 8, 2024
@maltekliemann maltekliemann added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on labels Jul 8, 2024
@maltekliemann maltekliemann changed the title Develop Merge develop into release branch Jul 8, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jul 8, 2024

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 89.47368% with 92 lines in your changes missing coverage. Please review.

Project coverage is 92.95%. Comparing base (91627e3) to head (142df85).

Files Patch % Lines
zrml/parimutuel/src/weights.rs 0.00% 17 Missing ⚠️
zrml/orderbook/src/lib.rs 73.33% 16 Missing ⚠️
primitives/src/serde_wrapper.rs 0.00% 15 Missing ⚠️
zrml/prediction-markets/src/lib.rs 39.13% 14 Missing ⚠️
primitives/src/market.rs 72.72% 9 Missing ⚠️
primitives/src/asset.rs 63.15% 7 Missing ⚠️
zrml/prediction-markets/src/tests/integration.rs 85.71% 5 Missing ⚠️
zrml/parimutuel/src/lib.rs 63.63% 4 Missing ⚠️
zrml/swaps/src/mock.rs 0.00% 3 Missing ⚠️
zrml/prediction-markets/src/mock.rs 66.66% 2 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@                 Coverage Diff                  @@
##           release-v0.5.3-2    #1347      +/-   ##
====================================================
+ Coverage             92.52%   92.95%   +0.42%     
====================================================
  Files                   198      162      -36     
  Lines                 36036    32388    -3648     
====================================================
- Hits                  33343    30105    -3238     
+ Misses                 2693     2283     -410     
Flag Coverage Δ
tests 92.95% <89.47%> (+0.42%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -22,7 +22,7 @@
clippy::arithmetic_side_effects
)]

#[cfg(feature = "mock")]
// #[cfg(any(feature = "mock", feature = "runtime-benchmarks"))]
Copy link
Member

Choose a reason for hiding this comment

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

Commented here?

@maltekliemann maltekliemann merged commit 0fa9ff5 into release-v0.5.3-2 Jul 22, 2024
29 checks passed
@maltekliemann maltekliemann deleted the develop branch July 22, 2024 20:57
@maltekliemann maltekliemann restored the develop branch July 24, 2024 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s:review-needed The pull request requires reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants