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 #1354

Merged
merged 18 commits into from
Sep 13, 2024
Merged

Commits on Jun 24, 2024

  1. 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
    maltekliemann authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    58f6a78 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. 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>
    3 people authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    19a3534 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c02dfda View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    142df85 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Restructure math module

    maltekliemann committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    699ff0a View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. More scaffolding

    maltekliemann committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    f9d2827 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Configuration menu
    Copy the full SHA
    9f762ae View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Configuration menu
    Copy the full SHA
    380d935 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0dec624 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ff0070f View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Remove println!

    maltekliemann committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    055e0b8 View commit details
    Browse the repository at this point in the history
  2. Implement equalization

    maltekliemann committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    325f8a0 View commit details
    Browse the repository at this point in the history
  3. Implement selling

    maltekliemann committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    f83fb63 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Configuration menu
    Copy the full SHA
    85af626 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6eb6645 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Configuration menu
    Copy the full SHA
    d5941bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5e7691e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    402c1cc View commit details
    Browse the repository at this point in the history