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

Remove zrml-simple-disputes and migrate markets #1344

Merged
merged 8 commits into from
Jul 8, 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 maltekliemann added the s:review-needed The pull request requires reviews label Jun 11, 2024
@maltekliemann maltekliemann added this to the v0.5.4 milestone Jun 11, 2024
@maltekliemann maltekliemann self-assigned this Jun 11, 2024
@maltekliemann maltekliemann changed the base branch from main to develop-v0.5.4 June 11, 2024 12:12
@codecov-commenter
Copy link

codecov-commenter commented Jun 11, 2024

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

Codecov Report

Attention: Patch coverage is 99.32886% with 1 line in your changes missing coverage. Please review.

Please upload report for BASE (develop-v0.5.4@8e2a12f). Learn more about missing BASE report.

Files Patch % Lines
zrml/market-commons/src/migrations.rs 98.55% 1 Missing ⚠️

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

Additional details and impacted files
@@                Coverage Diff                @@
##             develop-v0.5.4    #1344   +/-   ##
=================================================
  Coverage                  ?   92.61%           
=================================================
  Files                     ?      171           
  Lines                     ?    35025           
  Branches                  ?        0           
=================================================
  Hits                      ?    32438           
  Misses                    ?     2587           
  Partials                  ?        0           
Flag Coverage Δ
tests 92.61% <99.32%> (?)

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.

@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 Jun 11, 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 Jun 11, 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 Jun 11, 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 Jun 11, 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 Jun 11, 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 Jun 11, 2024
Copy link
Member

@Chralt98 Chralt98 left a comment

Choose a reason for hiding this comment

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

I don't think the Pallet ID of simple-disputes is still required here. Maybe add to changelog for devs: Remove simple-disputes from the code base..

Copy link
Contributor

mergify bot commented Jun 24, 2024

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

@mergify mergify bot added s:revision-needed The pull requests must be revised and removed s:review-needed The pull request requires reviews labels Jun 24, 2024
@mergify mergify bot added the s:in-progress The pull requests is currently being worked on label Jun 24, 2024
@mergify mergify bot removed the s:revision-needed The pull requests must be revised label Jun 24, 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 Jun 24, 2024
@maltekliemann maltekliemann removed s:review-needed The pull request requires reviews labels Jun 24, 2024
@mergify mergify bot added the s:in-progress The pull requests is currently being worked on label Jun 24, 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 Jun 24, 2024
@maltekliemann maltekliemann added s:accepted This pull request is ready for merge and removed s:review-needed The pull request requires reviews labels Jun 25, 2024
Copy link
Contributor

mergify bot commented Jun 25, 2024

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

@mergify mergify bot added s:revision-needed The pull requests must be revised and removed s:accepted This pull request is ready for merge labels Jun 25, 2024
@mergify mergify bot added s:in-progress The pull requests is currently being worked on and removed s:revision-needed The pull requests must be revised labels Jun 25, 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 Jun 25, 2024
@maltekliemann maltekliemann added s:accepted This pull request is ready for merge and removed s:review-needed The pull request requires reviews labels Jul 8, 2024
@mergify mergify bot merged commit 9253a7a into develop-v0.5.4 Jul 8, 2024
31 checks passed
@mergify mergify bot deleted the mkl-remove-simple-disputes branch July 8, 2024 08:16
mergify bot added a commit that referenced this pull request Aug 12, 2024
* Remove structs mentioned under TODO(#986) (#1342)

* Remove structs under TODO(#968)

* Remove OldOutcomeInfo and related structs

* Satisfy check-license

* Include buy/sell hybrid-router calls in proxy filters (#1343)

* Include buy/sell calls in proxy filters

* Add hybrid-router calls to HandleAssets

---------

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

* Remove zrml-liquidity-mining (#1341)

* Remove zrml-liquidity-mining

* Fix formatting

* Fix copyright notices

* Remove zrml-liquidity-mining from benchmarks script

---------

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

* Update style guide (#1339)

* Be more strict with feature branch size

* Clarify our workflow

* Fix formatting

---------

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

* Revert "New Asset System (#1295)" (#1338)

* Revert "New Asset System (#1295)"

This reverts commit a956877.

* Fix formatting

* Update copyright

* Remove pallet-assets dependency

* Fix fuzz tests

* Remove zrml-rikiddo (#1340)

* Remove zrml-rikiddo

* Remove zrml-rikiddo from README

* Remove remnants of zrml-rikiddo

* Add note to changelog

* Remove Rikiddo constants from fuzz script

* Remove code owners

---------

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

* Remove zrml-simple-disputes and migrate markets (#1344)

* Remove zrml-simple-disputes and migrate markets

* Fix formatting

* Minor improvement

* Fix redundant match guard

* Remove unused pallet constant

* Fix formatting

* Merge `main` into `develop` (#1345)

* 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 <mail@maltekliemann.com>

* Update try-runtime* Makefile targets

---------

Co-authored-by: Malte Kliemann <mail@maltekliemann.com>

* 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 <mail@maltekliemann.com>

* 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 <mail@haraldheckmann.de>
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 <mail@haraldheckmann.de>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* Merge develop into develop-v0.5.4

* Update versions to v0.5.3

---------

Co-authored-by: Nikhil Saboo <36529278+saboonikhil@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Harald Heckmann <mail@haraldheckmann.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s:accepted This pull request is ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants