Merge release-v0.4.0 branch into main (#1103)

* Update versions to v0.4.0 (#1098) * Update weights (#1101) * Reduce length of `MarketsCollectingSubsidy` (#1118) * Add bad block of the proof size fiasko to Battery Station chain spec (#1119) Add bad block to Battery Station chain spec * Update weights v0.4.0 (#1121) * Update moonbeam dependencies (bench fix) * Update weights * Adapt arbitrage weight calculations to proof sizes (#1120) Include proof size into arbitrage weight estimates --------- Co-authored-by: Malte Kliemann <[email protected]>
zeitgeistpm · Oct 11, 2023 · fdda998 · fdda998
1 parent 575ebec
commit fdda998
Show file tree

Hide file tree

Showing 55 changed files with 5,995 additions and 3,120 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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.3.11"
+version = "0.4.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/node/res/bs_parachain.json b/node/res/bs_parachain.json
@@ -25,6 +25,9 @@
   "parachain_id": 2101,
   "relay_chain": "rococo",
   "consensusEngine": null,
+  "bad_blocks": [
+    "0x74d8c181547c1607ed28120f94cbe527cb3828772b3e794aabb45dc6a16e482d"
+  ],
   "codeSubstitutes": {},
   "genesis": {
     "raw": {
@@ -97,4 +100,4 @@
       "childrenDefault": {}
     }
   }
-}
+}
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -34,4 +34,4 @@ std = [
 authors = ["Zeitgeist PM <[email protected]>"]
 edition = "2021"
 name = "zeitgeist-primitives"
-version = "0.3.11"
+version = "0.4.0"
diff --git a/runtime/battery-station/Cargo.toml b/runtime/battery-station/Cargo.toml
@@ -410,7 +410,7 @@ try-runtime = [
 authors = ["Zeitgeist PM <[email protected]>"]
 edition = "2021"
 name = "battery-station-runtime"
-version = "0.3.11"
+version = "0.4.0"
 
 [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: 48,
+    spec_version: 49,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 23,
+    transaction_version: 24,
     state_version: 1,
 };
 

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -78,7 +78,7 @@ std = [
 authors = ["Zeitgeist PM <[email protected]>"]
 edition = "2021"
 name = "common-runtime"
-version = "0.3.11"
+version = "0.4.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -19,8 +19,10 @@
 //! Autogenerated weights for cumulus_pallet_xcmp_queue
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-08-04, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! DATE: `2023-09-20`, 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`
 
 // Executed Command:
 // ./target/production/zeitgeist
@@ -35,6 +37,7 @@
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --template=./misc/frame_weight_template.hbs
+// --header=./HEADER_GPL3
 // --output=./runtime/common/src/weights/
 
 #![allow(unused_parens)]
@@ -49,16 +52,26 @@ use frame_support::{
 /// Weight functions for cumulus_pallet_xcmp_queue (automatically generated)
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::weights::WeightInfo for WeightInfo<T> {
-    // Storage: XcmpQueue QueueConfig (r:1 w: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_u32() -> Weight {
-        Weight::from_ref_time(16_530_000)
-            .saturating_add(T::DbWeight::get().reads(1))
-            .saturating_add(T::DbWeight::get().writes(1))
+        // Proof Size summary in bytes:
+        //  Measured:  `109`
+        //  Estimated: `604`
+        // Minimum execution time: 8_490 nanoseconds.
+        Weight::from_parts(10_580_000, 604)
+            .saturating_add(T::DbWeight::get().reads(1_u64))
+            .saturating_add(T::DbWeight::get().writes(1_u64))
     }
-    // Storage: XcmpQueue QueueConfig (r:1 w: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 {
-        Weight::from_ref_time(13_770_000)
-            .saturating_add(T::DbWeight::get().reads(1))
-            .saturating_add(T::DbWeight::get().writes(1))
+        // Proof Size summary in bytes:
+        //  Measured:  `109`
+        //  Estimated: `604`
+        // Minimum execution time: 8_690 nanoseconds.
+        Weight::from_parts(9_020_000, 604)
+            .saturating_add(T::DbWeight::get().reads(1_u64))
+            .saturating_add(T::DbWeight::get().writes(1_u64))
     }
 }