Merge branch 'main' into sea212-fix-invalid-changelog-reference

zeitgeistpm · Apr 5, 2024 · 37a377f · 37a377f
2 parents 687d0e2 + ff6628c
commit 37a377f
Show file tree

Hide file tree

Showing 66 changed files with 2,109 additions and 2,265 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,6 +1,7 @@
 pull_request_rules:
-  - name: Auto merge
+  - name: Auto merge (main)
     conditions:
+      - base=main
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
       - check-success=Coverage
@@ -21,6 +22,28 @@ pull_request_rules:
           - s:review-needed
       queue:
         merge_method: squash
+  - name: Auto merge (feature branch)
+    conditions:
+      - base!=main
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - check-success=Coverage
+      - check-success=Format
+      - check-success=Checks (clippy)
+      - check-success=Checks (parachain)
+      - check-success=Checks (standalone)
+      - check-success=Quick check benchmarks
+      - check-success=Test standalone build
+      - check-success=Test parachain build
+      - check-success=Fuzz
+      - label=s:accepted
+    actions:
+      label:
+        remove:
+          - s:in-progress
+          - s:review-needed
+      queue:
+        merge_method: squash
   - name: ask to resolve conflict
     conditions:
       - conflict

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
@@ -2,4 +2,4 @@
 authors = ["Zeitgeist PM <[email protected]>"]
 edition = "2021"
 name = "zeitgeist-macros"
-version = "0.5.0"
+version = "0.5.1"
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -187,7 +187,7 @@ description = "An evolving blockchain for prediction markets and futarchy."
 edition = "2021"
 homepage = "https://zeitgeist.pm"
 name = "zeitgeist-node"
-version = "0.5.0"
+version = "0.5.1"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -40,4 +40,4 @@ std = [
 authors = ["Zeitgeist PM <[email protected]>"]
 edition = "2021"
 name = "zeitgeist-primitives"
-version = "0.5.0"
+version = "0.5.1"
diff --git a/runtime/battery-station/Cargo.toml b/runtime/battery-station/Cargo.toml
@@ -426,7 +426,7 @@ force-debug = ["sp-debug-derive/force-debug"]
 authors = ["Zeitgeist PM <[email protected]>"]
 edition = "2021"
 name = "battery-station-runtime"
-version = "0.5.0"
+version = "0.5.1"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/runtime/battery-station/src/lib.rs b/runtime/battery-station/src/lib.rs
@@ -105,10 +105,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("zeitgeist"),
     impl_name: create_runtime_str!("zeitgeist"),
     authoring_version: 1,
-    spec_version: 53,
+    spec_version: 54,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 27,
+    transaction_version: 28,
     state_version: 1,
 };
 

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -82,7 +82,7 @@ std = [
 authors = ["Zeitgeist PM <[email protected]>"]
 edition = "2021"
 name = "common-runtime"
-version = "0.5.0"
+version = "0.5.1"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -55,13 +55,12 @@ macro_rules! decl_common_types {
         use orml_traits::MultiCurrency;
         use sp_runtime::{generic, DispatchError, DispatchResult, SaturatedConversion};
         use zeitgeist_primitives::traits::{DeployPoolApi, DistributeFees, MarketCommonsPalletApi};
-        use zrml_court::migrations::MigrateCourtPoolItems;
 
         pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
         type Address = sp_runtime::MultiAddress<AccountId, ()>;
 
-        type Migrations = (MigrateCourtPoolItems<Runtime>,);
+        type Migrations = ();
 
         pub type Executive = frame_executive::Executive<
             Runtime,

diff --git a/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for cumulus_pallet_xcmp_queue
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: `2024-01-15`, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: `2024-04-03`, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `zeitgeist-benchmark`, CPU: `AMD EPYC 7601 32-Core Processor`
 //! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
@@ -56,21 +56,21 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::weights::WeightInfo for
     /// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
     fn set_config_with_u32() -> Weight {
         // Proof Size summary in bytes:
-        //  Measured:  `142`
-        //  Estimated: `637`
-        // Minimum execution time: 9_070 nanoseconds.
-        Weight::from_parts(11_070_000, 637)
+        //  Measured:  `175`
+        //  Estimated: `670`
+        // Minimum execution time: 10_090 nanoseconds.
+        Weight::from_parts(11_060_000, 670)
             .saturating_add(T::DbWeight::get().reads(1))
             .saturating_add(T::DbWeight::get().writes(1))
     }
     /// Storage: XcmpQueue QueueConfig (r:1 w:1)
     /// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
     fn set_config_with_weight() -> Weight {
         // Proof Size summary in bytes:
-        //  Measured:  `142`
-        //  Estimated: `637`
-        // Minimum execution time: 9_260 nanoseconds.
-        Weight::from_parts(10_780_000, 637)
+        //  Measured:  `175`
+        //  Estimated: `670`
+        // Minimum execution time: 10_390 nanoseconds.
+        Weight::from_parts(10_900_000, 670)
             .saturating_add(T::DbWeight::get().reads(1))
             .saturating_add(T::DbWeight::get().writes(1))
     }