Merge branch 'develop' into settlement-small-improvements

Author: Neopallium

.maintain/frame-weight-template.hbs

@@ -30,7 +30,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
+use polymesh_primitives::{RocksDbWeight as DbWeight, Weight};
 
 /// Weights for {{pallet}} using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;

Cargo.lock

@@ -90,10 +90,8 @@ use pallet_permissions::with_call_metadata;
 use polymesh_primitives::multisig::{ProposalState, ProposalVoteCount};
 use polymesh_primitives::{
     extract_auth, storage_migration_ver, AuthorizationData, IdentityId, KeyRecord, Permissions,
-    Signatory,
+    RocksDbWeight as DbWeight, Signatory,
 };
-//use polymesh_runtime_common::RocksDbWeight as DbWeight;
-use frame_support::weights::constants::RocksDbWeight as DbWeight;
 
 pub trait WeightInfo {
     fn create_multisig(signers: u32) -> Weight;

contracts/nft_royalty/Cargo.lock

@@ -42,6 +42,7 @@ pub use sp_runtime::{Perbill, Permill};
 
 use pallet_balances as balances;
 use polymesh_primitives::constants::currency::*;
+pub use polymesh_primitives::RocksDbWeight;
 use polymesh_primitives::{Balance, BlockNumber, IdentityId, Moment};
 
 pub use cdd_check::CddChecker;
@@ -85,14 +86,6 @@ parameter_types! {
     pub const BlockExecutionWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_MILLIS.saturating_mul(20));
     /// 0.65 ms is needed to process an empty extrinsic.
     pub const ExtrinsicBaseWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_MICROS.saturating_mul(650));
-    /// When the read/writes are cached/buffered, they take 25/100 microseconds on NVMe disks.
-    /// When they are uncached, they take 250/450 microseconds on NVMe disks.
-    /// Most read will be cached and writes will be buffered in production.
-    /// We are taking a number slightly higher than what cached suggest to allow for some extra breathing room.
-    pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-        read: 50 * WEIGHT_REF_TIME_PER_MICROS,   // ~50 µs @ 100,000 items
-        write: 200 * WEIGHT_REF_TIME_PER_MICROS, // ~200 µs @ 100,000 items
-    };
     /// This implies a 100 POLYX fee per MB of transaction length
     pub const TransactionByteFee: Balance = 10 * MILLICENTS;
     /// We want the noop transaction to cost 0.03 POLYX

contracts/runtime-tester/Cargo.lock

@@ -79,7 +79,7 @@ macro_rules! misc_pallet_impls {
             /// Maximum number of block number to block hash mappings to keep (oldest pruned first).
             type BlockHashCount = polymesh_runtime_common::BlockHashCount;
             /// The weight of database operations that the runtime can invoke.
-            type DbWeight = polymesh_runtime_common::RocksDbWeight;
+            type DbWeight = polymesh_primitives::RocksDbWeight;
             /// Version of the runtime.
             type Version = Version;
             /// Converts a module to the index of the module in `construct_runtime!`.

contracts/settlements/Cargo.lock

@@ -41,7 +41,7 @@ pallet-sto = { workspace = true, default-features = false  }
 pallet-treasury = { workspace = true, default-features = false }
 pallet-utility = { workspace = true, default-features = false }
 polymesh-contracts = { workspace = true, default-features = false }
-polymesh-runtime-common = { workspace = true, default-features = false }
+polymesh-primitives = { workspace = true, default-features = false }
 
 [features]
 default = ["std"]
@@ -74,5 +74,5 @@ std = [
     "pallet-treasury/std",
     "pallet-utility/std",
     "polymesh-contracts/std",
-    "polymesh-runtime-common/std",
+    "polymesh-primitives/std",
 ]

contracts/upgradeable-polymesh-ink/Cargo.lock

@@ -48,7 +48,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
+use polymesh_primitives::{RocksDbWeight as DbWeight, Weight};
 
 /// Weights for frame_system using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;

contracts/upgradeable-polymesh-ink/examples/simple/Cargo.lock

@@ -48,7 +48,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
+use polymesh_primitives::{RocksDbWeight as DbWeight, Weight};
 
 /// Weights for pallet_asset using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;

contracts/wrapped-polyx/Cargo.lock

@@ -18,7 +18,7 @@
 //! Default weights for the Babe Pallet
 //! This file was not auto-generated.
 
-use polymesh_runtime_common::{
+use polymesh_primitives::{
     RocksDbWeight as DbWeight, Weight, WEIGHT_REF_TIME_PER_MICROS, WEIGHT_REF_TIME_PER_NANOS,
 };
 

integration/Cargo.lock

@@ -48,7 +48,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
+use polymesh_primitives::{RocksDbWeight as DbWeight, Weight};
 
 /// Weights for pallet_balances using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;

integration/contracts/call_runtime-tester/Cargo.lock

@@ -48,7 +48,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
+use polymesh_primitives::{RocksDbWeight as DbWeight, Weight};
 
 /// Weights for pallet_capital_distribution using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;

metadata-tools/Cargo.lock

@@ -48,7 +48,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
+use polymesh_primitives::{RocksDbWeight as DbWeight, Weight};
 
 /// Weights for pallet_checkpoint using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;

pallets/multisig/src/lib.rs

@@ -48,7 +48,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
+use polymesh_primitives::{RocksDbWeight as DbWeight, Weight};
 
 /// Weights for pallet_committee using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;