difftreelog
Merge pull request #1000 from UniqueNetwork/fix/minting-prop-weight
in: master
Refactor property writing + dev mode enhancements
42 files changed
.docker/Dockerfile-chain-devdiffbeforeafterboth--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -21,7 +21,7 @@
WORKDIR /dev_chain
-RUN cargo build --release
+RUN cargo build --profile integration-tests --features=${NETWORK}-runtime
RUN echo "$NETWORK"
-CMD cargo run --release --features=${NETWORK}-runtime -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
+CMD cargo run --profile integration-tests --features=${NETWORK}-runtime -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
.docker/Dockerfile-uniquediffbeforeafterboth--- a/.docker/Dockerfile-unique
+++ b/.docker/Dockerfile-unique
@@ -47,7 +47,7 @@
--mount=type=cache,target=/unique_parachain/unique-chain/target \
cd unique-chain && \
echo "Using runtime features '$RUNTIME_FEATURES'" && \
- CARGO_INCREMENTAL=0 cargo build --release --features="$RUNTIME_FEATURES" --locked && \
+ CARGO_INCREMENTAL=0 cargo build --profile integration-tests --features="$RUNTIME_FEATURES" --locked && \
mv ./target/release/unique-collator /unique_parachain/unique-chain/ && \
cd target/release/wbuild && find . -name "*.wasm" -exec sh -c 'mkdir -p "../../../wasm/$(dirname {})"; cp {} "../../../wasm/{}"' \;
.docker/docker-compose.gov.j2diffbeforeafterboth--- a/.docker/docker-compose.gov.j2
+++ b/.docker/docker-compose.gov.j2
@@ -21,4 +21,4 @@
options:
max-size: "1m"
max-file: "3"
- command: cargo run --release --features={{ NETWORK }}-runtime,gov-test-timings -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
+ command: cargo run --profile integration-tests --features={{ NETWORK }}-runtime,gov-test-timings -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
Cargo.tomldiffbeforeafterboth--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,6 +24,10 @@
lto = true
opt-level = 3
+[profile.integration-tests]
+inherits = "release"
+debug-assertions = true
+
[workspace.dependencies]
# Unique
app-promotion-rpc = { path = "primitives/app_promotion_rpc", default-features = false }
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@
.PHONY: _bench
_bench:
- cargo run --release --features runtime-benchmarks,$(RUNTIME) -- \
+ cargo run --profile production --features runtime-benchmarks,$(RUNTIME) -- \
benchmark pallet --pallet pallet-$(if $(PALLET),$(PALLET),$(error Must set PALLET)) \
--wasm-execution compiled --extrinsic '*' \
$(if $(TEMPLATE),$(TEMPLATE),--template=.maintain/frame-weight-template.hbs) --steps=50 --repeat=80 --heap-pages=4096 \
node/cli/src/cli.rsdiffbeforeafterboth--- a/node/cli/src/cli.rs
+++ b/node/cli/src/cli.rs
@@ -80,10 +80,20 @@
/// an empty block will be sealed automatically
/// after the `--idle-autoseal-interval` milliseconds.
///
- /// The default interval is 500 milliseconds
+ /// The default interval is 500 milliseconds.
#[structopt(default_value = "500", long)]
pub idle_autoseal_interval: u64,
+ /// Disable auto-sealing blocks on new transactions in the `--dev` mode.
+ #[structopt(long)]
+ pub disable_autoseal_on_tx: bool,
+
+ /// Finalization delay (in seconds) of auto-sealed blocks in the `--dev` mode.
+ ///
+ /// Disabled by default.
+ #[structopt(long)]
+ pub autoseal_finalization_delay: Option<u64>,
+
/// Disable automatic hardware benchmarks.
///
/// By default these benchmarks are automatically ran at startup and measure
node/cli/src/command.rsdiffbeforeafterboth--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -62,7 +62,6 @@
use sc_service::config::{BasePath, PrometheusConfig};
use sp_core::hexdisplay::HexDisplay;
use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
-use std::{time::Duration};
use up_common::types::opaque::{Block, RuntimeId};
@@ -480,15 +479,13 @@
if is_dev_service {
info!("Running Dev service");
-
- let autoseal_interval = Duration::from_millis(cli.idle_autoseal_interval);
let mut config = config;
config.state_pruning = Some(sc_service::PruningMode::ArchiveAll);
return start_node_using_chain_runtime! {
- start_dev_node(config, autoseal_interval).map_err(Into::into)
+ start_dev_node(config, cli.idle_autoseal_interval, cli.autoseal_finalization_delay, cli.disable_autoseal_on_tx).map_err(Into::into)
};
};
node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -169,9 +169,9 @@
}
impl AutosealInterval {
- pub fn new(config: &Configuration, interval: Duration) -> Self {
+ pub fn new(config: &Configuration, interval: u64) -> Self {
let _tokio_runtime = config.tokio_handle.enter();
- let interval = tokio::time::interval(interval);
+ let interval = tokio::time::interval(Duration::from_millis(interval));
Self { interval }
}
@@ -885,7 +885,9 @@
/// the parachain inherent
pub fn start_dev_node<Runtime, RuntimeApi, ExecutorDispatch>(
config: Configuration,
- autoseal_interval: Duration,
+ autoseal_interval: u64,
+ autoseal_finalize_delay: Option<u64>,
+ disable_autoseal_on_tx: bool,
) -> sc_service::error::Result<TaskManager>
where
Runtime: RuntimeInstance + Send + Sync + 'static,
@@ -912,7 +914,10 @@
+ sp_consensus_aura::AuraApi<Block, AuraId>,
ExecutorDispatch: NativeExecutionDispatch + 'static,
{
- use sc_consensus_manual_seal::{run_manual_seal, EngineCommand, ManualSealParams};
+ use sc_consensus_manual_seal::{
+ run_manual_seal, run_delayed_finalize, EngineCommand, ManualSealParams,
+ DelayedFinalizeParams,
+ };
use fc_consensus::FrontierBlockImport;
let sc_service::PartialComponents {
@@ -980,20 +985,22 @@
.pool()
.validated_pool()
.import_notification_stream()
+ .filter(move |_| futures::future::ready(!disable_autoseal_on_tx))
.map(|_| EngineCommand::SealNewBlock {
create_empty: true,
- finalize: false, // todo:collator finalize true
+ finalize: false,
parent_hash: None,
sender: None,
}),
);
let autoseal_interval = Box::pin(AutosealInterval::new(&config, autoseal_interval));
+
let idle_commands_stream: Box<
dyn Stream<Item = EngineCommand<Hash>> + Send + Sync + Unpin,
> = Box::new(autoseal_interval.map(|_| EngineCommand::SealNewBlock {
create_empty: true,
- finalize: false, // todo:collator finalize true
+ finalize: false,
parent_hash: None,
sender: None,
}));
@@ -1003,6 +1010,20 @@
let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
let client_set_aside_for_cidp = client.clone();
+ if let Some(delay_sec) = autoseal_finalize_delay {
+ let spawn_handle = task_manager.spawn_handle();
+
+ task_manager.spawn_essential_handle().spawn_blocking(
+ "finalization_task",
+ Some("block-authoring"),
+ run_delayed_finalize(DelayedFinalizeParams {
+ client: client.clone(),
+ delay_sec,
+ spawn_handle,
+ }),
+ );
+ }
+
task_manager.spawn_essential_handle().spawn_blocking(
"authorship_task",
Some("block-authoring"),
pallets/app-promotion/src/weights.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/weights.rs
+++ b/pallets/app-promotion/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_app_promotion
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/app-promotion/src/weights.rs
@@ -48,25 +48,29 @@
/// Weights for pallet_app_promotion using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+ /// Storage: Maintenance Enabled (r:1 w:0)
+ /// Proof: Maintenance Enabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
/// Storage: AppPromotion PendingUnstake (r:1 w:1)
/// Proof: AppPromotion PendingUnstake (max_values: None, max_size: Some(157), added: 2632, mode: MaxEncodedLen)
- /// Storage: Balances Locks (r:3 w:3)
- /// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+ /// Storage: Balances Freezes (r:3 w:3)
+ /// Proof: Balances Freezes (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
/// Storage: System Account (r:3 w:3)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+ /// Storage: Balances Locks (r:3 w:0)
+ /// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 3]`.
fn on_initialize(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `180 + b * (277 ±0)`
- // Estimated: `5602 + b * (6377 ±0)`
- // Minimum execution time: 3_724_000 picoseconds.
- Weight::from_parts(4_538_653, 5602)
- // Standard Error: 14_774
- .saturating_add(Weight::from_parts(10_368_686, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(1_u64))
- .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into())))
+ // Measured: `222 + b * (285 ±0)`
+ // Estimated: `3622 + b * (3774 ±0)`
+ // Minimum execution time: 4_107_000 picoseconds.
+ Weight::from_parts(4_751_973, 3622)
+ // Standard Error: 4_668
+ .saturating_add(Weight::from_parts(10_570_330, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(2_u64))
+ .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(b.into())))
.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 6377).saturating_mul(b.into()))
+ .saturating_add(Weight::from_parts(0, 3774).saturating_mul(b.into()))
}
/// Storage: AppPromotion Admin (r:0 w:1)
/// Proof: AppPromotion Admin (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
@@ -74,8 +78,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 5_426_000 picoseconds.
- Weight::from_parts(6_149_000, 0)
+ // Minimum execution time: 3_459_000 picoseconds.
+ Weight::from_parts(3_627_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: AppPromotion Admin (r:1 w:0)
@@ -90,24 +94,26 @@
/// Proof: AppPromotion Staked (max_values: None, max_size: Some(80), added: 2555, mode: MaxEncodedLen)
/// Storage: System Account (r:101 w:101)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
- /// Storage: Balances Locks (r:100 w:100)
+ /// Storage: Balances Freezes (r:100 w:100)
+ /// Proof: Balances Freezes (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
+ /// Storage: Balances Locks (r:100 w:0)
/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
/// Storage: AppPromotion TotalStaked (r:1 w:1)
/// Proof: AppPromotion TotalStaked (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// The range of component `b` is `[1, 100]`.
fn payout_stakers(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `531 + b * (633 ±0)`
- // Estimated: `16194 + b * (32560 ±0)`
- // Minimum execution time: 84_632_000 picoseconds.
- Weight::from_parts(800_384, 16194)
- // Standard Error: 19_457
- .saturating_add(Weight::from_parts(49_393_958, 0).saturating_mul(b.into()))
+ // Measured: `564 + b * (641 ±0)`
+ // Estimated: `3593 + b * (25550 ±0)`
+ // Minimum execution time: 73_245_000 picoseconds.
+ Weight::from_parts(74_196_000, 3593)
+ // Standard Error: 8_231
+ .saturating_add(Weight::from_parts(49_090_053, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(7_u64))
- .saturating_add(T::DbWeight::get().reads((12_u64).saturating_mul(b.into())))
+ .saturating_add(T::DbWeight::get().reads((13_u64).saturating_mul(b.into())))
.saturating_add(T::DbWeight::get().writes(3_u64))
.saturating_add(T::DbWeight::get().writes((12_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 32560).saturating_mul(b.into()))
+ .saturating_add(Weight::from_parts(0, 25550).saturating_mul(b.into()))
}
/// Storage: AppPromotion StakesPerAccount (r:1 w:1)
/// Proof: AppPromotion StakesPerAccount (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
@@ -115,7 +121,9 @@
/// Proof: Configuration AppPromomotionConfigurationOverride (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
/// Storage: System Account (r:1 w:1)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
- /// Storage: Balances Locks (r:1 w:1)
+ /// Storage: Balances Freezes (r:1 w:1)
+ /// Proof: Balances Freezes (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
+ /// Storage: Balances Locks (r:1 w:0)
/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
/// Storage: ParachainSystem ValidationData (r:1 w:0)
/// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
@@ -125,11 +133,11 @@
/// Proof: AppPromotion TotalStaked (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
fn stake() -> Weight {
// Proof Size summary in bytes:
- // Measured: `356`
- // Estimated: `20260`
- // Minimum execution time: 24_750_000 picoseconds.
- Weight::from_parts(25_157_000, 20260)
- .saturating_add(T::DbWeight::get().reads(7_u64))
+ // Measured: `389`
+ // Estimated: `4764`
+ // Minimum execution time: 21_088_000 picoseconds.
+ Weight::from_parts(21_639_000, 4764)
+ .saturating_add(T::DbWeight::get().reads(8_u64))
.saturating_add(T::DbWeight::get().writes(5_u64))
}
/// Storage: Configuration AppPromomotionConfigurationOverride (r:1 w:0)
@@ -144,10 +152,10 @@
/// Proof: AppPromotion StakesPerAccount (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
fn unstake_all() -> Weight {
// Proof Size summary in bytes:
- // Measured: `796`
- // Estimated: `35720`
- // Minimum execution time: 53_670_000 picoseconds.
- Weight::from_parts(54_376_000, 35720)
+ // Measured: `829`
+ // Estimated: `29095`
+ // Minimum execution time: 42_086_000 picoseconds.
+ Weight::from_parts(43_149_000, 29095)
.saturating_add(T::DbWeight::get().reads(14_u64))
.saturating_add(T::DbWeight::get().writes(13_u64))
}
@@ -163,10 +171,10 @@
/// Proof: AppPromotion StakesPerAccount (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
fn unstake_partial() -> Weight {
// Proof Size summary in bytes:
- // Measured: `796`
- // Estimated: `39234`
- // Minimum execution time: 58_317_000 picoseconds.
- Weight::from_parts(59_059_000, 39234)
+ // Measured: `829`
+ // Estimated: `29095`
+ // Minimum execution time: 46_458_000 picoseconds.
+ Weight::from_parts(47_333_000, 29095)
.saturating_add(T::DbWeight::get().reads(15_u64))
.saturating_add(T::DbWeight::get().writes(13_u64))
}
@@ -176,10 +184,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn sponsor_collection() -> Weight {
// Proof Size summary in bytes:
- // Measured: `1027`
- // Estimated: `5842`
- // Minimum execution time: 18_117_000 picoseconds.
- Weight::from_parts(18_634_000, 5842)
+ // Measured: `1060`
+ // Estimated: `4325`
+ // Minimum execution time: 12_827_000 picoseconds.
+ Weight::from_parts(13_610_000, 4325)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -189,10 +197,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn stop_sponsoring_collection() -> Weight {
// Proof Size summary in bytes:
- // Measured: `1059`
- // Estimated: `5842`
- // Minimum execution time: 16_999_000 picoseconds.
- Weight::from_parts(17_417_000, 5842)
+ // Measured: `1092`
+ // Estimated: `4325`
+ // Minimum execution time: 11_899_000 picoseconds.
+ Weight::from_parts(12_303_000, 4325)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -204,8 +212,8 @@
// Proof Size summary in bytes:
// Measured: `198`
// Estimated: `1517`
- // Minimum execution time: 14_438_000 picoseconds.
- Weight::from_parts(14_931_000, 1517)
+ // Minimum execution time: 10_226_000 picoseconds.
+ Weight::from_parts(10_549_000, 1517)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -215,10 +223,10 @@
/// Proof: EvmContractHelpers Sponsoring (max_values: None, max_size: Some(62), added: 2537, mode: MaxEncodedLen)
fn stop_sponsoring_contract() -> Weight {
// Proof Size summary in bytes:
- // Measured: `363`
- // Estimated: `5044`
- // Minimum execution time: 14_786_000 picoseconds.
- Weight::from_parts(15_105_000, 5044)
+ // Measured: `396`
+ // Estimated: `3527`
+ // Minimum execution time: 10_528_000 picoseconds.
+ Weight::from_parts(10_842_000, 3527)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -226,25 +234,29 @@
// For backwards compatibility and tests
impl WeightInfo for () {
+ /// Storage: Maintenance Enabled (r:1 w:0)
+ /// Proof: Maintenance Enabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
/// Storage: AppPromotion PendingUnstake (r:1 w:1)
/// Proof: AppPromotion PendingUnstake (max_values: None, max_size: Some(157), added: 2632, mode: MaxEncodedLen)
- /// Storage: Balances Locks (r:3 w:3)
- /// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+ /// Storage: Balances Freezes (r:3 w:3)
+ /// Proof: Balances Freezes (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
/// Storage: System Account (r:3 w:3)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+ /// Storage: Balances Locks (r:3 w:0)
+ /// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 3]`.
fn on_initialize(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `180 + b * (277 ±0)`
- // Estimated: `5602 + b * (6377 ±0)`
- // Minimum execution time: 3_724_000 picoseconds.
- Weight::from_parts(4_538_653, 5602)
- // Standard Error: 14_774
- .saturating_add(Weight::from_parts(10_368_686, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(1_u64))
- .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(b.into())))
+ // Measured: `222 + b * (285 ±0)`
+ // Estimated: `3622 + b * (3774 ±0)`
+ // Minimum execution time: 4_107_000 picoseconds.
+ Weight::from_parts(4_751_973, 3622)
+ // Standard Error: 4_668
+ .saturating_add(Weight::from_parts(10_570_330, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(2_u64))
+ .saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(b.into())))
.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 6377).saturating_mul(b.into()))
+ .saturating_add(Weight::from_parts(0, 3774).saturating_mul(b.into()))
}
/// Storage: AppPromotion Admin (r:0 w:1)
/// Proof: AppPromotion Admin (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
@@ -252,8 +264,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 5_426_000 picoseconds.
- Weight::from_parts(6_149_000, 0)
+ // Minimum execution time: 3_459_000 picoseconds.
+ Weight::from_parts(3_627_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: AppPromotion Admin (r:1 w:0)
@@ -268,24 +280,26 @@
/// Proof: AppPromotion Staked (max_values: None, max_size: Some(80), added: 2555, mode: MaxEncodedLen)
/// Storage: System Account (r:101 w:101)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
- /// Storage: Balances Locks (r:100 w:100)
+ /// Storage: Balances Freezes (r:100 w:100)
+ /// Proof: Balances Freezes (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
+ /// Storage: Balances Locks (r:100 w:0)
/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
/// Storage: AppPromotion TotalStaked (r:1 w:1)
/// Proof: AppPromotion TotalStaked (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// The range of component `b` is `[1, 100]`.
fn payout_stakers(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `531 + b * (633 ±0)`
- // Estimated: `16194 + b * (32560 ±0)`
- // Minimum execution time: 84_632_000 picoseconds.
- Weight::from_parts(800_384, 16194)
- // Standard Error: 19_457
- .saturating_add(Weight::from_parts(49_393_958, 0).saturating_mul(b.into()))
+ // Measured: `564 + b * (641 ±0)`
+ // Estimated: `3593 + b * (25550 ±0)`
+ // Minimum execution time: 73_245_000 picoseconds.
+ Weight::from_parts(74_196_000, 3593)
+ // Standard Error: 8_231
+ .saturating_add(Weight::from_parts(49_090_053, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(7_u64))
- .saturating_add(RocksDbWeight::get().reads((12_u64).saturating_mul(b.into())))
+ .saturating_add(RocksDbWeight::get().reads((13_u64).saturating_mul(b.into())))
.saturating_add(RocksDbWeight::get().writes(3_u64))
.saturating_add(RocksDbWeight::get().writes((12_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 32560).saturating_mul(b.into()))
+ .saturating_add(Weight::from_parts(0, 25550).saturating_mul(b.into()))
}
/// Storage: AppPromotion StakesPerAccount (r:1 w:1)
/// Proof: AppPromotion StakesPerAccount (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
@@ -293,7 +307,9 @@
/// Proof: Configuration AppPromomotionConfigurationOverride (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
/// Storage: System Account (r:1 w:1)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
- /// Storage: Balances Locks (r:1 w:1)
+ /// Storage: Balances Freezes (r:1 w:1)
+ /// Proof: Balances Freezes (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
+ /// Storage: Balances Locks (r:1 w:0)
/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
/// Storage: ParachainSystem ValidationData (r:1 w:0)
/// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
@@ -303,11 +319,11 @@
/// Proof: AppPromotion TotalStaked (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
fn stake() -> Weight {
// Proof Size summary in bytes:
- // Measured: `356`
- // Estimated: `20260`
- // Minimum execution time: 24_750_000 picoseconds.
- Weight::from_parts(25_157_000, 20260)
- .saturating_add(RocksDbWeight::get().reads(7_u64))
+ // Measured: `389`
+ // Estimated: `4764`
+ // Minimum execution time: 21_088_000 picoseconds.
+ Weight::from_parts(21_639_000, 4764)
+ .saturating_add(RocksDbWeight::get().reads(8_u64))
.saturating_add(RocksDbWeight::get().writes(5_u64))
}
/// Storage: Configuration AppPromomotionConfigurationOverride (r:1 w:0)
@@ -322,10 +338,10 @@
/// Proof: AppPromotion StakesPerAccount (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
fn unstake_all() -> Weight {
// Proof Size summary in bytes:
- // Measured: `796`
- // Estimated: `35720`
- // Minimum execution time: 53_670_000 picoseconds.
- Weight::from_parts(54_376_000, 35720)
+ // Measured: `829`
+ // Estimated: `29095`
+ // Minimum execution time: 42_086_000 picoseconds.
+ Weight::from_parts(43_149_000, 29095)
.saturating_add(RocksDbWeight::get().reads(14_u64))
.saturating_add(RocksDbWeight::get().writes(13_u64))
}
@@ -341,10 +357,10 @@
/// Proof: AppPromotion StakesPerAccount (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
fn unstake_partial() -> Weight {
// Proof Size summary in bytes:
- // Measured: `796`
- // Estimated: `39234`
- // Minimum execution time: 58_317_000 picoseconds.
- Weight::from_parts(59_059_000, 39234)
+ // Measured: `829`
+ // Estimated: `29095`
+ // Minimum execution time: 46_458_000 picoseconds.
+ Weight::from_parts(47_333_000, 29095)
.saturating_add(RocksDbWeight::get().reads(15_u64))
.saturating_add(RocksDbWeight::get().writes(13_u64))
}
@@ -354,10 +370,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn sponsor_collection() -> Weight {
// Proof Size summary in bytes:
- // Measured: `1027`
- // Estimated: `5842`
- // Minimum execution time: 18_117_000 picoseconds.
- Weight::from_parts(18_634_000, 5842)
+ // Measured: `1060`
+ // Estimated: `4325`
+ // Minimum execution time: 12_827_000 picoseconds.
+ Weight::from_parts(13_610_000, 4325)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -367,10 +383,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn stop_sponsoring_collection() -> Weight {
// Proof Size summary in bytes:
- // Measured: `1059`
- // Estimated: `5842`
- // Minimum execution time: 16_999_000 picoseconds.
- Weight::from_parts(17_417_000, 5842)
+ // Measured: `1092`
+ // Estimated: `4325`
+ // Minimum execution time: 11_899_000 picoseconds.
+ Weight::from_parts(12_303_000, 4325)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -382,8 +398,8 @@
// Proof Size summary in bytes:
// Measured: `198`
// Estimated: `1517`
- // Minimum execution time: 14_438_000 picoseconds.
- Weight::from_parts(14_931_000, 1517)
+ // Minimum execution time: 10_226_000 picoseconds.
+ Weight::from_parts(10_549_000, 1517)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -393,10 +409,10 @@
/// Proof: EvmContractHelpers Sponsoring (max_values: None, max_size: Some(62), added: 2537, mode: MaxEncodedLen)
fn stop_sponsoring_contract() -> Weight {
// Proof Size summary in bytes:
- // Measured: `363`
- // Estimated: `5044`
- // Minimum execution time: 14_786_000 picoseconds.
- Weight::from_parts(15_105_000, 5044)
+ // Measured: `396`
+ // Estimated: `3527`
+ // Minimum execution time: 10_528_000 picoseconds.
+ Weight::from_parts(10_842_000, 3527)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
pallets/balances-adapter/src/common.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -172,6 +172,18 @@
fail!(<pallet_common::Error<T>>::UnsupportedOperation);
}
+ fn get_token_properties_raw(
+ &self,
+ _token_id: TokenId,
+ ) -> Option<up_data_structs::TokenProperties> {
+ // No token properties are defined on fungibles
+ None
+ }
+
+ fn set_token_properties_raw(&self, _token_id: TokenId, _map: up_data_structs::TokenProperties) {
+ // No token properties are defined on fungibles
+ }
+
fn set_token_property_permissions(
&self,
_sender: &<T>::CrossAccountId,
@@ -277,6 +289,15 @@
Err(up_data_structs::TokenOwnerError::MultipleOwners)
}
+ fn check_token_indirect_owner(
+ &self,
+ _token: TokenId,
+ _maybe_owner: &<T>::CrossAccountId,
+ _nesting_budget: &dyn up_data_structs::budget::Budget,
+ ) -> Result<bool, frame_support::sp_runtime::DispatchError> {
+ Ok(false)
+ }
+
fn token_owners(&self, _token: TokenId) -> Vec<<T>::CrossAccountId> {
vec![]
}
pallets/balances-adapter/src/erc.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -25,7 +25,7 @@
}
fn approve(&mut self, _caller: Caller, _spender: Address, _amount: U256) -> Result<bool> {
- Err("Approve not supported".into())
+ Err("approve not supported".into())
}
fn balance_of(&self, owner: Address) -> Result<U256> {
pallets/collator-selection/src/weights.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/weights.rs
+++ b/pallets/collator-selection/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_collator_selection
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/collator-selection/src/weights.rs
@@ -57,11 +57,11 @@
fn add_invulnerable(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `403 + b * (45 ±0)`
- // Estimated: `7485 + b * (45 ±0)`
- // Minimum execution time: 14_147_000 picoseconds.
- Weight::from_parts(15_313_627, 7485)
- // Standard Error: 1_744
- .saturating_add(Weight::from_parts(178_890, 0).saturating_mul(b.into()))
+ // Estimated: `3873 + b * (45 ±0)`
+ // Minimum execution time: 10_975_000 picoseconds.
+ Weight::from_parts(11_362_608, 3873)
+ // Standard Error: 411
+ .saturating_add(Weight::from_parts(152_014, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(Weight::from_parts(0, 45).saturating_mul(b.into()))
@@ -73,10 +73,10 @@
// Proof Size summary in bytes:
// Measured: `96 + b * (32 ±0)`
// Estimated: `1806`
- // Minimum execution time: 9_426_000 picoseconds.
- Weight::from_parts(9_693_408, 1806)
- // Standard Error: 1_638
- .saturating_add(Weight::from_parts(227_917, 0).saturating_mul(b.into()))
+ // Minimum execution time: 6_369_000 picoseconds.
+ Weight::from_parts(6_604_933, 1806)
+ // Standard Error: 424
+ .saturating_add(Weight::from_parts(145_929, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -86,18 +86,20 @@
/// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
/// Storage: Configuration CollatorSelectionLicenseBondOverride (r:1 w:0)
/// Proof: Configuration CollatorSelectionLicenseBondOverride (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+ /// Storage: Balances Holds (r:1 w:1)
+ /// Proof: Balances Holds (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
/// The range of component `c` is `[1, 9]`.
fn get_license(c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `610 + c * (26 ±0)`
- // Estimated: `9099 + c * (28 ±0)`
- // Minimum execution time: 22_741_000 picoseconds.
- Weight::from_parts(24_210_604, 9099)
- // Standard Error: 2_703
- .saturating_add(Weight::from_parts(255_686, 0).saturating_mul(c.into()))
- .saturating_add(T::DbWeight::get().reads(3_u64))
- .saturating_add(T::DbWeight::get().writes(1_u64))
- .saturating_add(Weight::from_parts(0, 28).saturating_mul(c.into()))
+ // Measured: `668 + c * (46 ±0)`
+ // Estimated: `4131 + c * (47 ±0)`
+ // Minimum execution time: 23_857_000 picoseconds.
+ Weight::from_parts(25_984_655, 4131)
+ // Standard Error: 4_364
+ .saturating_add(Weight::from_parts(521_198, 0).saturating_mul(c.into()))
+ .saturating_add(T::DbWeight::get().reads(4_u64))
+ .saturating_add(T::DbWeight::get().writes(2_u64))
+ .saturating_add(Weight::from_parts(0, 47).saturating_mul(c.into()))
}
/// Storage: CollatorSelection LicenseDepositOf (r:1 w:0)
/// Proof: CollatorSelection LicenseDepositOf (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen)
@@ -114,12 +116,12 @@
/// The range of component `c` is `[1, 7]`.
fn onboard(c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `445 + c * (54 ±0)`
- // Estimated: `10119`
- // Minimum execution time: 20_397_000 picoseconds.
- Weight::from_parts(21_415_013, 10119)
- // Standard Error: 4_086
- .saturating_add(Weight::from_parts(252_810, 0).saturating_mul(c.into()))
+ // Measured: `414 + c * (54 ±0)`
+ // Estimated: `3529`
+ // Minimum execution time: 14_337_000 picoseconds.
+ Weight::from_parts(14_827_525, 3529)
+ // Standard Error: 1_210
+ .saturating_add(Weight::from_parts(298_748, 0).saturating_mul(c.into()))
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -127,15 +129,15 @@
/// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
/// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
- /// The range of component `c` is `[1, 10]`.
+ /// The range of component `c` is `[1, 8]`.
fn offboard(c: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `111 + c * (32 ±0)`
// Estimated: `1806`
- // Minimum execution time: 10_543_000 picoseconds.
- Weight::from_parts(11_227_541, 1806)
- // Standard Error: 1_699
- .saturating_add(Weight::from_parts(181_030, 0).saturating_mul(c.into()))
+ // Minimum execution time: 7_320_000 picoseconds.
+ Weight::from_parts(7_646_004, 1806)
+ // Standard Error: 479
+ .saturating_add(Weight::from_parts(160_089, 0).saturating_mul(c.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -143,37 +145,41 @@
/// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: CollatorSelection LicenseDepositOf (r:1 w:1)
/// Proof: CollatorSelection LicenseDepositOf (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen)
+ /// Storage: Balances Holds (r:1 w:1)
+ /// Proof: Balances Holds (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
/// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
/// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
- /// The range of component `c` is `[1, 10]`.
+ /// The range of component `c` is `[1, 8]`.
fn release_license(c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `306 + c * (61 ±0)`
- // Estimated: `5335`
- // Minimum execution time: 22_214_000 picoseconds.
- Weight::from_parts(24_373_981, 5335)
- // Standard Error: 8_018
- .saturating_add(Weight::from_parts(405_404, 0).saturating_mul(c.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
- .saturating_add(T::DbWeight::get().writes(3_u64))
+ // Measured: `328 + c * (103 ±0)`
+ // Estimated: `3834`
+ // Minimum execution time: 22_821_000 picoseconds.
+ Weight::from_parts(23_668_202, 3834)
+ // Standard Error: 6_654
+ .saturating_add(Weight::from_parts(844_978, 0).saturating_mul(c.into()))
+ .saturating_add(T::DbWeight::get().reads(3_u64))
+ .saturating_add(T::DbWeight::get().writes(4_u64))
}
/// Storage: CollatorSelection Candidates (r:1 w:1)
/// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: CollatorSelection LicenseDepositOf (r:1 w:1)
/// Proof: CollatorSelection LicenseDepositOf (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen)
+ /// Storage: Balances Holds (r:1 w:1)
+ /// Proof: Balances Holds (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
/// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
/// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
- /// The range of component `c` is `[1, 10]`.
+ /// The range of component `c` is `[1, 8]`.
fn force_release_license(c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `306 + c * (61 ±0)`
- // Estimated: `5335`
- // Minimum execution time: 22_159_000 picoseconds.
- Weight::from_parts(24_200_796, 5335)
- // Standard Error: 8_328
- .saturating_add(Weight::from_parts(312_138, 0).saturating_mul(c.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
- .saturating_add(T::DbWeight::get().writes(3_u64))
+ // Measured: `328 + c * (103 ±0)`
+ // Estimated: `3834`
+ // Minimum execution time: 22_462_000 picoseconds.
+ Weight::from_parts(23_215_875, 3834)
+ // Standard Error: 6_450
+ .saturating_add(Weight::from_parts(830_887, 0).saturating_mul(c.into()))
+ .saturating_add(T::DbWeight::get().reads(3_u64))
+ .saturating_add(T::DbWeight::get().writes(4_u64))
}
/// Storage: System Account (r:2 w:2)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
@@ -184,9 +190,9 @@
fn note_author() -> Weight {
// Proof Size summary in bytes:
// Measured: `155`
- // Estimated: `7729`
- // Minimum execution time: 16_520_000 picoseconds.
- Weight::from_parts(16_933_000, 7729)
+ // Estimated: `6196`
+ // Minimum execution time: 17_624_000 picoseconds.
+ Weight::from_parts(18_025_000, 6196)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
@@ -194,32 +200,34 @@
/// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: Configuration CollatorSelectionKickThresholdOverride (r:1 w:0)
/// Proof: Configuration CollatorSelectionKickThresholdOverride (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
- /// Storage: CollatorSelection LastAuthoredBlock (r:10 w:0)
+ /// Storage: CollatorSelection LastAuthoredBlock (r:8 w:0)
/// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
/// Storage: CollatorSelection Invulnerables (r:1 w:0)
/// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: System BlockWeight (r:1 w:1)
/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
- /// Storage: CollatorSelection LicenseDepositOf (r:9 w:9)
+ /// Storage: CollatorSelection LicenseDepositOf (r:7 w:7)
/// Proof: CollatorSelection LicenseDepositOf (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen)
- /// Storage: System Account (r:10 w:10)
+ /// Storage: Balances Holds (r:7 w:7)
+ /// Proof: Balances Holds (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
+ /// Storage: System Account (r:8 w:8)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
- /// The range of component `r` is `[1, 10]`.
- /// The range of component `c` is `[1, 10]`.
+ /// The range of component `r` is `[1, 8]`.
+ /// The range of component `c` is `[1, 8]`.
fn new_session(r: u32, c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `562 + r * (190 ±0) + c * (83 ±0)`
- // Estimated: `91818518943723 + c * (2519 ±0) + r * (5142 ±1)`
- // Minimum execution time: 16_153_000 picoseconds.
- Weight::from_parts(16_601_000, 91818518943723)
- // Standard Error: 119_095
- .saturating_add(Weight::from_parts(10_660_813, 0).saturating_mul(c.into()))
+ // Measured: `725 + c * (84 ±0) + r * (254 ±0)`
+ // Estimated: `6196 + c * (2519 ±0) + r * (2844 ±0)`
+ // Minimum execution time: 11_318_000 picoseconds.
+ Weight::from_parts(11_615_000, 6196)
+ // Standard Error: 69_557
+ .saturating_add(Weight::from_parts(13_016_275, 0).saturating_mul(c.into()))
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
- .saturating_add(Weight::from_parts(0, 5142).saturating_mul(r.into()))
+ .saturating_add(Weight::from_parts(0, 2844).saturating_mul(r.into()))
}
}
@@ -235,11 +243,11 @@
fn add_invulnerable(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `403 + b * (45 ±0)`
- // Estimated: `7485 + b * (45 ±0)`
- // Minimum execution time: 14_147_000 picoseconds.
- Weight::from_parts(15_313_627, 7485)
- // Standard Error: 1_744
- .saturating_add(Weight::from_parts(178_890, 0).saturating_mul(b.into()))
+ // Estimated: `3873 + b * (45 ±0)`
+ // Minimum execution time: 10_975_000 picoseconds.
+ Weight::from_parts(11_362_608, 3873)
+ // Standard Error: 411
+ .saturating_add(Weight::from_parts(152_014, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(Weight::from_parts(0, 45).saturating_mul(b.into()))
@@ -251,10 +259,10 @@
// Proof Size summary in bytes:
// Measured: `96 + b * (32 ±0)`
// Estimated: `1806`
- // Minimum execution time: 9_426_000 picoseconds.
- Weight::from_parts(9_693_408, 1806)
- // Standard Error: 1_638
- .saturating_add(Weight::from_parts(227_917, 0).saturating_mul(b.into()))
+ // Minimum execution time: 6_369_000 picoseconds.
+ Weight::from_parts(6_604_933, 1806)
+ // Standard Error: 424
+ .saturating_add(Weight::from_parts(145_929, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -264,18 +272,20 @@
/// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
/// Storage: Configuration CollatorSelectionLicenseBondOverride (r:1 w:0)
/// Proof: Configuration CollatorSelectionLicenseBondOverride (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+ /// Storage: Balances Holds (r:1 w:1)
+ /// Proof: Balances Holds (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
/// The range of component `c` is `[1, 9]`.
fn get_license(c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `610 + c * (26 ±0)`
- // Estimated: `9099 + c * (28 ±0)`
- // Minimum execution time: 22_741_000 picoseconds.
- Weight::from_parts(24_210_604, 9099)
- // Standard Error: 2_703
- .saturating_add(Weight::from_parts(255_686, 0).saturating_mul(c.into()))
- .saturating_add(RocksDbWeight::get().reads(3_u64))
- .saturating_add(RocksDbWeight::get().writes(1_u64))
- .saturating_add(Weight::from_parts(0, 28).saturating_mul(c.into()))
+ // Measured: `668 + c * (46 ±0)`
+ // Estimated: `4131 + c * (47 ±0)`
+ // Minimum execution time: 23_857_000 picoseconds.
+ Weight::from_parts(25_984_655, 4131)
+ // Standard Error: 4_364
+ .saturating_add(Weight::from_parts(521_198, 0).saturating_mul(c.into()))
+ .saturating_add(RocksDbWeight::get().reads(4_u64))
+ .saturating_add(RocksDbWeight::get().writes(2_u64))
+ .saturating_add(Weight::from_parts(0, 47).saturating_mul(c.into()))
}
/// Storage: CollatorSelection LicenseDepositOf (r:1 w:0)
/// Proof: CollatorSelection LicenseDepositOf (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen)
@@ -292,12 +302,12 @@
/// The range of component `c` is `[1, 7]`.
fn onboard(c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `445 + c * (54 ±0)`
- // Estimated: `10119`
- // Minimum execution time: 20_397_000 picoseconds.
- Weight::from_parts(21_415_013, 10119)
- // Standard Error: 4_086
- .saturating_add(Weight::from_parts(252_810, 0).saturating_mul(c.into()))
+ // Measured: `414 + c * (54 ±0)`
+ // Estimated: `3529`
+ // Minimum execution time: 14_337_000 picoseconds.
+ Weight::from_parts(14_827_525, 3529)
+ // Standard Error: 1_210
+ .saturating_add(Weight::from_parts(298_748, 0).saturating_mul(c.into()))
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -305,15 +315,15 @@
/// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
/// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
- /// The range of component `c` is `[1, 10]`.
+ /// The range of component `c` is `[1, 8]`.
fn offboard(c: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `111 + c * (32 ±0)`
// Estimated: `1806`
- // Minimum execution time: 10_543_000 picoseconds.
- Weight::from_parts(11_227_541, 1806)
- // Standard Error: 1_699
- .saturating_add(Weight::from_parts(181_030, 0).saturating_mul(c.into()))
+ // Minimum execution time: 7_320_000 picoseconds.
+ Weight::from_parts(7_646_004, 1806)
+ // Standard Error: 479
+ .saturating_add(Weight::from_parts(160_089, 0).saturating_mul(c.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -321,37 +331,41 @@
/// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: CollatorSelection LicenseDepositOf (r:1 w:1)
/// Proof: CollatorSelection LicenseDepositOf (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen)
+ /// Storage: Balances Holds (r:1 w:1)
+ /// Proof: Balances Holds (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
/// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
/// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
- /// The range of component `c` is `[1, 10]`.
+ /// The range of component `c` is `[1, 8]`.
fn release_license(c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `306 + c * (61 ±0)`
- // Estimated: `5335`
- // Minimum execution time: 22_214_000 picoseconds.
- Weight::from_parts(24_373_981, 5335)
- // Standard Error: 8_018
- .saturating_add(Weight::from_parts(405_404, 0).saturating_mul(c.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
- .saturating_add(RocksDbWeight::get().writes(3_u64))
+ // Measured: `328 + c * (103 ±0)`
+ // Estimated: `3834`
+ // Minimum execution time: 22_821_000 picoseconds.
+ Weight::from_parts(23_668_202, 3834)
+ // Standard Error: 6_654
+ .saturating_add(Weight::from_parts(844_978, 0).saturating_mul(c.into()))
+ .saturating_add(RocksDbWeight::get().reads(3_u64))
+ .saturating_add(RocksDbWeight::get().writes(4_u64))
}
/// Storage: CollatorSelection Candidates (r:1 w:1)
/// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: CollatorSelection LicenseDepositOf (r:1 w:1)
/// Proof: CollatorSelection LicenseDepositOf (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen)
+ /// Storage: Balances Holds (r:1 w:1)
+ /// Proof: Balances Holds (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
/// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
/// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
- /// The range of component `c` is `[1, 10]`.
+ /// The range of component `c` is `[1, 8]`.
fn force_release_license(c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `306 + c * (61 ±0)`
- // Estimated: `5335`
- // Minimum execution time: 22_159_000 picoseconds.
- Weight::from_parts(24_200_796, 5335)
- // Standard Error: 8_328
- .saturating_add(Weight::from_parts(312_138, 0).saturating_mul(c.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
- .saturating_add(RocksDbWeight::get().writes(3_u64))
+ // Measured: `328 + c * (103 ±0)`
+ // Estimated: `3834`
+ // Minimum execution time: 22_462_000 picoseconds.
+ Weight::from_parts(23_215_875, 3834)
+ // Standard Error: 6_450
+ .saturating_add(Weight::from_parts(830_887, 0).saturating_mul(c.into()))
+ .saturating_add(RocksDbWeight::get().reads(3_u64))
+ .saturating_add(RocksDbWeight::get().writes(4_u64))
}
/// Storage: System Account (r:2 w:2)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
@@ -362,9 +376,9 @@
fn note_author() -> Weight {
// Proof Size summary in bytes:
// Measured: `155`
- // Estimated: `7729`
- // Minimum execution time: 16_520_000 picoseconds.
- Weight::from_parts(16_933_000, 7729)
+ // Estimated: `6196`
+ // Minimum execution time: 17_624_000 picoseconds.
+ Weight::from_parts(18_025_000, 6196)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
@@ -372,32 +386,34 @@
/// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: Configuration CollatorSelectionKickThresholdOverride (r:1 w:0)
/// Proof: Configuration CollatorSelectionKickThresholdOverride (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
- /// Storage: CollatorSelection LastAuthoredBlock (r:10 w:0)
+ /// Storage: CollatorSelection LastAuthoredBlock (r:8 w:0)
/// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
/// Storage: CollatorSelection Invulnerables (r:1 w:0)
/// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(321), added: 816, mode: MaxEncodedLen)
/// Storage: System BlockWeight (r:1 w:1)
/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
- /// Storage: CollatorSelection LicenseDepositOf (r:9 w:9)
+ /// Storage: CollatorSelection LicenseDepositOf (r:7 w:7)
/// Proof: CollatorSelection LicenseDepositOf (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen)
- /// Storage: System Account (r:10 w:10)
+ /// Storage: Balances Holds (r:7 w:7)
+ /// Proof: Balances Holds (max_values: None, max_size: Some(369), added: 2844, mode: MaxEncodedLen)
+ /// Storage: System Account (r:8 w:8)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
- /// The range of component `r` is `[1, 10]`.
- /// The range of component `c` is `[1, 10]`.
+ /// The range of component `r` is `[1, 8]`.
+ /// The range of component `c` is `[1, 8]`.
fn new_session(r: u32, c: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `562 + r * (190 ±0) + c * (83 ±0)`
- // Estimated: `91818518943723 + c * (2519 ±0) + r * (5142 ±1)`
- // Minimum execution time: 16_153_000 picoseconds.
- Weight::from_parts(16_601_000, 91818518943723)
- // Standard Error: 119_095
- .saturating_add(Weight::from_parts(10_660_813, 0).saturating_mul(c.into()))
+ // Measured: `725 + c * (84 ±0) + r * (254 ±0)`
+ // Estimated: `6196 + c * (2519 ±0) + r * (2844 ±0)`
+ // Minimum execution time: 11_318_000 picoseconds.
+ Weight::from_parts(11_615_000, 6196)
+ // Standard Error: 69_557
+ .saturating_add(Weight::from_parts(13_016_275, 0).saturating_mul(c.into()))
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(c.into())))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(c.into())))
.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
- .saturating_add(Weight::from_parts(0, 5142).saturating_mul(r.into()))
+ .saturating_add(Weight::from_parts(0, 2844).saturating_mul(r.into()))
}
}
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -22,8 +22,9 @@
use frame_benchmarking::{benchmarks, account};
use up_data_structs::{
CollectionMode, CreateCollectionData, CollectionId, Property, PropertyKey, PropertyValue,
- CollectionPermissions, NestingPermissions, AccessMode, MAX_COLLECTION_NAME_LENGTH,
- MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, MAX_PROPERTIES_PER_ITEM,
+ CollectionPermissions, NestingPermissions, AccessMode, PropertiesPermissionMap,
+ MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,
+ MAX_PROPERTIES_PER_ITEM,
};
use frame_support::{
traits::{Get, fungible::Balanced, Imbalance, tokens::Precision},
@@ -123,6 +124,16 @@
)
}
+pub fn load_is_admin_and_property_permissions<T: Config>(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+) -> (bool, PropertiesPermissionMap) {
+ (
+ collection.is_owner_or_admin(sender),
+ <Pallet<T>>::property_permissions(collection.id),
+ )
+}
+
/// Helper macros, which handles all benchmarking preparation in semi-declarative way
///
/// `name` is a substrate account
@@ -215,4 +226,12 @@
assert_eq!(collection_handle.permissions.access(), AccessMode::AllowList);
}: {collection_handle.check_allowlist(&sender)?;}
+
+ init_token_properties_common {
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ sender: sub;
+ sender: cross_from_sub(sender);
+ };
+ }: {load_is_admin_and_property_permissions(&collection, &sender);}
}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -56,6 +56,7 @@
use core::{
ops::{Deref, DerefMut},
slice::from_ref,
+ marker::PhantomData,
};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_std::vec::Vec;
@@ -97,6 +98,9 @@
pub mod helpers;
#[allow(missing_docs)]
pub mod weights;
+
+use weights::WeightInfo;
+
/// Weight info.
pub type SelfWeightOf<T> = <T as Config>::WeightInfo;
@@ -863,18 +867,6 @@
),
QueryKind = OptionQuery,
>;
-}
-
-/// Represents the change mode for the token property.
-pub enum SetPropertyMode {
- /// The token already exists.
- ExistingToken,
-
- /// New token.
- NewToken {
- /// The creator of the token is the recipient.
- mint_target_is_sender: bool,
- },
}
/// Value representation with delayed initialization time.
@@ -892,19 +884,33 @@
}
}
- /// Get the value. If it call furst time the value will be initialized.
+ /// Get the value. If it is called the first time, the value will be initialized.
pub fn value(&mut self) -> &T {
- if self.value.is_none() {
- self.value = Some(self.f.take().unwrap()())
- }
+ self.compute_value_if_not_already();
+ self.value.as_ref().unwrap()
+ }
+
+ /// Get the value. If it is called the first time, the value will be initialized.
+ pub fn value_mut(&mut self) -> &mut T {
+ self.compute_value_if_not_already();
+ self.value.as_mut().unwrap()
+ }
- self.value.as_ref().unwrap()
+ fn into_inner(mut self) -> T {
+ self.compute_value_if_not_already();
+ self.value.unwrap()
}
- /// Is value initialized.
+ /// Is value initialized?
pub fn has_value(&self) -> bool {
self.value.is_some()
}
+
+ fn compute_value_if_not_already(&mut self) {
+ if self.value.is_none() {
+ self.value = Some(self.f.take().unwrap()())
+ }
+ }
}
fn check_token_permissions<T, FCA, FTO, FTE>(
@@ -926,10 +932,19 @@
fail!(<Error<T>>::NoPermission);
}
- let token_certainly_exist = is_token_owner.has_value() && (*is_token_owner.value())?;
- if !token_certainly_exist && !is_token_exist.value() {
- fail!(<Error<T>>::TokenNotFound);
+ let token_exist_due_to_owner_check_success =
+ is_token_owner.has_value() && (*is_token_owner.value())?;
+
+ // If the token owner check has occurred and succeeded,
+ // we know the token exists (otherwise, the owner check must fail).
+ if !token_exist_due_to_owner_check_success {
+ // If the token owner check didn't occur,
+ // we must check the token's existence ourselves.
+ if !is_token_exist.value() {
+ fail!(<Error<T>>::TokenNotFound);
+ }
}
+
Ok(())
}
@@ -1308,92 +1323,6 @@
}
<CollectionProperties<T>>::set(collection.id, stored_properties);
-
- Ok(())
- }
-
- /// A batch operation to add, edit or remove properties for a token.
- /// It sets or removes a token's properties according to
- /// `properties_updates` contents:
- /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
- /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
- ///
- /// All affected properties should have `mutable` permission
- /// to be **deleted** or to be **set more than once**,
- /// and the sender should have permission to edit those properties.
- ///
- /// This function fires an event for each property change.
- /// In case of an error, all the changes (including the events) will be reverted
- /// since the function is transactional.
- #[allow(clippy::too_many_arguments)]
- pub fn modify_token_properties<FTO, FTE>(
- collection: &CollectionHandle<T>,
- sender: &T::CrossAccountId,
- token_id: TokenId,
- is_token_exist: &mut LazyValue<bool, FTE>,
- properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
- mut stored_properties: TokenProperties,
- is_token_owner: &mut LazyValue<Result<bool, DispatchError>, FTO>,
- set_token_properties: impl FnOnce(TokenProperties),
- log: evm_coder::ethereum::Log,
- ) -> DispatchResult
- where
- FTO: FnOnce() -> Result<bool, DispatchError>,
- FTE: FnOnce() -> bool,
- {
- let mut is_collection_admin = LazyValue::new(|| collection.is_owner_or_admin(sender));
- let permissions = Self::property_permissions(collection.id);
-
- let mut changed = false;
- for (key, value) in properties_updates {
- let permission = permissions
- .get(&key)
- .cloned()
- .unwrap_or_else(PropertyPermission::none);
-
- let property_exists = stored_properties.get(&key).is_some();
-
- match permission {
- PropertyPermission { mutable: false, .. } if property_exists => {
- return Err(<Error<T>>::NoPermission.into());
- }
-
- PropertyPermission {
- collection_admin,
- token_owner,
- ..
- } => check_token_permissions::<T, _, FTO, FTE>(
- collection_admin,
- token_owner,
- &mut is_collection_admin,
- is_token_owner,
- is_token_exist,
- )?,
- }
-
- match value {
- Some(value) => {
- stored_properties
- .try_set(key.clone(), value)
- .map_err(<Error<T>>::from)?;
-
- Self::deposit_event(Event::TokenPropertySet(collection.id, token_id, key));
- }
- None => {
- stored_properties.remove(&key).map_err(<Error<T>>::from)?;
-
- Self::deposit_event(Event::TokenPropertyDeleted(collection.id, token_id, key));
- }
- }
-
- changed = true;
- }
-
- if changed {
- <PalletEvm<T>>::deposit_log(log);
- }
-
- set_token_properties(stored_properties);
Ok(())
}
@@ -2166,6 +2095,17 @@
budget: &dyn Budget,
) -> DispatchResultWithPostInfo;
+ /// Get token properties raw map.
+ ///
+ /// * `token_id` - The token which properties are needed.
+ fn get_token_properties_raw(&self, token_id: TokenId) -> Option<TokenProperties>;
+
+ /// Set token properties raw map.
+ ///
+ /// * `token_id` - The token for which the properties are being set.
+ /// * `map` - The raw map containing the token's properties.
+ fn set_token_properties_raw(&self, token_id: TokenId, map: TokenProperties);
+
/// Set token property permissions.
///
/// * `sender` - Must be either the owner of the token or its admin.
@@ -2309,6 +2249,18 @@
/// * `token` - The token for which you need to find out the owner.
fn token_owner(&self, token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError>;
+ /// Checks if the `maybe_owner` is the indirect owner of the `token`.
+ ///
+ /// * `token` - Id token to check.
+ /// * `maybe_owner` - The account to check.
+ /// * `nesting_budget` - A budget that can be spent on nesting tokens.
+ fn check_token_indirect_owner(
+ &self,
+ token: TokenId,
+ maybe_owner: &T::CrossAccountId,
+ nesting_budget: &dyn Budget,
+ ) -> Result<bool, DispatchError>;
+
/// Returns 10 tokens owners in no particular order.
///
/// * `token` - The token for which you need to find out the owners.
@@ -2420,6 +2372,352 @@
}
}
+/// A marker structure that enables the writer implementation
+/// to provide the interface to write properties to **newly created** tokens.
+pub struct NewTokenPropertyWriter;
+
+/// A marker structure that enables the writer implementation
+/// to provide the interface to write properties to **already existing** tokens.
+pub struct ExistingTokenPropertyWriter;
+
+/// The type-safe interface for writing properties (setting or deleting) to tokens.
+/// It has two distinct implementations for newly created tokens and existing ones.
+///
+/// This type utilizes the lazy evaluation to avoid repeating the computation
+/// of several performance-heavy or PoV-heavy tasks,
+/// such as checking the indirect ownership or reading the token property permissions.
+pub struct PropertyWriter<
+ 'a,
+ T,
+ Handle,
+ WriterVariant,
+ FIsAdmin,
+ FPropertyPermissions,
+ FCheckTokenExist,
+ FGetProperties,
+> where
+ T: Config,
+ FIsAdmin: FnOnce() -> bool,
+ FPropertyPermissions: FnOnce() -> PropertiesPermissionMap,
+{
+ collection: &'a Handle,
+ is_collection_admin: LazyValue<bool, FIsAdmin>,
+ property_permissions: LazyValue<PropertiesPermissionMap, FPropertyPermissions>,
+ check_token_exist: FCheckTokenExist,
+ get_properties: FGetProperties,
+ _phantom: PhantomData<(T, WriterVariant)>,
+}
+
+impl<'a, T, Handle, FIsAdmin, FPropertyPermissions, FCheckTokenExist, FGetProperties>
+ PropertyWriter<
+ 'a,
+ T,
+ Handle,
+ NewTokenPropertyWriter,
+ FIsAdmin,
+ FPropertyPermissions,
+ FCheckTokenExist,
+ FGetProperties,
+ > where
+ T: Config,
+ Handle: CommonCollectionOperations<T> + Deref<Target = CollectionHandle<T>>,
+ FIsAdmin: FnOnce() -> bool,
+ FPropertyPermissions: FnOnce() -> PropertiesPermissionMap,
+ FCheckTokenExist: Copy + FnOnce(TokenId) -> bool,
+ FGetProperties: Copy + FnOnce(TokenId) -> TokenProperties,
+{
+ /// A function to write properties to a **newly created** token.
+ pub fn write_token_properties(
+ &mut self,
+ mint_target_is_sender: bool,
+ token_id: TokenId,
+ properties_updates: impl Iterator<Item = Property>,
+ log: evm_coder::ethereum::Log,
+ ) -> DispatchResult {
+ self.internal_write_token_properties(
+ token_id,
+ properties_updates.map(|p| (p.key, Some(p.value))),
+ |_| Ok(mint_target_is_sender),
+ log,
+ )
+ }
+}
+
+impl<'a, T, Handle, FIsAdmin, FPropertyPermissions, FCheckTokenExist, FGetProperties>
+ PropertyWriter<
+ 'a,
+ T,
+ Handle,
+ ExistingTokenPropertyWriter,
+ FIsAdmin,
+ FPropertyPermissions,
+ FCheckTokenExist,
+ FGetProperties,
+ > where
+ T: Config,
+ Handle: CommonCollectionOperations<T> + Deref<Target = CollectionHandle<T>>,
+ FIsAdmin: FnOnce() -> bool,
+ FPropertyPermissions: FnOnce() -> PropertiesPermissionMap,
+ FCheckTokenExist: Copy + FnOnce(TokenId) -> bool,
+ FGetProperties: Copy + FnOnce(TokenId) -> TokenProperties,
+{
+ /// A function to write properties to an **already existing** token.
+ pub fn write_token_properties(
+ &mut self,
+ sender: &T::CrossAccountId,
+ token_id: TokenId,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ nesting_budget: &dyn Budget,
+ log: evm_coder::ethereum::Log,
+ ) -> DispatchResult {
+ self.internal_write_token_properties(
+ token_id,
+ properties_updates,
+ |collection| collection.check_token_indirect_owner(token_id, sender, nesting_budget),
+ log,
+ )
+ }
+}
+
+impl<
+ 'a,
+ T,
+ Handle,
+ WriterVariant,
+ FIsAdmin,
+ FPropertyPermissions,
+ FCheckTokenExist,
+ FGetProperties,
+ >
+ PropertyWriter<
+ 'a,
+ T,
+ Handle,
+ WriterVariant,
+ FIsAdmin,
+ FPropertyPermissions,
+ FCheckTokenExist,
+ FGetProperties,
+ > where
+ T: Config,
+ Handle: CommonCollectionOperations<T> + Deref<Target = CollectionHandle<T>>,
+ FIsAdmin: FnOnce() -> bool,
+ FPropertyPermissions: FnOnce() -> PropertiesPermissionMap,
+ FCheckTokenExist: Copy + FnOnce(TokenId) -> bool,
+ FGetProperties: Copy + FnOnce(TokenId) -> TokenProperties,
+{
+ fn internal_write_token_properties<FCheckTokenOwner>(
+ &mut self,
+ token_id: TokenId,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ check_token_owner: FCheckTokenOwner,
+ log: evm_coder::ethereum::Log,
+ ) -> DispatchResult
+ where
+ FCheckTokenOwner: FnOnce(&Handle) -> Result<bool, DispatchError>,
+ {
+ let get_properties = self.get_properties;
+ let mut stored_properties = LazyValue::new(move || get_properties(token_id));
+
+ let mut is_token_owner = LazyValue::new(|| check_token_owner(self.collection));
+
+ let check_token_exist = self.check_token_exist;
+ let mut is_token_exist = LazyValue::new(move || check_token_exist(token_id));
+
+ for (key, value) in properties_updates {
+ let permission = self
+ .property_permissions
+ .value()
+ .get(&key)
+ .cloned()
+ .unwrap_or_else(PropertyPermission::none);
+
+ match permission {
+ PropertyPermission { mutable: false, .. }
+ if stored_properties.value().get(&key).is_some() =>
+ {
+ return Err(<Error<T>>::NoPermission.into());
+ }
+
+ PropertyPermission {
+ collection_admin,
+ token_owner,
+ ..
+ } => check_token_permissions::<T, _, _, _>(
+ collection_admin,
+ token_owner,
+ &mut self.is_collection_admin,
+ &mut is_token_owner,
+ &mut is_token_exist,
+ )?,
+ }
+
+ match value {
+ Some(value) => {
+ stored_properties
+ .value_mut()
+ .try_set(key.clone(), value)
+ .map_err(<Error<T>>::from)?;
+
+ <Pallet<T>>::deposit_event(Event::TokenPropertySet(
+ self.collection.id,
+ token_id,
+ key,
+ ));
+ }
+ None => {
+ stored_properties
+ .value_mut()
+ .remove(&key)
+ .map_err(<Error<T>>::from)?;
+
+ <Pallet<T>>::deposit_event(Event::TokenPropertyDeleted(
+ self.collection.id,
+ token_id,
+ key,
+ ));
+ }
+ }
+ }
+
+ let properties_changed = stored_properties.has_value();
+ if properties_changed {
+ <PalletEvm<T>>::deposit_log(log);
+
+ self.collection
+ .set_token_properties_raw(token_id, stored_properties.into_inner());
+ }
+
+ Ok(())
+ }
+}
+
+/// Create a [`PropertyWriter`] for newly created tokens.
+pub fn property_writer_for_new_token<'a, T, Handle>(
+ collection: &'a Handle,
+ sender: &'a T::CrossAccountId,
+) -> PropertyWriter<
+ 'a,
+ T,
+ Handle,
+ NewTokenPropertyWriter,
+ impl FnOnce() -> bool + 'a,
+ impl FnOnce() -> PropertiesPermissionMap + 'a,
+ impl Copy + FnOnce(TokenId) -> bool + 'a,
+ impl Copy + FnOnce(TokenId) -> TokenProperties + 'a,
+>
+where
+ T: Config,
+ Handle: CommonCollectionOperations<T> + Deref<Target = CollectionHandle<T>>,
+{
+ PropertyWriter {
+ collection,
+ is_collection_admin: LazyValue::new(|| collection.is_owner_or_admin(sender)),
+ property_permissions: LazyValue::new(|| <Pallet<T>>::property_permissions(collection.id)),
+ check_token_exist: |token_id| {
+ debug_assert!(collection.token_exists(token_id));
+ true
+ },
+ get_properties: |token_id| {
+ debug_assert!(collection.get_token_properties_raw(token_id).is_none());
+ TokenProperties::new()
+ },
+ _phantom: PhantomData,
+ }
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+/// Create a `PropertyWriter` with preloaded `is_collection_admin` and `property_permissions.
+/// Also:
+/// * it will return `true` for the token ownership check.
+/// * it will return empty stored properties without reading them from the storage.
+pub fn collection_info_loaded_property_writer<T, Handle>(
+ collection: &Handle,
+ is_collection_admin: bool,
+ property_permissions: PropertiesPermissionMap,
+) -> PropertyWriter<
+ T,
+ Handle,
+ NewTokenPropertyWriter,
+ impl FnOnce() -> bool,
+ impl FnOnce() -> PropertiesPermissionMap,
+ impl Copy + FnOnce(TokenId) -> bool,
+ impl Copy + FnOnce(TokenId) -> TokenProperties,
+>
+where
+ T: Config,
+ Handle: CommonCollectionOperations<T> + Deref<Target = CollectionHandle<T>>,
+{
+ PropertyWriter {
+ collection,
+ is_collection_admin: LazyValue::new(move || is_collection_admin),
+ property_permissions: LazyValue::new(move || property_permissions),
+ check_token_exist: |_token_id| true,
+ get_properties: |_token_id| TokenProperties::new(),
+ _phantom: PhantomData,
+ }
+}
+
+/// Create a [`PropertyWriter`] for already existing tokens.
+pub fn property_writer_for_existing_token<'a, T, Handle>(
+ collection: &'a Handle,
+ sender: &'a T::CrossAccountId,
+) -> PropertyWriter<
+ 'a,
+ T,
+ Handle,
+ ExistingTokenPropertyWriter,
+ impl FnOnce() -> bool + 'a,
+ impl FnOnce() -> PropertiesPermissionMap + 'a,
+ impl Copy + FnOnce(TokenId) -> bool + 'a,
+ impl Copy + FnOnce(TokenId) -> TokenProperties + 'a,
+>
+where
+ T: Config,
+ Handle: CommonCollectionOperations<T> + Deref<Target = CollectionHandle<T>>,
+{
+ PropertyWriter {
+ collection,
+ is_collection_admin: LazyValue::new(|| collection.is_owner_or_admin(sender)),
+ property_permissions: LazyValue::new(|| <Pallet<T>>::property_permissions(collection.id)),
+ check_token_exist: |token_id| collection.token_exists(token_id),
+ get_properties: |token_id| {
+ collection
+ .get_token_properties_raw(token_id)
+ .unwrap_or_default()
+ },
+ _phantom: PhantomData,
+ }
+}
+
+/// Computes the weight delta for newly created tokens with properties.
+/// * `properties_nums` - The properties num of each created token.
+/// * `init_token_properties` - The function to obtain the weight from a token's properties num.
+pub fn init_token_properties_delta<T: Config, I: Fn(u32) -> Weight>(
+ properties_nums: impl Iterator<Item = u32>,
+ init_token_properties: I,
+) -> Weight {
+ let mut delta = properties_nums
+ .filter_map(|properties_num| {
+ if properties_num > 0 {
+ Some(init_token_properties(properties_num))
+ } else {
+ None
+ }
+ })
+ .fold(Weight::zero(), |a, b| a.saturating_add(b));
+
+ // If at least once the `init_token_properties` was called,
+ // it means at least one newly created token has properties.
+ // Becuase of that, some common collection data also was loaded and we need to add this weight.
+ // However, these common data was loaded only once which is guaranteed by the `PropertyWriter`.
+ if !delta.is_zero() {
+ delta = delta.saturating_add(<SelfWeightOf<T>>::init_token_properties_common())
+ }
+
+ delta
+}
+
#[cfg(any(feature = "tests", test))]
#[allow(missing_docs)]
pub mod tests {
pallets/common/src/weights.rsdiffbeforeafterboth--- a/pallets/common/src/weights.rs
+++ b/pallets/common/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_common
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-30, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/common/src/weights.rs
@@ -36,6 +36,7 @@
fn set_collection_properties(b: u32, ) -> Weight;
fn delete_collection_properties(b: u32, ) -> Weight;
fn check_accesslist() -> Weight;
+ fn init_token_properties_common() -> Weight;
}
/// Weights for pallet_common using the Substrate node and recommended hardware.
@@ -46,12 +47,12 @@
/// The range of component `b` is `[0, 64]`.
fn set_collection_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `265`
+ // Measured: `298`
// Estimated: `44457`
- // Minimum execution time: 6_805_000 picoseconds.
- Weight::from_parts(6_965_000, 44457)
- // Standard Error: 20_175
- .saturating_add(Weight::from_parts(6_191_369, 0).saturating_mul(b.into()))
+ // Minimum execution time: 4_987_000 picoseconds.
+ Weight::from_parts(5_119_000, 44457)
+ // Standard Error: 7_609
+ .saturating_add(Weight::from_parts(5_750_459, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -60,12 +61,12 @@
/// The range of component `b` is `[0, 64]`.
fn delete_collection_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `270 + b * (33030 ±0)`
+ // Measured: `303 + b * (33030 ±0)`
// Estimated: `44457`
- // Minimum execution time: 6_284_000 picoseconds.
- Weight::from_parts(6_416_000, 44457)
- // Standard Error: 81_929
- .saturating_add(Weight::from_parts(23_972_425, 0).saturating_mul(b.into()))
+ // Minimum execution time: 4_923_000 picoseconds.
+ Weight::from_parts(5_074_000, 44457)
+ // Standard Error: 36_651
+ .saturating_add(Weight::from_parts(23_145_677, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -73,12 +74,24 @@
/// Proof: Common Allowlist (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
fn check_accesslist() -> Weight {
// Proof Size summary in bytes:
- // Measured: `340`
+ // Measured: `373`
// Estimated: `3535`
- // Minimum execution time: 5_205_000 picoseconds.
- Weight::from_parts(5_438_000, 3535)
+ // Minimum execution time: 4_271_000 picoseconds.
+ Weight::from_parts(4_461_000, 3535)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
+ /// Storage: Common IsAdmin (r:1 w:0)
+ /// Proof: Common IsAdmin (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
+ /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
+ /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ fn init_token_properties_common() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `326`
+ // Estimated: `20191`
+ // Minimum execution time: 5_889_000 picoseconds.
+ Weight::from_parts(6_138_000, 20191)
+ .saturating_add(T::DbWeight::get().reads(2_u64))
+ }
}
// For backwards compatibility and tests
@@ -88,12 +101,12 @@
/// The range of component `b` is `[0, 64]`.
fn set_collection_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `265`
+ // Measured: `298`
// Estimated: `44457`
- // Minimum execution time: 6_805_000 picoseconds.
- Weight::from_parts(6_965_000, 44457)
- // Standard Error: 20_175
- .saturating_add(Weight::from_parts(6_191_369, 0).saturating_mul(b.into()))
+ // Minimum execution time: 4_987_000 picoseconds.
+ Weight::from_parts(5_119_000, 44457)
+ // Standard Error: 7_609
+ .saturating_add(Weight::from_parts(5_750_459, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -102,12 +115,12 @@
/// The range of component `b` is `[0, 64]`.
fn delete_collection_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `270 + b * (33030 ±0)`
+ // Measured: `303 + b * (33030 ±0)`
// Estimated: `44457`
- // Minimum execution time: 6_284_000 picoseconds.
- Weight::from_parts(6_416_000, 44457)
- // Standard Error: 81_929
- .saturating_add(Weight::from_parts(23_972_425, 0).saturating_mul(b.into()))
+ // Minimum execution time: 4_923_000 picoseconds.
+ Weight::from_parts(5_074_000, 44457)
+ // Standard Error: 36_651
+ .saturating_add(Weight::from_parts(23_145_677, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -115,11 +128,23 @@
/// Proof: Common Allowlist (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
fn check_accesslist() -> Weight {
// Proof Size summary in bytes:
- // Measured: `340`
+ // Measured: `373`
// Estimated: `3535`
- // Minimum execution time: 5_205_000 picoseconds.
- Weight::from_parts(5_438_000, 3535)
+ // Minimum execution time: 4_271_000 picoseconds.
+ Weight::from_parts(4_461_000, 3535)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
+ /// Storage: Common IsAdmin (r:1 w:0)
+ /// Proof: Common IsAdmin (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
+ /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
+ /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ fn init_token_properties_common() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `326`
+ // Estimated: `20191`
+ // Minimum execution time: 5_889_000 picoseconds.
+ Weight::from_parts(6_138_000, 20191)
+ .saturating_add(RocksDbWeight::get().reads(2_u64))
+ }
}
pallets/configuration/src/weights.rsdiffbeforeafterboth--- a/pallets/configuration/src/weights.rs
+++ b/pallets/configuration/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_configuration
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/configuration/src/weights.rs
@@ -50,19 +50,23 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 1_725_000 picoseconds.
- Weight::from_parts(1_853_000, 0)
+ // Minimum execution time: 990_000 picoseconds.
+ Weight::from_parts(1_090_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Configuration MinGasPriceOverride (r:0 w:1)
/// Proof: Configuration MinGasPriceOverride (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
+ /// Storage: unknown `0xc1fef3b7207c11a52df13c12884e772609bc3a1e532c9cb85d57feed02cbff8e` (r:0 w:1)
+ /// Proof Skipped: unknown `0xc1fef3b7207c11a52df13c12884e772609bc3a1e532c9cb85d57feed02cbff8e` (r:0 w:1)
+ /// Storage: unknown `0xc1fef3b7207c11a52df13c12884e77263864ade243c642793ebcfe9e16f454ca` (r:0 w:1)
+ /// Proof Skipped: unknown `0xc1fef3b7207c11a52df13c12884e77263864ade243c642793ebcfe9e16f454ca` (r:0 w:1)
fn set_min_gas_price_override() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 1_802_000 picoseconds.
- Weight::from_parts(1_903_000, 0)
- .saturating_add(T::DbWeight::get().writes(1_u64))
+ // Minimum execution time: 1_469_000 picoseconds.
+ Weight::from_parts(1_565_000, 0)
+ .saturating_add(T::DbWeight::get().writes(3_u64))
}
/// Storage: Configuration AppPromomotionConfigurationOverride (r:0 w:1)
/// Proof: Configuration AppPromomotionConfigurationOverride (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
@@ -70,8 +74,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 2_048_000 picoseconds.
- Weight::from_parts(2_157_000, 0)
+ // Minimum execution time: 1_027_000 picoseconds.
+ Weight::from_parts(1_098_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Configuration CollatorSelectionDesiredCollatorsOverride (r:0 w:1)
@@ -80,8 +84,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 7_622_000 picoseconds.
- Weight::from_parts(8_014_000, 0)
+ // Minimum execution time: 4_149_000 picoseconds.
+ Weight::from_parts(4_326_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Configuration CollatorSelectionLicenseBondOverride (r:0 w:1)
@@ -90,8 +94,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 4_981_000 picoseconds.
- Weight::from_parts(5_811_000, 0)
+ // Minimum execution time: 2_758_000 picoseconds.
+ Weight::from_parts(2_911_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Configuration CollatorSelectionKickThresholdOverride (r:0 w:1)
@@ -100,8 +104,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 4_664_000 picoseconds.
- Weight::from_parts(4_816_000, 0)
+ // Minimum execution time: 2_695_000 picoseconds.
+ Weight::from_parts(2_829_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
}
@@ -114,19 +118,23 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 1_725_000 picoseconds.
- Weight::from_parts(1_853_000, 0)
+ // Minimum execution time: 990_000 picoseconds.
+ Weight::from_parts(1_090_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Configuration MinGasPriceOverride (r:0 w:1)
/// Proof: Configuration MinGasPriceOverride (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
+ /// Storage: unknown `0xc1fef3b7207c11a52df13c12884e772609bc3a1e532c9cb85d57feed02cbff8e` (r:0 w:1)
+ /// Proof Skipped: unknown `0xc1fef3b7207c11a52df13c12884e772609bc3a1e532c9cb85d57feed02cbff8e` (r:0 w:1)
+ /// Storage: unknown `0xc1fef3b7207c11a52df13c12884e77263864ade243c642793ebcfe9e16f454ca` (r:0 w:1)
+ /// Proof Skipped: unknown `0xc1fef3b7207c11a52df13c12884e77263864ade243c642793ebcfe9e16f454ca` (r:0 w:1)
fn set_min_gas_price_override() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 1_802_000 picoseconds.
- Weight::from_parts(1_903_000, 0)
- .saturating_add(RocksDbWeight::get().writes(1_u64))
+ // Minimum execution time: 1_469_000 picoseconds.
+ Weight::from_parts(1_565_000, 0)
+ .saturating_add(RocksDbWeight::get().writes(3_u64))
}
/// Storage: Configuration AppPromomotionConfigurationOverride (r:0 w:1)
/// Proof: Configuration AppPromomotionConfigurationOverride (max_values: Some(1), max_size: Some(17), added: 512, mode: MaxEncodedLen)
@@ -134,8 +142,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 2_048_000 picoseconds.
- Weight::from_parts(2_157_000, 0)
+ // Minimum execution time: 1_027_000 picoseconds.
+ Weight::from_parts(1_098_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Configuration CollatorSelectionDesiredCollatorsOverride (r:0 w:1)
@@ -144,8 +152,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 7_622_000 picoseconds.
- Weight::from_parts(8_014_000, 0)
+ // Minimum execution time: 4_149_000 picoseconds.
+ Weight::from_parts(4_326_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Configuration CollatorSelectionLicenseBondOverride (r:0 w:1)
@@ -154,8 +162,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 4_981_000 picoseconds.
- Weight::from_parts(5_811_000, 0)
+ // Minimum execution time: 2_758_000 picoseconds.
+ Weight::from_parts(2_911_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Configuration CollatorSelectionKickThresholdOverride (r:0 w:1)
@@ -164,8 +172,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 4_664_000 picoseconds.
- Weight::from_parts(4_816_000, 0)
+ // Minimum execution time: 2_695_000 picoseconds.
+ Weight::from_parts(2_829_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
}
pallets/evm-migration/src/weights.rsdiffbeforeafterboth--- a/pallets/evm-migration/src/weights.rs
+++ b/pallets/evm-migration/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_evm_migration
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/evm-migration/src/weights.rs
@@ -52,9 +52,9 @@
fn begin() -> Weight {
// Proof Size summary in bytes:
// Measured: `94`
- // Estimated: `10646`
- // Minimum execution time: 8_519_000 picoseconds.
- Weight::from_parts(8_729_000, 10646)
+ // Estimated: `3593`
+ // Minimum execution time: 6_131_000 picoseconds.
+ Weight::from_parts(6_351_000, 3593)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -66,11 +66,11 @@
fn set_data(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `96`
- // Estimated: `3590`
- // Minimum execution time: 6_062_000 picoseconds.
- Weight::from_parts(7_193_727, 3590)
- // Standard Error: 1_844
- .saturating_add(Weight::from_parts(876_826, 0).saturating_mul(b.into()))
+ // Estimated: `3494`
+ // Minimum execution time: 4_522_000 picoseconds.
+ Weight::from_parts(4_569_839, 3494)
+ // Standard Error: 253
+ .saturating_add(Weight::from_parts(743_780, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(b.into())))
}
@@ -79,12 +79,14 @@
/// Storage: EVM AccountCodes (r:0 w:1)
/// Proof Skipped: EVM AccountCodes (max_values: None, max_size: None, mode: Measured)
/// The range of component `b` is `[0, 80]`.
- fn finish(_b: u32, ) -> Weight {
+ fn finish(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `96`
- // Estimated: `3590`
- // Minimum execution time: 7_452_000 picoseconds.
- Weight::from_parts(8_531_888, 3590)
+ // Estimated: `3494`
+ // Minimum execution time: 5_329_000 picoseconds.
+ Weight::from_parts(5_677_312, 3494)
+ // Standard Error: 22
+ .saturating_add(Weight::from_parts(1_369, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -93,20 +95,20 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 1_377_000 picoseconds.
- Weight::from_parts(3_388_877, 0)
- // Standard Error: 1_205
- .saturating_add(Weight::from_parts(696_701, 0).saturating_mul(b.into()))
+ // Minimum execution time: 890_000 picoseconds.
+ Weight::from_parts(1_279_871, 0)
+ // Standard Error: 112
+ .saturating_add(Weight::from_parts(408_968, 0).saturating_mul(b.into()))
}
/// The range of component `b` is `[0, 200]`.
fn insert_events(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 1_671_000 picoseconds.
- Weight::from_parts(4_402_497, 0)
- // Standard Error: 723
- .saturating_add(Weight::from_parts(1_338_678, 0).saturating_mul(b.into()))
+ // Minimum execution time: 896_000 picoseconds.
+ Weight::from_parts(1_975_680, 0)
+ // Standard Error: 117
+ .saturating_add(Weight::from_parts(1_003_721, 0).saturating_mul(b.into()))
}
}
@@ -121,9 +123,9 @@
fn begin() -> Weight {
// Proof Size summary in bytes:
// Measured: `94`
- // Estimated: `10646`
- // Minimum execution time: 8_519_000 picoseconds.
- Weight::from_parts(8_729_000, 10646)
+ // Estimated: `3593`
+ // Minimum execution time: 6_131_000 picoseconds.
+ Weight::from_parts(6_351_000, 3593)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -135,11 +137,11 @@
fn set_data(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `96`
- // Estimated: `3590`
- // Minimum execution time: 6_062_000 picoseconds.
- Weight::from_parts(7_193_727, 3590)
- // Standard Error: 1_844
- .saturating_add(Weight::from_parts(876_826, 0).saturating_mul(b.into()))
+ // Estimated: `3494`
+ // Minimum execution time: 4_522_000 picoseconds.
+ Weight::from_parts(4_569_839, 3494)
+ // Standard Error: 253
+ .saturating_add(Weight::from_parts(743_780, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(b.into())))
}
@@ -148,12 +150,14 @@
/// Storage: EVM AccountCodes (r:0 w:1)
/// Proof Skipped: EVM AccountCodes (max_values: None, max_size: None, mode: Measured)
/// The range of component `b` is `[0, 80]`.
- fn finish(_b: u32, ) -> Weight {
+ fn finish(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `96`
- // Estimated: `3590`
- // Minimum execution time: 7_452_000 picoseconds.
- Weight::from_parts(8_531_888, 3590)
+ // Estimated: `3494`
+ // Minimum execution time: 5_329_000 picoseconds.
+ Weight::from_parts(5_677_312, 3494)
+ // Standard Error: 22
+ .saturating_add(Weight::from_parts(1_369, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -162,20 +166,20 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 1_377_000 picoseconds.
- Weight::from_parts(3_388_877, 0)
- // Standard Error: 1_205
- .saturating_add(Weight::from_parts(696_701, 0).saturating_mul(b.into()))
+ // Minimum execution time: 890_000 picoseconds.
+ Weight::from_parts(1_279_871, 0)
+ // Standard Error: 112
+ .saturating_add(Weight::from_parts(408_968, 0).saturating_mul(b.into()))
}
/// The range of component `b` is `[0, 200]`.
fn insert_events(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 1_671_000 picoseconds.
- Weight::from_parts(4_402_497, 0)
- // Standard Error: 723
- .saturating_add(Weight::from_parts(1_338_678, 0).saturating_mul(b.into()))
+ // Minimum execution time: 896_000 picoseconds.
+ Weight::from_parts(1_975_680, 0)
+ // Standard Error: 117
+ .saturating_add(Weight::from_parts(1_003_721, 0).saturating_mul(b.into()))
}
}
pallets/foreign-assets/src/weights.rsdiffbeforeafterboth--- a/pallets/foreign-assets/src/weights.rs
+++ b/pallets/foreign-assets/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_foreign_assets
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/foreign-assets/src/weights.rs
@@ -56,6 +56,8 @@
/// Proof: ForeignAssets AssetMetadatas (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen)
/// Storage: ForeignAssets AssetBinding (r:1 w:1)
/// Proof: ForeignAssets AssetBinding (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
+ /// Storage: Common AdminAmount (r:0 w:1)
+ /// Proof: Common AdminAmount (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
/// Storage: Common CollectionPropertyPermissions (r:0 w:1)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Common CollectionProperties (r:0 w:1)
@@ -65,11 +67,11 @@
fn register_foreign_asset() -> Weight {
// Proof Size summary in bytes:
// Measured: `286`
- // Estimated: `25838`
- // Minimum execution time: 37_778_000 picoseconds.
- Weight::from_parts(38_334_000, 25838)
+ // Estimated: `6196`
+ // Minimum execution time: 33_294_000 picoseconds.
+ Weight::from_parts(34_011_000, 6196)
.saturating_add(T::DbWeight::get().reads(9_u64))
- .saturating_add(T::DbWeight::get().writes(11_u64))
+ .saturating_add(T::DbWeight::get().writes(12_u64))
}
/// Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
/// Proof: ForeignAssets ForeignAssetLocations (max_values: None, max_size: Some(614), added: 3089, mode: MaxEncodedLen)
@@ -78,9 +80,9 @@
fn update_foreign_asset() -> Weight {
// Proof Size summary in bytes:
// Measured: `197`
- // Estimated: `7615`
- // Minimum execution time: 13_739_000 picoseconds.
- Weight::from_parts(22_366_000, 7615)
+ // Estimated: `4079`
+ // Minimum execution time: 9_296_000 picoseconds.
+ Weight::from_parts(9_594_000, 4079)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -104,6 +106,8 @@
/// Proof: ForeignAssets AssetMetadatas (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen)
/// Storage: ForeignAssets AssetBinding (r:1 w:1)
/// Proof: ForeignAssets AssetBinding (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
+ /// Storage: Common AdminAmount (r:0 w:1)
+ /// Proof: Common AdminAmount (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
/// Storage: Common CollectionPropertyPermissions (r:0 w:1)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Common CollectionProperties (r:0 w:1)
@@ -113,11 +117,11 @@
fn register_foreign_asset() -> Weight {
// Proof Size summary in bytes:
// Measured: `286`
- // Estimated: `25838`
- // Minimum execution time: 37_778_000 picoseconds.
- Weight::from_parts(38_334_000, 25838)
+ // Estimated: `6196`
+ // Minimum execution time: 33_294_000 picoseconds.
+ Weight::from_parts(34_011_000, 6196)
.saturating_add(RocksDbWeight::get().reads(9_u64))
- .saturating_add(RocksDbWeight::get().writes(11_u64))
+ .saturating_add(RocksDbWeight::get().writes(12_u64))
}
/// Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
/// Proof: ForeignAssets ForeignAssetLocations (max_values: None, max_size: Some(614), added: 3089, mode: MaxEncodedLen)
@@ -126,9 +130,9 @@
fn update_foreign_asset() -> Weight {
// Proof Size summary in bytes:
// Measured: `197`
- // Estimated: `7615`
- // Minimum execution time: 13_739_000 picoseconds.
- Weight::from_parts(22_366_000, 7615)
+ // Estimated: `4079`
+ // Minimum execution time: 9_296_000 picoseconds.
+ Weight::from_parts(9_594_000, 4079)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -25,7 +25,7 @@
weights::WeightInfo as _, SelfWeightOf as PalletCommonWeightOf,
};
use pallet_structure::Error as StructureError;
-use sp_runtime::ArithmeticError;
+use sp_runtime::{ArithmeticError, DispatchError};
use sp_std::{vec::Vec, vec};
use up_data_structs::{Property, PropertyKey, PropertyValue, PropertyKeyPermission};
@@ -364,6 +364,18 @@
fail!(<Error<T>>::SettingPropertiesNotAllowed)
}
+ fn get_token_properties_raw(
+ &self,
+ _token_id: TokenId,
+ ) -> Option<up_data_structs::TokenProperties> {
+ // No token properties are defined on fungibles
+ None
+ }
+
+ fn set_token_properties_raw(&self, _token_id: TokenId, _map: up_data_structs::TokenProperties) {
+ // No token properties are defined on fungibles
+ }
+
fn check_nesting(
&self,
_sender: <T>::CrossAccountId,
@@ -402,6 +414,15 @@
Err(TokenOwnerError::MultipleOwners)
}
+ fn check_token_indirect_owner(
+ &self,
+ _token: TokenId,
+ _maybe_owner: &T::CrossAccountId,
+ _nesting_budget: &dyn Budget,
+ ) -> Result<bool, DispatchError> {
+ Ok(false)
+ }
+
/// Returns 10 tokens owners in no particular order.
fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {
<Pallet<T>>::token_owners(self.id, token).unwrap_or_default()
pallets/fungible/src/weights.rsdiffbeforeafterboth--- a/pallets/fungible/src/weights.rs
+++ b/pallets/fungible/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_fungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/fungible/src/weights.rs
@@ -54,9 +54,9 @@
fn create_item() -> Weight {
// Proof Size summary in bytes:
// Measured: `42`
- // Estimated: `7035`
- // Minimum execution time: 10_168_000 picoseconds.
- Weight::from_parts(10_453_000, 7035)
+ // Estimated: `3542`
+ // Minimum execution time: 7_228_000 picoseconds.
+ Weight::from_parts(7_472_000, 3542)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -68,11 +68,11 @@
fn create_multiple_items_ex(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `42`
- // Estimated: `4483 + b * (2552 ±0)`
- // Minimum execution time: 3_248_000 picoseconds.
- Weight::from_parts(12_455_981, 4483)
- // Standard Error: 2_698
- .saturating_add(Weight::from_parts(3_426_148, 0).saturating_mul(b.into()))
+ // Estimated: `3493 + b * (2552 ±0)`
+ // Minimum execution time: 2_398_000 picoseconds.
+ Weight::from_parts(4_432_908, 3493)
+ // Standard Error: 263
+ .saturating_add(Weight::from_parts(2_617_422, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
.saturating_add(T::DbWeight::get().writes(1_u64))
@@ -86,9 +86,9 @@
fn burn_item() -> Weight {
// Proof Size summary in bytes:
// Measured: `197`
- // Estimated: `7035`
- // Minimum execution time: 12_717_000 picoseconds.
- Weight::from_parts(13_031_000, 7035)
+ // Estimated: `3542`
+ // Minimum execution time: 9_444_000 picoseconds.
+ Weight::from_parts(9_742_000, 3542)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -98,8 +98,8 @@
// Proof Size summary in bytes:
// Measured: `182`
// Estimated: `6094`
- // Minimum execution time: 13_640_000 picoseconds.
- Weight::from_parts(13_935_000, 6094)
+ // Minimum execution time: 9_553_000 picoseconds.
+ Weight::from_parts(9_852_000, 6094)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -111,8 +111,8 @@
// Proof Size summary in bytes:
// Measured: `182`
// Estimated: `3542`
- // Minimum execution time: 11_769_000 picoseconds.
- Weight::from_parts(12_072_000, 3542)
+ // Minimum execution time: 8_435_000 picoseconds.
+ Weight::from_parts(8_714_000, 3542)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -124,8 +124,8 @@
// Proof Size summary in bytes:
// Measured: `170`
// Estimated: `3542`
- // Minimum execution time: 11_603_000 picoseconds.
- Weight::from_parts(12_003_000, 3542)
+ // Minimum execution time: 8_475_000 picoseconds.
+ Weight::from_parts(8_735_000, 3542)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -135,8 +135,8 @@
// Proof Size summary in bytes:
// Measured: `210`
// Estimated: `3558`
- // Minimum execution time: 5_682_000 picoseconds.
- Weight::from_parts(5_892_000, 3558)
+ // Minimum execution time: 4_426_000 picoseconds.
+ Weight::from_parts(4_604_000, 3558)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: Fungible Allowance (r:0 w:1)
@@ -145,8 +145,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 6_415_000 picoseconds.
- Weight::from_parts(6_599_000, 0)
+ // Minimum execution time: 4_130_000 picoseconds.
+ Weight::from_parts(4_275_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Fungible Allowance (r:1 w:1)
@@ -158,9 +158,9 @@
fn burn_from() -> Weight {
// Proof Size summary in bytes:
// Measured: `315`
- // Estimated: `10593`
- // Minimum execution time: 20_257_000 picoseconds.
- Weight::from_parts(20_625_000, 10593)
+ // Estimated: `3558`
+ // Minimum execution time: 14_878_000 picoseconds.
+ Weight::from_parts(15_263_000, 3558)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
}
@@ -175,9 +175,9 @@
fn create_item() -> Weight {
// Proof Size summary in bytes:
// Measured: `42`
- // Estimated: `7035`
- // Minimum execution time: 10_168_000 picoseconds.
- Weight::from_parts(10_453_000, 7035)
+ // Estimated: `3542`
+ // Minimum execution time: 7_228_000 picoseconds.
+ Weight::from_parts(7_472_000, 3542)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -189,11 +189,11 @@
fn create_multiple_items_ex(b: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `42`
- // Estimated: `4483 + b * (2552 ±0)`
- // Minimum execution time: 3_248_000 picoseconds.
- Weight::from_parts(12_455_981, 4483)
- // Standard Error: 2_698
- .saturating_add(Weight::from_parts(3_426_148, 0).saturating_mul(b.into()))
+ // Estimated: `3493 + b * (2552 ±0)`
+ // Minimum execution time: 2_398_000 picoseconds.
+ Weight::from_parts(4_432_908, 3493)
+ // Standard Error: 263
+ .saturating_add(Weight::from_parts(2_617_422, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(b.into())))
.saturating_add(RocksDbWeight::get().writes(1_u64))
@@ -207,9 +207,9 @@
fn burn_item() -> Weight {
// Proof Size summary in bytes:
// Measured: `197`
- // Estimated: `7035`
- // Minimum execution time: 12_717_000 picoseconds.
- Weight::from_parts(13_031_000, 7035)
+ // Estimated: `3542`
+ // Minimum execution time: 9_444_000 picoseconds.
+ Weight::from_parts(9_742_000, 3542)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -219,8 +219,8 @@
// Proof Size summary in bytes:
// Measured: `182`
// Estimated: `6094`
- // Minimum execution time: 13_640_000 picoseconds.
- Weight::from_parts(13_935_000, 6094)
+ // Minimum execution time: 9_553_000 picoseconds.
+ Weight::from_parts(9_852_000, 6094)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -232,8 +232,8 @@
// Proof Size summary in bytes:
// Measured: `182`
// Estimated: `3542`
- // Minimum execution time: 11_769_000 picoseconds.
- Weight::from_parts(12_072_000, 3542)
+ // Minimum execution time: 8_435_000 picoseconds.
+ Weight::from_parts(8_714_000, 3542)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -245,8 +245,8 @@
// Proof Size summary in bytes:
// Measured: `170`
// Estimated: `3542`
- // Minimum execution time: 11_603_000 picoseconds.
- Weight::from_parts(12_003_000, 3542)
+ // Minimum execution time: 8_475_000 picoseconds.
+ Weight::from_parts(8_735_000, 3542)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -256,8 +256,8 @@
// Proof Size summary in bytes:
// Measured: `210`
// Estimated: `3558`
- // Minimum execution time: 5_682_000 picoseconds.
- Weight::from_parts(5_892_000, 3558)
+ // Minimum execution time: 4_426_000 picoseconds.
+ Weight::from_parts(4_604_000, 3558)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: Fungible Allowance (r:0 w:1)
@@ -266,8 +266,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 6_415_000 picoseconds.
- Weight::from_parts(6_599_000, 0)
+ // Minimum execution time: 4_130_000 picoseconds.
+ Weight::from_parts(4_275_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Fungible Allowance (r:1 w:1)
@@ -279,9 +279,9 @@
fn burn_from() -> Weight {
// Proof Size summary in bytes:
// Measured: `315`
- // Estimated: `10593`
- // Minimum execution time: 20_257_000 picoseconds.
- Weight::from_parts(20_625_000, 10593)
+ // Estimated: `3558`
+ // Minimum execution time: 14_878_000 picoseconds.
+ Weight::from_parts(15_263_000, 3558)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
}
pallets/identity/src/weights.rsdiffbeforeafterboth--- a/pallets/identity/src/weights.rs
+++ b/pallets/identity/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_identity
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-27, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/identity/src/weights.rs
@@ -64,10 +64,10 @@
// Proof Size summary in bytes:
// Measured: `31 + r * (57 ±0)`
// Estimated: `2626`
- // Minimum execution time: 9_094_000 picoseconds.
- Weight::from_parts(10_431_627, 2626)
- // Standard Error: 1_046
- .saturating_add(Weight::from_parts(99_468, 0).saturating_mul(r.into()))
+ // Minimum execution time: 6_759_000 picoseconds.
+ Weight::from_parts(7_254_560, 2626)
+ // Standard Error: 231
+ .saturating_add(Weight::from_parts(64_513, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -79,12 +79,12 @@
// Proof Size summary in bytes:
// Measured: `441 + r * (5 ±0)`
// Estimated: `11003`
- // Minimum execution time: 18_662_000 picoseconds.
- Weight::from_parts(17_939_760, 11003)
- // Standard Error: 2_371
- .saturating_add(Weight::from_parts(22_184, 0).saturating_mul(r.into()))
- // Standard Error: 462
- .saturating_add(Weight::from_parts(151_368, 0).saturating_mul(x.into()))
+ // Minimum execution time: 14_134_000 picoseconds.
+ Weight::from_parts(12_591_985, 11003)
+ // Standard Error: 562
+ .saturating_add(Weight::from_parts(77_682, 0).saturating_mul(r.into()))
+ // Standard Error: 109
+ .saturating_add(Weight::from_parts(96_303, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -98,11 +98,11 @@
fn set_subs_new(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `100`
- // Estimated: `18716 + s * (2589 ±0)`
- // Minimum execution time: 6_921_000 picoseconds.
- Weight::from_parts(16_118_195, 18716)
- // Standard Error: 1_786
- .saturating_add(Weight::from_parts(1_350_155, 0).saturating_mul(s.into()))
+ // Estimated: `11003 + s * (2589 ±0)`
+ // Minimum execution time: 4_763_000 picoseconds.
+ Weight::from_parts(11_344_974, 11003)
+ // Standard Error: 401
+ .saturating_add(Weight::from_parts(1_141_028, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
.saturating_add(T::DbWeight::get().writes(1_u64))
@@ -119,11 +119,11 @@
fn set_subs_old(p: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `193 + p * (32 ±0)`
- // Estimated: `17726`
- // Minimum execution time: 6_858_000 picoseconds.
- Weight::from_parts(16_222_054, 17726)
- // Standard Error: 1_409
- .saturating_add(Weight::from_parts(593_588, 0).saturating_mul(p.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 4_783_000 picoseconds.
+ Weight::from_parts(11_531_027, 11003)
+ // Standard Error: 369
+ .saturating_add(Weight::from_parts(542_102, 0).saturating_mul(p.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
@@ -140,15 +140,15 @@
fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `468 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
- // Estimated: `17726`
- // Minimum execution time: 27_212_000 picoseconds.
- Weight::from_parts(19_030_840, 17726)
- // Standard Error: 3_118
- .saturating_add(Weight::from_parts(29_836, 0).saturating_mul(r.into()))
- // Standard Error: 608
- .saturating_add(Weight::from_parts(590_661, 0).saturating_mul(s.into()))
- // Standard Error: 608
- .saturating_add(Weight::from_parts(110_108, 0).saturating_mul(x.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 23_175_000 picoseconds.
+ Weight::from_parts(16_503_215, 11003)
+ // Standard Error: 625
+ .saturating_add(Weight::from_parts(1_175, 0).saturating_mul(r.into()))
+ // Standard Error: 122
+ .saturating_add(Weight::from_parts(533_184, 0).saturating_mul(s.into()))
+ // Standard Error: 122
+ .saturating_add(Weight::from_parts(94_600, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -162,13 +162,13 @@
fn request_judgement(r: u32, x: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `366 + r * (57 ±0) + x * (66 ±0)`
- // Estimated: `13629`
- // Minimum execution time: 19_771_000 picoseconds.
- Weight::from_parts(18_917_892, 13629)
- // Standard Error: 1_957
- .saturating_add(Weight::from_parts(57_465, 0).saturating_mul(r.into()))
- // Standard Error: 381
- .saturating_add(Weight::from_parts(168_586, 0).saturating_mul(x.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 15_322_000 picoseconds.
+ Weight::from_parts(13_671_670, 11003)
+ // Standard Error: 722
+ .saturating_add(Weight::from_parts(73_665, 0).saturating_mul(r.into()))
+ // Standard Error: 140
+ .saturating_add(Weight::from_parts(124_598, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -180,12 +180,12 @@
// Proof Size summary in bytes:
// Measured: `397 + x * (66 ±0)`
// Estimated: `11003`
- // Minimum execution time: 17_411_000 picoseconds.
- Weight::from_parts(16_856_331, 11003)
- // Standard Error: 7_002
- .saturating_add(Weight::from_parts(34_389, 0).saturating_mul(r.into()))
- // Standard Error: 1_366
- .saturating_add(Weight::from_parts(165_686, 0).saturating_mul(x.into()))
+ // Minimum execution time: 13_268_000 picoseconds.
+ Weight::from_parts(12_489_352, 11003)
+ // Standard Error: 544
+ .saturating_add(Weight::from_parts(35_424, 0).saturating_mul(r.into()))
+ // Standard Error: 106
+ .saturating_add(Weight::from_parts(123_149, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -196,10 +196,10 @@
// Proof Size summary in bytes:
// Measured: `88 + r * (57 ±0)`
// Estimated: `2626`
- // Minimum execution time: 7_089_000 picoseconds.
- Weight::from_parts(7_750_487, 2626)
- // Standard Error: 1_625
- .saturating_add(Weight::from_parts(101_135, 0).saturating_mul(r.into()))
+ // Minimum execution time: 4_845_000 picoseconds.
+ Weight::from_parts(5_147_478, 2626)
+ // Standard Error: 169
+ .saturating_add(Weight::from_parts(55_561, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -210,10 +210,10 @@
// Proof Size summary in bytes:
// Measured: `88 + r * (57 ±0)`
// Estimated: `2626`
- // Minimum execution time: 6_300_000 picoseconds.
- Weight::from_parts(6_836_140, 2626)
- // Standard Error: 655
- .saturating_add(Weight::from_parts(102_284, 0).saturating_mul(r.into()))
+ // Minimum execution time: 4_191_000 picoseconds.
+ Weight::from_parts(4_478_351, 2626)
+ // Standard Error: 138
+ .saturating_add(Weight::from_parts(53_627, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -224,10 +224,10 @@
// Proof Size summary in bytes:
// Measured: `88 + r * (57 ±0)`
// Estimated: `2626`
- // Minimum execution time: 6_257_000 picoseconds.
- Weight::from_parts(6_917_052, 2626)
- // Standard Error: 2_628
- .saturating_add(Weight::from_parts(71_362, 0).saturating_mul(r.into()))
+ // Minimum execution time: 4_003_000 picoseconds.
+ Weight::from_parts(4_303_365, 2626)
+ // Standard Error: 147
+ .saturating_add(Weight::from_parts(52_472, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -240,13 +240,13 @@
fn provide_judgement(r: u32, x: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `444 + r * (57 ±0) + x * (66 ±0)`
- // Estimated: `13629`
- // Minimum execution time: 16_021_000 picoseconds.
- Weight::from_parts(15_553_670, 13629)
- // Standard Error: 5_797
- .saturating_add(Weight::from_parts(42_423, 0).saturating_mul(r.into()))
- // Standard Error: 1_072
- .saturating_add(Weight::from_parts(252_721, 0).saturating_mul(x.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 11_465_000 picoseconds.
+ Weight::from_parts(10_326_049, 11003)
+ // Standard Error: 660
+ .saturating_add(Weight::from_parts(48_922, 0).saturating_mul(r.into()))
+ // Standard Error: 122
+ .saturating_add(Weight::from_parts(185_374, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -264,15 +264,15 @@
fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `665 + r * (12 ±0) + s * (32 ±0) + x * (66 ±0)`
- // Estimated: `23922`
- // Minimum execution time: 40_801_000 picoseconds.
- Weight::from_parts(34_079_397, 23922)
- // Standard Error: 3_750
- .saturating_add(Weight::from_parts(31_496, 0).saturating_mul(r.into()))
- // Standard Error: 732
- .saturating_add(Weight::from_parts(599_691, 0).saturating_mul(s.into()))
- // Standard Error: 732
- .saturating_add(Weight::from_parts(101_683, 0).saturating_mul(x.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 34_933_000 picoseconds.
+ Weight::from_parts(28_994_022, 11003)
+ // Standard Error: 668
+ .saturating_add(Weight::from_parts(21_722, 0).saturating_mul(r.into()))
+ // Standard Error: 130
+ .saturating_add(Weight::from_parts(540_580, 0).saturating_mul(s.into()))
+ // Standard Error: 130
+ .saturating_add(Weight::from_parts(89_348, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -285,12 +285,12 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 4_412_000 picoseconds.
- Weight::from_parts(4_592_000, 0)
- // Standard Error: 703_509
- .saturating_add(Weight::from_parts(43_647_925, 0).saturating_mul(x.into()))
- // Standard Error: 117_043
- .saturating_add(Weight::from_parts(9_312_431, 0).saturating_mul(n.into()))
+ // Minimum execution time: 2_770_000 picoseconds.
+ Weight::from_parts(2_875_000, 0)
+ // Standard Error: 281_295
+ .saturating_add(Weight::from_parts(37_513_186, 0).saturating_mul(x.into()))
+ // Standard Error: 46_799
+ .saturating_add(Weight::from_parts(7_949_936, 0).saturating_mul(n.into()))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
}
/// Storage: Identity SubsOf (r:600 w:0)
@@ -303,12 +303,12 @@
// Proof Size summary in bytes:
// Measured: `41`
// Estimated: `990 + n * (5733 ±0)`
- // Minimum execution time: 3_824_000 picoseconds.
- Weight::from_parts(3_950_000, 990)
- // Standard Error: 2_864
- .saturating_add(Weight::from_parts(55_678, 0).saturating_mul(x.into()))
- // Standard Error: 476
- .saturating_add(Weight::from_parts(1_138_349, 0).saturating_mul(n.into()))
+ // Minimum execution time: 2_751_000 picoseconds.
+ Weight::from_parts(2_862_000, 990)
+ // Standard Error: 953
+ .saturating_add(Weight::from_parts(28_947, 0).saturating_mul(x.into()))
+ // Standard Error: 158
+ .saturating_add(Weight::from_parts(994_085, 0).saturating_mul(n.into()))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
.saturating_add(Weight::from_parts(0, 5733).saturating_mul(n.into()))
@@ -323,12 +323,12 @@
// Proof Size summary in bytes:
// Measured: `41`
// Estimated: `990 + n * (5733 ±0)`
- // Minimum execution time: 4_196_000 picoseconds.
- Weight::from_parts(4_340_000, 990)
- // Standard Error: 2_081_979
- .saturating_add(Weight::from_parts(130_653_903, 0).saturating_mul(s.into()))
- // Standard Error: 346_381
- .saturating_add(Weight::from_parts(23_046_001, 0).saturating_mul(n.into()))
+ // Minimum execution time: 2_671_000 picoseconds.
+ Weight::from_parts(2_814_000, 990)
+ // Standard Error: 785_159
+ .saturating_add(Weight::from_parts(109_659_566, 0).saturating_mul(s.into()))
+ // Standard Error: 130_628
+ .saturating_add(Weight::from_parts(19_169_269, 0).saturating_mul(n.into()))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -344,11 +344,11 @@
fn add_sub(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `474 + s * (36 ±0)`
- // Estimated: `21305`
- // Minimum execution time: 15_289_000 picoseconds.
- Weight::from_parts(21_319_844, 21305)
- // Standard Error: 893
- .saturating_add(Weight::from_parts(53_159, 0).saturating_mul(s.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 12_571_000 picoseconds.
+ Weight::from_parts(16_366_301, 11003)
+ // Standard Error: 217
+ .saturating_add(Weight::from_parts(42_542, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -360,11 +360,11 @@
fn rename_sub(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `590 + s * (3 ±0)`
- // Estimated: `14582`
- // Minimum execution time: 9_867_000 picoseconds.
- Weight::from_parts(12_546_245, 14582)
- // Standard Error: 509
- .saturating_add(Weight::from_parts(10_078, 0).saturating_mul(s.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 7_278_000 picoseconds.
+ Weight::from_parts(9_227_799, 11003)
+ // Standard Error: 104
+ .saturating_add(Weight::from_parts(14_014, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -378,11 +378,11 @@
fn remove_sub(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `637 + s * (35 ±0)`
- // Estimated: `21305`
- // Minimum execution time: 19_299_000 picoseconds.
- Weight::from_parts(24_125_576, 21305)
- // Standard Error: 1_479
- .saturating_add(Weight::from_parts(22_611, 0).saturating_mul(s.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 15_771_000 picoseconds.
+ Weight::from_parts(18_105_475, 11003)
+ // Standard Error: 129
+ .saturating_add(Weight::from_parts(32_074, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -390,16 +390,18 @@
/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
/// Storage: Identity SubsOf (r:1 w:1)
/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
+ /// Storage: System Account (r:1 w:0)
+ /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
/// The range of component `s` is `[0, 99]`.
fn quit_sub(s: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `563 + s * (37 ±0)`
- // Estimated: `10302`
- // Minimum execution time: 14_183_000 picoseconds.
- Weight::from_parts(17_343_547, 10302)
- // Standard Error: 454
- .saturating_add(Weight::from_parts(45_925, 0).saturating_mul(s.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
+ // Measured: `703 + s * (37 ±0)`
+ // Estimated: `6723`
+ // Minimum execution time: 14_093_000 picoseconds.
+ Weight::from_parts(16_125_177, 6723)
+ // Standard Error: 146
+ .saturating_add(Weight::from_parts(39_270, 0).saturating_mul(s.into()))
+ .saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
}
@@ -413,10 +415,10 @@
// Proof Size summary in bytes:
// Measured: `31 + r * (57 ±0)`
// Estimated: `2626`
- // Minimum execution time: 9_094_000 picoseconds.
- Weight::from_parts(10_431_627, 2626)
- // Standard Error: 1_046
- .saturating_add(Weight::from_parts(99_468, 0).saturating_mul(r.into()))
+ // Minimum execution time: 6_759_000 picoseconds.
+ Weight::from_parts(7_254_560, 2626)
+ // Standard Error: 231
+ .saturating_add(Weight::from_parts(64_513, 0).saturating_mul(r.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -428,12 +430,12 @@
// Proof Size summary in bytes:
// Measured: `441 + r * (5 ±0)`
// Estimated: `11003`
- // Minimum execution time: 18_662_000 picoseconds.
- Weight::from_parts(17_939_760, 11003)
- // Standard Error: 2_371
- .saturating_add(Weight::from_parts(22_184, 0).saturating_mul(r.into()))
- // Standard Error: 462
- .saturating_add(Weight::from_parts(151_368, 0).saturating_mul(x.into()))
+ // Minimum execution time: 14_134_000 picoseconds.
+ Weight::from_parts(12_591_985, 11003)
+ // Standard Error: 562
+ .saturating_add(Weight::from_parts(77_682, 0).saturating_mul(r.into()))
+ // Standard Error: 109
+ .saturating_add(Weight::from_parts(96_303, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -447,11 +449,11 @@
fn set_subs_new(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `100`
- // Estimated: `18716 + s * (2589 ±0)`
- // Minimum execution time: 6_921_000 picoseconds.
- Weight::from_parts(16_118_195, 18716)
- // Standard Error: 1_786
- .saturating_add(Weight::from_parts(1_350_155, 0).saturating_mul(s.into()))
+ // Estimated: `11003 + s * (2589 ±0)`
+ // Minimum execution time: 4_763_000 picoseconds.
+ Weight::from_parts(11_344_974, 11003)
+ // Standard Error: 401
+ .saturating_add(Weight::from_parts(1_141_028, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(s.into())))
.saturating_add(RocksDbWeight::get().writes(1_u64))
@@ -468,11 +470,11 @@
fn set_subs_old(p: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `193 + p * (32 ±0)`
- // Estimated: `17726`
- // Minimum execution time: 6_858_000 picoseconds.
- Weight::from_parts(16_222_054, 17726)
- // Standard Error: 1_409
- .saturating_add(Weight::from_parts(593_588, 0).saturating_mul(p.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 4_783_000 picoseconds.
+ Weight::from_parts(11_531_027, 11003)
+ // Standard Error: 369
+ .saturating_add(Weight::from_parts(542_102, 0).saturating_mul(p.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(p.into())))
@@ -489,15 +491,15 @@
fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `468 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
- // Estimated: `17726`
- // Minimum execution time: 27_212_000 picoseconds.
- Weight::from_parts(19_030_840, 17726)
- // Standard Error: 3_118
- .saturating_add(Weight::from_parts(29_836, 0).saturating_mul(r.into()))
- // Standard Error: 608
- .saturating_add(Weight::from_parts(590_661, 0).saturating_mul(s.into()))
- // Standard Error: 608
- .saturating_add(Weight::from_parts(110_108, 0).saturating_mul(x.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 23_175_000 picoseconds.
+ Weight::from_parts(16_503_215, 11003)
+ // Standard Error: 625
+ .saturating_add(Weight::from_parts(1_175, 0).saturating_mul(r.into()))
+ // Standard Error: 122
+ .saturating_add(Weight::from_parts(533_184, 0).saturating_mul(s.into()))
+ // Standard Error: 122
+ .saturating_add(Weight::from_parts(94_600, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -511,13 +513,13 @@
fn request_judgement(r: u32, x: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `366 + r * (57 ±0) + x * (66 ±0)`
- // Estimated: `13629`
- // Minimum execution time: 19_771_000 picoseconds.
- Weight::from_parts(18_917_892, 13629)
- // Standard Error: 1_957
- .saturating_add(Weight::from_parts(57_465, 0).saturating_mul(r.into()))
- // Standard Error: 381
- .saturating_add(Weight::from_parts(168_586, 0).saturating_mul(x.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 15_322_000 picoseconds.
+ Weight::from_parts(13_671_670, 11003)
+ // Standard Error: 722
+ .saturating_add(Weight::from_parts(73_665, 0).saturating_mul(r.into()))
+ // Standard Error: 140
+ .saturating_add(Weight::from_parts(124_598, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -529,12 +531,12 @@
// Proof Size summary in bytes:
// Measured: `397 + x * (66 ±0)`
// Estimated: `11003`
- // Minimum execution time: 17_411_000 picoseconds.
- Weight::from_parts(16_856_331, 11003)
- // Standard Error: 7_002
- .saturating_add(Weight::from_parts(34_389, 0).saturating_mul(r.into()))
- // Standard Error: 1_366
- .saturating_add(Weight::from_parts(165_686, 0).saturating_mul(x.into()))
+ // Minimum execution time: 13_268_000 picoseconds.
+ Weight::from_parts(12_489_352, 11003)
+ // Standard Error: 544
+ .saturating_add(Weight::from_parts(35_424, 0).saturating_mul(r.into()))
+ // Standard Error: 106
+ .saturating_add(Weight::from_parts(123_149, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -545,10 +547,10 @@
// Proof Size summary in bytes:
// Measured: `88 + r * (57 ±0)`
// Estimated: `2626`
- // Minimum execution time: 7_089_000 picoseconds.
- Weight::from_parts(7_750_487, 2626)
- // Standard Error: 1_625
- .saturating_add(Weight::from_parts(101_135, 0).saturating_mul(r.into()))
+ // Minimum execution time: 4_845_000 picoseconds.
+ Weight::from_parts(5_147_478, 2626)
+ // Standard Error: 169
+ .saturating_add(Weight::from_parts(55_561, 0).saturating_mul(r.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -559,10 +561,10 @@
// Proof Size summary in bytes:
// Measured: `88 + r * (57 ±0)`
// Estimated: `2626`
- // Minimum execution time: 6_300_000 picoseconds.
- Weight::from_parts(6_836_140, 2626)
- // Standard Error: 655
- .saturating_add(Weight::from_parts(102_284, 0).saturating_mul(r.into()))
+ // Minimum execution time: 4_191_000 picoseconds.
+ Weight::from_parts(4_478_351, 2626)
+ // Standard Error: 138
+ .saturating_add(Weight::from_parts(53_627, 0).saturating_mul(r.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -573,10 +575,10 @@
// Proof Size summary in bytes:
// Measured: `88 + r * (57 ±0)`
// Estimated: `2626`
- // Minimum execution time: 6_257_000 picoseconds.
- Weight::from_parts(6_917_052, 2626)
- // Standard Error: 2_628
- .saturating_add(Weight::from_parts(71_362, 0).saturating_mul(r.into()))
+ // Minimum execution time: 4_003_000 picoseconds.
+ Weight::from_parts(4_303_365, 2626)
+ // Standard Error: 147
+ .saturating_add(Weight::from_parts(52_472, 0).saturating_mul(r.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -589,13 +591,13 @@
fn provide_judgement(r: u32, x: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `444 + r * (57 ±0) + x * (66 ±0)`
- // Estimated: `13629`
- // Minimum execution time: 16_021_000 picoseconds.
- Weight::from_parts(15_553_670, 13629)
- // Standard Error: 5_797
- .saturating_add(Weight::from_parts(42_423, 0).saturating_mul(r.into()))
- // Standard Error: 1_072
- .saturating_add(Weight::from_parts(252_721, 0).saturating_mul(x.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 11_465_000 picoseconds.
+ Weight::from_parts(10_326_049, 11003)
+ // Standard Error: 660
+ .saturating_add(Weight::from_parts(48_922, 0).saturating_mul(r.into()))
+ // Standard Error: 122
+ .saturating_add(Weight::from_parts(185_374, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -613,15 +615,15 @@
fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `665 + r * (12 ±0) + s * (32 ±0) + x * (66 ±0)`
- // Estimated: `23922`
- // Minimum execution time: 40_801_000 picoseconds.
- Weight::from_parts(34_079_397, 23922)
- // Standard Error: 3_750
- .saturating_add(Weight::from_parts(31_496, 0).saturating_mul(r.into()))
- // Standard Error: 732
- .saturating_add(Weight::from_parts(599_691, 0).saturating_mul(s.into()))
- // Standard Error: 732
- .saturating_add(Weight::from_parts(101_683, 0).saturating_mul(x.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 34_933_000 picoseconds.
+ Weight::from_parts(28_994_022, 11003)
+ // Standard Error: 668
+ .saturating_add(Weight::from_parts(21_722, 0).saturating_mul(r.into()))
+ // Standard Error: 130
+ .saturating_add(Weight::from_parts(540_580, 0).saturating_mul(s.into()))
+ // Standard Error: 130
+ .saturating_add(Weight::from_parts(89_348, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -634,12 +636,12 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 4_412_000 picoseconds.
- Weight::from_parts(4_592_000, 0)
- // Standard Error: 703_509
- .saturating_add(Weight::from_parts(43_647_925, 0).saturating_mul(x.into()))
- // Standard Error: 117_043
- .saturating_add(Weight::from_parts(9_312_431, 0).saturating_mul(n.into()))
+ // Minimum execution time: 2_770_000 picoseconds.
+ Weight::from_parts(2_875_000, 0)
+ // Standard Error: 281_295
+ .saturating_add(Weight::from_parts(37_513_186, 0).saturating_mul(x.into()))
+ // Standard Error: 46_799
+ .saturating_add(Weight::from_parts(7_949_936, 0).saturating_mul(n.into()))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into())))
}
/// Storage: Identity SubsOf (r:600 w:0)
@@ -652,12 +654,12 @@
// Proof Size summary in bytes:
// Measured: `41`
// Estimated: `990 + n * (5733 ±0)`
- // Minimum execution time: 3_824_000 picoseconds.
- Weight::from_parts(3_950_000, 990)
- // Standard Error: 2_864
- .saturating_add(Weight::from_parts(55_678, 0).saturating_mul(x.into()))
- // Standard Error: 476
- .saturating_add(Weight::from_parts(1_138_349, 0).saturating_mul(n.into()))
+ // Minimum execution time: 2_751_000 picoseconds.
+ Weight::from_parts(2_862_000, 990)
+ // Standard Error: 953
+ .saturating_add(Weight::from_parts(28_947, 0).saturating_mul(x.into()))
+ // Standard Error: 158
+ .saturating_add(Weight::from_parts(994_085, 0).saturating_mul(n.into()))
.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into())))
.saturating_add(Weight::from_parts(0, 5733).saturating_mul(n.into()))
@@ -672,12 +674,12 @@
// Proof Size summary in bytes:
// Measured: `41`
// Estimated: `990 + n * (5733 ±0)`
- // Minimum execution time: 4_196_000 picoseconds.
- Weight::from_parts(4_340_000, 990)
- // Standard Error: 2_081_979
- .saturating_add(Weight::from_parts(130_653_903, 0).saturating_mul(s.into()))
- // Standard Error: 346_381
- .saturating_add(Weight::from_parts(23_046_001, 0).saturating_mul(n.into()))
+ // Minimum execution time: 2_671_000 picoseconds.
+ Weight::from_parts(2_814_000, 990)
+ // Standard Error: 785_159
+ .saturating_add(Weight::from_parts(109_659_566, 0).saturating_mul(s.into()))
+ // Standard Error: 130_628
+ .saturating_add(Weight::from_parts(19_169_269, 0).saturating_mul(n.into()))
.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -693,11 +695,11 @@
fn add_sub(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `474 + s * (36 ±0)`
- // Estimated: `21305`
- // Minimum execution time: 15_289_000 picoseconds.
- Weight::from_parts(21_319_844, 21305)
- // Standard Error: 893
- .saturating_add(Weight::from_parts(53_159, 0).saturating_mul(s.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 12_571_000 picoseconds.
+ Weight::from_parts(16_366_301, 11003)
+ // Standard Error: 217
+ .saturating_add(Weight::from_parts(42_542, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -709,11 +711,11 @@
fn rename_sub(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `590 + s * (3 ±0)`
- // Estimated: `14582`
- // Minimum execution time: 9_867_000 picoseconds.
- Weight::from_parts(12_546_245, 14582)
- // Standard Error: 509
- .saturating_add(Weight::from_parts(10_078, 0).saturating_mul(s.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 7_278_000 picoseconds.
+ Weight::from_parts(9_227_799, 11003)
+ // Standard Error: 104
+ .saturating_add(Weight::from_parts(14_014, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -727,11 +729,11 @@
fn remove_sub(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `637 + s * (35 ±0)`
- // Estimated: `21305`
- // Minimum execution time: 19_299_000 picoseconds.
- Weight::from_parts(24_125_576, 21305)
- // Standard Error: 1_479
- .saturating_add(Weight::from_parts(22_611, 0).saturating_mul(s.into()))
+ // Estimated: `11003`
+ // Minimum execution time: 15_771_000 picoseconds.
+ Weight::from_parts(18_105_475, 11003)
+ // Standard Error: 129
+ .saturating_add(Weight::from_parts(32_074, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -739,16 +741,18 @@
/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
/// Storage: Identity SubsOf (r:1 w:1)
/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
+ /// Storage: System Account (r:1 w:0)
+ /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
/// The range of component `s` is `[0, 99]`.
fn quit_sub(s: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `563 + s * (37 ±0)`
- // Estimated: `10302`
- // Minimum execution time: 14_183_000 picoseconds.
- Weight::from_parts(17_343_547, 10302)
- // Standard Error: 454
- .saturating_add(Weight::from_parts(45_925, 0).saturating_mul(s.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
+ // Measured: `703 + s * (37 ±0)`
+ // Estimated: `6723`
+ // Minimum execution time: 14_093_000 picoseconds.
+ Weight::from_parts(16_125_177, 6723)
+ // Standard Error: 146
+ .saturating_add(Weight::from_parts(39_270, 0).saturating_mul(s.into()))
+ .saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
}
pallets/maintenance/src/weights.rsdiffbeforeafterboth--- a/pallets/maintenance/src/weights.rs
+++ b/pallets/maintenance/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_maintenance
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/maintenance/src/weights.rs
@@ -47,8 +47,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 4_407_000 picoseconds.
- Weight::from_parts(4_556_000, 0)
+ // Minimum execution time: 3_015_000 picoseconds.
+ Weight::from_parts(3_184_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Maintenance Enabled (r:0 w:1)
@@ -57,8 +57,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 5_868_000 picoseconds.
- Weight::from_parts(6_100_000, 0)
+ // Minimum execution time: 2_976_000 picoseconds.
+ Weight::from_parts(3_111_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Preimage StatusFor (r:1 w:0)
@@ -68,9 +68,9 @@
fn execute_preimage() -> Weight {
// Proof Size summary in bytes:
// Measured: `209`
- // Estimated: `7230`
- // Minimum execution time: 14_046_000 picoseconds.
- Weight::from_parts(14_419_000, 7230)
+ // Estimated: `3674`
+ // Minimum execution time: 7_359_000 picoseconds.
+ Weight::from_parts(7_613_000, 3674)
.saturating_add(T::DbWeight::get().reads(2_u64))
}
}
@@ -83,8 +83,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 4_407_000 picoseconds.
- Weight::from_parts(4_556_000, 0)
+ // Minimum execution time: 3_015_000 picoseconds.
+ Weight::from_parts(3_184_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Maintenance Enabled (r:0 w:1)
@@ -93,8 +93,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 5_868_000 picoseconds.
- Weight::from_parts(6_100_000, 0)
+ // Minimum execution time: 2_976_000 picoseconds.
+ Weight::from_parts(3_111_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Preimage StatusFor (r:1 w:0)
@@ -104,9 +104,9 @@
fn execute_preimage() -> Weight {
// Proof Size summary in bytes:
// Measured: `209`
- // Estimated: `7230`
- // Minimum execution time: 14_046_000 picoseconds.
- Weight::from_parts(14_419_000, 7230)
+ // Estimated: `3674`
+ // Minimum execution time: 7_359_000 picoseconds.
+ Weight::from_parts(7_613_000, 3674)
.saturating_add(RocksDbWeight::get().reads(2_u64))
}
}
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -20,7 +20,9 @@
use frame_benchmarking::{benchmarks, account};
use pallet_common::{
bench_init,
- benchmarking::{create_collection_raw, property_key, property_value},
+ benchmarking::{
+ create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions,
+ },
CommonCollectionOperations,
};
use sp_std::prelude::*;
@@ -198,8 +200,49 @@
value: property_value(),
}).collect::<Vec<_>>();
let item = create_max_item(&collection, &owner, owner.clone())?;
- }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), SetPropertyMode::ExistingToken, &Unlimited)?}
+ }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?}
+
+ init_token_properties {
+ let b in 0..MAX_PROPERTIES_PER_ITEM;
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ owner: cross_from_sub;
+ };
+ let perms = (0..b).map(|k| PropertyKeyPermission {
+ key: property_key(k as usize),
+ permission: PropertyPermission {
+ mutable: false,
+ collection_admin: true,
+ token_owner: true,
+ },
+ }).collect::<Vec<_>>();
+ <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;
+ let props = (0..b).map(|k| Property {
+ key: property_key(k as usize),
+ value: property_value(),
+ }).collect::<Vec<_>>();
+ let item = create_max_item(&collection, &owner, owner.clone())?;
+
+ let (is_collection_admin, property_permissions) = load_is_admin_and_property_permissions(&collection, &owner);
+ }: {
+ let mut property_writer = pallet_common::collection_info_loaded_property_writer(
+ &collection,
+ is_collection_admin,
+ property_permissions,
+ );
+
+ property_writer.write_token_properties(
+ true,
+ item,
+ props.into_iter(),
+ crate::erc::ERC721TokenEvent::TokenChanged {
+ token_id: item.into(),
+ }
+ .to_log(T::ContractAddress::get()),
+ )?
+ }
+
delete_token_properties {
let b in 0..MAX_PROPERTIES_PER_ITEM;
bench_init!{
@@ -220,7 +263,7 @@
value: property_value(),
}).collect::<Vec<_>>();
let item = create_max_item(&collection, &owner, owner.clone())?;
- <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), SetPropertyMode::ExistingToken, &Unlimited)?;
+ <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?;
let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();
}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -23,47 +23,40 @@
};
use pallet_common::{
CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,
- weights::WeightInfo as _, SelfWeightOf as PalletCommonWeightOf,
+ weights::WeightInfo as _, SelfWeightOf as PalletCommonWeightOf, init_token_properties_delta,
};
+use pallet_structure::Pallet as PalletStructure;
use sp_runtime::DispatchError;
use sp_std::{vec::Vec, vec};
use crate::{
AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,
- SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,
+ SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted, TokenProperties,
};
pub struct CommonWeights<T: Config>(PhantomData<T>);
impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {
match data {
- CreateItemExData::NFT(t) => {
- <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)
- + t.iter()
- .filter_map(|t| {
- if t.properties.len() > 0 {
- Some(Self::set_token_properties(t.properties.len() as u32))
- } else {
- None
- }
- })
- .fold(Weight::zero(), |a, b| a.saturating_add(b))
- }
+ CreateItemExData::NFT(t) => <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)
+ .saturating_add(init_token_properties_delta::<T, _>(
+ t.iter().map(|t| t.properties.len() as u32),
+ <SelfWeightOf<T>>::init_token_properties,
+ )),
_ => Weight::zero(),
}
}
fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {
- <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)
- + data
- .iter()
- .filter_map(|t| match t {
- up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => {
- Some(Self::set_token_properties(n.properties.len() as u32))
- }
- _ => None,
- })
- .fold(Weight::zero(), |a, b| a.saturating_add(b))
+ <SelfWeightOf<T>>::create_multiple_items(data.len() as u32).saturating_add(
+ init_token_properties_delta::<T, _>(
+ data.iter().map(|t| match t {
+ up_data_structs::CreateItemData::NFT(n) => n.properties.len() as u32,
+ _ => 0,
+ }),
+ <SelfWeightOf<T>>::init_token_properties,
+ ),
+ )
}
fn burn_item() -> Weight {
@@ -245,7 +238,6 @@
&sender,
token_id,
properties.into_iter(),
- pallet_common::SetPropertyMode::ExistingToken,
nesting_budget,
),
weight,
@@ -273,6 +265,17 @@
)
}
+ fn get_token_properties_raw(
+ &self,
+ token_id: TokenId,
+ ) -> Option<up_data_structs::TokenProperties> {
+ <TokenProperties<T>>::get((self.id, token_id))
+ }
+
+ fn set_token_properties_raw(&self, token_id: TokenId, map: up_data_structs::TokenProperties) {
+ <TokenProperties<T>>::insert((self.id, token_id), map)
+ }
+
fn set_token_property_permissions(
&self,
sender: &T::CrossAccountId,
@@ -457,19 +460,36 @@
.ok_or(TokenOwnerError::NotFound)
}
+ fn check_token_indirect_owner(
+ &self,
+ token: TokenId,
+ maybe_owner: &T::CrossAccountId,
+ nesting_budget: &dyn Budget,
+ ) -> Result<bool, DispatchError> {
+ <PalletStructure<T>>::check_indirectly_owned(
+ maybe_owner.clone(),
+ self.id,
+ token,
+ None,
+ nesting_budget,
+ )
+ }
+
/// Returns token owners.
fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {
self.token_owner(token).map_or_else(|_| vec![], |t| vec![t])
}
fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {
- <Pallet<T>>::token_properties((self.id, token_id))
+ <Pallet<T>>::token_properties((self.id, token_id))?
.get(key)
.cloned()
}
fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {
- let properties = <Pallet<T>>::token_properties((self.id, token_id));
+ let Some(properties) = <Pallet<T>>::token_properties((self.id, token_id)) else {
+ return vec![];
+ };
keys.map(|keys| {
keys.into_iter()
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -203,7 +203,6 @@
&caller,
TokenId(token_id),
properties.into_iter(),
- pallet_common::SetPropertyMode::ExistingToken,
&nesting_budget,
)
.map_err(dispatch_to_evm::<T>)
@@ -273,7 +272,8 @@
.try_into()
.map_err(|_| "key too long")?;
- let props = <TokenProperties<T>>::get((self.id, token_id));
+ let props =
+ <TokenProperties<T>>::get((self.id, token_id)).ok_or("token properties not found")?;
let prop = props.get(&key).ok_or("key not found")?;
Ok(prop.to_vec().into())
@@ -367,7 +367,7 @@
.transpose()
.map_err(|e| {
Error::Revert(alloc::format!(
- "Can not convert value \"baseURI\" to string with error \"{e}\""
+ "can not convert value \"baseURI\" to string with error \"{e}\""
))
})?;
@@ -658,7 +658,7 @@
let key = key::url();
let permission = get_token_permission::<T>(self.id, &key)?;
if !permission.collection_admin {
- return Err("Operation is not allowed".into());
+ return Err("operation is not allowed".into());
}
let caller = T::CrossAccountId::from_eth(caller);
@@ -685,7 +685,7 @@
.try_into()
.map_err(|_| "token uri is too long")?,
})
- .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
+ .map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
<Pallet<T>>::create_item(
self,
@@ -708,12 +708,12 @@
) -> Result<String> {
collection.consume_store_reads(1)?;
let properties = <TokenProperties<T>>::try_get((collection.id, token_id))
- .map_err(|_| Error::Revert("Token properties not found".into()))?;
+ .map_err(|_| Error::Revert("token properties not found".into()))?;
if let Some(property) = properties.get(key) {
return Ok(String::from_utf8_lossy(property).into());
}
- Err("Property tokenURI not found".into())
+ Err("property tokenURI not found".into())
}
fn get_token_permission<T: Config>(
@@ -721,13 +721,13 @@
key: &PropertyKey,
) -> Result<PropertyPermission> {
let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)
- .map_err(|_| Error::Revert("No permissions for collection".into()))?;
+ .map_err(|_| Error::Revert("no permissions for collection".into()))?;
let a = token_property_permissions
.get(key)
.map(Clone::clone)
.ok_or_else(|| {
let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
- Error::Revert(alloc::format!("No permission for key {key}"))
+ Error::Revert(alloc::format!("no permission for key {key}"))
})?;
Ok(a)
}
@@ -1058,7 +1058,7 @@
.try_into()
.map_err(|_| "token uri is too long")?,
})
- .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
+ .map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
data.push(CreateItemData::<T> {
properties,
pallets/nonfungible/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Nonfungible Pallet18//!19//! The Nonfungible pallet provides functionality for handling nonfungible collections and tokens.20//!21//! - [`Config`]22//! - [`NonfungibleHandle`]23//! - [`Pallet`]24//! - [`CommonWeights`](common::CommonWeights)25//!26//! ## Overview27//!28//! The Nonfungible pallet provides functions for:29//!30//! - NFT collection creation and removal31//! - Minting and burning of NFT tokens32//! - Retrieving account balances33//! - Transfering NFT tokens34//! - Setting and checking allowance for NFT tokens35//! - Setting properties and permissions for NFT collections and tokens36//! - Nesting and unnesting tokens37//!38//! ### Terminology39//!40//! - **NFT token:** Non fungible token.41//!42//! - **NFT Collection:** A collection of NFT tokens. All NFT tokens are part of a collection.43//! Each collection can define it's own properties, properties for it's tokens and set of permissions.44//!45//! - **Balance:** Number of NFT tokens owned by an account46//!47//! - **Allowance:** NFT tokens owned by one account that another account is allowed to make operations on48//!49//! - **Burning:** The process of “deleting” a token from a collection and from50//! an account balance of the owner.51//!52//! - **Nesting:** Setting up parent-child relationship between tokens. Nested tokens are inhereting53//! owner from their parent. There could be multiple levels of nesting. Token couldn't be nested in54//! it's child token i.e. parent-child relationship graph shouldn't have cycles.55//!56//! - **Properties:** Key-Values pairs. Token properties are attached to a token. Collection properties are57//! attached to a collection. Set of permissions could be defined for each property.58//!59//! ### Implementations60//!61//! The Nonfungible pallet provides implementations for the following traits. If these traits provide62//! the functionality that you need, then you can avoid coupling with the Nonfungible pallet.63//!64//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight65//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing66//! with collections67//!68//! ## Interface69//!70//! ### Dispatchable Functions71//!72//! - `init_collection` - Create NFT collection. NFT collection can be configured to allow or deny access for73//! some accounts.74//! - `destroy_collection` - Destroy exising NFT collection. There should be no tokens in the collection.75//! - `burn` - Burn NFT token owned by account.76//! - `transfer` - Transfer NFT token. Transfers should be enabled for NFT collection.77//! Nests the NFT token if it is sent to another token.78//! - `create_item` - Mint NFT token in collection. Sender should have permission to mint tokens.79//! - `set_allowance` - Set allowance for another account.80//! - `set_token_property` - Set token property value.81//! - `delete_token_property` - Remove property from the token.82//! - `set_collection_properties` - Set collection properties.83//! - `delete_collection_properties` - Remove properties from the collection.84//! - `set_property_permission` - Set collection property permission.85//! - `set_token_property_permissions` - Set token property permissions.86//!87//! ## Assumptions88//!89//! * To perform operations on tokens sender should be in collection's allow list if collection access mode is `AllowList`.9091#![cfg_attr(not(feature = "std"), no_std)]9293use erc::ERC721Events;94use evm_coder::ToLog;95use frame_support::{96 BoundedVec, ensure, fail, transactional,97 storage::with_transaction,98 pallet_prelude::DispatchResultWithPostInfo,99 pallet_prelude::Weight,100 dispatch::{PostDispatchInfo, Pays},101};102use up_data_structs::{103 AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,104 mapping::TokenAddressMapping, budget::Budget, Property, PropertyKey, PropertyValue,105 PropertyKeyPermission, PropertyScope, TrySetProperty, TokenChild, AuxPropertyValue,106 PropertiesPermissionMap, TokenProperties as TokenPropertiesT,107};108use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};109use pallet_common::{110 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,111 eth::collection_id_to_address, SelfWeightOf as PalletCommonWeightOf,112 weights::WeightInfo as CommonWeightInfo, helpers::add_weight_to_post_info, SetPropertyMode,113};114use pallet_structure::{Pallet as PalletStructure, Error as StructureError};115use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};116use sp_core::{Get, H160};117use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};118use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};119use core::ops::Deref;120use codec::{Encode, Decode, MaxEncodedLen};121use scale_info::TypeInfo;122123pub use pallet::*;124use weights::WeightInfo;125#[cfg(feature = "runtime-benchmarks")]126pub mod benchmarking;127pub mod common;128pub mod erc;129pub mod weights;130131pub type CreateItemData<T> = CreateNftExData<<T as pallet_evm::Config>::CrossAccountId>;132pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;133134/// Token data, stored independently from other data used to describe it135/// for the convenience of database access. Notably contains the owner account address.136#[struct_versioning::versioned(version = 2, upper)]137#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]138pub struct ItemData<CrossAccountId> {139 #[version(..2)]140 pub const_data: BoundedVec<u8, CustomDataLimit>,141142 #[version(..2)]143 pub variable_data: BoundedVec<u8, CustomDataLimit>,144145 pub owner: CrossAccountId,146}147148#[frame_support::pallet]149pub mod pallet {150 use super::*;151 use frame_support::{152 Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key, traits::StorageVersion,153 };154 use up_data_structs::{CollectionId, TokenId};155 use super::weights::WeightInfo;156157 #[pallet::error]158 pub enum Error<T> {159 /// Not Nonfungible item data used to mint in Nonfungible collection.160 NotNonfungibleDataUsedToMintFungibleCollectionToken,161 /// Used amount > 1 with NFT162 NonfungibleItemsHaveNoAmount,163 /// Unable to burn NFT with children164 CantBurnNftWithChildren,165 }166167 #[pallet::config]168 pub trait Config:169 frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config170 {171 type WeightInfo: WeightInfo;172 }173174 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);175176 #[pallet::pallet]177 #[pallet::storage_version(STORAGE_VERSION)]178 pub struct Pallet<T>(_);179180 /// Total amount of minted tokens in a collection.181 #[pallet::storage]182 pub type TokensMinted<T: Config> =183 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;184185 /// Amount of burnt tokens in a collection.186 #[pallet::storage]187 pub type TokensBurnt<T: Config> =188 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;189190 /// Token data, used to partially describe a token.191 #[pallet::storage]192 pub type TokenData<T: Config> = StorageNMap<193 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),194 Value = ItemData<T::CrossAccountId>,195 QueryKind = OptionQuery,196 >;197198 /// Map of key-value pairs, describing the metadata of a token.199 #[pallet::storage]200 #[pallet::getter(fn token_properties)]201 pub type TokenProperties<T: Config> = StorageNMap<202 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),203 Value = TokenPropertiesT,204 QueryKind = ValueQuery,205 >;206207 /// Custom data of a token that is serialized to bytes,208 /// primarily reserved for on-chain operations,209 /// normally obscured from the external users.210 ///211 /// Auxiliary properties are slightly different from212 /// usual [`TokenProperties`] due to an unlimited number213 /// and separately stored and written-to key-value pairs.214 ///215 /// Currently unused.216 #[pallet::storage]217 #[pallet::getter(fn token_aux_property)]218 pub type TokenAuxProperties<T: Config> = StorageNMap<219 Key = (220 Key<Twox64Concat, CollectionId>,221 Key<Twox64Concat, TokenId>,222 Key<Twox64Concat, PropertyScope>,223 Key<Twox64Concat, PropertyKey>,224 ),225 Value = AuxPropertyValue,226 QueryKind = OptionQuery,227 >;228229 /// Used to enumerate tokens owned by account.230 #[pallet::storage]231 pub type Owned<T: Config> = StorageNMap<232 Key = (233 Key<Twox64Concat, CollectionId>,234 Key<Blake2_128Concat, T::CrossAccountId>,235 Key<Twox64Concat, TokenId>,236 ),237 Value = bool,238 QueryKind = ValueQuery,239 >;240241 /// Used to enumerate token's children.242 #[pallet::storage]243 #[pallet::getter(fn token_children)]244 pub type TokenChildren<T: Config> = StorageNMap<245 Key = (246 Key<Twox64Concat, CollectionId>,247 Key<Twox64Concat, TokenId>,248 Key<Twox64Concat, (CollectionId, TokenId)>,249 ),250 Value = bool,251 QueryKind = ValueQuery,252 >;253254 /// Amount of tokens owned by an account in a collection.255 #[pallet::storage]256 pub type AccountBalance<T: Config> = StorageNMap<257 Key = (258 Key<Twox64Concat, CollectionId>,259 Key<Blake2_128Concat, T::CrossAccountId>,260 ),261 Value = u32,262 QueryKind = ValueQuery,263 >;264265 /// Allowance set by a token owner for another user to perform one of certain transactions on a token.266 #[pallet::storage]267 pub type Allowance<T: Config> = StorageNMap<268 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),269 Value = T::CrossAccountId,270 QueryKind = OptionQuery,271 >;272273 /// Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.274 #[pallet::storage]275 pub type CollectionAllowance<T: Config> = StorageNMap<276 Key = (277 Key<Twox64Concat, CollectionId>,278 Key<Blake2_128Concat, T::CrossAccountId>,279 Key<Blake2_128Concat, T::CrossAccountId>,280 ),281 Value = bool,282 QueryKind = ValueQuery,283 >;284285 #[pallet::genesis_config]286 pub struct GenesisConfig<T>(PhantomData<T>);287288 #[cfg(feature = "std")]289 impl<T: Config> Default for GenesisConfig<T> {290 fn default() -> Self {291 Self(Default::default())292 }293 }294295 #[pallet::genesis_build]296 impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {297 fn build(&self) {298 StorageVersion::new(1).put::<Pallet<T>>();299 }300 }301}302303pub struct NonfungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);304impl<T: Config> NonfungibleHandle<T> {305 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {306 Self(inner)307 }308 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {309 self.0310 }311 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {312 &mut self.0313 }314}315316impl<T: Config> WithRecorder<T> for NonfungibleHandle<T> {317 fn recorder(&self) -> &SubstrateRecorder<T> {318 self.0.recorder()319 }320 fn into_recorder(self) -> SubstrateRecorder<T> {321 self.0.into_recorder()322 }323}324impl<T: Config> Deref for NonfungibleHandle<T> {325 type Target = pallet_common::CollectionHandle<T>;326327 fn deref(&self) -> &Self::Target {328 &self.0329 }330}331332impl<T: Config> Pallet<T> {333 /// Get number of NFT tokens in collection.334 pub fn total_supply(collection: &NonfungibleHandle<T>) -> u32 {335 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)336 }337338 /// Check that NFT token exists.339 ///340 /// - `token`: Token ID.341 pub fn token_exists(collection: &NonfungibleHandle<T>, token: TokenId) -> bool {342 <TokenData<T>>::contains_key((collection.id, token))343 }344345 /// Set the token property with the scope.346 ///347 /// - `property`: Contains key-value pair.348 pub fn set_scoped_token_property(349 collection_id: CollectionId,350 token_id: TokenId,351 scope: PropertyScope,352 property: Property,353 ) -> DispatchResult {354 TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {355 properties.try_scoped_set(scope, property.key, property.value)356 })357 .map_err(<CommonError<T>>::from)?;358359 Ok(())360 }361362 /// Batch operation to set multiple properties with the same scope.363 pub fn set_scoped_token_properties(364 collection_id: CollectionId,365 token_id: TokenId,366 scope: PropertyScope,367 properties: impl Iterator<Item = Property>,368 ) -> DispatchResult {369 TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {370 stored_properties.try_scoped_set_from_iter(scope, properties)371 })372 .map_err(<CommonError<T>>::from)?;373374 Ok(())375 }376377 /// Add or edit auxiliary data for the property.378 ///379 /// - `f`: function that adds or edits auxiliary data.380 pub fn try_mutate_token_aux_property<R, E>(381 collection_id: CollectionId,382 token_id: TokenId,383 scope: PropertyScope,384 key: PropertyKey,385 f: impl FnOnce(&mut Option<AuxPropertyValue>) -> Result<R, E>,386 ) -> Result<R, E> {387 <TokenAuxProperties<T>>::try_mutate((collection_id, token_id, scope, key), f)388 }389390 /// Remove auxiliary data for the property.391 pub fn remove_token_aux_property(392 collection_id: CollectionId,393 token_id: TokenId,394 scope: PropertyScope,395 key: PropertyKey,396 ) {397 <TokenAuxProperties<T>>::remove((collection_id, token_id, scope, key));398 }399400 /// Get all auxiliary data in a given scope.401 ///402 /// Returns iterator over Property Key - Data pairs.403 pub fn iterate_token_aux_properties(404 collection_id: CollectionId,405 token_id: TokenId,406 scope: PropertyScope,407 ) -> impl Iterator<Item = (PropertyKey, AuxPropertyValue)> {408 <TokenAuxProperties<T>>::iter_prefix((collection_id, token_id, scope))409 }410411 /// Get ID of the last minted token412 pub fn current_token_id(collection_id: CollectionId) -> TokenId {413 TokenId(<TokensMinted<T>>::get(collection_id))414 }415}416417// unchecked calls skips any permission checks418impl<T: Config> Pallet<T> {419 /// Create NFT collection420 ///421 /// `init_collection` will take non-refundable deposit for collection creation.422 ///423 /// - `data`: Contains settings for collection limits and permissions.424 pub fn init_collection(425 owner: T::CrossAccountId,426 payer: T::CrossAccountId,427 data: CreateCollectionData<T::CrossAccountId>,428 ) -> Result<CollectionId, DispatchError> {429 <PalletCommon<T>>::init_collection(owner, payer, data)430 }431432 /// Destroy NFT collection433 ///434 /// `destroy_collection` will throw error if collection contains any tokens.435 /// Only owner can destroy collection.436 pub fn destroy_collection(437 collection: NonfungibleHandle<T>,438 sender: &T::CrossAccountId,439 ) -> DispatchResult {440 let id = collection.id;441442 if Self::collection_has_tokens(id) {443 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());444 }445446 // =========447448 PalletCommon::destroy_collection(collection.0, sender)?;449450 let _ = <TokenData<T>>::clear_prefix((id,), u32::MAX, None);451 let _ = <TokenChildren<T>>::clear_prefix((id,), u32::MAX, None);452 let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);453 <TokensMinted<T>>::remove(id);454 <TokensBurnt<T>>::remove(id);455 let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);456 let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);457 let _ = <CollectionAllowance<T>>::clear_prefix((id,), u32::MAX, None);458 Ok(())459 }460461 /// Burn NFT token462 ///463 /// `burn` removes `token` from the `collection`, from it's owner and from the parent token464 /// if the token is nested.465 /// Only the owner can `burn` the token. The `token` shouldn't have any nested tokens.466 /// Also removes all corresponding properties and auxiliary properties.467 ///468 /// - `token`: Token that should be burned469 /// - `collection`: Collection that contains the token470 pub fn burn(471 collection: &NonfungibleHandle<T>,472 sender: &T::CrossAccountId,473 token: TokenId,474 ) -> DispatchResult {475 let token_data =476 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;477 ensure!(&token_data.owner == sender, <CommonError<T>>::NoPermission);478479 if collection.permissions.access() == AccessMode::AllowList {480 collection.check_allowlist(sender)?;481 }482483 if Self::token_has_children(collection.id, token) {484 return Err(<Error<T>>::CantBurnNftWithChildren.into());485 }486487 let burnt = <TokensBurnt<T>>::get(collection.id)488 .checked_add(1)489 .ok_or(ArithmeticError::Overflow)?;490491 let balance = <AccountBalance<T>>::get((collection.id, token_data.owner.clone()))492 .checked_sub(1)493 .ok_or(ArithmeticError::Overflow)?;494495 // =========496497 if balance == 0 {498 <AccountBalance<T>>::remove((collection.id, token_data.owner.clone()));499 } else {500 <AccountBalance<T>>::insert((collection.id, token_data.owner.clone()), balance);501 }502503 <PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);504505 <Owned<T>>::remove((collection.id, &token_data.owner, token));506 <TokensBurnt<T>>::insert(collection.id, burnt);507 <TokenData<T>>::remove((collection.id, token));508 <TokenProperties<T>>::remove((collection.id, token));509 let _ = <TokenAuxProperties<T>>::clear_prefix((collection.id, token), u32::MAX, None);510 let old_spender = <Allowance<T>>::take((collection.id, token));511512 if let Some(old_spender) = old_spender {513 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(514 collection.id,515 token,516 token_data.owner.clone(),517 old_spender,518 0,519 ));520 }521522 <PalletEvm<T>>::deposit_log(523 ERC721Events::Transfer {524 from: *token_data.owner.as_eth(),525 to: H160::default(),526 token_id: token.into(),527 }528 .to_log(collection_id_to_address(collection.id)),529 );530 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(531 collection.id,532 token,533 token_data.owner,534 1,535 ));536 Ok(())537 }538539 /// Same as [`burn`] but burns all the tokens that are nested in the token first540 ///541 /// - `self_budget`: Limit for searching children in depth.542 /// - `breadth_budget`: Limit of breadth of searching children.543 ///544 /// [`burn`]: struct.Pallet.html#method.burn545 #[transactional]546 pub fn burn_recursively(547 collection: &NonfungibleHandle<T>,548 sender: &T::CrossAccountId,549 token: TokenId,550 self_budget: &dyn Budget,551 breadth_budget: &dyn Budget,552 ) -> DispatchResultWithPostInfo {553 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);554555 let current_token_account =556 T::CrossTokenAddressMapping::token_to_address(collection.id, token);557558 let mut weight = Weight::zero();559560 // This method is transactional, if user in fact doesn't have permissions to remove token -561 // tokens removed here will be restored after rejected transaction562 for ((collection, token), _) in <TokenChildren<T>>::iter_prefix((collection.id, token)) {563 ensure!(breadth_budget.consume(), <StructureError<T>>::BreadthLimit,);564 let PostDispatchInfo { actual_weight, .. } =565 <PalletStructure<T>>::burn_item_recursively(566 current_token_account.clone(),567 collection,568 token,569 self_budget,570 breadth_budget,571 )?;572 if let Some(actual_weight) = actual_weight {573 weight = weight.saturating_add(actual_weight);574 }575 }576577 Self::burn(collection, sender, token)?;578 DispatchResultWithPostInfo::Ok(PostDispatchInfo {579 actual_weight: Some(weight + <SelfWeightOf<T>>::burn_item()),580 pays_fee: Pays::Yes,581 })582 }583584 /// A batch operation to add, edit or remove properties for a token.585 ///586 /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.587 ///588 /// All affected properties should have `mutable` permission589 /// to be **deleted** or to be **set more than once**,590 /// and the sender should have permission to edit those properties.591 ///592 /// This function fires an event for each property change.593 /// In case of an error, all the changes (including the events) will be reverted594 /// since the function is transactional.595 #[transactional]596 fn modify_token_properties(597 collection: &NonfungibleHandle<T>,598 sender: &T::CrossAccountId,599 token_id: TokenId,600 properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,601 mode: SetPropertyMode,602 nesting_budget: &dyn Budget,603 ) -> DispatchResult {604 let mut is_token_owner = pallet_common::LazyValue::new(|| {605 if let SetPropertyMode::NewToken {606 mint_target_is_sender,607 } = mode608 {609 return Ok(mint_target_is_sender);610 }611612 let is_owned = <PalletStructure<T>>::check_indirectly_owned(613 sender.clone(),614 collection.id,615 token_id,616 None,617 nesting_budget,618 )?;619620 Ok(is_owned)621 });622623 let mut is_token_exist =624 pallet_common::LazyValue::new(|| Self::token_exists(collection, token_id));625626 let stored_properties = <TokenProperties<T>>::get((collection.id, token_id));627628 <PalletCommon<T>>::modify_token_properties(629 collection,630 sender,631 token_id,632 &mut is_token_exist,633 properties_updates,634 stored_properties,635 &mut is_token_owner,636 |properties| <TokenProperties<T>>::set((collection.id, token_id), properties),637 erc::ERC721TokenEvent::TokenChanged {638 token_id: token_id.into(),639 }640 .to_log(T::ContractAddress::get()),641 )642 }643644 pub fn next_token_id(collection: &NonfungibleHandle<T>) -> Result<TokenId, DispatchError> {645 let next_token_id = <TokensMinted<T>>::get(collection.id)646 .checked_add(1)647 .ok_or(<CommonError<T>>::CollectionTokenLimitExceeded)?;648649 ensure!(650 collection.limits.token_limit() >= next_token_id,651 <CommonError<T>>::CollectionTokenLimitExceeded652 );653654 Ok(TokenId(next_token_id))655 }656657 /// Batch operation to add or edit properties for the token658 ///659 /// Same as [`modify_token_properties`] but doesn't allow to remove properties660 ///661 /// [`modify_token_properties`]: struct.Pallet.html#method.modify_token_properties662 pub fn set_token_properties(663 collection: &NonfungibleHandle<T>,664 sender: &T::CrossAccountId,665 token_id: TokenId,666 properties: impl Iterator<Item = Property>,667 mode: SetPropertyMode,668 nesting_budget: &dyn Budget,669 ) -> DispatchResult {670 Self::modify_token_properties(671 collection,672 sender,673 token_id,674 properties.map(|p| (p.key, Some(p.value))),675 mode,676 nesting_budget,677 )678 }679680 /// Add or edit single property for the token681 ///682 /// Calls [`set_token_properties`] internally683 ///684 /// [`set_token_properties`]: struct.Pallet.html#method.set_token_properties685 pub fn set_token_property(686 collection: &NonfungibleHandle<T>,687 sender: &T::CrossAccountId,688 token_id: TokenId,689 property: Property,690 nesting_budget: &dyn Budget,691 ) -> DispatchResult {692 Self::set_token_properties(693 collection,694 sender,695 token_id,696 [property].into_iter(),697 SetPropertyMode::ExistingToken,698 nesting_budget,699 )700 }701702 /// Batch operation to remove properties from the token703 ///704 /// Same as [`modify_token_properties`] but doesn't allow to add or edit properties705 ///706 /// [`modify_token_properties`]: struct.Pallet.html#method.modify_token_properties707 pub fn delete_token_properties(708 collection: &NonfungibleHandle<T>,709 sender: &T::CrossAccountId,710 token_id: TokenId,711 property_keys: impl Iterator<Item = PropertyKey>,712 nesting_budget: &dyn Budget,713 ) -> DispatchResult {714 Self::modify_token_properties(715 collection,716 sender,717 token_id,718 property_keys.into_iter().map(|key| (key, None)),719 SetPropertyMode::ExistingToken,720 nesting_budget,721 )722 }723724 /// Remove single property from the token725 ///726 /// Calls [`delete_token_properties`] internally727 ///728 /// [`delete_token_properties`]: struct.Pallet.html#method.delete_token_properties729 pub fn delete_token_property(730 collection: &NonfungibleHandle<T>,731 sender: &T::CrossAccountId,732 token_id: TokenId,733 property_key: PropertyKey,734 nesting_budget: &dyn Budget,735 ) -> DispatchResult {736 Self::delete_token_properties(737 collection,738 sender,739 token_id,740 [property_key].into_iter(),741 nesting_budget,742 )743 }744745 /// Add or edit properties for the collection746 pub fn set_collection_properties(747 collection: &NonfungibleHandle<T>,748 sender: &T::CrossAccountId,749 properties: Vec<Property>,750 ) -> DispatchResult {751 <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())752 }753754 /// Remove properties from the collection755 pub fn delete_collection_properties(756 collection: &CollectionHandle<T>,757 sender: &T::CrossAccountId,758 property_keys: Vec<PropertyKey>,759 ) -> DispatchResult {760 <PalletCommon<T>>::delete_collection_properties(761 collection,762 sender,763 property_keys.into_iter(),764 )765 }766767 /// Set property permissions for the token.768 ///769 /// Sender should be the owner or admin of token's collection.770 pub fn set_token_property_permissions(771 collection: &CollectionHandle<T>,772 sender: &T::CrossAccountId,773 property_permissions: Vec<PropertyKeyPermission>,774 ) -> DispatchResult {775 <PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)776 }777778 /// Set property permissions for the token with scope.779 ///780 /// Sender should be the owner or admin of token's collection.781 pub fn set_scoped_token_property_permissions(782 collection: &CollectionHandle<T>,783 sender: &T::CrossAccountId,784 scope: PropertyScope,785 property_permissions: Vec<PropertyKeyPermission>,786 ) -> DispatchResult {787 <PalletCommon<T>>::set_scoped_token_property_permissions(788 collection,789 sender,790 scope,791 property_permissions,792 )793 }794795 pub fn token_property_permission(collection_id: CollectionId) -> PropertiesPermissionMap {796 <PalletCommon<T>>::property_permissions(collection_id)797 }798799 pub fn check_token_immediate_ownership(800 collection: &NonfungibleHandle<T>,801 token: TokenId,802 possible_owner: &T::CrossAccountId,803 ) -> DispatchResult {804 let token_data =805 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;806 ensure!(807 &token_data.owner == possible_owner,808 <CommonError<T>>::NoPermission809 );810 Ok(())811 }812813 /// Transfer NFT token from one account to another.814 ///815 /// `from` account stops being the owner and `to` account becomes the owner of the token.816 /// If `to` is token than `to` becomes owner of the token and the token become nested.817 /// Unnests token from previous parent if it was nested before.818 /// Removes allowance for the token if there was any.819 /// Throws if transfers aren't allowed for collection or if receiver reached token ownership limit.820 ///821 /// - `nesting_budget`: Limit for token nesting depth822 pub fn transfer(823 collection: &NonfungibleHandle<T>,824 from: &T::CrossAccountId,825 to: &T::CrossAccountId,826 token: TokenId,827 nesting_budget: &dyn Budget,828 ) -> DispatchResultWithPostInfo {829 ensure!(830 collection.limits.transfers_enabled(),831 <CommonError<T>>::TransferNotAllowed832 );833834 let mut actual_weight = <SelfWeightOf<T>>::transfer_raw();835 let token_data =836 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;837 ensure!(&token_data.owner == from, <CommonError<T>>::NoPermission);838839 if collection.permissions.access() == AccessMode::AllowList {840 collection.check_allowlist(from)?;841 collection.check_allowlist(to)?;842 actual_weight += <PalletCommonWeightOf<T>>::check_accesslist() * 2;843 }844 <PalletCommon<T>>::ensure_correct_receiver(to)?;845846 let balance_from = <AccountBalance<T>>::get((collection.id, from))847 .checked_sub(1)848 .ok_or(<CommonError<T>>::TokenValueTooLow)?;849 let balance_to = if from != to {850 let balance_to = <AccountBalance<T>>::get((collection.id, to))851 .checked_add(1)852 .ok_or(ArithmeticError::Overflow)?;853854 ensure!(855 balance_to < collection.limits.account_token_ownership_limit(),856 <CommonError<T>>::AccountTokenLimitExceeded,857 );858859 Some(balance_to)860 } else {861 None862 };863864 <PalletStructure<T>>::nest_if_sent_to_token(865 from.clone(),866 to,867 collection.id,868 token,869 nesting_budget,870 )?;871872 // =========873874 <PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);875876 <TokenData<T>>::insert((collection.id, token), ItemData { owner: to.clone() });877878 if let Some(balance_to) = balance_to {879 // from != to880 if balance_from == 0 {881 <AccountBalance<T>>::remove((collection.id, from));882 } else {883 <AccountBalance<T>>::insert((collection.id, from), balance_from);884 }885 <AccountBalance<T>>::insert((collection.id, to), balance_to);886 <Owned<T>>::remove((collection.id, from, token));887 <Owned<T>>::insert((collection.id, to, token), true);888 }889 Self::set_allowance_unchecked(collection, from, token, None, true);890891 <PalletEvm<T>>::deposit_log(892 ERC721Events::Transfer {893 from: *from.as_eth(),894 to: *to.as_eth(),895 token_id: token.into(),896 }897 .to_log(collection_id_to_address(collection.id)),898 );899 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(900 collection.id,901 token,902 from.clone(),903 to.clone(),904 1,905 ));906907 Ok(PostDispatchInfo {908 actual_weight: Some(actual_weight),909 pays_fee: Pays::Yes,910 })911 }912913 /// Batch operation to mint multiple NFT tokens.914 ///915 /// The sender should be the owner/admin of the collection or collection should be configured916 /// to allow public minting.917 /// Throws if amount of tokens reached it's limit for the collection or if caller reached918 /// token ownership limit.919 ///920 /// - `data`: Contains list of token properties and users who will become the owners of the921 /// corresponging tokens.922 /// - `nesting_budget`: Limit for token nesting depth923 pub fn create_multiple_items(924 collection: &NonfungibleHandle<T>,925 sender: &T::CrossAccountId,926 data: Vec<CreateItemData<T>>,927 nesting_budget: &dyn Budget,928 ) -> DispatchResult {929 if !collection.is_owner_or_admin(sender) {930 ensure!(931 collection.permissions.mint_mode(),932 <CommonError<T>>::PublicMintingNotAllowed933 );934 collection.check_allowlist(sender)?;935936 for item in data.iter() {937 collection.check_allowlist(&item.owner)?;938 }939 }940941 for data in data.iter() {942 <PalletCommon<T>>::ensure_correct_receiver(&data.owner)?;943 }944945 let first_token = <TokensMinted<T>>::get(collection.id);946 let tokens_minted = first_token947 .checked_add(data.len() as u32)948 .ok_or(ArithmeticError::Overflow)?;949 ensure!(950 tokens_minted <= collection.limits.token_limit(),951 <CommonError<T>>::CollectionTokenLimitExceeded952 );953954 let mut balances = BTreeMap::new();955 for data in &data {956 let balance = balances957 .entry(&data.owner)958 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, &data.owner)));959 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;960961 ensure!(962 *balance <= collection.limits.account_token_ownership_limit(),963 <CommonError<T>>::AccountTokenLimitExceeded,964 );965 }966967 for (i, data) in data.iter().enumerate() {968 let token = TokenId(first_token + i as u32 + 1);969970 <PalletStructure<T>>::check_nesting(971 sender.clone(),972 &data.owner,973 collection.id,974 token,975 nesting_budget,976 )?;977 }978979 // =========980981 with_transaction(|| {982 for (i, data) in data.iter().enumerate() {983 let token = first_token + i as u32 + 1;984985 <TokenData<T>>::insert(986 (collection.id, token),987 ItemData {988 // const_data: data.const_data.clone(),989 owner: data.owner.clone(),990 },991 );992993 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(994 &data.owner,995 collection.id,996 TokenId(token),997 );998999 if let Err(e) = Self::set_token_properties(1000 collection,1001 sender,1002 TokenId(token),1003 data.properties.clone().into_iter(),1004 SetPropertyMode::NewToken {1005 mint_target_is_sender: sender.conv_eq(&data.owner),1006 },1007 nesting_budget,1008 ) {1009 return TransactionOutcome::Rollback(Err(e));1010 }1011 }1012 TransactionOutcome::Commit(Ok(()))1013 })?;10141015 <TokensMinted<T>>::insert(collection.id, tokens_minted);1016 for (account, balance) in balances {1017 <AccountBalance<T>>::insert((collection.id, account), balance);1018 }1019 for (i, data) in data.into_iter().enumerate() {1020 let token = first_token + i as u32 + 1;1021 <Owned<T>>::insert((collection.id, &data.owner, token), true);10221023 <PalletEvm<T>>::deposit_log(1024 ERC721Events::Transfer {1025 from: H160::default(),1026 to: *data.owner.as_eth(),1027 token_id: token.into(),1028 }1029 .to_log(collection_id_to_address(collection.id)),1030 );1031 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1032 collection.id,1033 TokenId(token),1034 data.owner.clone(),1035 1,1036 ));1037 }1038 Ok(())1039 }10401041 pub fn set_allowance_unchecked(1042 collection: &NonfungibleHandle<T>,1043 sender: &T::CrossAccountId,1044 token: TokenId,1045 spender: Option<&T::CrossAccountId>,1046 assume_implicit_eth: bool,1047 ) {1048 if let Some(spender) = spender {1049 let old_spender = <Allowance<T>>::get((collection.id, token));1050 <Allowance<T>>::insert((collection.id, token), spender);1051 // In ERC721 there is only one possible approved user of token, so we set1052 // approved user to spender1053 <PalletEvm<T>>::deposit_log(1054 ERC721Events::Approval {1055 owner: *sender.as_eth(),1056 approved: *spender.as_eth(),1057 token_id: token.into(),1058 }1059 .to_log(collection_id_to_address(collection.id)),1060 );1061 // In Unique chain, any token can have any amount of approved users, so we need to1062 // set allowance of old owner to 0, and allowance of new owner to 11063 if old_spender.as_ref() != Some(spender) {1064 if let Some(old_owner) = old_spender {1065 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1066 collection.id,1067 token,1068 sender.clone(),1069 old_owner,1070 0,1071 ));1072 }1073 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1074 collection.id,1075 token,1076 sender.clone(),1077 spender.clone(),1078 1,1079 ));1080 }1081 } else {1082 let old_spender = <Allowance<T>>::take((collection.id, token));1083 if !assume_implicit_eth {1084 // In ERC721 there is only one possible approved user of token, so we set1085 // approved user to zero address1086 <PalletEvm<T>>::deposit_log(1087 ERC721Events::Approval {1088 owner: *sender.as_eth(),1089 approved: H160::default(),1090 token_id: token.into(),1091 }1092 .to_log(collection_id_to_address(collection.id)),1093 );1094 }1095 // In Unique chain, any token can have any amount of approved users, so we need to1096 // set allowance of old owner to 01097 if let Some(old_spender) = old_spender {1098 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1099 collection.id,1100 token,1101 sender.clone(),1102 old_spender,1103 0,1104 ));1105 }1106 }1107 }11081109 pub fn get_allowance(1110 collection: &NonfungibleHandle<T>,1111 token_id: TokenId,1112 ) -> Result<Option<T::CrossAccountId>, DispatchError> {1113 ensure!(1114 <TokenData<T>>::get((collection.id, token_id)).is_some(),1115 <CommonError<T>>::TokenNotFound1116 );1117 Ok(<Allowance<T>>::get((collection.id, token_id)))1118 }11191120 /// Set allowance for the spender to `transfer` or `burn` sender's token.1121 ///1122 /// - `token`: Token the spender is allowed to `transfer` or `burn`.1123 pub fn set_allowance(1124 collection: &NonfungibleHandle<T>,1125 sender: &T::CrossAccountId,1126 token: TokenId,1127 spender: Option<&T::CrossAccountId>,1128 ) -> DispatchResult {1129 if collection.permissions.access() == AccessMode::AllowList {1130 collection.check_allowlist(sender)?;1131 if let Some(spender) = spender {1132 collection.check_allowlist(spender)?;1133 }1134 }11351136 if let Some(spender) = spender {1137 <PalletCommon<T>>::ensure_correct_receiver(spender)?;1138 }11391140 let token_data =1141 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;1142 if &token_data.owner != sender {1143 ensure!(1144 collection.ignores_owned_amount(sender),1145 <CommonError<T>>::CantApproveMoreThanOwned1146 );1147 }11481149 // =========11501151 Self::set_allowance_unchecked(collection, sender, token, spender, false);1152 Ok(())1153 }11541155 /// Set allowance for the spender to `transfer` or `burn` sender's token from eth mirror.1156 ///1157 /// - `from`: Address of sender's eth mirror.1158 /// - `to`: Adress of spender.1159 /// - `token`: Token the spender is allowed to `transfer` or `burn`.1160 pub fn set_allowance_from(1161 collection: &NonfungibleHandle<T>,1162 sender: &T::CrossAccountId,1163 from: &T::CrossAccountId,1164 token: TokenId,1165 to: Option<&T::CrossAccountId>,1166 ) -> DispatchResult {1167 if collection.permissions.access() == AccessMode::AllowList {1168 collection.check_allowlist(sender)?;1169 collection.check_allowlist(from)?;1170 if let Some(to) = to {1171 collection.check_allowlist(to)?;1172 }1173 }11741175 if let Some(to) = to {1176 <PalletCommon<T>>::ensure_correct_receiver(to)?;1177 }11781179 ensure!(1180 sender.conv_eq(from),1181 <CommonError<T>>::AddressIsNotEthMirror1182 );11831184 let token_data =1185 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;1186 if token_data.owner != *from {1187 ensure!(1188 collection.limits.owner_can_transfer()1189 && (collection.is_owner_or_admin(sender) || collection.is_owner_or_admin(from)),1190 <CommonError<T>>::CantApproveMoreThanOwned1191 );1192 }11931194 // =========11951196 Self::set_allowance_unchecked(collection, from, token, to, false);1197 Ok(())1198 }11991200 /// Checks allowance for the spender to use the token.1201 fn check_allowed(1202 collection: &NonfungibleHandle<T>,1203 spender: &T::CrossAccountId,1204 from: &T::CrossAccountId,1205 token: TokenId,1206 nesting_budget: &dyn Budget,1207 ) -> DispatchResult {1208 if spender.conv_eq(from) {1209 return Ok(());1210 }1211 if collection.permissions.access() == AccessMode::AllowList {1212 // `from`, `to` checked in [`transfer`]1213 collection.check_allowlist(spender)?;1214 }12151216 if collection.ignores_token_restrictions(spender) {1217 return Ok(());1218 }12191220 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {1221 ensure!(1222 <PalletStructure<T>>::check_indirectly_owned(1223 spender.clone(),1224 source.0,1225 source.1,1226 None,1227 nesting_budget1228 )?,1229 <CommonError<T>>::ApprovedValueTooLow,1230 );1231 return Ok(());1232 }1233 if <Allowance<T>>::get((collection.id, token)).as_ref() == Some(spender) {1234 return Ok(());1235 }1236 if <CollectionAllowance<T>>::get((collection.id, from, spender)) {1237 return Ok(());1238 }12391240 Err(<CommonError<T>>::ApprovedValueTooLow.into())1241 }12421243 /// Transfer NFT token from one account to another.1244 ///1245 /// Same as the [`transfer`] but spender doesn't needs to be the owner of the token.1246 /// The owner should set allowance for the spender to transfer token.1247 ///1248 /// [`transfer`]: struct.Pallet.html#method.transfer1249 pub fn transfer_from(1250 collection: &NonfungibleHandle<T>,1251 spender: &T::CrossAccountId,1252 from: &T::CrossAccountId,1253 to: &T::CrossAccountId,1254 token: TokenId,1255 nesting_budget: &dyn Budget,1256 ) -> DispatchResultWithPostInfo {1257 Self::check_allowed(collection, spender, from, token, nesting_budget)?;12581259 // =========12601261 // Allowance is reset in [`transfer`]1262 let mut result = Self::transfer(collection, from, to, token, nesting_budget);1263 add_weight_to_post_info(&mut result, <SelfWeightOf<T>>::check_allowed_raw());1264 result1265 }12661267 /// Burn NFT token for `from` account.1268 ///1269 /// Same as the [`burn`] but spender doesn't need to be an owner of the token. The owner should1270 /// set allowance for the spender to burn token.1271 ///1272 /// [`burn`]: struct.Pallet.html#method.burn1273 pub fn burn_from(1274 collection: &NonfungibleHandle<T>,1275 spender: &T::CrossAccountId,1276 from: &T::CrossAccountId,1277 token: TokenId,1278 nesting_budget: &dyn Budget,1279 ) -> DispatchResult {1280 Self::check_allowed(collection, spender, from, token, nesting_budget)?;12811282 // =========12831284 Self::burn(collection, from, token)1285 }12861287 /// Check that `from` token could be nested in `under` token.1288 ///1289 pub fn check_nesting(1290 handle: &NonfungibleHandle<T>,1291 sender: T::CrossAccountId,1292 from: (CollectionId, TokenId),1293 under: TokenId,1294 nesting_budget: &dyn Budget,1295 ) -> DispatchResult {1296 let nesting = handle.permissions.nesting();12971298 #[cfg(not(feature = "runtime-benchmarks"))]1299 let permissive = false;1300 #[cfg(feature = "runtime-benchmarks")]1301 let permissive = nesting.permissive;13021303 if permissive {1304 ensure!(1305 <TokenData<T>>::contains_key((handle.id, under)),1306 <CommonError<T>>::TokenNotFound1307 );1308 } else if nesting.token_owner1309 && <PalletStructure<T>>::check_indirectly_owned(1310 sender.clone(),1311 handle.id,1312 under,1313 Some(from),1314 nesting_budget,1315 )? {1316 // Pass, token existence and ouroboros checks are done in `check_indirectly_owned`1317 } else if nesting.collection_admin && handle.is_owner_or_admin(&sender) {1318 // token existence and ouroboros checks are done in `get_checked_topmost_owner`1319 let _ = <PalletStructure<T>>::get_checked_topmost_owner(1320 handle.id,1321 under,1322 Some(from),1323 nesting_budget,1324 )?1325 .ok_or(<CommonError<T>>::TokenNotFound)?;1326 } else {1327 fail!(<CommonError<T>>::UserIsNotAllowedToNest);1328 }13291330 if let Some(whitelist) = &nesting.restricted {1331 ensure!(1332 whitelist.contains(&from.0),1333 <CommonError<T>>::SourceCollectionIsNotAllowedToNest1334 );1335 }1336 Ok(())1337 }13381339 fn nest(under: (CollectionId, TokenId), to_nest: (CollectionId, TokenId)) {1340 if to_nest.0 != pallet_common::NATIVE_FUNGIBLE_COLLECTION_ID {1341 <TokenChildren<T>>::insert((under.0, under.1, to_nest), true);1342 }1343 }13441345 fn unnest(under: (CollectionId, TokenId), to_unnest: (CollectionId, TokenId)) {1346 if to_unnest.0 != pallet_common::NATIVE_FUNGIBLE_COLLECTION_ID {1347 <TokenChildren<T>>::remove((under.0, under.1, to_unnest));1348 }1349 }13501351 fn collection_has_tokens(collection_id: CollectionId) -> bool {1352 <TokenData<T>>::iter_prefix((collection_id,))1353 .next()1354 .is_some()1355 }13561357 fn token_has_children(collection_id: CollectionId, token_id: TokenId) -> bool {1358 <TokenChildren<T>>::iter_prefix((collection_id, token_id))1359 .next()1360 .is_some()1361 }13621363 pub fn token_children_ids(collection_id: CollectionId, token_id: TokenId) -> Vec<TokenChild> {1364 <TokenChildren<T>>::iter_prefix((collection_id, token_id))1365 .map(|((child_collection_id, child_id), _)| TokenChild {1366 collection: child_collection_id,1367 token: child_id,1368 })1369 .collect()1370 }13711372 /// Mint single NFT token.1373 ///1374 /// Delegated to [`create_multiple_items`]1375 ///1376 /// [`create_multiple_items`]: struct.Pallet.html#method.create_multiple_items1377 pub fn create_item(1378 collection: &NonfungibleHandle<T>,1379 sender: &T::CrossAccountId,1380 data: CreateItemData<T>,1381 nesting_budget: &dyn Budget,1382 ) -> DispatchResult {1383 Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1384 }13851386 /// Sets or unsets the approval of a given operator.1387 ///1388 /// The `operator` is allowed to transfer all token pieces of the `owner` on their behalf.1389 /// - `owner`: Token owner1390 /// - `operator`: Operator1391 /// - `approve`: Should operator status be granted or revoked?1392 pub fn set_allowance_for_all(1393 collection: &NonfungibleHandle<T>,1394 owner: &T::CrossAccountId,1395 operator: &T::CrossAccountId,1396 approve: bool,1397 ) -> DispatchResult {1398 <PalletCommon<T>>::set_allowance_for_all(1399 collection,1400 owner,1401 operator,1402 approve,1403 || <CollectionAllowance<T>>::insert((collection.id, owner, operator), approve),1404 ERC721Events::ApprovalForAll {1405 owner: *owner.as_eth(),1406 operator: *operator.as_eth(),1407 approved: approve,1408 }1409 .to_log(collection_id_to_address(collection.id)),1410 )1411 }14121413 /// Tells whether the given `owner` approves the `operator`.1414 pub fn allowance_for_all(1415 collection: &NonfungibleHandle<T>,1416 owner: &T::CrossAccountId,1417 operator: &T::CrossAccountId,1418 ) -> bool {1419 <CollectionAllowance<T>>::get((collection.id, owner, operator))1420 }14211422 pub fn repair_item(collection: &NonfungibleHandle<T>, token: TokenId) -> DispatchResult {1423 <TokenProperties<T>>::mutate((collection.id, token), |properties| {1424 properties.recompute_consumed_space();1425 });14261427 Ok(())1428 }1429}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Nonfungible Pallet18//!19//! The Nonfungible pallet provides functionality for handling nonfungible collections and tokens.20//!21//! - [`Config`]22//! - [`NonfungibleHandle`]23//! - [`Pallet`]24//! - [`CommonWeights`](common::CommonWeights)25//!26//! ## Overview27//!28//! The Nonfungible pallet provides functions for:29//!30//! - NFT collection creation and removal31//! - Minting and burning of NFT tokens32//! - Retrieving account balances33//! - Transfering NFT tokens34//! - Setting and checking allowance for NFT tokens35//! - Setting properties and permissions for NFT collections and tokens36//! - Nesting and unnesting tokens37//!38//! ### Terminology39//!40//! - **NFT token:** Non fungible token.41//!42//! - **NFT Collection:** A collection of NFT tokens. All NFT tokens are part of a collection.43//! Each collection can define it's own properties, properties for it's tokens and set of permissions.44//!45//! - **Balance:** Number of NFT tokens owned by an account46//!47//! - **Allowance:** NFT tokens owned by one account that another account is allowed to make operations on48//!49//! - **Burning:** The process of “deleting” a token from a collection and from50//! an account balance of the owner.51//!52//! - **Nesting:** Setting up parent-child relationship between tokens. Nested tokens are inhereting53//! owner from their parent. There could be multiple levels of nesting. Token couldn't be nested in54//! it's child token i.e. parent-child relationship graph shouldn't have cycles.55//!56//! - **Properties:** Key-Values pairs. Token properties are attached to a token. Collection properties are57//! attached to a collection. Set of permissions could be defined for each property.58//!59//! ### Implementations60//!61//! The Nonfungible pallet provides implementations for the following traits. If these traits provide62//! the functionality that you need, then you can avoid coupling with the Nonfungible pallet.63//!64//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight65//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing66//! with collections67//!68//! ## Interface69//!70//! ### Dispatchable Functions71//!72//! - `init_collection` - Create NFT collection. NFT collection can be configured to allow or deny access for73//! some accounts.74//! - `destroy_collection` - Destroy exising NFT collection. There should be no tokens in the collection.75//! - `burn` - Burn NFT token owned by account.76//! - `transfer` - Transfer NFT token. Transfers should be enabled for NFT collection.77//! Nests the NFT token if it is sent to another token.78//! - `create_item` - Mint NFT token in collection. Sender should have permission to mint tokens.79//! - `set_allowance` - Set allowance for another account.80//! - `set_token_property` - Set token property value.81//! - `delete_token_property` - Remove property from the token.82//! - `set_collection_properties` - Set collection properties.83//! - `delete_collection_properties` - Remove properties from the collection.84//! - `set_property_permission` - Set collection property permission.85//! - `set_token_property_permissions` - Set token property permissions.86//!87//! ## Assumptions88//!89//! * To perform operations on tokens sender should be in collection's allow list if collection access mode is `AllowList`.9091#![cfg_attr(not(feature = "std"), no_std)]9293use erc::ERC721Events;94use evm_coder::ToLog;95use frame_support::{96 BoundedVec, ensure, fail, transactional,97 storage::with_transaction,98 pallet_prelude::DispatchResultWithPostInfo,99 pallet_prelude::Weight,100 dispatch::{PostDispatchInfo, Pays},101};102use up_data_structs::{103 AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,104 mapping::TokenAddressMapping, budget::Budget, Property, PropertyKey, PropertyValue,105 PropertyKeyPermission, PropertyScope, TokenChild, AuxPropertyValue, PropertiesPermissionMap,106 TokenProperties as TokenPropertiesT,107};108use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};109use pallet_common::{110 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,111 eth::collection_id_to_address, SelfWeightOf as PalletCommonWeightOf,112 weights::WeightInfo as CommonWeightInfo, helpers::add_weight_to_post_info,113};114use pallet_structure::{Pallet as PalletStructure, Error as StructureError};115use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};116use sp_core::{Get, H160};117use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};118use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};119use core::ops::Deref;120use codec::{Encode, Decode, MaxEncodedLen};121use scale_info::TypeInfo;122123pub use pallet::*;124use weights::WeightInfo;125#[cfg(feature = "runtime-benchmarks")]126pub mod benchmarking;127pub mod common;128pub mod erc;129pub mod weights;130131pub type CreateItemData<T> = CreateNftExData<<T as pallet_evm::Config>::CrossAccountId>;132pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;133134/// Token data, stored independently from other data used to describe it135/// for the convenience of database access. Notably contains the owner account address.136#[struct_versioning::versioned(version = 2, upper)]137#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]138pub struct ItemData<CrossAccountId> {139 #[version(..2)]140 pub const_data: BoundedVec<u8, CustomDataLimit>,141142 #[version(..2)]143 pub variable_data: BoundedVec<u8, CustomDataLimit>,144145 pub owner: CrossAccountId,146}147148#[frame_support::pallet]149pub mod pallet {150 use super::*;151 use frame_support::{152 Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key, traits::StorageVersion,153 };154 use up_data_structs::{CollectionId, TokenId};155 use super::weights::WeightInfo;156157 #[pallet::error]158 pub enum Error<T> {159 /// Not Nonfungible item data used to mint in Nonfungible collection.160 NotNonfungibleDataUsedToMintFungibleCollectionToken,161 /// Used amount > 1 with NFT162 NonfungibleItemsHaveNoAmount,163 /// Unable to burn NFT with children164 CantBurnNftWithChildren,165 }166167 #[pallet::config]168 pub trait Config:169 frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config170 {171 type WeightInfo: WeightInfo;172 }173174 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);175176 #[pallet::pallet]177 #[pallet::storage_version(STORAGE_VERSION)]178 pub struct Pallet<T>(_);179180 /// Total amount of minted tokens in a collection.181 #[pallet::storage]182 pub type TokensMinted<T: Config> =183 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;184185 /// Amount of burnt tokens in a collection.186 #[pallet::storage]187 pub type TokensBurnt<T: Config> =188 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;189190 /// Token data, used to partially describe a token.191 #[pallet::storage]192 pub type TokenData<T: Config> = StorageNMap<193 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),194 Value = ItemData<T::CrossAccountId>,195 QueryKind = OptionQuery,196 >;197198 /// Map of key-value pairs, describing the metadata of a token.199 #[pallet::storage]200 #[pallet::getter(fn token_properties)]201 pub type TokenProperties<T: Config> = StorageNMap<202 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),203 Value = TokenPropertiesT,204 QueryKind = OptionQuery,205 >;206207 /// Custom data of a token that is serialized to bytes,208 /// primarily reserved for on-chain operations,209 /// normally obscured from the external users.210 ///211 /// Auxiliary properties are slightly different from212 /// usual [`TokenProperties`] due to an unlimited number213 /// and separately stored and written-to key-value pairs.214 ///215 /// Currently unused.216 #[pallet::storage]217 #[pallet::getter(fn token_aux_property)]218 pub type TokenAuxProperties<T: Config> = StorageNMap<219 Key = (220 Key<Twox64Concat, CollectionId>,221 Key<Twox64Concat, TokenId>,222 Key<Twox64Concat, PropertyScope>,223 Key<Twox64Concat, PropertyKey>,224 ),225 Value = AuxPropertyValue,226 QueryKind = OptionQuery,227 >;228229 /// Used to enumerate tokens owned by account.230 #[pallet::storage]231 pub type Owned<T: Config> = StorageNMap<232 Key = (233 Key<Twox64Concat, CollectionId>,234 Key<Blake2_128Concat, T::CrossAccountId>,235 Key<Twox64Concat, TokenId>,236 ),237 Value = bool,238 QueryKind = ValueQuery,239 >;240241 /// Used to enumerate token's children.242 #[pallet::storage]243 #[pallet::getter(fn token_children)]244 pub type TokenChildren<T: Config> = StorageNMap<245 Key = (246 Key<Twox64Concat, CollectionId>,247 Key<Twox64Concat, TokenId>,248 Key<Twox64Concat, (CollectionId, TokenId)>,249 ),250 Value = bool,251 QueryKind = ValueQuery,252 >;253254 /// Amount of tokens owned by an account in a collection.255 #[pallet::storage]256 pub type AccountBalance<T: Config> = StorageNMap<257 Key = (258 Key<Twox64Concat, CollectionId>,259 Key<Blake2_128Concat, T::CrossAccountId>,260 ),261 Value = u32,262 QueryKind = ValueQuery,263 >;264265 /// Allowance set by a token owner for another user to perform one of certain transactions on a token.266 #[pallet::storage]267 pub type Allowance<T: Config> = StorageNMap<268 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),269 Value = T::CrossAccountId,270 QueryKind = OptionQuery,271 >;272273 /// Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.274 #[pallet::storage]275 pub type CollectionAllowance<T: Config> = StorageNMap<276 Key = (277 Key<Twox64Concat, CollectionId>,278 Key<Blake2_128Concat, T::CrossAccountId>,279 Key<Blake2_128Concat, T::CrossAccountId>,280 ),281 Value = bool,282 QueryKind = ValueQuery,283 >;284285 #[pallet::genesis_config]286 pub struct GenesisConfig<T>(PhantomData<T>);287288 #[cfg(feature = "std")]289 impl<T: Config> Default for GenesisConfig<T> {290 fn default() -> Self {291 Self(Default::default())292 }293 }294295 #[pallet::genesis_build]296 impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {297 fn build(&self) {298 StorageVersion::new(1).put::<Pallet<T>>();299 }300 }301}302303pub struct NonfungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);304impl<T: Config> NonfungibleHandle<T> {305 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {306 Self(inner)307 }308 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {309 self.0310 }311 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {312 &mut self.0313 }314}315316impl<T: Config> WithRecorder<T> for NonfungibleHandle<T> {317 fn recorder(&self) -> &SubstrateRecorder<T> {318 self.0.recorder()319 }320 fn into_recorder(self) -> SubstrateRecorder<T> {321 self.0.into_recorder()322 }323}324impl<T: Config> Deref for NonfungibleHandle<T> {325 type Target = pallet_common::CollectionHandle<T>;326327 fn deref(&self) -> &Self::Target {328 &self.0329 }330}331332impl<T: Config> Pallet<T> {333 /// Get number of NFT tokens in collection.334 pub fn total_supply(collection: &NonfungibleHandle<T>) -> u32 {335 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)336 }337338 /// Check that NFT token exists.339 ///340 /// - `token`: Token ID.341 pub fn token_exists(collection: &NonfungibleHandle<T>, token: TokenId) -> bool {342 <TokenData<T>>::contains_key((collection.id, token))343 }344345 /// Add or edit auxiliary data for the property.346 ///347 /// - `f`: function that adds or edits auxiliary data.348 pub fn try_mutate_token_aux_property<R, E>(349 collection_id: CollectionId,350 token_id: TokenId,351 scope: PropertyScope,352 key: PropertyKey,353 f: impl FnOnce(&mut Option<AuxPropertyValue>) -> Result<R, E>,354 ) -> Result<R, E> {355 <TokenAuxProperties<T>>::try_mutate((collection_id, token_id, scope, key), f)356 }357358 /// Remove auxiliary data for the property.359 pub fn remove_token_aux_property(360 collection_id: CollectionId,361 token_id: TokenId,362 scope: PropertyScope,363 key: PropertyKey,364 ) {365 <TokenAuxProperties<T>>::remove((collection_id, token_id, scope, key));366 }367368 /// Get all auxiliary data in a given scope.369 ///370 /// Returns iterator over Property Key - Data pairs.371 pub fn iterate_token_aux_properties(372 collection_id: CollectionId,373 token_id: TokenId,374 scope: PropertyScope,375 ) -> impl Iterator<Item = (PropertyKey, AuxPropertyValue)> {376 <TokenAuxProperties<T>>::iter_prefix((collection_id, token_id, scope))377 }378379 /// Get ID of the last minted token380 pub fn current_token_id(collection_id: CollectionId) -> TokenId {381 TokenId(<TokensMinted<T>>::get(collection_id))382 }383}384385// unchecked calls skips any permission checks386impl<T: Config> Pallet<T> {387 /// Create NFT collection388 ///389 /// `init_collection` will take non-refundable deposit for collection creation.390 ///391 /// - `data`: Contains settings for collection limits and permissions.392 pub fn init_collection(393 owner: T::CrossAccountId,394 payer: T::CrossAccountId,395 data: CreateCollectionData<T::CrossAccountId>,396 ) -> Result<CollectionId, DispatchError> {397 <PalletCommon<T>>::init_collection(owner, payer, data)398 }399400 /// Destroy NFT collection401 ///402 /// `destroy_collection` will throw error if collection contains any tokens.403 /// Only owner can destroy collection.404 pub fn destroy_collection(405 collection: NonfungibleHandle<T>,406 sender: &T::CrossAccountId,407 ) -> DispatchResult {408 let id = collection.id;409410 if Self::collection_has_tokens(id) {411 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());412 }413414 // =========415416 PalletCommon::destroy_collection(collection.0, sender)?;417418 let _ = <TokenData<T>>::clear_prefix((id,), u32::MAX, None);419 let _ = <TokenChildren<T>>::clear_prefix((id,), u32::MAX, None);420 let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);421 <TokensMinted<T>>::remove(id);422 <TokensBurnt<T>>::remove(id);423 let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);424 let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);425 let _ = <CollectionAllowance<T>>::clear_prefix((id,), u32::MAX, None);426 Ok(())427 }428429 /// Burn NFT token430 ///431 /// `burn` removes `token` from the `collection`, from it's owner and from the parent token432 /// if the token is nested.433 /// Only the owner can `burn` the token. The `token` shouldn't have any nested tokens.434 /// Also removes all corresponding properties and auxiliary properties.435 ///436 /// - `token`: Token that should be burned437 /// - `collection`: Collection that contains the token438 pub fn burn(439 collection: &NonfungibleHandle<T>,440 sender: &T::CrossAccountId,441 token: TokenId,442 ) -> DispatchResult {443 let token_data =444 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;445 ensure!(&token_data.owner == sender, <CommonError<T>>::NoPermission);446447 if collection.permissions.access() == AccessMode::AllowList {448 collection.check_allowlist(sender)?;449 }450451 if Self::token_has_children(collection.id, token) {452 return Err(<Error<T>>::CantBurnNftWithChildren.into());453 }454455 let burnt = <TokensBurnt<T>>::get(collection.id)456 .checked_add(1)457 .ok_or(ArithmeticError::Overflow)?;458459 let balance = <AccountBalance<T>>::get((collection.id, token_data.owner.clone()))460 .checked_sub(1)461 .ok_or(ArithmeticError::Overflow)?;462463 // =========464465 if balance == 0 {466 <AccountBalance<T>>::remove((collection.id, token_data.owner.clone()));467 } else {468 <AccountBalance<T>>::insert((collection.id, token_data.owner.clone()), balance);469 }470471 <PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);472473 <Owned<T>>::remove((collection.id, &token_data.owner, token));474 <TokensBurnt<T>>::insert(collection.id, burnt);475 <TokenData<T>>::remove((collection.id, token));476 <TokenProperties<T>>::remove((collection.id, token));477 let _ = <TokenAuxProperties<T>>::clear_prefix((collection.id, token), u32::MAX, None);478 let old_spender = <Allowance<T>>::take((collection.id, token));479480 if let Some(old_spender) = old_spender {481 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(482 collection.id,483 token,484 token_data.owner.clone(),485 old_spender,486 0,487 ));488 }489490 <PalletEvm<T>>::deposit_log(491 ERC721Events::Transfer {492 from: *token_data.owner.as_eth(),493 to: H160::default(),494 token_id: token.into(),495 }496 .to_log(collection_id_to_address(collection.id)),497 );498 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(499 collection.id,500 token,501 token_data.owner,502 1,503 ));504 Ok(())505 }506507 /// Same as [`burn`] but burns all the tokens that are nested in the token first508 ///509 /// - `self_budget`: Limit for searching children in depth.510 /// - `breadth_budget`: Limit of breadth of searching children.511 ///512 /// [`burn`]: struct.Pallet.html#method.burn513 #[transactional]514 pub fn burn_recursively(515 collection: &NonfungibleHandle<T>,516 sender: &T::CrossAccountId,517 token: TokenId,518 self_budget: &dyn Budget,519 breadth_budget: &dyn Budget,520 ) -> DispatchResultWithPostInfo {521 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);522523 let current_token_account =524 T::CrossTokenAddressMapping::token_to_address(collection.id, token);525526 let mut weight = Weight::zero();527528 // This method is transactional, if user in fact doesn't have permissions to remove token -529 // tokens removed here will be restored after rejected transaction530 for ((collection, token), _) in <TokenChildren<T>>::iter_prefix((collection.id, token)) {531 ensure!(breadth_budget.consume(), <StructureError<T>>::BreadthLimit,);532 let PostDispatchInfo { actual_weight, .. } =533 <PalletStructure<T>>::burn_item_recursively(534 current_token_account.clone(),535 collection,536 token,537 self_budget,538 breadth_budget,539 )?;540 if let Some(actual_weight) = actual_weight {541 weight = weight.saturating_add(actual_weight);542 }543 }544545 Self::burn(collection, sender, token)?;546 DispatchResultWithPostInfo::Ok(PostDispatchInfo {547 actual_weight: Some(weight + <SelfWeightOf<T>>::burn_item()),548 pays_fee: Pays::Yes,549 })550 }551552 /// A batch operation to add, edit or remove properties for a token.553 ///554 /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.555 ///556 /// All affected properties should have `mutable` permission557 /// to be **deleted** or to be **set more than once**,558 /// and the sender should have permission to edit those properties.559 ///560 /// This function fires an event for each property change.561 /// In case of an error, all the changes (including the events) will be reverted562 /// since the function is transactional.563 #[transactional]564 fn modify_token_properties(565 collection: &NonfungibleHandle<T>,566 sender: &T::CrossAccountId,567 token_id: TokenId,568 properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,569 nesting_budget: &dyn Budget,570 ) -> DispatchResult {571 let mut property_writer =572 pallet_common::property_writer_for_existing_token(collection, sender);573574 property_writer.write_token_properties(575 sender,576 token_id,577 properties_updates,578 nesting_budget,579 erc::ERC721TokenEvent::TokenChanged {580 token_id: token_id.into(),581 }582 .to_log(T::ContractAddress::get()),583 )584 }585586 pub fn next_token_id(collection: &NonfungibleHandle<T>) -> Result<TokenId, DispatchError> {587 let next_token_id = <TokensMinted<T>>::get(collection.id)588 .checked_add(1)589 .ok_or(<CommonError<T>>::CollectionTokenLimitExceeded)?;590591 ensure!(592 collection.limits.token_limit() >= next_token_id,593 <CommonError<T>>::CollectionTokenLimitExceeded594 );595596 Ok(TokenId(next_token_id))597 }598599 /// Batch operation to add or edit properties for the token600 ///601 /// Same as [`modify_token_properties`] but doesn't allow to remove properties602 ///603 /// [`modify_token_properties`]: struct.Pallet.html#method.modify_token_properties604 pub fn set_token_properties(605 collection: &NonfungibleHandle<T>,606 sender: &T::CrossAccountId,607 token_id: TokenId,608 properties: impl Iterator<Item = Property>,609 nesting_budget: &dyn Budget,610 ) -> DispatchResult {611 Self::modify_token_properties(612 collection,613 sender,614 token_id,615 properties.map(|p| (p.key, Some(p.value))),616 nesting_budget,617 )618 }619620 /// Add or edit single property for the token621 ///622 /// Calls [`set_token_properties`] internally623 ///624 /// [`set_token_properties`]: struct.Pallet.html#method.set_token_properties625 pub fn set_token_property(626 collection: &NonfungibleHandle<T>,627 sender: &T::CrossAccountId,628 token_id: TokenId,629 property: Property,630 nesting_budget: &dyn Budget,631 ) -> DispatchResult {632 Self::set_token_properties(633 collection,634 sender,635 token_id,636 [property].into_iter(),637 nesting_budget,638 )639 }640641 /// Batch operation to remove properties from the token642 ///643 /// Same as [`modify_token_properties`] but doesn't allow to add or edit properties644 ///645 /// [`modify_token_properties`]: struct.Pallet.html#method.modify_token_properties646 pub fn delete_token_properties(647 collection: &NonfungibleHandle<T>,648 sender: &T::CrossAccountId,649 token_id: TokenId,650 property_keys: impl Iterator<Item = PropertyKey>,651 nesting_budget: &dyn Budget,652 ) -> DispatchResult {653 Self::modify_token_properties(654 collection,655 sender,656 token_id,657 property_keys.into_iter().map(|key| (key, None)),658 nesting_budget,659 )660 }661662 /// Remove single property from the token663 ///664 /// Calls [`delete_token_properties`] internally665 ///666 /// [`delete_token_properties`]: struct.Pallet.html#method.delete_token_properties667 pub fn delete_token_property(668 collection: &NonfungibleHandle<T>,669 sender: &T::CrossAccountId,670 token_id: TokenId,671 property_key: PropertyKey,672 nesting_budget: &dyn Budget,673 ) -> DispatchResult {674 Self::delete_token_properties(675 collection,676 sender,677 token_id,678 [property_key].into_iter(),679 nesting_budget,680 )681 }682683 /// Add or edit properties for the collection684 pub fn set_collection_properties(685 collection: &NonfungibleHandle<T>,686 sender: &T::CrossAccountId,687 properties: Vec<Property>,688 ) -> DispatchResult {689 <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())690 }691692 /// Remove properties from the collection693 pub fn delete_collection_properties(694 collection: &CollectionHandle<T>,695 sender: &T::CrossAccountId,696 property_keys: Vec<PropertyKey>,697 ) -> DispatchResult {698 <PalletCommon<T>>::delete_collection_properties(699 collection,700 sender,701 property_keys.into_iter(),702 )703 }704705 /// Set property permissions for the token.706 ///707 /// Sender should be the owner or admin of token's collection.708 pub fn set_token_property_permissions(709 collection: &CollectionHandle<T>,710 sender: &T::CrossAccountId,711 property_permissions: Vec<PropertyKeyPermission>,712 ) -> DispatchResult {713 <PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)714 }715716 /// Set property permissions for the token with scope.717 ///718 /// Sender should be the owner or admin of token's collection.719 pub fn set_scoped_token_property_permissions(720 collection: &CollectionHandle<T>,721 sender: &T::CrossAccountId,722 scope: PropertyScope,723 property_permissions: Vec<PropertyKeyPermission>,724 ) -> DispatchResult {725 <PalletCommon<T>>::set_scoped_token_property_permissions(726 collection,727 sender,728 scope,729 property_permissions,730 )731 }732733 pub fn token_property_permission(collection_id: CollectionId) -> PropertiesPermissionMap {734 <PalletCommon<T>>::property_permissions(collection_id)735 }736737 pub fn check_token_immediate_ownership(738 collection: &NonfungibleHandle<T>,739 token: TokenId,740 possible_owner: &T::CrossAccountId,741 ) -> DispatchResult {742 let token_data =743 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;744 ensure!(745 &token_data.owner == possible_owner,746 <CommonError<T>>::NoPermission747 );748 Ok(())749 }750751 /// Transfer NFT token from one account to another.752 ///753 /// `from` account stops being the owner and `to` account becomes the owner of the token.754 /// If `to` is token than `to` becomes owner of the token and the token become nested.755 /// Unnests token from previous parent if it was nested before.756 /// Removes allowance for the token if there was any.757 /// Throws if transfers aren't allowed for collection or if receiver reached token ownership limit.758 ///759 /// - `nesting_budget`: Limit for token nesting depth760 pub fn transfer(761 collection: &NonfungibleHandle<T>,762 from: &T::CrossAccountId,763 to: &T::CrossAccountId,764 token: TokenId,765 nesting_budget: &dyn Budget,766 ) -> DispatchResultWithPostInfo {767 ensure!(768 collection.limits.transfers_enabled(),769 <CommonError<T>>::TransferNotAllowed770 );771772 let mut actual_weight = <SelfWeightOf<T>>::transfer_raw();773 let token_data =774 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;775 ensure!(&token_data.owner == from, <CommonError<T>>::NoPermission);776777 if collection.permissions.access() == AccessMode::AllowList {778 collection.check_allowlist(from)?;779 collection.check_allowlist(to)?;780 actual_weight += <PalletCommonWeightOf<T>>::check_accesslist() * 2;781 }782 <PalletCommon<T>>::ensure_correct_receiver(to)?;783784 let balance_from = <AccountBalance<T>>::get((collection.id, from))785 .checked_sub(1)786 .ok_or(<CommonError<T>>::TokenValueTooLow)?;787 let balance_to = if from != to {788 let balance_to = <AccountBalance<T>>::get((collection.id, to))789 .checked_add(1)790 .ok_or(ArithmeticError::Overflow)?;791792 ensure!(793 balance_to < collection.limits.account_token_ownership_limit(),794 <CommonError<T>>::AccountTokenLimitExceeded,795 );796797 Some(balance_to)798 } else {799 None800 };801802 <PalletStructure<T>>::nest_if_sent_to_token(803 from.clone(),804 to,805 collection.id,806 token,807 nesting_budget,808 )?;809810 // =========811812 <PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);813814 <TokenData<T>>::insert((collection.id, token), ItemData { owner: to.clone() });815816 if let Some(balance_to) = balance_to {817 // from != to818 if balance_from == 0 {819 <AccountBalance<T>>::remove((collection.id, from));820 } else {821 <AccountBalance<T>>::insert((collection.id, from), balance_from);822 }823 <AccountBalance<T>>::insert((collection.id, to), balance_to);824 <Owned<T>>::remove((collection.id, from, token));825 <Owned<T>>::insert((collection.id, to, token), true);826 }827 Self::set_allowance_unchecked(collection, from, token, None, true);828829 <PalletEvm<T>>::deposit_log(830 ERC721Events::Transfer {831 from: *from.as_eth(),832 to: *to.as_eth(),833 token_id: token.into(),834 }835 .to_log(collection_id_to_address(collection.id)),836 );837 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(838 collection.id,839 token,840 from.clone(),841 to.clone(),842 1,843 ));844845 Ok(PostDispatchInfo {846 actual_weight: Some(actual_weight),847 pays_fee: Pays::Yes,848 })849 }850851 /// Batch operation to mint multiple NFT tokens.852 ///853 /// The sender should be the owner/admin of the collection or collection should be configured854 /// to allow public minting.855 /// Throws if amount of tokens reached it's limit for the collection or if caller reached856 /// token ownership limit.857 ///858 /// - `data`: Contains list of token properties and users who will become the owners of the859 /// corresponging tokens.860 /// - `nesting_budget`: Limit for token nesting depth861 pub fn create_multiple_items(862 collection: &NonfungibleHandle<T>,863 sender: &T::CrossAccountId,864 data: Vec<CreateItemData<T>>,865 nesting_budget: &dyn Budget,866 ) -> DispatchResult {867 if !collection.is_owner_or_admin(sender) {868 ensure!(869 collection.permissions.mint_mode(),870 <CommonError<T>>::PublicMintingNotAllowed871 );872 collection.check_allowlist(sender)?;873874 for item in data.iter() {875 collection.check_allowlist(&item.owner)?;876 }877 }878879 for data in data.iter() {880 <PalletCommon<T>>::ensure_correct_receiver(&data.owner)?;881 }882883 let first_token = <TokensMinted<T>>::get(collection.id);884 let tokens_minted = first_token885 .checked_add(data.len() as u32)886 .ok_or(ArithmeticError::Overflow)?;887 ensure!(888 tokens_minted <= collection.limits.token_limit(),889 <CommonError<T>>::CollectionTokenLimitExceeded890 );891892 let mut balances = BTreeMap::new();893 for data in &data {894 let balance = balances895 .entry(&data.owner)896 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, &data.owner)));897 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;898899 ensure!(900 *balance <= collection.limits.account_token_ownership_limit(),901 <CommonError<T>>::AccountTokenLimitExceeded,902 );903 }904905 for (i, data) in data.iter().enumerate() {906 let token = TokenId(first_token + i as u32 + 1);907908 <PalletStructure<T>>::check_nesting(909 sender.clone(),910 &data.owner,911 collection.id,912 token,913 nesting_budget,914 )?;915 }916917 // =========918919 let mut property_writer = pallet_common::property_writer_for_new_token(collection, sender);920921 with_transaction(|| {922 for (i, data) in data.iter().enumerate() {923 let token = first_token + i as u32 + 1;924925 <TokenData<T>>::insert(926 (collection.id, token),927 ItemData {928 // const_data: data.const_data.clone(),929 owner: data.owner.clone(),930 },931 );932933 let token = TokenId(token);934935 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(936 &data.owner,937 collection.id,938 token,939 );940941 if let Err(e) = property_writer.write_token_properties(942 sender.conv_eq(&data.owner),943 token,944 data.properties.clone().into_iter(),945 erc::ERC721TokenEvent::TokenChanged {946 token_id: token.into(),947 }948 .to_log(T::ContractAddress::get()),949 ) {950 return TransactionOutcome::Rollback(Err(e));951 }952 }953 TransactionOutcome::Commit(Ok(()))954 })?;955956 <TokensMinted<T>>::insert(collection.id, tokens_minted);957 for (account, balance) in balances {958 <AccountBalance<T>>::insert((collection.id, account), balance);959 }960 for (i, data) in data.into_iter().enumerate() {961 let token = first_token + i as u32 + 1;962 <Owned<T>>::insert((collection.id, &data.owner, token), true);963964 <PalletEvm<T>>::deposit_log(965 ERC721Events::Transfer {966 from: H160::default(),967 to: *data.owner.as_eth(),968 token_id: token.into(),969 }970 .to_log(collection_id_to_address(collection.id)),971 );972 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(973 collection.id,974 TokenId(token),975 data.owner.clone(),976 1,977 ));978 }979 Ok(())980 }981982 pub fn set_allowance_unchecked(983 collection: &NonfungibleHandle<T>,984 sender: &T::CrossAccountId,985 token: TokenId,986 spender: Option<&T::CrossAccountId>,987 assume_implicit_eth: bool,988 ) {989 if let Some(spender) = spender {990 let old_spender = <Allowance<T>>::get((collection.id, token));991 <Allowance<T>>::insert((collection.id, token), spender);992 // In ERC721 there is only one possible approved user of token, so we set993 // approved user to spender994 <PalletEvm<T>>::deposit_log(995 ERC721Events::Approval {996 owner: *sender.as_eth(),997 approved: *spender.as_eth(),998 token_id: token.into(),999 }1000 .to_log(collection_id_to_address(collection.id)),1001 );1002 // In Unique chain, any token can have any amount of approved users, so we need to1003 // set allowance of old owner to 0, and allowance of new owner to 11004 if old_spender.as_ref() != Some(spender) {1005 if let Some(old_owner) = old_spender {1006 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1007 collection.id,1008 token,1009 sender.clone(),1010 old_owner,1011 0,1012 ));1013 }1014 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1015 collection.id,1016 token,1017 sender.clone(),1018 spender.clone(),1019 1,1020 ));1021 }1022 } else {1023 let old_spender = <Allowance<T>>::take((collection.id, token));1024 if !assume_implicit_eth {1025 // In ERC721 there is only one possible approved user of token, so we set1026 // approved user to zero address1027 <PalletEvm<T>>::deposit_log(1028 ERC721Events::Approval {1029 owner: *sender.as_eth(),1030 approved: H160::default(),1031 token_id: token.into(),1032 }1033 .to_log(collection_id_to_address(collection.id)),1034 );1035 }1036 // In Unique chain, any token can have any amount of approved users, so we need to1037 // set allowance of old owner to 01038 if let Some(old_spender) = old_spender {1039 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1040 collection.id,1041 token,1042 sender.clone(),1043 old_spender,1044 0,1045 ));1046 }1047 }1048 }10491050 pub fn get_allowance(1051 collection: &NonfungibleHandle<T>,1052 token_id: TokenId,1053 ) -> Result<Option<T::CrossAccountId>, DispatchError> {1054 ensure!(1055 <TokenData<T>>::get((collection.id, token_id)).is_some(),1056 <CommonError<T>>::TokenNotFound1057 );1058 Ok(<Allowance<T>>::get((collection.id, token_id)))1059 }10601061 /// Set allowance for the spender to `transfer` or `burn` sender's token.1062 ///1063 /// - `token`: Token the spender is allowed to `transfer` or `burn`.1064 pub fn set_allowance(1065 collection: &NonfungibleHandle<T>,1066 sender: &T::CrossAccountId,1067 token: TokenId,1068 spender: Option<&T::CrossAccountId>,1069 ) -> DispatchResult {1070 if collection.permissions.access() == AccessMode::AllowList {1071 collection.check_allowlist(sender)?;1072 if let Some(spender) = spender {1073 collection.check_allowlist(spender)?;1074 }1075 }10761077 if let Some(spender) = spender {1078 <PalletCommon<T>>::ensure_correct_receiver(spender)?;1079 }10801081 let token_data =1082 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;1083 if &token_data.owner != sender {1084 ensure!(1085 collection.ignores_owned_amount(sender),1086 <CommonError<T>>::CantApproveMoreThanOwned1087 );1088 }10891090 // =========10911092 Self::set_allowance_unchecked(collection, sender, token, spender, false);1093 Ok(())1094 }10951096 /// Set allowance for the spender to `transfer` or `burn` sender's token from eth mirror.1097 ///1098 /// - `from`: Address of sender's eth mirror.1099 /// - `to`: Adress of spender.1100 /// - `token`: Token the spender is allowed to `transfer` or `burn`.1101 pub fn set_allowance_from(1102 collection: &NonfungibleHandle<T>,1103 sender: &T::CrossAccountId,1104 from: &T::CrossAccountId,1105 token: TokenId,1106 to: Option<&T::CrossAccountId>,1107 ) -> DispatchResult {1108 if collection.permissions.access() == AccessMode::AllowList {1109 collection.check_allowlist(sender)?;1110 collection.check_allowlist(from)?;1111 if let Some(to) = to {1112 collection.check_allowlist(to)?;1113 }1114 }11151116 if let Some(to) = to {1117 <PalletCommon<T>>::ensure_correct_receiver(to)?;1118 }11191120 ensure!(1121 sender.conv_eq(from),1122 <CommonError<T>>::AddressIsNotEthMirror1123 );11241125 let token_data =1126 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;1127 if token_data.owner != *from {1128 ensure!(1129 collection.limits.owner_can_transfer()1130 && (collection.is_owner_or_admin(sender) || collection.is_owner_or_admin(from)),1131 <CommonError<T>>::CantApproveMoreThanOwned1132 );1133 }11341135 // =========11361137 Self::set_allowance_unchecked(collection, from, token, to, false);1138 Ok(())1139 }11401141 /// Checks allowance for the spender to use the token.1142 fn check_allowed(1143 collection: &NonfungibleHandle<T>,1144 spender: &T::CrossAccountId,1145 from: &T::CrossAccountId,1146 token: TokenId,1147 nesting_budget: &dyn Budget,1148 ) -> DispatchResult {1149 if spender.conv_eq(from) {1150 return Ok(());1151 }1152 if collection.permissions.access() == AccessMode::AllowList {1153 // `from`, `to` checked in [`transfer`]1154 collection.check_allowlist(spender)?;1155 }11561157 if collection.ignores_token_restrictions(spender) {1158 return Ok(());1159 }11601161 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {1162 ensure!(1163 <PalletStructure<T>>::check_indirectly_owned(1164 spender.clone(),1165 source.0,1166 source.1,1167 None,1168 nesting_budget1169 )?,1170 <CommonError<T>>::ApprovedValueTooLow,1171 );1172 return Ok(());1173 }1174 if <Allowance<T>>::get((collection.id, token)).as_ref() == Some(spender) {1175 return Ok(());1176 }1177 if <CollectionAllowance<T>>::get((collection.id, from, spender)) {1178 return Ok(());1179 }11801181 Err(<CommonError<T>>::ApprovedValueTooLow.into())1182 }11831184 /// Transfer NFT token from one account to another.1185 ///1186 /// Same as the [`transfer`] but spender doesn't needs to be the owner of the token.1187 /// The owner should set allowance for the spender to transfer token.1188 ///1189 /// [`transfer`]: struct.Pallet.html#method.transfer1190 pub fn transfer_from(1191 collection: &NonfungibleHandle<T>,1192 spender: &T::CrossAccountId,1193 from: &T::CrossAccountId,1194 to: &T::CrossAccountId,1195 token: TokenId,1196 nesting_budget: &dyn Budget,1197 ) -> DispatchResultWithPostInfo {1198 Self::check_allowed(collection, spender, from, token, nesting_budget)?;11991200 // =========12011202 // Allowance is reset in [`transfer`]1203 let mut result = Self::transfer(collection, from, to, token, nesting_budget);1204 add_weight_to_post_info(&mut result, <SelfWeightOf<T>>::check_allowed_raw());1205 result1206 }12071208 /// Burn NFT token for `from` account.1209 ///1210 /// Same as the [`burn`] but spender doesn't need to be an owner of the token. The owner should1211 /// set allowance for the spender to burn token.1212 ///1213 /// [`burn`]: struct.Pallet.html#method.burn1214 pub fn burn_from(1215 collection: &NonfungibleHandle<T>,1216 spender: &T::CrossAccountId,1217 from: &T::CrossAccountId,1218 token: TokenId,1219 nesting_budget: &dyn Budget,1220 ) -> DispatchResult {1221 Self::check_allowed(collection, spender, from, token, nesting_budget)?;12221223 // =========12241225 Self::burn(collection, from, token)1226 }12271228 /// Check that `from` token could be nested in `under` token.1229 ///1230 pub fn check_nesting(1231 handle: &NonfungibleHandle<T>,1232 sender: T::CrossAccountId,1233 from: (CollectionId, TokenId),1234 under: TokenId,1235 nesting_budget: &dyn Budget,1236 ) -> DispatchResult {1237 let nesting = handle.permissions.nesting();12381239 #[cfg(not(feature = "runtime-benchmarks"))]1240 let permissive = false;1241 #[cfg(feature = "runtime-benchmarks")]1242 let permissive = nesting.permissive;12431244 if permissive {1245 ensure!(1246 <TokenData<T>>::contains_key((handle.id, under)),1247 <CommonError<T>>::TokenNotFound1248 );1249 } else if nesting.token_owner1250 && <PalletStructure<T>>::check_indirectly_owned(1251 sender.clone(),1252 handle.id,1253 under,1254 Some(from),1255 nesting_budget,1256 )? {1257 // Pass, token existence and ouroboros checks are done in `check_indirectly_owned`1258 } else if nesting.collection_admin && handle.is_owner_or_admin(&sender) {1259 // token existence and ouroboros checks are done in `get_checked_topmost_owner`1260 let _ = <PalletStructure<T>>::get_checked_topmost_owner(1261 handle.id,1262 under,1263 Some(from),1264 nesting_budget,1265 )?1266 .ok_or(<CommonError<T>>::TokenNotFound)?;1267 } else {1268 fail!(<CommonError<T>>::UserIsNotAllowedToNest);1269 }12701271 if let Some(whitelist) = &nesting.restricted {1272 ensure!(1273 whitelist.contains(&from.0),1274 <CommonError<T>>::SourceCollectionIsNotAllowedToNest1275 );1276 }1277 Ok(())1278 }12791280 fn nest(under: (CollectionId, TokenId), to_nest: (CollectionId, TokenId)) {1281 if to_nest.0 != pallet_common::NATIVE_FUNGIBLE_COLLECTION_ID {1282 <TokenChildren<T>>::insert((under.0, under.1, to_nest), true);1283 }1284 }12851286 fn unnest(under: (CollectionId, TokenId), to_unnest: (CollectionId, TokenId)) {1287 if to_unnest.0 != pallet_common::NATIVE_FUNGIBLE_COLLECTION_ID {1288 <TokenChildren<T>>::remove((under.0, under.1, to_unnest));1289 }1290 }12911292 fn collection_has_tokens(collection_id: CollectionId) -> bool {1293 <TokenData<T>>::iter_prefix((collection_id,))1294 .next()1295 .is_some()1296 }12971298 fn token_has_children(collection_id: CollectionId, token_id: TokenId) -> bool {1299 <TokenChildren<T>>::iter_prefix((collection_id, token_id))1300 .next()1301 .is_some()1302 }13031304 pub fn token_children_ids(collection_id: CollectionId, token_id: TokenId) -> Vec<TokenChild> {1305 <TokenChildren<T>>::iter_prefix((collection_id, token_id))1306 .map(|((child_collection_id, child_id), _)| TokenChild {1307 collection: child_collection_id,1308 token: child_id,1309 })1310 .collect()1311 }13121313 /// Mint single NFT token.1314 ///1315 /// Delegated to [`create_multiple_items`]1316 ///1317 /// [`create_multiple_items`]: struct.Pallet.html#method.create_multiple_items1318 pub fn create_item(1319 collection: &NonfungibleHandle<T>,1320 sender: &T::CrossAccountId,1321 data: CreateItemData<T>,1322 nesting_budget: &dyn Budget,1323 ) -> DispatchResult {1324 Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1325 }13261327 /// Sets or unsets the approval of a given operator.1328 ///1329 /// The `operator` is allowed to transfer all token pieces of the `owner` on their behalf.1330 /// - `owner`: Token owner1331 /// - `operator`: Operator1332 /// - `approve`: Should operator status be granted or revoked?1333 pub fn set_allowance_for_all(1334 collection: &NonfungibleHandle<T>,1335 owner: &T::CrossAccountId,1336 operator: &T::CrossAccountId,1337 approve: bool,1338 ) -> DispatchResult {1339 <PalletCommon<T>>::set_allowance_for_all(1340 collection,1341 owner,1342 operator,1343 approve,1344 || <CollectionAllowance<T>>::insert((collection.id, owner, operator), approve),1345 ERC721Events::ApprovalForAll {1346 owner: *owner.as_eth(),1347 operator: *operator.as_eth(),1348 approved: approve,1349 }1350 .to_log(collection_id_to_address(collection.id)),1351 )1352 }13531354 /// Tells whether the given `owner` approves the `operator`.1355 pub fn allowance_for_all(1356 collection: &NonfungibleHandle<T>,1357 owner: &T::CrossAccountId,1358 operator: &T::CrossAccountId,1359 ) -> bool {1360 <CollectionAllowance<T>>::get((collection.id, owner, operator))1361 }13621363 pub fn repair_item(collection: &NonfungibleHandle<T>, token: TokenId) -> DispatchResult {1364 <TokenProperties<T>>::mutate((collection.id, token), |properties| {1365 if let Some(properties) = properties {1366 properties.recompute_consumed_space();1367 }1368 });13691370 Ok(())1371 }1372}pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_nonfungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-30, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/nonfungible/src/weights.rs
@@ -46,6 +46,7 @@
fn burn_from() -> Weight;
fn set_token_property_permissions(b: u32, ) -> Weight;
fn set_token_properties(b: u32, ) -> Weight;
+ fn init_token_properties(b: u32, ) -> Weight;
fn delete_token_properties(b: u32, ) -> Weight;
fn token_owner() -> Weight;
fn set_allowance_for_all() -> Weight;
@@ -60,31 +61,23 @@
/// Proof: Nonfungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Nonfungible AccountBalance (r:1 w:1)
/// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible TokenProperties (r:1 w:1)
- /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Nonfungible TokenData (r:0 w:1)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
/// Storage: Nonfungible Owned (r:0 w:1)
/// Proof: Nonfungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn create_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `390`
- // Estimated: `63471`
- // Minimum execution time: 25_892_000 picoseconds.
- Weight::from_parts(26_424_000, 63471)
- .saturating_add(T::DbWeight::get().reads(4_u64))
- .saturating_add(T::DbWeight::get().writes(5_u64))
+ // Measured: `142`
+ // Estimated: `3530`
+ // Minimum execution time: 9_726_000 picoseconds.
+ Weight::from_parts(10_059_000, 3530)
+ .saturating_add(T::DbWeight::get().reads(2_u64))
+ .saturating_add(T::DbWeight::get().writes(4_u64))
}
/// Storage: Nonfungible TokensMinted (r:1 w:1)
/// Proof: Nonfungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Nonfungible AccountBalance (r:1 w:1)
/// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible TokenProperties (r:200 w:200)
- /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Nonfungible TokenData (r:0 w:200)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
/// Storage: Nonfungible Owned (r:0 w:200)
@@ -92,26 +85,20 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `390`
- // Estimated: `28192 + b * (35279 ±0)`
- // Minimum execution time: 4_612_000 picoseconds.
- Weight::from_parts(6_399_460, 28192)
- // Standard Error: 5_119
- .saturating_add(Weight::from_parts(7_230_389, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(3_u64))
- .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
+ // Measured: `142`
+ // Estimated: `3530`
+ // Minimum execution time: 3_270_000 picoseconds.
+ Weight::from_parts(3_693_659, 3530)
+ // Standard Error: 255
+ .saturating_add(Weight::from_parts(3_024_284, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
- .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 35279).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(b.into())))
}
/// Storage: Nonfungible TokensMinted (r:1 w:1)
/// Proof: Nonfungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Nonfungible AccountBalance (r:200 w:200)
/// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible TokenProperties (r:200 w:200)
- /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Nonfungible TokenData (r:0 w:200)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
/// Storage: Nonfungible Owned (r:0 w:200)
@@ -119,17 +106,17 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items_ex(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `390`
- // Estimated: `25652 + b * (37819 ±0)`
- // Minimum execution time: 4_538_000 picoseconds.
- Weight::from_parts(4_686_000, 25652)
- // Standard Error: 3_518
- .saturating_add(Weight::from_parts(8_905_771, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
- .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into())))
+ // Measured: `142`
+ // Estimated: `3481 + b * (2540 ±0)`
+ // Minimum execution time: 3_188_000 picoseconds.
+ Weight::from_parts(3_307_000, 3481)
+ // Standard Error: 567
+ .saturating_add(Weight::from_parts(4_320_449, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(1_u64))
+ .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
.saturating_add(T::DbWeight::get().writes(1_u64))
- .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 37819).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
+ .saturating_add(Weight::from_parts(0, 2540).saturating_mul(b.into()))
}
/// Storage: Nonfungible TokenData (r:1 w:1)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
@@ -148,9 +135,9 @@
fn burn_item() -> Weight {
// Proof Size summary in bytes:
// Measured: `380`
- // Estimated: `17561`
- // Minimum execution time: 24_230_000 picoseconds.
- Weight::from_parts(24_672_000, 17561)
+ // Estimated: `3530`
+ // Minimum execution time: 18_062_000 picoseconds.
+ Weight::from_parts(18_433_000, 3530)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(5_u64))
}
@@ -171,9 +158,9 @@
fn burn_recursively_self_raw() -> Weight {
// Proof Size summary in bytes:
// Measured: `380`
- // Estimated: `17561`
- // Minimum execution time: 30_521_000 picoseconds.
- Weight::from_parts(31_241_000, 17561)
+ // Estimated: `3530`
+ // Minimum execution time: 22_942_000 picoseconds.
+ Weight::from_parts(23_527_000, 3530)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(5_u64))
}
@@ -196,17 +183,17 @@
/// The range of component `b` is `[0, 200]`.
fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `1467 + b * (58 ±0)`
- // Estimated: `24230 + b * (10097 ±0)`
- // Minimum execution time: 31_734_000 picoseconds.
- Weight::from_parts(32_162_000, 24230)
- // Standard Error: 210_514
- .saturating_add(Weight::from_parts(71_382_804, 0).saturating_mul(b.into()))
+ // Measured: `1500 + b * (58 ±0)`
+ // Estimated: `5874 + b * (5032 ±0)`
+ // Minimum execution time: 22_709_000 picoseconds.
+ Weight::from_parts(23_287_000, 5874)
+ // Standard Error: 89_471
+ .saturating_add(Weight::from_parts(63_285_201, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(7_u64))
.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(b.into())))
.saturating_add(T::DbWeight::get().writes(6_u64))
.saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 10097).saturating_mul(b.into()))
+ .saturating_add(Weight::from_parts(0, 5032).saturating_mul(b.into()))
}
/// Storage: Nonfungible TokenData (r:1 w:1)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
@@ -219,9 +206,9 @@
fn transfer_raw() -> Weight {
// Proof Size summary in bytes:
// Measured: `380`
- // Estimated: `13114`
- // Minimum execution time: 18_305_000 picoseconds.
- Weight::from_parts(18_859_000, 13114)
+ // Estimated: `6070`
+ // Minimum execution time: 13_652_000 picoseconds.
+ Weight::from_parts(13_981_000, 6070)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(5_u64))
}
@@ -232,9 +219,9 @@
fn approve() -> Weight {
// Proof Size summary in bytes:
// Measured: `326`
- // Estimated: `7044`
- // Minimum execution time: 10_977_000 picoseconds.
- Weight::from_parts(11_184_000, 7044)
+ // Estimated: `3522`
+ // Minimum execution time: 7_837_000 picoseconds.
+ Weight::from_parts(8_113_000, 3522)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -245,9 +232,9 @@
fn approve_from() -> Weight {
// Proof Size summary in bytes:
// Measured: `313`
- // Estimated: `7044`
- // Minimum execution time: 11_456_000 picoseconds.
- Weight::from_parts(11_731_000, 7044)
+ // Estimated: `3522`
+ // Minimum execution time: 7_769_000 picoseconds.
+ Weight::from_parts(7_979_000, 3522)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -257,8 +244,8 @@
// Proof Size summary in bytes:
// Measured: `362`
// Estimated: `3522`
- // Minimum execution time: 5_771_000 picoseconds.
- Weight::from_parts(5_972_000, 3522)
+ // Minimum execution time: 4_194_000 picoseconds.
+ Weight::from_parts(4_353_000, 3522)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: Nonfungible Allowance (r:1 w:1)
@@ -278,9 +265,9 @@
fn burn_from() -> Weight {
// Proof Size summary in bytes:
// Measured: `463`
- // Estimated: `17561`
- // Minimum execution time: 30_633_000 picoseconds.
- Weight::from_parts(31_136_000, 17561)
+ // Estimated: `3530`
+ // Minimum execution time: 21_978_000 picoseconds.
+ Weight::from_parts(22_519_000, 3530)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(6_u64))
}
@@ -289,45 +276,62 @@
/// The range of component `b` is `[0, 64]`.
fn set_token_property_permissions(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `281`
+ // Measured: `314`
// Estimated: `20191`
- // Minimum execution time: 2_300_000 picoseconds.
- Weight::from_parts(2_382_000, 20191)
- // Standard Error: 45_076
- .saturating_add(Weight::from_parts(12_000_777, 0).saturating_mul(b.into()))
+ // Minimum execution time: 1_457_000 picoseconds.
+ Weight::from_parts(1_563_000, 20191)
+ // Standard Error: 14_041
+ .saturating_add(Weight::from_parts(8_452_415, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
+ /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
+ /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Nonfungible TokenProperties (r:1 w:1)
/// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ /// Storage: Nonfungible TokenData (r:1 w:0)
+ /// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 64]`.
fn set_token_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `584 + b * (261 ±0)`
- // Estimated: `56460`
- // Minimum execution time: 12_422_000 picoseconds.
- Weight::from_parts(5_523_689, 56460)
- // Standard Error: 74_137
- .saturating_add(Weight::from_parts(6_320_501, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
+ // Measured: `640 + b * (261 ±0)`
+ // Estimated: `36269`
+ // Minimum execution time: 963_000 picoseconds.
+ Weight::from_parts(1_126_511, 36269)
+ // Standard Error: 9_175
+ .saturating_add(Weight::from_parts(5_096_011, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
- /// Storage: Nonfungible TokenProperties (r:1 w:1)
+ /// Storage: Nonfungible TokenProperties (r:0 w:1)
/// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
+ /// The range of component `b` is `[0, 64]`.
+ fn init_token_properties(b: u32, ) -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `0`
+ // Estimated: `0`
+ // Minimum execution time: 194_000 picoseconds.
+ Weight::from_parts(222_000, 0)
+ // Standard Error: 7_295
+ .saturating_add(Weight::from_parts(4_499_463, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().writes(1_u64))
+ }
/// Storage: Common CollectionPropertyPermissions (r:1 w:0)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ /// Storage: Nonfungible TokenData (r:1 w:0)
+ /// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
+ /// Storage: Nonfungible TokenProperties (r:1 w:1)
+ /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 64]`.
fn delete_token_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `589 + b * (33291 ±0)`
- // Estimated: `56460`
- // Minimum execution time: 12_006_000 picoseconds.
- Weight::from_parts(12_216_000, 56460)
- // Standard Error: 83_431
- .saturating_add(Weight::from_parts(24_556_999, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
+ // Measured: `699 + b * (33291 ±0)`
+ // Estimated: `36269`
+ // Minimum execution time: 992_000 picoseconds.
+ Weight::from_parts(1_043_000, 36269)
+ // Standard Error: 37_370
+ .saturating_add(Weight::from_parts(23_672_870, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Nonfungible TokenData (r:1 w:0)
@@ -336,8 +340,8 @@
// Proof Size summary in bytes:
// Measured: `326`
// Estimated: `3522`
- // Minimum execution time: 4_827_000 picoseconds.
- Weight::from_parts(4_984_000, 3522)
+ // Minimum execution time: 3_743_000 picoseconds.
+ Weight::from_parts(3_908_000, 3522)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: Nonfungible CollectionAllowance (r:0 w:1)
@@ -346,28 +350,28 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 6_151_000 picoseconds.
- Weight::from_parts(6_394_000, 0)
+ // Minimum execution time: 4_106_000 picoseconds.
+ Weight::from_parts(4_293_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Nonfungible CollectionAllowance (r:1 w:0)
/// Proof: Nonfungible CollectionAllowance (max_values: None, max_size: Some(111), added: 2586, mode: MaxEncodedLen)
fn allowance_for_all() -> Weight {
// Proof Size summary in bytes:
- // Measured: `109`
+ // Measured: `142`
// Estimated: `3576`
- // Minimum execution time: 3_791_000 picoseconds.
- Weight::from_parts(3_950_000, 3576)
+ // Minimum execution time: 2_775_000 picoseconds.
+ Weight::from_parts(2_923_000, 3576)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: Nonfungible TokenProperties (r:1 w:1)
/// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
fn repair_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `300`
+ // Measured: `279`
// Estimated: `36269`
- // Minimum execution time: 5_364_000 picoseconds.
- Weight::from_parts(5_539_000, 36269)
+ // Minimum execution time: 3_033_000 picoseconds.
+ Weight::from_parts(3_174_000, 36269)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -379,31 +383,23 @@
/// Proof: Nonfungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Nonfungible AccountBalance (r:1 w:1)
/// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible TokenProperties (r:1 w:1)
- /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Nonfungible TokenData (r:0 w:1)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
/// Storage: Nonfungible Owned (r:0 w:1)
/// Proof: Nonfungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn create_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `390`
- // Estimated: `63471`
- // Minimum execution time: 25_892_000 picoseconds.
- Weight::from_parts(26_424_000, 63471)
- .saturating_add(RocksDbWeight::get().reads(4_u64))
- .saturating_add(RocksDbWeight::get().writes(5_u64))
+ // Measured: `142`
+ // Estimated: `3530`
+ // Minimum execution time: 9_726_000 picoseconds.
+ Weight::from_parts(10_059_000, 3530)
+ .saturating_add(RocksDbWeight::get().reads(2_u64))
+ .saturating_add(RocksDbWeight::get().writes(4_u64))
}
/// Storage: Nonfungible TokensMinted (r:1 w:1)
/// Proof: Nonfungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Nonfungible AccountBalance (r:1 w:1)
/// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible TokenProperties (r:200 w:200)
- /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Nonfungible TokenData (r:0 w:200)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
/// Storage: Nonfungible Owned (r:0 w:200)
@@ -411,26 +407,20 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `390`
- // Estimated: `28192 + b * (35279 ±0)`
- // Minimum execution time: 4_612_000 picoseconds.
- Weight::from_parts(6_399_460, 28192)
- // Standard Error: 5_119
- .saturating_add(Weight::from_parts(7_230_389, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(3_u64))
- .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(b.into())))
+ // Measured: `142`
+ // Estimated: `3530`
+ // Minimum execution time: 3_270_000 picoseconds.
+ Weight::from_parts(3_693_659, 3530)
+ // Standard Error: 255
+ .saturating_add(Weight::from_parts(3_024_284, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
- .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 35279).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(b.into())))
}
/// Storage: Nonfungible TokensMinted (r:1 w:1)
/// Proof: Nonfungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Nonfungible AccountBalance (r:200 w:200)
/// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible TokenProperties (r:200 w:200)
- /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Nonfungible TokenData (r:0 w:200)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
/// Storage: Nonfungible Owned (r:0 w:200)
@@ -438,17 +428,17 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items_ex(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `390`
- // Estimated: `25652 + b * (37819 ±0)`
- // Minimum execution time: 4_538_000 picoseconds.
- Weight::from_parts(4_686_000, 25652)
- // Standard Error: 3_518
- .saturating_add(Weight::from_parts(8_905_771, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
- .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(b.into())))
+ // Measured: `142`
+ // Estimated: `3481 + b * (2540 ±0)`
+ // Minimum execution time: 3_188_000 picoseconds.
+ Weight::from_parts(3_307_000, 3481)
+ // Standard Error: 567
+ .saturating_add(Weight::from_parts(4_320_449, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(1_u64))
+ .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(b.into())))
.saturating_add(RocksDbWeight::get().writes(1_u64))
- .saturating_add(RocksDbWeight::get().writes((4_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 37819).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(b.into())))
+ .saturating_add(Weight::from_parts(0, 2540).saturating_mul(b.into()))
}
/// Storage: Nonfungible TokenData (r:1 w:1)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
@@ -467,9 +457,9 @@
fn burn_item() -> Weight {
// Proof Size summary in bytes:
// Measured: `380`
- // Estimated: `17561`
- // Minimum execution time: 24_230_000 picoseconds.
- Weight::from_parts(24_672_000, 17561)
+ // Estimated: `3530`
+ // Minimum execution time: 18_062_000 picoseconds.
+ Weight::from_parts(18_433_000, 3530)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(5_u64))
}
@@ -490,9 +480,9 @@
fn burn_recursively_self_raw() -> Weight {
// Proof Size summary in bytes:
// Measured: `380`
- // Estimated: `17561`
- // Minimum execution time: 30_521_000 picoseconds.
- Weight::from_parts(31_241_000, 17561)
+ // Estimated: `3530`
+ // Minimum execution time: 22_942_000 picoseconds.
+ Weight::from_parts(23_527_000, 3530)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(5_u64))
}
@@ -515,17 +505,17 @@
/// The range of component `b` is `[0, 200]`.
fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `1467 + b * (58 ±0)`
- // Estimated: `24230 + b * (10097 ±0)`
- // Minimum execution time: 31_734_000 picoseconds.
- Weight::from_parts(32_162_000, 24230)
- // Standard Error: 210_514
- .saturating_add(Weight::from_parts(71_382_804, 0).saturating_mul(b.into()))
+ // Measured: `1500 + b * (58 ±0)`
+ // Estimated: `5874 + b * (5032 ±0)`
+ // Minimum execution time: 22_709_000 picoseconds.
+ Weight::from_parts(23_287_000, 5874)
+ // Standard Error: 89_471
+ .saturating_add(Weight::from_parts(63_285_201, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(7_u64))
.saturating_add(RocksDbWeight::get().reads((4_u64).saturating_mul(b.into())))
.saturating_add(RocksDbWeight::get().writes(6_u64))
.saturating_add(RocksDbWeight::get().writes((4_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 10097).saturating_mul(b.into()))
+ .saturating_add(Weight::from_parts(0, 5032).saturating_mul(b.into()))
}
/// Storage: Nonfungible TokenData (r:1 w:1)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
@@ -538,9 +528,9 @@
fn transfer_raw() -> Weight {
// Proof Size summary in bytes:
// Measured: `380`
- // Estimated: `13114`
- // Minimum execution time: 18_305_000 picoseconds.
- Weight::from_parts(18_859_000, 13114)
+ // Estimated: `6070`
+ // Minimum execution time: 13_652_000 picoseconds.
+ Weight::from_parts(13_981_000, 6070)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(5_u64))
}
@@ -551,9 +541,9 @@
fn approve() -> Weight {
// Proof Size summary in bytes:
// Measured: `326`
- // Estimated: `7044`
- // Minimum execution time: 10_977_000 picoseconds.
- Weight::from_parts(11_184_000, 7044)
+ // Estimated: `3522`
+ // Minimum execution time: 7_837_000 picoseconds.
+ Weight::from_parts(8_113_000, 3522)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -564,9 +554,9 @@
fn approve_from() -> Weight {
// Proof Size summary in bytes:
// Measured: `313`
- // Estimated: `7044`
- // Minimum execution time: 11_456_000 picoseconds.
- Weight::from_parts(11_731_000, 7044)
+ // Estimated: `3522`
+ // Minimum execution time: 7_769_000 picoseconds.
+ Weight::from_parts(7_979_000, 3522)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -576,8 +566,8 @@
// Proof Size summary in bytes:
// Measured: `362`
// Estimated: `3522`
- // Minimum execution time: 5_771_000 picoseconds.
- Weight::from_parts(5_972_000, 3522)
+ // Minimum execution time: 4_194_000 picoseconds.
+ Weight::from_parts(4_353_000, 3522)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: Nonfungible Allowance (r:1 w:1)
@@ -597,9 +587,9 @@
fn burn_from() -> Weight {
// Proof Size summary in bytes:
// Measured: `463`
- // Estimated: `17561`
- // Minimum execution time: 30_633_000 picoseconds.
- Weight::from_parts(31_136_000, 17561)
+ // Estimated: `3530`
+ // Minimum execution time: 21_978_000 picoseconds.
+ Weight::from_parts(22_519_000, 3530)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(6_u64))
}
@@ -608,45 +598,62 @@
/// The range of component `b` is `[0, 64]`.
fn set_token_property_permissions(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `281`
+ // Measured: `314`
// Estimated: `20191`
- // Minimum execution time: 2_300_000 picoseconds.
- Weight::from_parts(2_382_000, 20191)
- // Standard Error: 45_076
- .saturating_add(Weight::from_parts(12_000_777, 0).saturating_mul(b.into()))
+ // Minimum execution time: 1_457_000 picoseconds.
+ Weight::from_parts(1_563_000, 20191)
+ // Standard Error: 14_041
+ .saturating_add(Weight::from_parts(8_452_415, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
- /// Storage: Nonfungible TokenProperties (r:1 w:1)
- /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
/// Storage: Common CollectionPropertyPermissions (r:1 w:0)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ /// Storage: Nonfungible TokenProperties (r:1 w:1)
+ /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
+ /// Storage: Nonfungible TokenData (r:1 w:0)
+ /// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 64]`.
fn set_token_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `584 + b * (261 ±0)`
- // Estimated: `56460`
- // Minimum execution time: 12_422_000 picoseconds.
- Weight::from_parts(5_523_689, 56460)
- // Standard Error: 74_137
- .saturating_add(Weight::from_parts(6_320_501, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
+ // Measured: `640 + b * (261 ±0)`
+ // Estimated: `36269`
+ // Minimum execution time: 963_000 picoseconds.
+ Weight::from_parts(1_126_511, 36269)
+ // Standard Error: 9_175
+ .saturating_add(Weight::from_parts(5_096_011, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
- /// Storage: Nonfungible TokenProperties (r:1 w:1)
+ /// Storage: Nonfungible TokenProperties (r:0 w:1)
/// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
+ /// The range of component `b` is `[0, 64]`.
+ fn init_token_properties(b: u32, ) -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `0`
+ // Estimated: `0`
+ // Minimum execution time: 194_000 picoseconds.
+ Weight::from_parts(222_000, 0)
+ // Standard Error: 7_295
+ .saturating_add(Weight::from_parts(4_499_463, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().writes(1_u64))
+ }
/// Storage: Common CollectionPropertyPermissions (r:1 w:0)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ /// Storage: Nonfungible TokenData (r:1 w:0)
+ /// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
+ /// Storage: Nonfungible TokenProperties (r:1 w:1)
+ /// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 64]`.
fn delete_token_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `589 + b * (33291 ±0)`
- // Estimated: `56460`
- // Minimum execution time: 12_006_000 picoseconds.
- Weight::from_parts(12_216_000, 56460)
- // Standard Error: 83_431
- .saturating_add(Weight::from_parts(24_556_999, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
+ // Measured: `699 + b * (33291 ±0)`
+ // Estimated: `36269`
+ // Minimum execution time: 992_000 picoseconds.
+ Weight::from_parts(1_043_000, 36269)
+ // Standard Error: 37_370
+ .saturating_add(Weight::from_parts(23_672_870, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Nonfungible TokenData (r:1 w:0)
@@ -655,8 +662,8 @@
// Proof Size summary in bytes:
// Measured: `326`
// Estimated: `3522`
- // Minimum execution time: 4_827_000 picoseconds.
- Weight::from_parts(4_984_000, 3522)
+ // Minimum execution time: 3_743_000 picoseconds.
+ Weight::from_parts(3_908_000, 3522)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: Nonfungible CollectionAllowance (r:0 w:1)
@@ -665,28 +672,28 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 6_151_000 picoseconds.
- Weight::from_parts(6_394_000, 0)
+ // Minimum execution time: 4_106_000 picoseconds.
+ Weight::from_parts(4_293_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Nonfungible CollectionAllowance (r:1 w:0)
/// Proof: Nonfungible CollectionAllowance (max_values: None, max_size: Some(111), added: 2586, mode: MaxEncodedLen)
fn allowance_for_all() -> Weight {
// Proof Size summary in bytes:
- // Measured: `109`
+ // Measured: `142`
// Estimated: `3576`
- // Minimum execution time: 3_791_000 picoseconds.
- Weight::from_parts(3_950_000, 3576)
+ // Minimum execution time: 2_775_000 picoseconds.
+ Weight::from_parts(2_923_000, 3576)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: Nonfungible TokenProperties (r:1 w:1)
/// Proof: Nonfungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
fn repair_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `300`
+ // Measured: `279`
// Estimated: `36269`
- // Minimum execution time: 5_364_000 picoseconds.
- Weight::from_parts(5_539_000, 36269)
+ // Minimum execution time: 3_033_000 picoseconds.
+ Weight::from_parts(3_174_000, 36269)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -22,7 +22,9 @@
use frame_benchmarking::{benchmarks, account};
use pallet_common::{
bench_init,
- benchmarking::{create_collection_raw, property_key, property_value},
+ benchmarking::{
+ create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions,
+ },
};
use sp_std::prelude::*;
use up_data_structs::{
@@ -255,8 +257,49 @@
value: property_value(),
}).collect::<Vec<_>>();
let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;
- }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), SetPropertyMode::ExistingToken, &Unlimited)?}
+ }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?}
+
+ init_token_properties {
+ let b in 0..MAX_PROPERTIES_PER_ITEM;
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ owner: cross_from_sub;
+ };
+ let perms = (0..b).map(|k| PropertyKeyPermission {
+ key: property_key(k as usize),
+ permission: PropertyPermission {
+ mutable: false,
+ collection_admin: true,
+ token_owner: true,
+ },
+ }).collect::<Vec<_>>();
+ <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;
+ let props = (0..b).map(|k| Property {
+ key: property_key(k as usize),
+ value: property_value(),
+ }).collect::<Vec<_>>();
+ let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;
+
+ let (is_collection_admin, property_permissions) = load_is_admin_and_property_permissions(&collection, &owner);
+ }: {
+ let mut property_writer = pallet_common::collection_info_loaded_property_writer(
+ &collection,
+ is_collection_admin,
+ property_permissions,
+ );
+
+ property_writer.write_token_properties(
+ true,
+ item,
+ props.into_iter(),
+ crate::erc::ERC721TokenEvent::TokenChanged {
+ token_id: item.into(),
+ }
+ .to_log(T::ContractAddress::get()),
+ )?
+ }
+
delete_token_properties {
let b in 0..MAX_PROPERTIES_PER_ITEM;
bench_init!{
@@ -277,7 +320,7 @@
value: property_value(),
}).collect::<Vec<_>>();
let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;
- <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), SetPropertyMode::ExistingToken, &Unlimited)?;
+ <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?;
let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();
}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -20,20 +20,20 @@
use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};
use up_data_structs::{
CollectionId, TokenId, CreateItemExData, budget::Budget, Property, PropertyKey, PropertyValue,
- PropertyKeyPermission, CollectionPropertiesVec, CreateRefungibleExMultipleOwners,
- CreateRefungibleExSingleOwner, TokenOwnerError,
+ PropertyKeyPermission, CreateRefungibleExMultipleOwners, CreateRefungibleExSingleOwner,
+ TokenOwnerError,
};
use pallet_common::{
CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,
- weights::WeightInfo as _,
+ weights::WeightInfo as _, init_token_properties_delta,
};
-use pallet_structure::Error as StructureError;
+use pallet_structure::{Pallet as PalletStructure, Error as StructureError};
use sp_runtime::{DispatchError};
use sp_std::{vec::Vec, vec};
use crate::{
AccountBalance, Allowance, Balance, Config, Error, Owned, Pallet, RefungibleHandle,
- SelfWeightOf, weights::WeightInfo, TokensMinted, TotalSupply, CreateItemData,
+ SelfWeightOf, weights::WeightInfo, TokensMinted, TotalSupply, CreateItemData, TokenProperties,
};
macro_rules! max_weight_of {
@@ -43,28 +43,21 @@
.max(<SelfWeightOf<T>>::$method($($args)*))
)*
};
-}
-
-fn properties_weight<T: Config>(properties: &CollectionPropertiesVec) -> Weight {
- if properties.len() > 0 {
- <CommonWeights<T>>::set_token_properties(properties.len() as u32)
- } else {
- Weight::zero()
- }
}
pub struct CommonWeights<T: Config>(PhantomData<T>);
impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {
<SelfWeightOf<T>>::create_multiple_items(data.len() as u32).saturating_add(
- data.iter()
- .map(|data| match data {
+ init_token_properties_delta::<T, _>(
+ data.iter().map(|data| match data {
up_data_structs::CreateItemData::ReFungible(rft_data) => {
- properties_weight::<T>(&rft_data.properties)
+ rft_data.properties.len() as u32
}
- _ => Weight::zero(),
- })
- .fold(Weight::zero(), |a, b| a.saturating_add(b)),
+ _ => 0,
+ }),
+ <SelfWeightOf<T>>::init_token_properties,
+ ),
)
}
@@ -72,15 +65,17 @@
match call {
CreateItemExData::RefungibleMultipleOwners(i) => {
<SelfWeightOf<T>>::create_multiple_items_ex_multiple_owners(i.users.len() as u32)
- .saturating_add(properties_weight::<T>(&i.properties))
+ .saturating_add(init_token_properties_delta::<T, _>(
+ [i.properties.len() as u32].into_iter(),
+ <SelfWeightOf<T>>::init_token_properties,
+ ))
}
CreateItemExData::RefungibleMultipleItems(i) => {
<SelfWeightOf<T>>::create_multiple_items_ex_multiple_items(i.len() as u32)
- .saturating_add(
- i.iter()
- .map(|d| properties_weight::<T>(&d.properties))
- .fold(Weight::zero(), |a, b| a.saturating_add(b)),
- )
+ .saturating_add(init_token_properties_delta::<T, _>(
+ i.iter().map(|d| d.properties.len() as u32),
+ <SelfWeightOf<T>>::init_token_properties,
+ ))
}
_ => Weight::zero(),
}
@@ -399,7 +394,6 @@
&sender,
token_id,
properties.into_iter(),
- pallet_common::SetPropertyMode::ExistingToken,
nesting_budget,
),
weight,
@@ -441,6 +435,17 @@
)
}
+ fn get_token_properties_raw(
+ &self,
+ token_id: TokenId,
+ ) -> Option<up_data_structs::TokenProperties> {
+ <TokenProperties<T>>::get((self.id, token_id))
+ }
+
+ fn set_token_properties_raw(&self, token_id: TokenId, map: up_data_structs::TokenProperties) {
+ <TokenProperties<T>>::insert((self.id, token_id), map)
+ }
+
fn check_nesting(
&self,
_sender: <T>::CrossAccountId,
@@ -479,19 +484,44 @@
<Pallet<T>>::token_owner(self.id, token)
}
+ fn check_token_indirect_owner(
+ &self,
+ token: TokenId,
+ maybe_owner: &T::CrossAccountId,
+ nesting_budget: &dyn Budget,
+ ) -> Result<bool, DispatchError> {
+ let balance = self.balance(maybe_owner.clone(), token);
+ let total_pieces: u128 = <Pallet<T>>::total_pieces(self.id, token).unwrap_or(u128::MAX);
+ if balance != total_pieces {
+ return Ok(false);
+ }
+
+ let is_bundle_owner = <PalletStructure<T>>::check_indirectly_owned(
+ maybe_owner.clone(),
+ self.id,
+ token,
+ None,
+ nesting_budget,
+ )?;
+
+ Ok(is_bundle_owner)
+ }
+
/// Returns 10 token in no particular order.
fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {
<Pallet<T>>::token_owners(self.id, token).unwrap_or_default()
}
fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {
- <Pallet<T>>::token_properties((self.id, token_id))
+ <Pallet<T>>::token_properties((self.id, token_id))?
.get(key)
.cloned()
}
fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {
- let properties = <Pallet<T>>::token_properties((self.id, token_id));
+ let Some(properties) = <Pallet<T>>::token_properties((self.id, token_id)) else {
+ return vec![];
+ };
keys.map(|keys| {
keys.into_iter()
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -214,7 +214,6 @@
&caller,
TokenId(token_id),
properties.into_iter(),
- pallet_common::SetPropertyMode::ExistingToken,
&nesting_budget,
)
.map_err(dispatch_to_evm::<T>)
@@ -284,7 +283,8 @@
.try_into()
.map_err(|_| "key too long")?;
- let props = <TokenProperties<T>>::get((self.id, token_id));
+ let props =
+ <TokenProperties<T>>::get((self.id, token_id)).ok_or("token properties not found")?;
let prop = props.get(&key).ok_or("key not found")?;
Ok(prop.to_vec().into())
@@ -372,7 +372,7 @@
.transpose()
.map_err(|e| {
Error::Revert(alloc::format!(
- "Can not convert value \"baseURI\" to string with error \"{e}\""
+ "can not convert value \"baseURI\" to string with error \"{e}\""
))
})?;
@@ -697,7 +697,7 @@
let key = key::url();
let permission = get_token_permission::<T>(self.id, &key)?;
if !permission.collection_admin {
- return Err("Operation is not allowed".into());
+ return Err("operation is not allowed".into());
}
let caller = T::CrossAccountId::from_eth(caller);
@@ -724,7 +724,7 @@
.try_into()
.map_err(|_| "token uri is too long")?,
})
- .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
+ .map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
let users = [(to, 1)]
.into_iter()
@@ -749,12 +749,12 @@
) -> Result<String> {
collection.consume_store_reads(1)?;
let properties = <TokenProperties<T>>::try_get((collection.id, token_id))
- .map_err(|_| Error::Revert("Token properties not found".into()))?;
+ .map_err(|_| Error::Revert("token properties not found".into()))?;
if let Some(property) = properties.get(key) {
return Ok(String::from_utf8_lossy(property).into());
}
- Err("Property tokenURI not found".into())
+ Err("property tokenURI not found".into())
}
fn get_token_permission<T: Config>(
@@ -762,13 +762,13 @@
key: &PropertyKey,
) -> Result<PropertyPermission> {
let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)
- .map_err(|_| Error::Revert("No permissions for collection".into()))?;
+ .map_err(|_| Error::Revert("no permissions for collection".into()))?;
let a = token_property_permissions
.get(key)
.map(Clone::clone)
.ok_or_else(|| {
let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
- Error::Revert(alloc::format!("No permission for key {key}"))
+ Error::Revert(alloc::format!("no permission for key {key}"))
})?;
Ok(a)
}
@@ -1133,7 +1133,7 @@
.try_into()
.map_err(|_| "token uri is too long")?,
})
- .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
+ .map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
let create_item_data = CreateItemData::<T> {
users: users.clone(),
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -96,8 +96,8 @@
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use pallet_evm_coder_substrate::WithRecorder;
use pallet_common::{
- CommonCollectionOperations, Error as CommonError, eth::collection_id_to_address,
- Event as CommonEvent, Pallet as PalletCommon, SetPropertyMode,
+ Error as CommonError, eth::collection_id_to_address, Event as CommonEvent,
+ Pallet as PalletCommon,
};
use pallet_structure::Pallet as PalletStructure;
use sp_core::{Get, H160};
@@ -106,8 +106,8 @@
use up_data_structs::{
AccessMode, budget::Budget, CollectionId, CreateCollectionData, mapping::TokenAddressMapping,
MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyScope,
- PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
- CreateRefungibleExMultipleOwners, TokenOwnerError, TokenProperties as TokenPropertiesT,
+ PropertyValue, TokenId, PropertiesPermissionMap, CreateRefungibleExMultipleOwners,
+ TokenOwnerError, TokenProperties as TokenPropertiesT,
};
pub use pallet::*;
@@ -175,7 +175,7 @@
pub type TokenProperties<T: Config> = StorageNMap<
Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),
Value = TokenPropertiesT,
- QueryKind = ValueQuery,
+ QueryKind = OptionQuery,
>;
/// Total amount of pieces for token
@@ -292,34 +292,6 @@
/// - `token`: Token ID.
pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {
<TotalSupply<T>>::contains_key((collection.id, token))
- }
-
- pub fn set_scoped_token_property(
- collection_id: CollectionId,
- token_id: TokenId,
- scope: PropertyScope,
- property: Property,
- ) -> DispatchResult {
- TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {
- properties.try_scoped_set(scope, property.key, property.value)
- })
- .map_err(<CommonError<T>>::from)?;
-
- Ok(())
- }
-
- pub fn set_scoped_token_properties(
- collection_id: CollectionId,
- token_id: TokenId,
- scope: PropertyScope,
- properties: impl Iterator<Item = Property>,
- ) -> DispatchResult {
- TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {
- stored_properties.try_scoped_set_from_iter(scope, properties)
- })
- .map_err(<CommonError<T>>::from)?;
-
- Ok(())
}
}
@@ -533,50 +505,16 @@
sender: &T::CrossAccountId,
token_id: TokenId,
properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
- mode: SetPropertyMode,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- let mut is_token_owner =
- pallet_common::LazyValue::new(|| -> Result<bool, DispatchError> {
- if let SetPropertyMode::NewToken {
- mint_target_is_sender,
- } = mode
- {
- return Ok(mint_target_is_sender);
- }
-
- let balance = collection.balance(sender.clone(), token_id);
- let total_pieces: u128 =
- Self::total_pieces(collection.id, token_id).unwrap_or(u128::MAX);
- if balance != total_pieces {
- return Ok(false);
- }
-
- let is_bundle_owner = <PalletStructure<T>>::check_indirectly_owned(
- sender.clone(),
- collection.id,
- token_id,
- None,
- nesting_budget,
- )?;
-
- Ok(is_bundle_owner)
- });
+ let mut property_writer =
+ pallet_common::property_writer_for_existing_token(collection, sender);
- let mut is_token_exist =
- pallet_common::LazyValue::new(|| Self::token_exists(collection, token_id));
-
- let stored_properties = <TokenProperties<T>>::get((collection.id, token_id));
-
- <PalletCommon<T>>::modify_token_properties(
- collection,
+ property_writer.write_token_properties(
sender,
token_id,
- &mut is_token_exist,
properties_updates,
- stored_properties,
- &mut is_token_owner,
- |properties| <TokenProperties<T>>::set((collection.id, token_id), properties),
+ nesting_budget,
erc::ERC721TokenEvent::TokenChanged {
token_id: token_id.into(),
}
@@ -602,7 +540,6 @@
sender: &T::CrossAccountId,
token_id: TokenId,
properties: impl Iterator<Item = Property>,
- mode: SetPropertyMode,
nesting_budget: &dyn Budget,
) -> DispatchResult {
Self::modify_token_properties(
@@ -610,7 +547,6 @@
sender,
token_id,
properties.map(|p| (p.key, Some(p.value))),
- mode,
nesting_budget,
)
}
@@ -627,7 +563,6 @@
sender,
token_id,
[property].into_iter(),
- SetPropertyMode::ExistingToken,
nesting_budget,
)
}
@@ -644,7 +579,6 @@
sender,
token_id,
property_keys.into_iter().map(|key| (key, None)),
- SetPropertyMode::ExistingToken,
nesting_budget,
)
}
@@ -925,11 +859,15 @@
// =========
+ let mut property_writer = pallet_common::property_writer_for_new_token(collection, sender);
+
with_transaction(|| {
for (i, data) in data.iter().enumerate() {
let token_id = first_token_id + i as u32 + 1;
<TotalSupply<T>>::insert((collection.id, token_id), totals[i]);
+ let token = TokenId(token_id);
+
let mut mint_target_is_sender = true;
for (user, amount) in data.users.iter() {
if *amount == 0 {
@@ -939,23 +877,22 @@
mint_target_is_sender = mint_target_is_sender && sender.conv_eq(user);
<Balance<T>>::insert((collection.id, token_id, &user), amount);
- <Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);
+ <Owned<T>>::insert((collection.id, &user, token), true);
<PalletStructure<T>>::nest_if_sent_to_token_unchecked(
user,
collection.id,
- TokenId(token_id),
+ token,
);
}
- if let Err(e) = Self::set_token_properties(
- collection,
- sender,
- TokenId(token_id),
+ if let Err(e) = property_writer.write_token_properties(
+ mint_target_is_sender,
+ token,
data.properties.clone().into_iter(),
- SetPropertyMode::NewToken {
- mint_target_is_sender,
- },
- nesting_budget,
+ erc::ERC721TokenEvent::TokenChanged {
+ token_id: token.into(),
+ }
+ .to_log(T::ContractAddress::get()),
) {
return TransactionOutcome::Rollback(Err(e));
}
@@ -1461,7 +1398,9 @@
pub fn repair_item(collection: &RefungibleHandle<T>, token: TokenId) -> DispatchResult {
<TokenProperties<T>>::mutate((collection.id, token), |properties| {
- properties.recompute_consumed_space();
+ if let Some(properties) = properties {
+ properties.recompute_consumed_space();
+ }
});
Ok(())
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_refungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-30, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/refungible/src/weights.rs
@@ -52,6 +52,7 @@
fn burn_from() -> Weight;
fn set_token_property_permissions(b: u32, ) -> Weight;
fn set_token_properties(b: u32, ) -> Weight;
+ fn init_token_properties(b: u32, ) -> Weight;
fn delete_token_properties(b: u32, ) -> Weight;
fn repartition_item() -> Weight;
fn token_owner() -> Weight;
@@ -67,10 +68,6 @@
/// Proof: Refungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Refungible AccountBalance (r:1 w:1)
/// Proof: Refungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Refungible TokenProperties (r:1 w:1)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible Balance (r:0 w:1)
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
/// Storage: Refungible TotalSupply (r:0 w:1)
@@ -79,21 +76,17 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn create_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `285`
- // Estimated: `63471`
- // Minimum execution time: 30_759_000 picoseconds.
- Weight::from_parts(31_321_000, 63471)
- .saturating_add(T::DbWeight::get().reads(4_u64))
- .saturating_add(T::DbWeight::get().writes(6_u64))
+ // Measured: `4`
+ // Estimated: `3530`
+ // Minimum execution time: 11_341_000 picoseconds.
+ Weight::from_parts(11_741_000, 3530)
+ .saturating_add(T::DbWeight::get().reads(2_u64))
+ .saturating_add(T::DbWeight::get().writes(5_u64))
}
/// Storage: Refungible TokensMinted (r:1 w:1)
/// Proof: Refungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Refungible AccountBalance (r:1 w:1)
/// Proof: Refungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Refungible TokenProperties (r:200 w:200)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible Balance (r:0 w:200)
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
/// Storage: Refungible TotalSupply (r:0 w:200)
@@ -103,26 +96,20 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `285`
- // Estimated: `28192 + b * (35279 ±0)`
- // Minimum execution time: 4_024_000 picoseconds.
- Weight::from_parts(4_145_000, 28192)
- // Standard Error: 3_332
- .saturating_add(Weight::from_parts(8_967_757, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(3_u64))
- .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
+ // Measured: `4`
+ // Estimated: `3530`
+ // Minimum execution time: 2_665_000 picoseconds.
+ Weight::from_parts(2_791_000, 3530)
+ // Standard Error: 996
+ .saturating_add(Weight::from_parts(4_343_736, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
- .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 35279).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
}
/// Storage: Refungible TokensMinted (r:1 w:1)
/// Proof: Refungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Refungible AccountBalance (r:200 w:200)
/// Proof: Refungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Refungible TokenProperties (r:200 w:200)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible Balance (r:0 w:200)
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
/// Storage: Refungible TotalSupply (r:0 w:200)
@@ -132,26 +119,22 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `285`
- // Estimated: `25652 + b * (37819 ±0)`
- // Minimum execution time: 3_715_000 picoseconds.
- Weight::from_parts(3_881_000, 25652)
- // Standard Error: 3_275
- .saturating_add(Weight::from_parts(10_525_271, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
- .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into())))
+ // Measured: `4`
+ // Estimated: `3481 + b * (2540 ±0)`
+ // Minimum execution time: 2_616_000 picoseconds.
+ Weight::from_parts(2_726_000, 3481)
+ // Standard Error: 665
+ .saturating_add(Weight::from_parts(5_554_066, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(1_u64))
+ .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
.saturating_add(T::DbWeight::get().writes(1_u64))
- .saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 37819).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(b.into())))
+ .saturating_add(Weight::from_parts(0, 2540).saturating_mul(b.into()))
}
/// Storage: Refungible TokensMinted (r:1 w:1)
/// Proof: Refungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Refungible AccountBalance (r:200 w:200)
/// Proof: Refungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Refungible TokenProperties (r:1 w:1)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible Balance (r:0 w:200)
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
/// Storage: Refungible TotalSupply (r:0 w:1)
@@ -161,15 +144,15 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `285`
- // Estimated: `60931 + b * (2540 ±0)`
- // Minimum execution time: 13_150_000 picoseconds.
- Weight::from_parts(15_655_930, 60931)
- // Standard Error: 4_170
- .saturating_add(Weight::from_parts(5_673_702, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(3_u64))
+ // Measured: `4`
+ // Estimated: `3481 + b * (2540 ±0)`
+ // Minimum execution time: 3_697_000 picoseconds.
+ Weight::from_parts(2_136_481, 3481)
+ // Standard Error: 567
+ .saturating_add(Weight::from_parts(4_390_621, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
- .saturating_add(T::DbWeight::get().writes(3_u64))
+ .saturating_add(T::DbWeight::get().writes(2_u64))
.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
.saturating_add(Weight::from_parts(0, 2540).saturating_mul(b.into()))
}
@@ -183,10 +166,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn burn_item_partial() -> Weight {
// Proof Size summary in bytes:
- // Measured: `490`
- // Estimated: `15717`
- // Minimum execution time: 28_992_000 picoseconds.
- Weight::from_parts(29_325_000, 15717)
+ // Measured: `456`
+ // Estimated: `8682`
+ // Minimum execution time: 22_859_000 picoseconds.
+ Weight::from_parts(23_295_000, 8682)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
@@ -204,10 +187,10 @@
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
fn burn_item_fully() -> Weight {
// Proof Size summary in bytes:
- // Measured: `375`
- // Estimated: `14070`
- // Minimum execution time: 27_980_000 picoseconds.
- Weight::from_parts(28_582_000, 14070)
+ // Measured: `341`
+ // Estimated: `3554`
+ // Minimum execution time: 21_477_000 picoseconds.
+ Weight::from_parts(22_037_000, 3554)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(6_u64))
}
@@ -217,10 +200,10 @@
/// Proof: Refungible TotalSupply (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
fn transfer_normal() -> Weight {
// Proof Size summary in bytes:
- // Measured: `398`
- // Estimated: `9623`
- // Minimum execution time: 18_746_000 picoseconds.
- Weight::from_parts(19_096_000, 9623)
+ // Measured: `365`
+ // Estimated: `6118`
+ // Minimum execution time: 13_714_000 picoseconds.
+ Weight::from_parts(14_050_000, 6118)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -234,10 +217,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_creating() -> Weight {
// Proof Size summary in bytes:
- // Measured: `375`
- // Estimated: `13153`
- // Minimum execution time: 21_719_000 picoseconds.
- Weight::from_parts(22_219_000, 13153)
+ // Measured: `341`
+ // Estimated: `6118`
+ // Minimum execution time: 15_879_000 picoseconds.
+ Weight::from_parts(16_266_000, 6118)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
@@ -251,10 +234,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_removing() -> Weight {
// Proof Size summary in bytes:
- // Measured: `490`
- // Estimated: `13153`
- // Minimum execution time: 24_784_000 picoseconds.
- Weight::from_parts(25_231_000, 13153)
+ // Measured: `456`
+ // Estimated: `6118`
+ // Minimum execution time: 18_186_000 picoseconds.
+ Weight::from_parts(18_682_000, 6118)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
@@ -268,10 +251,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_creating_removing() -> Weight {
// Proof Size summary in bytes:
- // Measured: `375`
- // Estimated: `15693`
- // Minimum execution time: 24_865_000 picoseconds.
- Weight::from_parts(25_253_000, 15693)
+ // Measured: `341`
+ // Estimated: `6118`
+ // Minimum execution time: 17_943_000 picoseconds.
+ Weight::from_parts(18_333_000, 6118)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(6_u64))
}
@@ -281,10 +264,10 @@
/// Proof: Refungible Allowance (max_values: None, max_size: Some(105), added: 2580, mode: MaxEncodedLen)
fn approve() -> Weight {
// Proof Size summary in bytes:
- // Measured: `256`
+ // Measured: `223`
// Estimated: `3554`
- // Minimum execution time: 12_318_000 picoseconds.
- Weight::from_parts(12_597_000, 3554)
+ // Minimum execution time: 8_391_000 picoseconds.
+ Weight::from_parts(8_637_000, 3554)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -294,10 +277,10 @@
/// Proof: Refungible Allowance (max_values: None, max_size: Some(105), added: 2580, mode: MaxEncodedLen)
fn approve_from() -> Weight {
// Proof Size summary in bytes:
- // Measured: `244`
+ // Measured: `211`
// Estimated: `3554`
- // Minimum execution time: 12_276_000 picoseconds.
- Weight::from_parts(12_557_000, 3554)
+ // Minimum execution time: 8_519_000 picoseconds.
+ Weight::from_parts(8_760_000, 3554)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -309,10 +292,10 @@
/// Proof: Refungible TotalSupply (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
fn transfer_from_normal() -> Weight {
// Proof Size summary in bytes:
- // Measured: `528`
- // Estimated: `13193`
- // Minimum execution time: 26_852_000 picoseconds.
- Weight::from_parts(27_427_000, 13193)
+ // Measured: `495`
+ // Estimated: `6118`
+ // Minimum execution time: 19_554_000 picoseconds.
+ Weight::from_parts(20_031_000, 6118)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
}
@@ -328,10 +311,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_from_creating() -> Weight {
// Proof Size summary in bytes:
- // Measured: `505`
- // Estimated: `16723`
- // Minimum execution time: 29_893_000 picoseconds.
- Weight::from_parts(30_345_000, 16723)
+ // Measured: `471`
+ // Estimated: `6118`
+ // Minimum execution time: 21_338_000 picoseconds.
+ Weight::from_parts(21_803_000, 6118)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(5_u64))
}
@@ -347,10 +330,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_from_removing() -> Weight {
// Proof Size summary in bytes:
- // Measured: `620`
- // Estimated: `16723`
- // Minimum execution time: 32_784_000 picoseconds.
- Weight::from_parts(33_322_000, 16723)
+ // Measured: `586`
+ // Estimated: `6118`
+ // Minimum execution time: 24_179_000 picoseconds.
+ Weight::from_parts(24_647_000, 6118)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(5_u64))
}
@@ -366,10 +349,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_from_creating_removing() -> Weight {
// Proof Size summary in bytes:
- // Measured: `505`
- // Estimated: `19263`
- // Minimum execution time: 32_987_000 picoseconds.
- Weight::from_parts(33_428_000, 19263)
+ // Measured: `471`
+ // Estimated: `6118`
+ // Minimum execution time: 24_008_000 picoseconds.
+ Weight::from_parts(24_545_000, 6118)
.saturating_add(T::DbWeight::get().reads(6_u64))
.saturating_add(T::DbWeight::get().writes(7_u64))
}
@@ -389,10 +372,10 @@
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
fn burn_from() -> Weight {
// Proof Size summary in bytes:
- // Measured: `505`
- // Estimated: `17640`
- // Minimum execution time: 38_277_000 picoseconds.
- Weight::from_parts(38_983_000, 17640)
+ // Measured: `471`
+ // Estimated: `3570`
+ // Minimum execution time: 27_907_000 picoseconds.
+ Weight::from_parts(28_489_000, 3570)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(7_u64))
}
@@ -401,45 +384,62 @@
/// The range of component `b` is `[0, 64]`.
fn set_token_property_permissions(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `281`
+ // Measured: `314`
// Estimated: `20191`
- // Minimum execution time: 2_254_000 picoseconds.
- Weight::from_parts(2_335_000, 20191)
- // Standard Error: 44_906
- .saturating_add(Weight::from_parts(12_118_499, 0).saturating_mul(b.into()))
+ // Minimum execution time: 1_460_000 picoseconds.
+ Weight::from_parts(1_564_000, 20191)
+ // Standard Error: 14_117
+ .saturating_add(Weight::from_parts(8_196_214, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
+ /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
+ /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible TokenProperties (r:1 w:1)
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ /// Storage: Refungible TotalSupply (r:1 w:0)
+ /// Proof: Refungible TotalSupply (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 64]`.
fn set_token_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `458 + b * (261 ±0)`
- // Estimated: `56460`
- // Minimum execution time: 11_249_000 picoseconds.
- Weight::from_parts(11_420_000, 56460)
- // Standard Error: 72_033
- .saturating_add(Weight::from_parts(7_008_012, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
+ // Measured: `502 + b * (261 ±0)`
+ // Estimated: `36269`
+ // Minimum execution time: 1_012_000 picoseconds.
+ Weight::from_parts(1_081_000, 36269)
+ // Standard Error: 6_838
+ .saturating_add(Weight::from_parts(5_801_181, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
- /// Storage: Refungible TokenProperties (r:1 w:1)
+ /// Storage: Refungible TokenProperties (r:0 w:1)
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
+ /// The range of component `b` is `[0, 64]`.
+ fn init_token_properties(b: u32, ) -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `0`
+ // Estimated: `0`
+ // Minimum execution time: 229_000 picoseconds.
+ Weight::from_parts(253_000, 0)
+ // Standard Error: 100_218
+ .saturating_add(Weight::from_parts(12_632_221, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().writes(1_u64))
+ }
/// Storage: Common CollectionPropertyPermissions (r:1 w:0)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ /// Storage: Refungible TotalSupply (r:1 w:0)
+ /// Proof: Refungible TotalSupply (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
+ /// Storage: Refungible TokenProperties (r:1 w:1)
+ /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 64]`.
fn delete_token_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `463 + b * (33291 ±0)`
- // Estimated: `56460`
- // Minimum execution time: 11_368_000 picoseconds.
- Weight::from_parts(11_546_000, 56460)
- // Standard Error: 85_444
- .saturating_add(Weight::from_parts(24_644_980, 0).saturating_mul(b.into()))
- .saturating_add(T::DbWeight::get().reads(2_u64))
+ // Measured: `561 + b * (33291 ±0)`
+ // Estimated: `36269`
+ // Minimum execution time: 1_014_000 picoseconds.
+ Weight::from_parts(1_065_000, 36269)
+ // Standard Error: 39_536
+ .saturating_add(Weight::from_parts(24_125_838, 0).saturating_mul(b.into()))
+ .saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Refungible TotalSupply (r:1 w:1)
@@ -448,10 +448,10 @@
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
fn repartition_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `321`
- // Estimated: `7059`
- // Minimum execution time: 13_586_000 picoseconds.
- Weight::from_parts(14_489_000, 7059)
+ // Measured: `288`
+ // Estimated: `3554`
+ // Minimum execution time: 10_315_000 picoseconds.
+ Weight::from_parts(10_601_000, 3554)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -459,10 +459,10 @@
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
fn token_owner() -> Weight {
// Proof Size summary in bytes:
- // Measured: `321`
+ // Measured: `288`
// Estimated: `6118`
- // Minimum execution time: 7_049_000 picoseconds.
- Weight::from_parts(7_320_000, 6118)
+ // Minimum execution time: 4_898_000 picoseconds.
+ Weight::from_parts(5_136_000, 6118)
.saturating_add(T::DbWeight::get().reads(2_u64))
}
/// Storage: Refungible CollectionAllowance (r:0 w:1)
@@ -471,8 +471,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 6_432_000 picoseconds.
- Weight::from_parts(6_642_000, 0)
+ // Minimum execution time: 4_146_000 picoseconds.
+ Weight::from_parts(4_337_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: Refungible CollectionAllowance (r:1 w:0)
@@ -481,18 +481,18 @@
// Proof Size summary in bytes:
// Measured: `4`
// Estimated: `3576`
- // Minimum execution time: 3_030_000 picoseconds.
- Weight::from_parts(3_206_000, 3576)
+ // Minimum execution time: 2_170_000 picoseconds.
+ Weight::from_parts(2_301_000, 3576)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: Refungible TokenProperties (r:1 w:1)
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
fn repair_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `174`
+ // Measured: `120`
// Estimated: `36269`
- // Minimum execution time: 4_371_000 picoseconds.
- Weight::from_parts(4_555_000, 36269)
+ // Minimum execution time: 2_098_000 picoseconds.
+ Weight::from_parts(2_251_000, 36269)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -504,10 +504,6 @@
/// Proof: Refungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Refungible AccountBalance (r:1 w:1)
/// Proof: Refungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Refungible TokenProperties (r:1 w:1)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible Balance (r:0 w:1)
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
/// Storage: Refungible TotalSupply (r:0 w:1)
@@ -516,21 +512,17 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn create_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `285`
- // Estimated: `63471`
- // Minimum execution time: 30_759_000 picoseconds.
- Weight::from_parts(31_321_000, 63471)
- .saturating_add(RocksDbWeight::get().reads(4_u64))
- .saturating_add(RocksDbWeight::get().writes(6_u64))
+ // Measured: `4`
+ // Estimated: `3530`
+ // Minimum execution time: 11_341_000 picoseconds.
+ Weight::from_parts(11_741_000, 3530)
+ .saturating_add(RocksDbWeight::get().reads(2_u64))
+ .saturating_add(RocksDbWeight::get().writes(5_u64))
}
/// Storage: Refungible TokensMinted (r:1 w:1)
/// Proof: Refungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Refungible AccountBalance (r:1 w:1)
/// Proof: Refungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Refungible TokenProperties (r:200 w:200)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible Balance (r:0 w:200)
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
/// Storage: Refungible TotalSupply (r:0 w:200)
@@ -540,26 +532,20 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `285`
- // Estimated: `28192 + b * (35279 ±0)`
- // Minimum execution time: 4_024_000 picoseconds.
- Weight::from_parts(4_145_000, 28192)
- // Standard Error: 3_332
- .saturating_add(Weight::from_parts(8_967_757, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(3_u64))
- .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(b.into())))
+ // Measured: `4`
+ // Estimated: `3530`
+ // Minimum execution time: 2_665_000 picoseconds.
+ Weight::from_parts(2_791_000, 3530)
+ // Standard Error: 996
+ .saturating_add(Weight::from_parts(4_343_736, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
- .saturating_add(RocksDbWeight::get().writes((4_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 35279).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(b.into())))
}
/// Storage: Refungible TokensMinted (r:1 w:1)
/// Proof: Refungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Refungible AccountBalance (r:200 w:200)
/// Proof: Refungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Refungible TokenProperties (r:200 w:200)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible Balance (r:0 w:200)
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
/// Storage: Refungible TotalSupply (r:0 w:200)
@@ -569,26 +555,22 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `285`
- // Estimated: `25652 + b * (37819 ±0)`
- // Minimum execution time: 3_715_000 picoseconds.
- Weight::from_parts(3_881_000, 25652)
- // Standard Error: 3_275
- .saturating_add(Weight::from_parts(10_525_271, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
- .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(b.into())))
+ // Measured: `4`
+ // Estimated: `3481 + b * (2540 ±0)`
+ // Minimum execution time: 2_616_000 picoseconds.
+ Weight::from_parts(2_726_000, 3481)
+ // Standard Error: 665
+ .saturating_add(Weight::from_parts(5_554_066, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(1_u64))
+ .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(b.into())))
.saturating_add(RocksDbWeight::get().writes(1_u64))
- .saturating_add(RocksDbWeight::get().writes((5_u64).saturating_mul(b.into())))
- .saturating_add(Weight::from_parts(0, 37819).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().writes((4_u64).saturating_mul(b.into())))
+ .saturating_add(Weight::from_parts(0, 2540).saturating_mul(b.into()))
}
/// Storage: Refungible TokensMinted (r:1 w:1)
/// Proof: Refungible TokensMinted (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
/// Storage: Refungible AccountBalance (r:200 w:200)
/// Proof: Refungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Refungible TokenProperties (r:1 w:1)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
- /// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- /// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Refungible Balance (r:0 w:200)
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
/// Storage: Refungible TotalSupply (r:0 w:1)
@@ -598,15 +580,15 @@
/// The range of component `b` is `[0, 200]`.
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `285`
- // Estimated: `60931 + b * (2540 ±0)`
- // Minimum execution time: 13_150_000 picoseconds.
- Weight::from_parts(15_655_930, 60931)
- // Standard Error: 4_170
- .saturating_add(Weight::from_parts(5_673_702, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(3_u64))
+ // Measured: `4`
+ // Estimated: `3481 + b * (2540 ±0)`
+ // Minimum execution time: 3_697_000 picoseconds.
+ Weight::from_parts(2_136_481, 3481)
+ // Standard Error: 567
+ .saturating_add(Weight::from_parts(4_390_621, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(b.into())))
- .saturating_add(RocksDbWeight::get().writes(3_u64))
+ .saturating_add(RocksDbWeight::get().writes(2_u64))
.saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(b.into())))
.saturating_add(Weight::from_parts(0, 2540).saturating_mul(b.into()))
}
@@ -620,10 +602,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn burn_item_partial() -> Weight {
// Proof Size summary in bytes:
- // Measured: `490`
- // Estimated: `15717`
- // Minimum execution time: 28_992_000 picoseconds.
- Weight::from_parts(29_325_000, 15717)
+ // Measured: `456`
+ // Estimated: `8682`
+ // Minimum execution time: 22_859_000 picoseconds.
+ Weight::from_parts(23_295_000, 8682)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
@@ -641,10 +623,10 @@
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
fn burn_item_fully() -> Weight {
// Proof Size summary in bytes:
- // Measured: `375`
- // Estimated: `14070`
- // Minimum execution time: 27_980_000 picoseconds.
- Weight::from_parts(28_582_000, 14070)
+ // Measured: `341`
+ // Estimated: `3554`
+ // Minimum execution time: 21_477_000 picoseconds.
+ Weight::from_parts(22_037_000, 3554)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(6_u64))
}
@@ -654,10 +636,10 @@
/// Proof: Refungible TotalSupply (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
fn transfer_normal() -> Weight {
// Proof Size summary in bytes:
- // Measured: `398`
- // Estimated: `9623`
- // Minimum execution time: 18_746_000 picoseconds.
- Weight::from_parts(19_096_000, 9623)
+ // Measured: `365`
+ // Estimated: `6118`
+ // Minimum execution time: 13_714_000 picoseconds.
+ Weight::from_parts(14_050_000, 6118)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -671,10 +653,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_creating() -> Weight {
// Proof Size summary in bytes:
- // Measured: `375`
- // Estimated: `13153`
- // Minimum execution time: 21_719_000 picoseconds.
- Weight::from_parts(22_219_000, 13153)
+ // Measured: `341`
+ // Estimated: `6118`
+ // Minimum execution time: 15_879_000 picoseconds.
+ Weight::from_parts(16_266_000, 6118)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
@@ -688,10 +670,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_removing() -> Weight {
// Proof Size summary in bytes:
- // Measured: `490`
- // Estimated: `13153`
- // Minimum execution time: 24_784_000 picoseconds.
- Weight::from_parts(25_231_000, 13153)
+ // Measured: `456`
+ // Estimated: `6118`
+ // Minimum execution time: 18_186_000 picoseconds.
+ Weight::from_parts(18_682_000, 6118)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
@@ -705,10 +687,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_creating_removing() -> Weight {
// Proof Size summary in bytes:
- // Measured: `375`
- // Estimated: `15693`
- // Minimum execution time: 24_865_000 picoseconds.
- Weight::from_parts(25_253_000, 15693)
+ // Measured: `341`
+ // Estimated: `6118`
+ // Minimum execution time: 17_943_000 picoseconds.
+ Weight::from_parts(18_333_000, 6118)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(6_u64))
}
@@ -718,10 +700,10 @@
/// Proof: Refungible Allowance (max_values: None, max_size: Some(105), added: 2580, mode: MaxEncodedLen)
fn approve() -> Weight {
// Proof Size summary in bytes:
- // Measured: `256`
+ // Measured: `223`
// Estimated: `3554`
- // Minimum execution time: 12_318_000 picoseconds.
- Weight::from_parts(12_597_000, 3554)
+ // Minimum execution time: 8_391_000 picoseconds.
+ Weight::from_parts(8_637_000, 3554)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -731,10 +713,10 @@
/// Proof: Refungible Allowance (max_values: None, max_size: Some(105), added: 2580, mode: MaxEncodedLen)
fn approve_from() -> Weight {
// Proof Size summary in bytes:
- // Measured: `244`
+ // Measured: `211`
// Estimated: `3554`
- // Minimum execution time: 12_276_000 picoseconds.
- Weight::from_parts(12_557_000, 3554)
+ // Minimum execution time: 8_519_000 picoseconds.
+ Weight::from_parts(8_760_000, 3554)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -746,10 +728,10 @@
/// Proof: Refungible TotalSupply (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
fn transfer_from_normal() -> Weight {
// Proof Size summary in bytes:
- // Measured: `528`
- // Estimated: `13193`
- // Minimum execution time: 26_852_000 picoseconds.
- Weight::from_parts(27_427_000, 13193)
+ // Measured: `495`
+ // Estimated: `6118`
+ // Minimum execution time: 19_554_000 picoseconds.
+ Weight::from_parts(20_031_000, 6118)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
}
@@ -765,10 +747,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_from_creating() -> Weight {
// Proof Size summary in bytes:
- // Measured: `505`
- // Estimated: `16723`
- // Minimum execution time: 29_893_000 picoseconds.
- Weight::from_parts(30_345_000, 16723)
+ // Measured: `471`
+ // Estimated: `6118`
+ // Minimum execution time: 21_338_000 picoseconds.
+ Weight::from_parts(21_803_000, 6118)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(5_u64))
}
@@ -784,10 +766,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_from_removing() -> Weight {
// Proof Size summary in bytes:
- // Measured: `620`
- // Estimated: `16723`
- // Minimum execution time: 32_784_000 picoseconds.
- Weight::from_parts(33_322_000, 16723)
+ // Measured: `586`
+ // Estimated: `6118`
+ // Minimum execution time: 24_179_000 picoseconds.
+ Weight::from_parts(24_647_000, 6118)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(5_u64))
}
@@ -803,10 +785,10 @@
/// Proof: Refungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
fn transfer_from_creating_removing() -> Weight {
// Proof Size summary in bytes:
- // Measured: `505`
- // Estimated: `19263`
- // Minimum execution time: 32_987_000 picoseconds.
- Weight::from_parts(33_428_000, 19263)
+ // Measured: `471`
+ // Estimated: `6118`
+ // Minimum execution time: 24_008_000 picoseconds.
+ Weight::from_parts(24_545_000, 6118)
.saturating_add(RocksDbWeight::get().reads(6_u64))
.saturating_add(RocksDbWeight::get().writes(7_u64))
}
@@ -826,10 +808,10 @@
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
fn burn_from() -> Weight {
// Proof Size summary in bytes:
- // Measured: `505`
- // Estimated: `17640`
- // Minimum execution time: 38_277_000 picoseconds.
- Weight::from_parts(38_983_000, 17640)
+ // Measured: `471`
+ // Estimated: `3570`
+ // Minimum execution time: 27_907_000 picoseconds.
+ Weight::from_parts(28_489_000, 3570)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(7_u64))
}
@@ -838,45 +820,62 @@
/// The range of component `b` is `[0, 64]`.
fn set_token_property_permissions(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `281`
+ // Measured: `314`
// Estimated: `20191`
- // Minimum execution time: 2_254_000 picoseconds.
- Weight::from_parts(2_335_000, 20191)
- // Standard Error: 44_906
- .saturating_add(Weight::from_parts(12_118_499, 0).saturating_mul(b.into()))
+ // Minimum execution time: 1_460_000 picoseconds.
+ Weight::from_parts(1_564_000, 20191)
+ // Standard Error: 14_117
+ .saturating_add(Weight::from_parts(8_196_214, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
- /// Storage: Refungible TokenProperties (r:1 w:1)
- /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
/// Storage: Common CollectionPropertyPermissions (r:1 w:0)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ /// Storage: Refungible TokenProperties (r:1 w:1)
+ /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
+ /// Storage: Refungible TotalSupply (r:1 w:0)
+ /// Proof: Refungible TotalSupply (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 64]`.
fn set_token_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `458 + b * (261 ±0)`
- // Estimated: `56460`
- // Minimum execution time: 11_249_000 picoseconds.
- Weight::from_parts(11_420_000, 56460)
- // Standard Error: 72_033
- .saturating_add(Weight::from_parts(7_008_012, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
+ // Measured: `502 + b * (261 ±0)`
+ // Estimated: `36269`
+ // Minimum execution time: 1_012_000 picoseconds.
+ Weight::from_parts(1_081_000, 36269)
+ // Standard Error: 6_838
+ .saturating_add(Weight::from_parts(5_801_181, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
- /// Storage: Refungible TokenProperties (r:1 w:1)
+ /// Storage: Refungible TokenProperties (r:0 w:1)
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
+ /// The range of component `b` is `[0, 64]`.
+ fn init_token_properties(b: u32, ) -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `0`
+ // Estimated: `0`
+ // Minimum execution time: 229_000 picoseconds.
+ Weight::from_parts(253_000, 0)
+ // Standard Error: 100_218
+ .saturating_add(Weight::from_parts(12_632_221, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().writes(1_u64))
+ }
/// Storage: Common CollectionPropertyPermissions (r:1 w:0)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
+ /// Storage: Refungible TotalSupply (r:1 w:0)
+ /// Proof: Refungible TotalSupply (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
+ /// Storage: Refungible TokenProperties (r:1 w:1)
+ /// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
/// The range of component `b` is `[0, 64]`.
fn delete_token_properties(b: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `463 + b * (33291 ±0)`
- // Estimated: `56460`
- // Minimum execution time: 11_368_000 picoseconds.
- Weight::from_parts(11_546_000, 56460)
- // Standard Error: 85_444
- .saturating_add(Weight::from_parts(24_644_980, 0).saturating_mul(b.into()))
- .saturating_add(RocksDbWeight::get().reads(2_u64))
+ // Measured: `561 + b * (33291 ±0)`
+ // Estimated: `36269`
+ // Minimum execution time: 1_014_000 picoseconds.
+ Weight::from_parts(1_065_000, 36269)
+ // Standard Error: 39_536
+ .saturating_add(Weight::from_parts(24_125_838, 0).saturating_mul(b.into()))
+ .saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Refungible TotalSupply (r:1 w:1)
@@ -885,10 +884,10 @@
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
fn repartition_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `321`
- // Estimated: `7059`
- // Minimum execution time: 13_586_000 picoseconds.
- Weight::from_parts(14_489_000, 7059)
+ // Measured: `288`
+ // Estimated: `3554`
+ // Minimum execution time: 10_315_000 picoseconds.
+ Weight::from_parts(10_601_000, 3554)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -896,10 +895,10 @@
/// Proof: Refungible Balance (max_values: None, max_size: Some(89), added: 2564, mode: MaxEncodedLen)
fn token_owner() -> Weight {
// Proof Size summary in bytes:
- // Measured: `321`
+ // Measured: `288`
// Estimated: `6118`
- // Minimum execution time: 7_049_000 picoseconds.
- Weight::from_parts(7_320_000, 6118)
+ // Minimum execution time: 4_898_000 picoseconds.
+ Weight::from_parts(5_136_000, 6118)
.saturating_add(RocksDbWeight::get().reads(2_u64))
}
/// Storage: Refungible CollectionAllowance (r:0 w:1)
@@ -908,8 +907,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 6_432_000 picoseconds.
- Weight::from_parts(6_642_000, 0)
+ // Minimum execution time: 4_146_000 picoseconds.
+ Weight::from_parts(4_337_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: Refungible CollectionAllowance (r:1 w:0)
@@ -918,18 +917,18 @@
// Proof Size summary in bytes:
// Measured: `4`
// Estimated: `3576`
- // Minimum execution time: 3_030_000 picoseconds.
- Weight::from_parts(3_206_000, 3576)
+ // Minimum execution time: 2_170_000 picoseconds.
+ Weight::from_parts(2_301_000, 3576)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: Refungible TokenProperties (r:1 w:1)
/// Proof: Refungible TokenProperties (max_values: None, max_size: Some(32804), added: 35279, mode: MaxEncodedLen)
fn repair_item() -> Weight {
// Proof Size summary in bytes:
- // Measured: `174`
+ // Measured: `120`
// Estimated: `36269`
- // Minimum execution time: 4_371_000 picoseconds.
- Weight::from_parts(4_555_000, 36269)
+ // Minimum execution time: 2_098_000 picoseconds.
+ Weight::from_parts(2_251_000, 36269)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
pallets/structure/src/weights.rsdiffbeforeafterboth--- a/pallets/structure/src/weights.rs
+++ b/pallets/structure/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_structure
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/structure/src/weights.rs
@@ -45,10 +45,10 @@
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
fn find_parent() -> Weight {
// Proof Size summary in bytes:
- // Measured: `634`
- // Estimated: `7847`
- // Minimum execution time: 10_781_000 picoseconds.
- Weight::from_parts(11_675_000, 7847)
+ // Measured: `667`
+ // Estimated: `4325`
+ // Minimum execution time: 7_344_000 picoseconds.
+ Weight::from_parts(7_578_000, 4325)
.saturating_add(T::DbWeight::get().reads(2_u64))
}
}
@@ -61,10 +61,10 @@
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
fn find_parent() -> Weight {
// Proof Size summary in bytes:
- // Measured: `634`
- // Estimated: `7847`
- // Minimum execution time: 10_781_000 picoseconds.
- Weight::from_parts(11_675_000, 7847)
+ // Measured: `667`
+ // Estimated: `4325`
+ // Minimum execution time: 7_344_000 picoseconds.
+ Weight::from_parts(7_578_000, 4325)
.saturating_add(RocksDbWeight::get().reads(2_u64))
}
}
pallets/unique/src/weights.rsdiffbeforeafterboth--- a/pallets/unique/src/weights.rs
+++ b/pallets/unique/src/weights.rs
@@ -3,13 +3,13 @@
//! Autogenerated weights for pallet_unique
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: `80`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: `400`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `bench-host`, CPU: `Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -20,7 +20,7 @@
// *
// --template=.maintain/frame-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./pallets/unique/src/weights.rs
@@ -57,6 +57,8 @@
/// Proof: Common DestroyedCollectionCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
/// Storage: System Account (r:2 w:2)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+ /// Storage: Common AdminAmount (r:0 w:1)
+ /// Proof: Common AdminAmount (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
/// Storage: Common CollectionPropertyPermissions (r:0 w:1)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Common CollectionProperties (r:0 w:1)
@@ -66,11 +68,11 @@
fn create_collection() -> Weight {
// Proof Size summary in bytes:
// Measured: `245`
- // Estimated: `9174`
- // Minimum execution time: 31_198_000 picoseconds.
- Weight::from_parts(32_046_000, 9174)
+ // Estimated: `6196`
+ // Minimum execution time: 26_618_000 picoseconds.
+ Weight::from_parts(27_287_000, 6196)
.saturating_add(T::DbWeight::get().reads(4_u64))
- .saturating_add(T::DbWeight::get().writes(6_u64))
+ .saturating_add(T::DbWeight::get().writes(7_u64))
}
/// Storage: Common CollectionById (r:1 w:1)
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
@@ -88,10 +90,10 @@
/// Proof: Common CollectionProperties (max_values: None, max_size: Some(40992), added: 43467, mode: MaxEncodedLen)
fn destroy_collection() -> Weight {
// Proof Size summary in bytes:
- // Measured: `1086`
- // Estimated: `9336`
- // Minimum execution time: 48_208_000 picoseconds.
- Weight::from_parts(49_031_000, 9336)
+ // Measured: `1200`
+ // Estimated: `4325`
+ // Minimum execution time: 37_428_000 picoseconds.
+ Weight::from_parts(38_258_000, 4325)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(6_u64))
}
@@ -101,10 +103,10 @@
/// Proof: Common Allowlist (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
fn add_to_allow_list() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 14_852_000 picoseconds.
- Weight::from_parts(15_268_000, 4325)
+ // Minimum execution time: 9_968_000 picoseconds.
+ Weight::from_parts(10_388_000, 4325)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -114,10 +116,10 @@
/// Proof: Common Allowlist (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
fn remove_from_allow_list() -> Weight {
// Proof Size summary in bytes:
- // Measured: `1000`
+ // Measured: `1033`
// Estimated: `4325`
- // Minimum execution time: 14_595_000 picoseconds.
- Weight::from_parts(14_933_000, 4325)
+ // Minimum execution time: 9_600_000 picoseconds.
+ Weight::from_parts(9_974_000, 4325)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -125,10 +127,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn change_collection_owner() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 14_132_000 picoseconds.
- Weight::from_parts(14_501_000, 4325)
+ // Minimum execution time: 9_185_000 picoseconds.
+ Weight::from_parts(9_525_000, 4325)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -140,10 +142,10 @@
/// Proof: Common AdminAmount (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
fn add_collection_admin() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
- // Estimated: `11349`
- // Minimum execution time: 17_229_000 picoseconds.
- Weight::from_parts(17_657_000, 11349)
+ // Measured: `1012`
+ // Estimated: `4325`
+ // Minimum execution time: 12_704_000 picoseconds.
+ Weight::from_parts(13_115_000, 4325)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -156,9 +158,9 @@
fn remove_collection_admin() -> Weight {
// Proof Size summary in bytes:
// Measured: `1107`
- // Estimated: `11349`
- // Minimum execution time: 19_827_000 picoseconds.
- Weight::from_parts(20_479_000, 11349)
+ // Estimated: `4325`
+ // Minimum execution time: 14_185_000 picoseconds.
+ Weight::from_parts(14_492_000, 4325)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -166,10 +168,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn set_collection_sponsor() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 14_049_000 picoseconds.
- Weight::from_parts(14_420_000, 4325)
+ // Minimum execution time: 9_217_000 picoseconds.
+ Weight::from_parts(9_499_000, 4325)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -177,10 +179,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn confirm_sponsorship() -> Weight {
// Proof Size summary in bytes:
- // Measured: `999`
+ // Measured: `1032`
// Estimated: `4325`
- // Minimum execution time: 13_689_000 picoseconds.
- Weight::from_parts(14_044_000, 4325)
+ // Minimum execution time: 8_993_000 picoseconds.
+ Weight::from_parts(9_264_000, 4325)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -188,10 +190,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn remove_collection_sponsor() -> Weight {
// Proof Size summary in bytes:
- // Measured: `999`
+ // Measured: `1032`
// Estimated: `4325`
- // Minimum execution time: 13_275_000 picoseconds.
- Weight::from_parts(13_598_000, 4325)
+ // Minimum execution time: 8_804_000 picoseconds.
+ Weight::from_parts(9_302_000, 4325)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -199,10 +201,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn set_transfers_enabled_flag() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 9_411_000 picoseconds.
- Weight::from_parts(9_706_000, 4325)
+ // Minimum execution time: 5_985_000 picoseconds.
+ Weight::from_parts(6_155_000, 4325)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -210,10 +212,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn set_collection_limits() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 13_864_000 picoseconds.
- Weight::from_parts(14_368_000, 4325)
+ // Minimum execution time: 9_288_000 picoseconds.
+ Weight::from_parts(9_608_000, 4325)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -221,10 +223,10 @@
/// Proof: Common CollectionProperties (max_values: None, max_size: Some(40992), added: 43467, mode: MaxEncodedLen)
fn force_repair_collection() -> Weight {
// Proof Size summary in bytes:
- // Measured: `265`
+ // Measured: `298`
// Estimated: `44457`
- // Minimum execution time: 7_104_000 picoseconds.
- Weight::from_parts(7_293_000, 44457)
+ // Minimum execution time: 4_904_000 picoseconds.
+ Weight::from_parts(5_142_000, 44457)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -238,6 +240,8 @@
/// Proof: Common DestroyedCollectionCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
/// Storage: System Account (r:2 w:2)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+ /// Storage: Common AdminAmount (r:0 w:1)
+ /// Proof: Common AdminAmount (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
/// Storage: Common CollectionPropertyPermissions (r:0 w:1)
/// Proof: Common CollectionPropertyPermissions (max_values: None, max_size: Some(16726), added: 19201, mode: MaxEncodedLen)
/// Storage: Common CollectionProperties (r:0 w:1)
@@ -247,11 +251,11 @@
fn create_collection() -> Weight {
// Proof Size summary in bytes:
// Measured: `245`
- // Estimated: `9174`
- // Minimum execution time: 31_198_000 picoseconds.
- Weight::from_parts(32_046_000, 9174)
+ // Estimated: `6196`
+ // Minimum execution time: 26_618_000 picoseconds.
+ Weight::from_parts(27_287_000, 6196)
.saturating_add(RocksDbWeight::get().reads(4_u64))
- .saturating_add(RocksDbWeight::get().writes(6_u64))
+ .saturating_add(RocksDbWeight::get().writes(7_u64))
}
/// Storage: Common CollectionById (r:1 w:1)
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
@@ -269,10 +273,10 @@
/// Proof: Common CollectionProperties (max_values: None, max_size: Some(40992), added: 43467, mode: MaxEncodedLen)
fn destroy_collection() -> Weight {
// Proof Size summary in bytes:
- // Measured: `1086`
- // Estimated: `9336`
- // Minimum execution time: 48_208_000 picoseconds.
- Weight::from_parts(49_031_000, 9336)
+ // Measured: `1200`
+ // Estimated: `4325`
+ // Minimum execution time: 37_428_000 picoseconds.
+ Weight::from_parts(38_258_000, 4325)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(6_u64))
}
@@ -282,10 +286,10 @@
/// Proof: Common Allowlist (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
fn add_to_allow_list() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 14_852_000 picoseconds.
- Weight::from_parts(15_268_000, 4325)
+ // Minimum execution time: 9_968_000 picoseconds.
+ Weight::from_parts(10_388_000, 4325)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -295,10 +299,10 @@
/// Proof: Common Allowlist (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen)
fn remove_from_allow_list() -> Weight {
// Proof Size summary in bytes:
- // Measured: `1000`
+ // Measured: `1033`
// Estimated: `4325`
- // Minimum execution time: 14_595_000 picoseconds.
- Weight::from_parts(14_933_000, 4325)
+ // Minimum execution time: 9_600_000 picoseconds.
+ Weight::from_parts(9_974_000, 4325)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -306,10 +310,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn change_collection_owner() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 14_132_000 picoseconds.
- Weight::from_parts(14_501_000, 4325)
+ // Minimum execution time: 9_185_000 picoseconds.
+ Weight::from_parts(9_525_000, 4325)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -321,10 +325,10 @@
/// Proof: Common AdminAmount (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
fn add_collection_admin() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
- // Estimated: `11349`
- // Minimum execution time: 17_229_000 picoseconds.
- Weight::from_parts(17_657_000, 11349)
+ // Measured: `1012`
+ // Estimated: `4325`
+ // Minimum execution time: 12_704_000 picoseconds.
+ Weight::from_parts(13_115_000, 4325)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -337,9 +341,9 @@
fn remove_collection_admin() -> Weight {
// Proof Size summary in bytes:
// Measured: `1107`
- // Estimated: `11349`
- // Minimum execution time: 19_827_000 picoseconds.
- Weight::from_parts(20_479_000, 11349)
+ // Estimated: `4325`
+ // Minimum execution time: 14_185_000 picoseconds.
+ Weight::from_parts(14_492_000, 4325)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -347,10 +351,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn set_collection_sponsor() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 14_049_000 picoseconds.
- Weight::from_parts(14_420_000, 4325)
+ // Minimum execution time: 9_217_000 picoseconds.
+ Weight::from_parts(9_499_000, 4325)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -358,10 +362,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn confirm_sponsorship() -> Weight {
// Proof Size summary in bytes:
- // Measured: `999`
+ // Measured: `1032`
// Estimated: `4325`
- // Minimum execution time: 13_689_000 picoseconds.
- Weight::from_parts(14_044_000, 4325)
+ // Minimum execution time: 8_993_000 picoseconds.
+ Weight::from_parts(9_264_000, 4325)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -369,10 +373,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn remove_collection_sponsor() -> Weight {
// Proof Size summary in bytes:
- // Measured: `999`
+ // Measured: `1032`
// Estimated: `4325`
- // Minimum execution time: 13_275_000 picoseconds.
- Weight::from_parts(13_598_000, 4325)
+ // Minimum execution time: 8_804_000 picoseconds.
+ Weight::from_parts(9_302_000, 4325)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -380,10 +384,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn set_transfers_enabled_flag() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 9_411_000 picoseconds.
- Weight::from_parts(9_706_000, 4325)
+ // Minimum execution time: 5_985_000 picoseconds.
+ Weight::from_parts(6_155_000, 4325)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -391,10 +395,10 @@
/// Proof: Common CollectionById (max_values: None, max_size: Some(860), added: 3335, mode: MaxEncodedLen)
fn set_collection_limits() -> Weight {
// Proof Size summary in bytes:
- // Measured: `967`
+ // Measured: `1000`
// Estimated: `4325`
- // Minimum execution time: 13_864_000 picoseconds.
- Weight::from_parts(14_368_000, 4325)
+ // Minimum execution time: 9_288_000 picoseconds.
+ Weight::from_parts(9_608_000, 4325)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -402,10 +406,10 @@
/// Proof: Common CollectionProperties (max_values: None, max_size: Some(40992), added: 43467, mode: MaxEncodedLen)
fn force_repair_collection() -> Weight {
// Proof Size summary in bytes:
- // Measured: `265`
+ // Measured: `298`
// Estimated: `44457`
- // Minimum execution time: 7_104_000 picoseconds.
- Weight::from_parts(7_293_000, 44457)
+ // Minimum execution time: 4_904_000 picoseconds.
+ Weight::from_parts(5_142_000, 44457)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
primitives/common/src/constants.rsdiffbeforeafterboth--- a/primitives/common/src/constants.rs
+++ b/primitives/common/src/constants.rs
@@ -52,10 +52,10 @@
pub const SESSION_LENGTH: BlockNumber = HOURS;
// Targeting 0.1 UNQ per transfer
-pub const WEIGHT_TO_FEE_COEFF: u64 = /*<weight2fee>*/76_840_511_488_584_762/*</weight2fee>*/;
+pub const WEIGHT_TO_FEE_COEFF: u64 = /*<weight2fee>*/77_334_604_063_436_322/*</weight2fee>*/;
// Targeting 0.15 UNQ per transfer via ETH
-pub const MIN_GAS_PRICE: u64 = /*<mingasprice>*/1_906_626_161_453/*</mingasprice>*/;
+pub const MIN_GAS_PRICE: u64 = /*<mingasprice>*/1_920_639_188_722/*</mingasprice>*/;
/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
/// This is used to limit the maximal weight of a single extrinsic.
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -692,7 +692,7 @@
{
use codec::Decode;
- let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &uxt)
+ let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &*uxt)
.map_err(|_| DispatchError::Other("failed to decode the extrinsic"));
let uxt = match uxt_decode {
runtime/common/weights/xcm.rsdiffbeforeafterboth--- a/runtime/common/weights/xcm.rs
+++ b/runtime/common/weights/xcm.rs
@@ -3,12 +3,12 @@
//! Autogenerated weights for pallet_xcm
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-20, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-26, STEPS: `50`, REPEAT: 400, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
-// target/release/unique-collator
+// target/production/unique-collator
// benchmark
// pallet
// --pallet
@@ -19,7 +19,7 @@
// *
// --template=.maintain/external-weight-template.hbs
// --steps=50
-// --repeat=80
+// --repeat=400
// --heap-pages=4096
// --output=./runtime/common/weights/xcm.rs
@@ -47,10 +47,10 @@
/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
fn send() -> Weight {
// Proof Size summary in bytes:
- // Measured: `211`
- // Estimated: `10460`
- // Minimum execution time: 17_089_000 picoseconds.
- Weight::from_parts(17_615_000, 10460)
+ // Measured: `278`
+ // Estimated: `3743`
+ // Minimum execution time: 12_999_000 picoseconds.
+ Weight::from_parts(13_426_000, 3743)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -58,28 +58,28 @@
/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
fn teleport_assets() -> Weight {
// Proof Size summary in bytes:
- // Measured: `136`
+ // Measured: `169`
// Estimated: `1489`
- // Minimum execution time: 14_443_000 picoseconds.
- Weight::from_parts(14_895_000, 1489)
+ // Minimum execution time: 10_299_000 picoseconds.
+ Weight::from_parts(10_647_000, 1489)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: ParachainInfo ParachainId (r:1 w:0)
/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
fn reserve_transfer_assets() -> Weight {
// Proof Size summary in bytes:
- // Measured: `136`
+ // Measured: `169`
// Estimated: `1489`
- // Minimum execution time: 14_340_000 picoseconds.
- Weight::from_parts(14_748_000, 1489)
+ // Minimum execution time: 10_094_000 picoseconds.
+ Weight::from_parts(10_464_000, 1489)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
fn execute() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 5_266_000 picoseconds.
- Weight::from_parts(5_430_000, 0)
+ // Minimum execution time: 3_485_000 picoseconds.
+ Weight::from_parts(3_664_000, 0)
}
/// Storage: PolkadotXcm SupportedVersion (r:0 w:1)
/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
@@ -87,8 +87,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 5_621_000 picoseconds.
- Weight::from_parts(5_888_000, 0)
+ // Minimum execution time: 3_717_000 picoseconds.
+ Weight::from_parts(3_866_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: PolkadotXcm SafeXcmVersion (r:0 w:1)
@@ -97,8 +97,8 @@
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
- // Minimum execution time: 2_087_000 picoseconds.
- Weight::from_parts(2_218_000, 0)
+ // Minimum execution time: 1_328_000 picoseconds.
+ Weight::from_parts(1_400_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
@@ -119,10 +119,10 @@
/// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured)
fn force_subscribe_version_notify() -> Weight {
// Proof Size summary in bytes:
- // Measured: `211`
- // Estimated: `16043`
- // Minimum execution time: 21_067_000 picoseconds.
- Weight::from_parts(21_466_000, 16043)
+ // Measured: `278`
+ // Estimated: `3743`
+ // Minimum execution time: 16_057_000 picoseconds.
+ Weight::from_parts(16_483_000, 3743)
.saturating_add(T::DbWeight::get().reads(7_u64))
.saturating_add(T::DbWeight::get().writes(5_u64))
}
@@ -142,21 +142,31 @@
/// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured)
fn force_unsubscribe_version_notify() -> Weight {
// Proof Size summary in bytes:
- // Measured: `394`
- // Estimated: `15628`
- // Minimum execution time: 23_986_000 picoseconds.
- Weight::from_parts(25_328_000, 15628)
+ // Measured: `461`
+ // Estimated: `3926`
+ // Minimum execution time: 18_009_000 picoseconds.
+ Weight::from_parts(18_565_000, 3926)
.saturating_add(T::DbWeight::get().reads(6_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
+ /// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1)
+ /// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured)
+ fn force_suspension() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `0`
+ // Estimated: `0`
+ // Minimum execution time: 1_378_000 picoseconds.
+ Weight::from_parts(1_447_000, 0)
+ .saturating_add(T::DbWeight::get().writes(1_u64))
+ }
/// Storage: PolkadotXcm SupportedVersion (r:4 w:2)
/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
fn migrate_supported_version() -> Weight {
// Proof Size summary in bytes:
- // Measured: `131`
- // Estimated: `11021`
- // Minimum execution time: 15_073_000 picoseconds.
- Weight::from_parts(15_451_000, 11021)
+ // Measured: `196`
+ // Estimated: `11086`
+ // Minimum execution time: 10_770_000 picoseconds.
+ Weight::from_parts(11_090_000, 11086)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -164,10 +174,10 @@
/// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured)
fn migrate_version_notifiers() -> Weight {
// Proof Size summary in bytes:
- // Measured: `135`
- // Estimated: `11025`
- // Minimum execution time: 14_840_000 picoseconds.
- Weight::from_parts(15_347_000, 11025)
+ // Measured: `200`
+ // Estimated: `11090`
+ // Minimum execution time: 10_760_000 picoseconds.
+ Weight::from_parts(11_091_000, 11090)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -175,10 +185,10 @@
/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
fn already_notified_target() -> Weight {
// Proof Size summary in bytes:
- // Measured: `142`
- // Estimated: `13507`
- // Minimum execution time: 16_215_000 picoseconds.
- Weight::from_parts(16_461_000, 13507)
+ // Measured: `207`
+ // Estimated: `13572`
+ // Minimum execution time: 12_026_000 picoseconds.
+ Weight::from_parts(12_321_000, 13572)
.saturating_add(T::DbWeight::get().reads(5_u64))
}
/// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1)
@@ -195,10 +205,10 @@
/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
fn notify_current_targets() -> Weight {
// Proof Size summary in bytes:
- // Measured: `278`
- // Estimated: `17013`
- // Minimum execution time: 21_705_000 picoseconds.
- Weight::from_parts(22_313_000, 17013)
+ // Measured: `345`
+ // Estimated: `6285`
+ // Minimum execution time: 15_508_000 picoseconds.
+ Weight::from_parts(15_885_000, 6285)
.saturating_add(T::DbWeight::get().reads(7_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
}
@@ -206,20 +216,20 @@
/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
fn notify_target_migration_fail() -> Weight {
// Proof Size summary in bytes:
- // Measured: `172`
- // Estimated: `8587`
- // Minimum execution time: 7_869_000 picoseconds.
- Weight::from_parts(8_052_000, 8587)
+ // Measured: `239`
+ // Estimated: `8654`
+ // Minimum execution time: 5_580_000 picoseconds.
+ Weight::from_parts(5_753_000, 8654)
.saturating_add(T::DbWeight::get().reads(3_u64))
}
/// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
/// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
fn migrate_version_notify_targets() -> Weight {
// Proof Size summary in bytes:
- // Measured: `142`
- // Estimated: `11032`
- // Minimum execution time: 15_340_000 picoseconds.
- Weight::from_parts(15_738_000, 11032)
+ // Measured: `207`
+ // Estimated: `11097`
+ // Minimum execution time: 10_951_000 picoseconds.
+ Weight::from_parts(11_341_000, 11097)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -237,16 +247,12 @@
/// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured)
fn migrate_and_notify_old_targets() -> Weight {
// Proof Size summary in bytes:
- // Measured: `284`
- // Estimated: `21999`
- // Minimum execution time: 27_809_000 picoseconds.
- Weight::from_parts(28_290_000, 21999)
+ // Measured: `349`
+ // Estimated: `11239`
+ // Minimum execution time: 19_990_000 picoseconds.
+ Weight::from_parts(20_433_000, 11239)
.saturating_add(T::DbWeight::get().reads(9_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
- }
-
- fn force_suspension() -> Weight {
- Default::default()
}
}
runtime/tests/src/tests.rsdiffbeforeafterboth--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -168,6 +168,7 @@
fn get_token_properties(collection_id: CollectionId, token_id: TokenId) -> Vec<Property> {
<pallet_nonfungible::Pallet<Test>>::token_properties((collection_id, token_id))
+ .unwrap_or_default()
.into_iter()
.map(|(key, value)| Property { key, value })
.collect()
tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -48,6 +48,7 @@
"testEthFractionalizer": "yarn _test './**/eth/fractionalizer/**/*.*test.ts'",
"testEthMarketplace": "yarn _test './**/eth/marketplace/**/*.*test.ts'",
"testEthMarket": "yarn _test './**/eth/marketplace-v2/**/*.*test.ts'",
+ "testPerformance": "yarn _test ./**/performance.*test.ts",
"testSub": "yarn _test './**/sub/**/*.*test.ts'",
"testSubNesting": "yarn _test './**/sub/nesting/**/*.*test.ts'",
"testEvent": "yarn _test ./src/check-event/*.*test.ts",
tests/src/migrations/942057-appPromotion/lockedToFreeze.tsdiffbeforeafterboth--- a/tests/src/migrations/942057-appPromotion/lockedToFreeze.ts
+++ b/tests/src/migrations/942057-appPromotion/lockedToFreeze.ts
@@ -4,9 +4,10 @@
import path, {dirname} from 'path';
import {isInteger, parse} from 'lossless-json';
import {fileURLToPath} from 'url';
+import config from '../../config';
-const WS_ENDPOINT = 'ws://localhost:9944';
+const WS_ENDPOINT = config.substrateUrl;
const DONOR_SEED = '//Alice';
const UPDATE_IF_VERSION = 942057;
tests/src/migrations/correctStateAfterMaintenance.tsdiffbeforeafterboth--- a/tests/src/migrations/correctStateAfterMaintenance.ts
+++ b/tests/src/migrations/correctStateAfterMaintenance.ts
@@ -1,8 +1,9 @@
+import config from '../config';
import {usingPlaygrounds} from '../util';
-const WS_ENDPOINT = 'ws://localhost:9944';
+const WS_ENDPOINT = config.substrateUrl;
const DONOR_SEED = '//Alice';
export const main = async(options: { wsEndpoint: string; donorSeed: string } = {
@@ -66,4 +67,4 @@
const chunk = <T>(arr: T[], size: number) =>
Array.from({length: Math.ceil(arr.length / size)}, (_: any, i: number) =>
- arr.slice(i * size, i * size + size));
\ No newline at end of file
+ arr.slice(i * size, i * size + size));
tests/src/performance.seq.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/performance.seq.test.ts
@@ -0,0 +1,166 @@
+// Copyright 2019-2023 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network 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.
+
+// Unique Network 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 Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+import {ApiPromise} from '@polkadot/api';
+import {IKeyringPair} from '@polkadot/types/types';
+import {expect, itSub, usingPlaygrounds} from './util';
+import {ICrossAccountId, IProperty} from './util/playgrounds/types';
+import {UniqueHelper} from './util/playgrounds/unique';
+
+describe('Performace tests', () => {
+ let alice: IKeyringPair;
+ const MAX_TOKENS_TO_MINT = 200;
+
+ before(async () => {
+ await usingPlaygrounds(async (helper, privateKey) => {
+ const donor = await privateKey({url: import.meta.url});
+ [alice] = await helper.arrange.createAccounts([100_000n], donor);
+ });
+ });
+
+ itSub('NFT tokens minting', async ({helper}) => {
+ const propertyKey = 'prop-a';
+ const collection = await helper.nft.mintCollection(alice, {
+ name: 'test properties',
+ description: 'test properties collection',
+ tokenPrefix: 'TPC',
+ tokenPropertyPermissions: [
+ {key: propertyKey, permission: {mutable: true, collectionAdmin: true, tokenOwner: true}},
+ ],
+ });
+
+
+ const results = [];
+ const step = 1_000;
+ const sizeOfKey = sizeOfEncodedStr(propertyKey);
+ let currentSize = step;
+ let startCount = 0;
+ let minterFunc = tryMintUnsafeRPC;
+ try {
+ startCount = await tryMintUnsafeRPC(helper, alice, MAX_TOKENS_TO_MINT, collection.collectionId, {Substrate: alice.address});
+ }
+ catch (e) {
+ startCount = await tryMintExplicit(helper, alice, MAX_TOKENS_TO_MINT, collection.collectionId, {Substrate: alice.address});
+ minterFunc = tryMintExplicit;
+ }
+ results.push({propertySize: 0, tokens: startCount});
+
+ while(currentSize <= 32_000) {
+ const property = {key: propertyKey, value: 'A'.repeat(currentSize - sizeOfKey - sizeOfInt(currentSize))};
+ const maxTokens = Math.ceil(results.map(x => x.tokens).reduce((a, b) => a + b) / results.length);
+ const tokens = await minterFunc(helper, alice, maxTokens, collection.collectionId, {Substrate: alice.address}, property);
+ results.push({propertySize: sizeOfProperty(property), tokens});
+ currentSize += step;
+ await helper.wait.newBlocks(2);
+ }
+
+ expect(results).to.be.deep.equal([
+ {propertySize: 0, tokens: 200},
+ {propertySize: 1000, tokens: 149},
+ {propertySize: 2000, tokens: 149},
+ {propertySize: 3000, tokens: 149},
+ {propertySize: 4000, tokens: 149},
+ {propertySize: 5000, tokens: 149},
+ {propertySize: 6000, tokens: 149},
+ {propertySize: 7000, tokens: 149},
+ {propertySize: 8000, tokens: 149},
+ {propertySize: 9000, tokens: 149},
+ {propertySize: 10000, tokens: 149},
+ {propertySize: 11000, tokens: 149},
+ {propertySize: 12000, tokens: 149},
+ {propertySize: 13000, tokens: 149},
+ {propertySize: 14000, tokens: 149},
+ {propertySize: 15000, tokens: 149},
+ {propertySize: 16000, tokens: 149},
+ {propertySize: 17000, tokens: 149},
+ {propertySize: 18000, tokens: 149},
+ {propertySize: 19000, tokens: 149},
+ {propertySize: 20000, tokens: 149},
+ {propertySize: 21000, tokens: 149},
+ {propertySize: 22000, tokens: 149},
+ {propertySize: 23000, tokens: 149},
+ {propertySize: 24000, tokens: 149},
+ {propertySize: 25000, tokens: 149},
+ {propertySize: 26000, tokens: 149},
+ {propertySize: 27000, tokens: 145},
+ {propertySize: 28000, tokens: 140},
+ {propertySize: 29000, tokens: 135},
+ {propertySize: 30000, tokens: 130},
+ {propertySize: 31000, tokens: 126},
+ {propertySize: 32000, tokens: 122},
+ ]);
+ });
+});
+
+
+const dryRun = async (api: ApiPromise, signer: IKeyringPair, tx: any) => {
+ const signed = await tx.signAsync(signer);
+ const dryRun = await api.rpc.system.dryRun(signed.toHex());
+ return dryRun.isOk && dryRun.asOk.isOk;
+};
+
+const getTokens = (tokensCount: number, owner: ICrossAccountId, property?: IProperty) => (new Array(tokensCount)).fill(0).map(() => {
+ const token = {owner} as {owner: ICrossAccountId, properties?: IProperty[]};
+ if(property) token.properties = [property];
+ return token;
+});
+
+const tryMintUnsafeRPC = async (helper: UniqueHelper, signer: IKeyringPair, tokensCount: number, collectionId: number, owner: ICrossAccountId, property?: IProperty): Promise<number> => {
+ if(tokensCount < 10) console.log('try mint', tokensCount, 'tokens');
+ const tokens = getTokens(tokensCount, owner, property);
+ const tx = helper.constructApiCall('api.tx.unique.createMultipleItemsEx', [collectionId, {NFT: tokens}]);
+ if(!(await dryRun(helper.getApi(), signer, tx))) {
+ if(tokensCount < 2) return 0;
+ return await tryMintUnsafeRPC(helper, signer, tokensCount - 1, collectionId, owner, property);
+ }
+ await helper.executeExtrinsic(signer, 'api.tx.unique.createMultipleItemsEx', [collectionId, {NFT: tokens}]);
+ return tokensCount;
+};
+
+const tryMintExplicit = async (helper: UniqueHelper, signer: IKeyringPair, tokensCount: number, collectionId: number, owner: ICrossAccountId, property?: IProperty): Promise<number> => {
+ const tokens = getTokens(tokensCount, owner, property);
+ try {
+ await helper.executeExtrinsic(signer, 'api.tx.unique.createMultipleItemsEx', [collectionId, {NFT: tokens}]);
+ }
+ catch (e) {
+ if(tokensCount < 2) return 0;
+ return await tryMintExplicit(helper, signer, tokensCount - 1, collectionId, owner, property);
+ }
+ return tokensCount;
+};
+
+function sizeOfProperty(prop: IProperty) {
+ return sizeOfEncodedStr(prop.key) + sizeOfEncodedStr(prop.value!);
+}
+
+function sizeOfInt(i: number) {
+ if(i < 0 || i > 0xffffffff) throw new Error('out of range');
+ if(i < 0b11_1111) {
+ return 1;
+ } else if(i < 0b11_1111_1111_1111) {
+ return 2;
+ } else if(i < 0b11_1111_1111_1111_1111_1111_1111_1111) {
+ return 4;
+ } else {
+ return 5;
+ }
+}
+
+const UTF8_ENCODER = new TextEncoder();
+function sizeOfEncodedStr(v: string) {
+ const encoded = UTF8_ENCODER.encode(v);
+ return sizeOfInt(encoded.length) + encoded.length;
+}