Skip to content

Commit

Permalink
Merge main into develop (#1345)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people authored Jul 8, 2024
1 parent 58f6a78 commit 19a3534
Show file tree
Hide file tree
Showing 166 changed files with 11,060 additions and 9,430 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Free up disk space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
tool-cache: true

- name: Install rust toolchain
run: rustup show
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Free up disk space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
tool-cache: true

- name: Install build tools
run: ./scripts/init.sh
Expand All @@ -84,7 +84,7 @@ jobs:
- name: Free up disk space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
tool-cache: true

- name: Install build tools
run: ./scripts/init.sh
Expand All @@ -106,7 +106,7 @@ jobs:
- name: Free up disk space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
tool-cache: true

- name: Install build tools
run: ./scripts/init.sh
Expand All @@ -132,7 +132,7 @@ jobs:
- name: Free up disk space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
tool-cache: true

- name: Install build tools
run: ./scripts/init.sh
Expand All @@ -158,7 +158,7 @@ jobs:
- name: Free up disk space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
tool-cache: true

- name: Install build tools
run: ./scripts/init.sh
Expand Down
Loading

0 comments on commit 19a3534

Please sign in to comment.