Implement Combinatorial Betting and Futarchy #1364

maltekliemann · 2024-09-13T13:16:32Z

No description provided.

* 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 * 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 <[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> * Update versions to v0.5.3 * Restructure math module * More scaffolding * Implement combinatorial buy math * Implement price calculation for combo * Remove `println!` * Implement equalization * Implement selling * Add tests for combinatorial buying * Add more tests for combinatorial buying * Add tests for equalization * Add more tests/corner cases * Implement full testing, fix critical bug --------- Co-authored-by: Harald Heckmann <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* Implement classical buying using combinatorial buys * Calculate classical sells with combinatorial math * Implement `combo_buy` * Implement `combo_sell`

* Fix compiler and clippy issues * Fix formatting * Fix tests

* Scaffold combo pallet * Fix dependencies/features

* More scaffolding * Add `IdManager` trait * Scaffold ID manager * Use generics * WIP * Rough outline of `CryptographicIdManager` implementation * Improve `MaybeToBytes` implementation for `bool` * Implement pseudo-root * Add more tests * Implement `quadratic_residue` and add tests * Partial implementation of decompression algorithm * Loads of cleaning up * Refactor * Clean up `hash_pair` * Simplify interface * Simplify serialization * More cleanup * Clean up and tests * Better `ToBytes` implementation * Abstract `decompressor` tests * Reorganize tests * Minor clean up * More clean up * Test `get_collection_id`, fix bugs * Clean up * Expose `force_max_work` parameter and test it properly * Properly forget dummies * Add more tests * Fix some error handling, docs, and add missing tests * Prettify

* Extend `Config` * wip * Some refactors * Implement splitting tokens * Implement merging tokens

…1370) * . * Use `core::hint` * Replace `halo2curves` dependency with `ark-*` dependency * Fix clippy issues * Fix formatting

* Add mock for zrml-combinatorial-tokens * Add test framework * Add negative tests for `split_token` * Add more tests, fix some bugs, extend `Event` object * Add more tests * Add more integration tests * Add more integration tests * Add more integration tests * More tests * Add merge tests * final tests * fixes

codecov-commenter · 2024-10-13T17:23:06Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 95.54377% with 252 lines in your changes missing coverage. Please review.

Project coverage is 93.44%. Comparing base (36faa40) to head (d3bf2b2).
Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
zrml/neo-swaps/src/lib.rs	85.34%	62 Missing ⚠️
zrml/combinatorial-tokens/src/lib.rs	85.40%	41 Missing ⚠️
...waps/src/types/decision_market_benchmark_helper.rs	0.00%	41 Missing ⚠️
zrml/neo-swaps/src/migration.rs	89.95%	21 Missing ⚠️
zrml/futarchy/src/lib.rs	72.22%	15 Missing ⚠️
...aps/src/types/decision_market_oracle_scoreboard.rs	74.13%	15 Missing ⚠️
primitives/src/types.rs	0.00%	12 Missing ⚠️
zrml/futarchy/src/mock/types/scheduler.rs	71.42%	12 Missing ⚠️
zrml/futarchy/src/weights.rs	68.96%	9 Missing ⚠️
zrml/neo-swaps/src/types/decision_market_oracle.rs	82.75%	5 Missing ⚠️
... and 7 more

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

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1364      +/-   ##
==========================================
+ Coverage   93.19%   93.44%   +0.24%     
==========================================
  Files         131      183      +52     
  Lines       29245    34953    +5708     
==========================================
+ Hits        27256    32662    +5406     
- Misses       1989     2291     +302

Flag	Coverage Δ
tests	`93.44% <95.54%> (+0.24%)`	⬆️

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.

* Add numerical thresholds to combinatorial betting * Add protected `exp` for normal bets * Ensure correctness of partitions * Check partitions

* Add licenses * Add remark about LGPL-3.0 licensing by Gnosis

* Fix formatting * Fix mess with copyright notices

maltekliemann added the s:in-progress The pull requests is currently being worked on label Sep 13, 2024

maltekliemann added this to the v0.7.0 milestone Sep 13, 2024

maltekliemann added 3 commits September 17, 2024 13:41

Implement combinatorial betting extrinsics (#1365)

c0a0598

* Implement classical buying using combinatorial buys * Calculate classical sells with combinatorial math * Implement `combo_buy` * Implement `combo_sell`

Fix compiler and clippy issues (#1366)

d45ecf4

* Fix compiler and clippy issues * Fix formatting * Fix tests

Scaffold combo pallet (#1367)

2bd5e6c

* Scaffold combo pallet * Fix dependencies/features

maltekliemann requested a review from sea212 as a code owner September 24, 2024 14:10

maltekliemann added 4 commits October 3, 2024 10:35

Implement zrml-combo extrinsics (#1369)

a04d02e

* Extend `Config` * wip * Some refactors * Implement splitting tokens * Implement merging tokens

Replace halo2curves and ethnum dependency and fix clippy issues (#…

fba1a07

…1370) * . * Use `core::hint` * Replace `halo2curves` dependency with `ark-*` dependency * Fix clippy issues * Fix formatting

maltekliemann added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on labels Oct 13, 2024

Refine combinatorial betting (#1372)

d0a07a5

* Add numerical thresholds to combinatorial betting * Add protected `exp` for normal bets * Ensure correctness of partitions * Check partitions

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 Oct 13, 2024

Update copyright notices (#1373)

45aeeb8

* Add licenses * Add remark about LGPL-3.0 licensing by Gnosis

maltekliemann added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on labels Oct 13, 2024

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 Oct 13, 2024

maltekliemann added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on labels Oct 13, 2024

Fix compiler errors (#1374)

d87ae7c

* Fix formatting * Fix mess with copyright notices

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 Oct 13, 2024

maltekliemann added s:review-needed The pull request requires reviews and removed s:in-progress The pull requests is currently being worked on labels Oct 13, 2024

Format Cargo.toml files (#1375)

c4e50d4

fix copyrights

929df7d