update substrate to polkadot-v0.9.40 (polkadot-evm#1026)

* update substrate to polkadot-v0.9.40 * some improvements and remove RpcResult alias * fix compilation error --------- Co-authored-by: Wei Tang <wei@pacna.org>
AstarNetwork · May 28, 2023 · a39a6fd · a39a6fd
1 parent c1e014f
commit a39a6fd
Show file tree

Hide file tree

Showing 60 changed files with 949 additions and 792 deletions.
diff --git a/benchmarking/frame-weight-template.hbs → .maintain/frame-weight-template.hbs b/benchmarking/frame-weight-template.hbs → .maintain/frame-weight-template.hbs
@@ -1,24 +1,9 @@
-// SPDX-License-Identifier: Apache-2.0
-// This file is part of Frontier.
-//
-// Copyright (c) 2020-2022 Parity Technologies (UK) Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+{{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}}`
+//! 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}}
 
@@ -30,9 +15,10 @@
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(missing_docs)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weight functions needed for {{pallet}}.
 pub trait WeightInfo {
@@ -54,7 +40,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 {{/if}}
  {{#each benchmarks as |benchmark|}}
  {{#each benchmark.comments as |comment|}}
- // {{comment}}
+ /// {{comment}}
  {{/each}}
  {{#each benchmark.component_ranges as |range|}}
  /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
@@ -64,22 +50,29 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
  {{~#each benchmark.components as |c| ~}}
  {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
  ) -> Weight {
- Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
+ // 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}}_000 picoseconds.
+ Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
  {{#each benchmark.component_weight as |cw|}}
  // Standard Error: {{underscore cw.error}}
- .saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
+ .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
  {{/each}}
  {{#if (ne benchmark.base_reads "0")}}
- .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as u64))
+ .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}} as u64).saturating_mul({{cr.name}} as u64)))
+ .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}} as u64))
+ .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}} as u64).saturating_mul({{cw.name}} as u64)))
+ .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_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
  {{/each}}
  }
  {{/each}}
@@ -89,7 +82,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
  {{#each benchmarks as |benchmark|}}
  {{#each benchmark.comments as |comment|}}
- // {{comment}}
+ /// {{comment}}
  {{/each}}
  {{#each benchmark.component_ranges as |range|}}
  /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
@@ -99,22 +92,29 @@ impl WeightInfo for () {
  {{~#each benchmark.components as |c| ~}}
  {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
  ) -> Weight {
- Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
+ // 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}}_000 picoseconds.
+ Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
  {{#each benchmark.component_weight as |cw|}}
  // Standard Error: {{underscore cw.error}}
- .saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
+ .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
  {{/each}}
  {{#if (ne benchmark.base_reads "0")}}
- .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as u64))
+ .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64))
  {{/if}}
  {{#each benchmark.component_reads as |cr|}}
- .saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
+ .saturating_add(RocksDbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
  {{/each}}
  {{#if (ne benchmark.base_writes "0")}}
- .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as u64))
+ .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}}_u64))
  {{/if}}
  {{#each benchmark.component_writes as |cw|}}
- .saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
+ .saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
+ {{/each}}
+ {{#each benchmark.component_calculated_proof_size as |cp|}}
+ .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
  {{/each}}
  }
  {{/each}}