Update dependencies to v0.9.38 (#1079)

* Update dependencies to v0.9.38 * Add migrations * Use upper case copyright name Strange, locally the copyright script says: "All copyright notices are up to date! 🍉" On GH pipeline: "error: zrml/prediction-markets/src/benchmarks.rs: no copyright notice for Forecasting Technologies LTD found" * Update weight templates * Use header option for benchmarks Also format benchmark script and moves header file into HEADER_GPL3. * Update rust-toolchain * Use patched wasm-builder for new rustc
zeitgeistpm · Aug 25, 2023 · 30c7414 · 30c7414
1 parent 256deb3
commit 30c7414
Show file tree

Hide file tree

Showing 38 changed files with 1,674 additions and 1,235 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/file_header.txt → HEADER_GPL3 b/file_header.txt → HEADER_GPL3
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
 // Copyright 2021-2022 Zeitgeist PM LLC.
 //
 // This file is part of Zeitgeist.

diff --git a/misc/frame_weight_template.hbs b/misc/frame_weight_template.hbs
@@ -1,26 +1,11 @@
-// Copyright 2022-2023 Forecasting Technologies LTD.
-// Copyright 2021-2022 Zeitgeist PM LLC.
-//
-// This file is part of Zeitgeist.
-//
-// Zeitgeist is free software: you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the
-// Free Software Foundation, either version 3 of the License, or (at
-// your option) any later version.
-//
-// Zeitgeist is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
-
+{{header}}
 //! Autogenerated weights for {{pallet}}
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
-//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
-//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+//! DATE: `{{date}}`, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
+//! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}`
+//! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
+//! EXECUTION: `{{cmd.execution}}`, WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}`
 
 // Executed Command:
 {{#each args as |arg|}}
@@ -38,30 +23,38 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> {{pallet}}::weights::WeightInfo for WeightInfo<T> {
     {{#each benchmarks as |benchmark|}}
     {{#each benchmark.comments as |comment|}}
-    // {{comment}}
+    /// {{comment}}
     {{/each}}
     fn {{benchmark.name~}}
     (
         {{~#each benchmark.components as |c| ~}}
         {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
     ) -> Weight {
+        // Proof Size summary in bytes:
+        //  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
+        //  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
+        // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
+        {{#if (ne benchmark.base_calculated_proof_size "0")}}
+        Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
+        {{else}}
         Weight::from_ref_time({{underscore benchmark.base_weight}})
+        {{/if}}
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
             .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
             .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
             {{/if}}
-            {{#each benchmark.component_writes as |cw|}}
-            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
-            {{/each}}
+            {{#each benchmark.component_calculated_proof_size as |cp|}}
+			.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
+			{{/each}}
     }
     {{/each}}
 }
diff --git a/misc/orml_weight_template.hbs b/misc/orml_weight_template.hbs
@@ -1,27 +1,11 @@
-// Copyright 2022-2023 Forecasting Technologies LTD.
-// Copyright 2021-2022 Zeitgeist PM LLC.
-//
-// This file is part of Zeitgeist.
-//
-// Zeitgeist is free software: you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the
-// Free Software Foundation, either version 3 of the License, or (at
-// your option) any later version.
-//
-// Zeitgeist is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
-
 {{header}}
 //! Autogenerated weights for {{pallet}}
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
-//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
-//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+//! DATE: `{{date}}`, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
+//! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}`
+//! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
+//! EXECUTION: `{{cmd.execution}}`, WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}`
 
 // Executed Command:
 {{#each args as |arg|}}
@@ -39,30 +23,38 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
     {{#each benchmarks as |benchmark|}}
     {{#each benchmark.comments as |comment|}}
-    // {{comment}}
+    /// {{comment}}
     {{/each}}
     fn {{benchmark.name~}}
     (
         {{~#each benchmark.components as |c| ~}}
         {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
     ) -> Weight {
+        // Proof Size summary in bytes:
+        //  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
+        //  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
+        // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
+        {{#if (ne benchmark.base_calculated_proof_size "0")}}
+        Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
+        {{else}}
         Weight::from_ref_time({{underscore benchmark.base_weight}})
+        {{/if}}
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
             .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
             .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
             {{/if}}
-            {{#each benchmark.component_writes as |cw|}}
-            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
-            {{/each}}
+            {{#each benchmark.component_calculated_proof_size as |cp|}}
+			.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
+			{{/each}}
     }
     {{/each}}
 }
diff --git a/misc/weight_template.hbs b/misc/weight_template.hbs
@@ -1,27 +1,11 @@
-// Copyright 2022-2023 Forecasting Technologies LTD.
-// Copyright 2021-2022 Zeitgeist PM LLC.
-//
-// This file is part of Zeitgeist.
-//
-// Zeitgeist is free software: you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the
-// Free Software Foundation, either version 3 of the License, or (at
-// your option) any later version.
-//
-// Zeitgeist is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
-
 {{header}}
 //! Autogenerated weights for {{pallet}}
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
-//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
-//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+//! DATE: `{{date}}`, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
+//! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}`
+//! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
+//! EXECUTION: `{{cmd.execution}}`, WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}`
 
 // Executed Command:
 {{#each args as |arg|}}
@@ -51,30 +35,38 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     {{#each benchmarks as |benchmark|}}
     {{#each benchmark.comments as |comment|}}
-    // {{comment}}
+    /// {{comment}}
     {{/each}}
     fn {{benchmark.name~}}
     (
         {{~#each benchmark.components as |c| ~}}
         {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
     ) -> Weight {
+        // Proof Size summary in bytes:
+        //  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
+        //  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
+        // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
+        {{#if (ne benchmark.base_calculated_proof_size "0")}}
+        Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
+        {{else}}
         Weight::from_ref_time({{underscore benchmark.base_weight}})
+        {{/if}}
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
             .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
             .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
             {{/if}}
-            {{#each benchmark.component_writes as |cw|}}
-            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
-            {{/each}}
+            {{#each benchmark.component_calculated_proof_size as |cp|}}
+			.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
+			{{/each}}
     }
     {{/each}}
 }
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -20,6 +20,7 @@ sc-keystore = { workspace = true }
 sc-rpc = { workspace = true }
 sc-rpc-api = { workspace = true }
 sc-service = { workspace = true }
+sc-storage-monitor = { workspace = true }
 sc-sysinfo = { workspace = true }
 sc-telemetry = { workspace = true }
 sc-transaction-pool = { workspace = true }
@@ -168,6 +169,7 @@ runtime-benchmarks = [
     "frame-benchmarking-cli/runtime-benchmarks",
     "polkadot-cli?/runtime-benchmarks",
     "polkadot-service?/runtime-benchmarks",
+    "polkadot-test-service?/runtime-benchmarks",
     "zeitgeist-runtime?/runtime-benchmarks",
 ]
 try-runtime = [

diff --git a/node/src/cli.rs b/node/src/cli.rs
@@ -206,6 +206,10 @@ pub struct Cli {
     #[cfg(feature = "parachain")]
     #[clap(long)]
     pub parachain_id: Option<u32>,
+
+    #[allow(missing_docs)]
+    #[clap(flatten)]
+    pub storage_monitor: sc_storage_monitor::StorageMonitorParams,
 }
 
 impl SubstrateCli for Cli {
@@ -479,13 +483,13 @@ impl sc_client_api::StorageProvider<Block, FullBackend> for Client {
         match_client!(self, storage_pairs(hash, key_prefix))
     }
 
-    fn storage_keys_iter<'a>(
+    fn storage_keys_iter(
         &self,
         hash: <Block as BlockT>::Hash,
-        prefix: Option<&'a StorageKey>,
+        prefix: Option<&StorageKey>,
         start_key: Option<&StorageKey>,
     ) -> sp_blockchain::Result<
-        KeyIterator<'a, <FullBackend as sc_client_api::Backend<Block>>::State, Block>,
+        KeyIterator<<FullBackend as sc_client_api::Backend<Block>>::State, Block>,
     > {
         match_client!(self, storage_keys_iter(hash, prefix, start_key))
     }
@@ -508,14 +512,14 @@ impl sc_client_api::StorageProvider<Block, FullBackend> for Client {
         match_client!(self, child_storage_keys(hash, child_info, key_prefix))
     }
 
-    fn child_storage_keys_iter<'a>(
+    fn child_storage_keys_iter(
         &self,
         hash: <Block as BlockT>::Hash,
         child_info: ChildInfo,
-        prefix: Option<&'a StorageKey>,
+        prefix: Option<&StorageKey>,
         start_key: Option<&StorageKey>,
     ) -> sp_blockchain::Result<
-        KeyIterator<'a, <FullBackend as sc_client_api::Backend<Block>>::State, Block>,
+        KeyIterator<<FullBackend as sc_client_api::Backend<Block>>::State, Block>,
     > {
         match_client!(self, child_storage_keys_iter(hash, child_info, prefix, start_key))
     }

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -484,7 +484,7 @@ pub fn run() -> sc_cli::Result<()> {
         Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \
                                              You can enable it with `--features try-runtime`."
             .into()),
-        None => none_command(&cli),
+        None => none_command(cli),
     }
 }
 
@@ -499,7 +499,7 @@ fn extract_genesis_wasm(chain_spec: Box<dyn sc_service::ChainSpec>) -> sc_cli::R
 }
 
 #[cfg(feature = "parachain")]
-fn none_command(cli: &Cli) -> sc_cli::Result<()> {
+fn none_command(cli: Cli) -> sc_cli::Result<()> {
     let runner = cli.create_runner(&cli.run.normalize())?;
 
     runner.run_node_until_exit(|parachain_config| async move {
@@ -533,14 +533,12 @@ fn none_command(cli: &Cli) -> sc_cli::Result<()> {
         log::info!("Parachain Account: {}", parachain_account);
         log::info!("Parachain genesis state: {}", genesis_state);
 
-        let hwbench = if !cli.no_hardware_benchmarks {
-            parachain_config.database.path().map(|database_path| {
+        let hwbench = (!cli.no_hardware_benchmarks)
+            .then_some(parachain_config.database.path().map(|database_path| {
                 let _ = std::fs::create_dir_all(database_path);
                 sc_sysinfo::gather_hwbench(Some(database_path))
-            })
-        } else {
-            None
-        };
+            }))
+            .flatten();
 
         log::info!(
             "Is collating: {}",
@@ -585,31 +583,24 @@ fn none_command(cli: &Cli) -> sc_cli::Result<()> {
 }
 
 #[cfg(not(feature = "parachain"))]
-fn none_command(cli: &Cli) -> sc_cli::Result<()> {
+fn none_command(cli: Cli) -> sc_cli::Result<()> {
     let runner = cli.create_runner(&cli.run)?;
     runner.run_node_until_exit(|config| async move {
         match &config.chain_spec {
             #[cfg(feature = "with-zeitgeist-runtime")]
-            spec if spec.is_zeitgeist() => new_full::<ZeitgeistRuntimeApi, ZeitgeistExecutor>(
-                config,
-                cli.no_hardware_benchmarks,
-            )
-            .map_err(sc_cli::Error::Service),
+            spec if spec.is_zeitgeist() => {
+                new_full::<ZeitgeistRuntimeApi, ZeitgeistExecutor>(config, cli)
+                    .map_err(sc_cli::Error::Service)
+            }
             #[cfg(feature = "with-battery-station-runtime")]
-            _ => new_full::<BatteryStationRuntimeApi, BatteryStationExecutor>(
-                config,
-                cli.no_hardware_benchmarks,
-            )
-            .map_err(sc_cli::Error::Service),
+            _ => new_full::<BatteryStationRuntimeApi, BatteryStationExecutor>(config, cli)
+                .map_err(sc_cli::Error::Service),
             #[cfg(all(
                 not(feature = "with-battery-station-runtime"),
                 feature = "with-zeitgeist-runtime"
             ))]
-            _ => new_full::<ZeitgeistRuntimeApi, ZeitgeistExecutor>(
-                config,
-                cli.no_hardware_benchmarks,
-            )
-            .map_err(sc_cli::Error::Service),
+            _ => new_full::<ZeitgeistRuntimeApi, ZeitgeistExecutor>(config, cli)
+                .map_err(sc_cli::Error::Service),
             #[cfg(all(
                 not(feature = "with-battery-station-runtime"),
                 not(feature = "with-zeitgeist-runtime")

diff --git a/node/src/service.rs b/node/src/service.rs
@@ -201,7 +201,7 @@ pub fn new_chain_ops(
 
 #[allow(clippy::type_complexity)]
 fn new_chain_ops_inner<RuntimeApi, Executor>(
-    mut config: &mut Configuration,
+    config: &mut Configuration,
 ) -> Result<
     (
         Arc<Client>,