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

Implement Combinatorial Betting and Futarchy #1364

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Commits on Sep 13, 2024

  1. Implement Combinatorial Betting (#1354)

    * 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 <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>
    
    * 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 <mail@haraldheckmann.de>
    Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
    3 people committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ff21a04 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Implement combinatorial betting extrinsics (#1365)

    * Implement classical buying using combinatorial buys
    
    * Calculate classical sells with combinatorial math
    
    * Implement `combo_buy`
    
    * Implement `combo_sell`
    maltekliemann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    c0a0598 View commit details
    Browse the repository at this point in the history