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 main into develop #1345

Merged
merged 11 commits into from
Jul 8, 2024
Merged

Merge main into develop #1345

merged 11 commits into from
Jul 8, 2024

Commits on Jun 25, 2024

  1. 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>
    3 people authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    38e279d View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Merge

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

Commits on Jul 7, 2024

  1. Configuration menu
    Copy the full SHA
    3abcc37 View commit details
    Browse the repository at this point in the history
  2. Fix benchmark

    maltekliemann committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    fec0e86 View commit details
    Browse the repository at this point in the history
  3. Fix compiler error

    maltekliemann committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    6d1c61c View commit details
    Browse the repository at this point in the history
  4. Fix tests and imports

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

Commits on Jul 8, 2024

  1. Fix imports (again...)

    maltekliemann committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    69c19fc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0511828 View commit details
    Browse the repository at this point in the history
  3. Fix fuzz tests

    maltekliemann committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5b71e1d View commit details
    Browse the repository at this point in the history
  4. Fix formatting

    maltekliemann committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    28b99af View commit details
    Browse the repository at this point in the history
  5. Fix orderbook fuzz

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