difftreelog
feat benchmark structure
in: master
9 files changed
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -57,5 +57,9 @@
bench-nonfungible:
make _bench PALLET=nonfungible
+.PHONY: bench-structure
+bench-structure:
+ make _bench PALLET=structure
+
.PHONY: bench
-bench: bench-evm-migration bench-unique bench-fungible bench-refungible bench-nonfungible
+bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible
pallets/structure/Cargo.tomldiffbeforeafterboth--- a/pallets/structure/Cargo.toml
+++ b/pallets/structure/Cargo.toml
@@ -6,6 +6,7 @@
[dependencies]
frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.17' }
frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.17' }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.17' }
sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.17' }
pallet-common = { path = "../common", default-features = false }
parity-scale-codec = { version = "2.0.0", default-features = false, features = [
@@ -21,9 +22,11 @@
std = [
"frame-support/std",
"frame-system/std",
+ "frame-benchmarking/std",
"sp-std/std",
"pallet-common/std",
"scale-info/std",
"parity-scale-codec/std",
"up-data-structs/std",
]
+runtime-benchmarks = ['frame-benchmarking', 'pallet-common/runtime-benchmarks']
pallets/structure/src/benchmarking.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/structure/src/benchmarking.rs
@@ -0,0 +1,28 @@
+use super::*;
+
+use frame_benchmarking::{benchmarks, account};
+use frame_support::traits::{Currency, Get};
+use up_data_structs::{CreateCollectionData, CollectionMode, CreateItemData, CreateNftData};
+use pallet_common::CrossAccountId;
+
+const SEED: u32 = 1;
+
+benchmarks! {
+ find_parent {
+ let caller: T::AccountId = account("caller", 0, SEED);
+ let caller_cross = T::CrossAccountId::from_sub(caller.clone());
+
+ T::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
+ T::CollectionDispatch::create(caller, CreateCollectionData {
+ mode: CollectionMode::NFT,
+ ..Default::default()
+ })?;
+ let dispatch = T::CollectionDispatch::dispatch(CollectionHandle::try_get(CollectionId(1))?);
+ let dispatch = dispatch.as_dyn();
+
+ dispatch.create_item(caller_cross.clone(), caller_cross.clone(), CreateItemData::NFT(CreateNftData::default()))?;
+ }: {
+ let parent = <Pallet<T>>::find_parent(CollectionId(1), TokenId(1))?;
+ assert!(matches!(parent, Parent::Normal(_)))
+ }
+}
pallets/structure/src/weights.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/structure/src/weights.rs
@@ -0,0 +1,57 @@
+// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
+
+//! Autogenerated weights for pallet_structure
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2022-03-24, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
+
+// Executed Command:
+// target/release/unique-collator
+// benchmark
+// --pallet
+// pallet-structure
+// --wasm-execution
+// compiled
+// --extrinsic
+// *
+// --template
+// .maintain/frame-weight-template.hbs
+// --steps=50
+// --repeat=200
+// --heap-pages=4096
+// --output=./pallets/structure/src/weights.rs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(clippy::unnecessary_cast)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_structure.
+pub trait WeightInfo {
+ fn find_parent() -> Weight;
+}
+
+/// Weights for pallet_structure using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:1 w:0)
+ fn find_parent() -> Weight {
+ (6_302_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ }
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+ // Storage: Common CollectionById (r:1 w:0)
+ // Storage: Nonfungible TokenData (r:1 w:0)
+ fn find_parent() -> Weight {
+ (6_302_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(2 as Weight))
+ }
+}
runtime/common/src/runtime_apis.rsdiffbeforeafterboth1#[macro_export]2macro_rules! impl_common_runtime_apis {3 (4 $(5 #![custom_apis]67 $($custom_apis:tt)+8 )?9 ) => {10 impl_runtime_apis! {11 $($($custom_apis)+)?1213 impl up_rpc::UniqueApi<Block, CrossAccountId, AccountId> for Runtime {14 fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>, DispatchError> {15 dispatch_unique_runtime!(collection.account_tokens(account))16 }17 fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool, DispatchError> {18 dispatch_unique_runtime!(collection.token_exists(token))19 }2021 fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {22 dispatch_unique_runtime!(collection.token_owner(token))23 }24 fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {25 dispatch_unique_runtime!(collection.const_metadata(token))26 }27 fn variable_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {28 dispatch_unique_runtime!(collection.variable_metadata(token))29 }3031 fn collection_tokens(collection: CollectionId) -> Result<u32, DispatchError> {32 dispatch_unique_runtime!(collection.collection_tokens())33 }34 fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {35 dispatch_unique_runtime!(collection.account_balance(account))36 }37 fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128, DispatchError> {38 dispatch_unique_runtime!(collection.balance(account, token))39 }40 fn allowance(41 collection: CollectionId,42 sender: CrossAccountId,43 spender: CrossAccountId,44 token: TokenId,45 ) -> Result<u128, DispatchError> {46 dispatch_unique_runtime!(collection.allowance(sender, spender, token))47 }4849 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {50 Ok(<pallet_common::Pallet<Runtime>>::adminlist(collection))51 }52 fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {53 Ok(<pallet_common::Pallet<Runtime>>::allowlist(collection))54 }55 fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool, DispatchError> {56 Ok(<pallet_common::Pallet<Runtime>>::allowed(collection, user))57 }58 fn last_token_id(collection: CollectionId) -> Result<TokenId, DispatchError> {59 dispatch_unique_runtime!(collection.last_token_id())60 }61 fn collection_by_id(collection: CollectionId) -> Result<Option<Collection<AccountId>>, DispatchError> {62 Ok(<pallet_common::CollectionById<Runtime>>::get(collection))63 }64 fn collection_stats() -> Result<CollectionStats, DispatchError> {65 Ok(<pallet_common::Pallet<Runtime>>::collection_stats())66 }67 fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>, DispatchError> {68 Ok(<pallet_unique::UniqueSponsorshipPredict<Runtime> as69 pallet_unique::SponsorshipPredict<Runtime>>::predict(70 collection,71 account,72 token))73 }7475 fn effective_collection_limits(collection: CollectionId) -> Result<Option<CollectionLimits>, DispatchError> {76 Ok(<pallet_common::Pallet<Runtime>>::effective_collection_limits(collection))77 }78 }7980 impl sp_api::Core<Block> for Runtime {81 fn version() -> RuntimeVersion {82 VERSION83 }8485 fn execute_block(block: Block) {86 Executive::execute_block(block)87 }8889 fn initialize_block(header: &<Block as BlockT>::Header) {90 Executive::initialize_block(header)91 }92 }9394 impl sp_api::Metadata<Block> for Runtime {95 fn metadata() -> OpaqueMetadata {96 OpaqueMetadata::new(Runtime::metadata().into())97 }98 }99100 impl sp_block_builder::BlockBuilder<Block> for Runtime {101 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {102 Executive::apply_extrinsic(extrinsic)103 }104105 fn finalize_block() -> <Block as BlockT>::Header {106 Executive::finalize_block()107 }108109 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {110 data.create_extrinsics()111 }112113 fn check_inherents(114 block: Block,115 data: sp_inherents::InherentData,116 ) -> sp_inherents::CheckInherentsResult {117 data.check_extrinsics(&block)118 }119120 // fn random_seed() -> <Block as BlockT>::Hash {121 // RandomnessCollectiveFlip::random_seed().0122 // }123 }124125 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {126 fn validate_transaction(127 source: TransactionSource,128 tx: <Block as BlockT>::Extrinsic,129 hash: <Block as BlockT>::Hash,130 ) -> TransactionValidity {131 Executive::validate_transaction(source, tx, hash)132 }133 }134135 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {136 fn offchain_worker(header: &<Block as BlockT>::Header) {137 Executive::offchain_worker(header)138 }139 }140141 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {142 fn chain_id() -> u64 {143 <Runtime as pallet_evm::Config>::ChainId::get()144 }145146 fn account_basic(address: H160) -> EVMAccount {147 EVM::account_basic(&address)148 }149150 fn gas_price() -> U256 {151 <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price()152 }153154 fn account_code_at(address: H160) -> Vec<u8> {155 EVM::account_codes(address)156 }157158 fn author() -> H160 {159 <pallet_evm::Pallet<Runtime>>::find_author()160 }161162 fn storage_at(address: H160, index: U256) -> H256 {163 let mut tmp = [0u8; 32];164 index.to_big_endian(&mut tmp);165 EVM::account_storages(address, H256::from_slice(&tmp[..]))166 }167168 #[allow(clippy::redundant_closure)]169 fn call(170 from: H160,171 to: H160,172 data: Vec<u8>,173 value: U256,174 gas_limit: U256,175 max_fee_per_gas: Option<U256>,176 max_priority_fee_per_gas: Option<U256>,177 nonce: Option<U256>,178 estimate: bool,179 access_list: Option<Vec<(H160, Vec<H256>)>>,180 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {181 let config = if estimate {182 let mut config = <Runtime as pallet_evm::Config>::config().clone();183 config.estimate = true;184 Some(config)185 } else {186 None187 };188189 let is_transactional = false;190 <Runtime as pallet_evm::Config>::Runner::call(191 CrossAccountId::from_eth(from),192 to,193 data,194 value,195 gas_limit.low_u64(),196 max_fee_per_gas,197 max_priority_fee_per_gas,198 nonce,199 access_list.unwrap_or_default(),200 is_transactional,201 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),202 ).map_err(|err| err.into())203 }204205 #[allow(clippy::redundant_closure)]206 fn create(207 from: H160,208 data: Vec<u8>,209 value: U256,210 gas_limit: U256,211 max_fee_per_gas: Option<U256>,212 max_priority_fee_per_gas: Option<U256>,213 nonce: Option<U256>,214 estimate: bool,215 access_list: Option<Vec<(H160, Vec<H256>)>>,216 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {217 let config = if estimate {218 let mut config = <Runtime as pallet_evm::Config>::config().clone();219 config.estimate = true;220 Some(config)221 } else {222 None223 };224225 let is_transactional = false;226 <Runtime as pallet_evm::Config>::Runner::create(227 CrossAccountId::from_eth(from),228 data,229 value,230 gas_limit.low_u64(),231 max_fee_per_gas,232 max_priority_fee_per_gas,233 nonce,234 access_list.unwrap_or_default(),235 is_transactional,236 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),237 ).map_err(|err| err.into())238 }239240 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {241 Ethereum::current_transaction_statuses()242 }243244 fn current_block() -> Option<pallet_ethereum::Block> {245 Ethereum::current_block()246 }247248 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {249 Ethereum::current_receipts()250 }251252 fn current_all() -> (253 Option<pallet_ethereum::Block>,254 Option<Vec<pallet_ethereum::Receipt>>,255 Option<Vec<TransactionStatus>>256 ) {257 (258 Ethereum::current_block(),259 Ethereum::current_receipts(),260 Ethereum::current_transaction_statuses()261 )262 }263264 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {265 xts.into_iter().filter_map(|xt| match xt.0.function {266 Call::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),267 _ => None268 }).collect()269 }270271 fn elasticity() -> Option<Permill> {272 None273 }274 }275276 impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {277 fn convert_transaction(transaction: pallet_ethereum::Transaction) -> <Block as BlockT>::Extrinsic {278 UncheckedExtrinsic::new_unsigned(279 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),280 )281 }282 }283284 impl sp_session::SessionKeys<Block> for Runtime {285 fn decode_session_keys(286 encoded: Vec<u8>,287 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {288 SessionKeys::decode_into_raw_public_keys(&encoded)289 }290291 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {292 SessionKeys::generate(seed)293 }294 }295296 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {297 fn slot_duration() -> sp_consensus_aura::SlotDuration {298 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())299 }300301 fn authorities() -> Vec<AuraId> {302 Aura::authorities().to_vec()303 }304 }305306 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {307 fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {308 ParachainSystem::collect_collation_info(header)309 }310 }311312 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {313 fn account_nonce(account: AccountId) -> Index {314 System::account_nonce(account)315 }316 }317318 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {319 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {320 TransactionPayment::query_info(uxt, len)321 }322 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {323 TransactionPayment::query_fee_details(uxt, len)324 }325 }326327 /*328 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>329 for Runtime330 {331 fn call(332 origin: AccountId,333 dest: AccountId,334 value: Balance,335 gas_limit: u64,336 input_data: Vec<u8>,337 ) -> pallet_contracts_primitives::ContractExecResult {338 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)339 }340341 fn instantiate(342 origin: AccountId,343 endowment: Balance,344 gas_limit: u64,345 code: pallet_contracts_primitives::Code<Hash>,346 data: Vec<u8>,347 salt: Vec<u8>,348 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>349 {350 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)351 }352353 fn get_storage(354 address: AccountId,355 key: [u8; 32],356 ) -> pallet_contracts_primitives::GetStorageResult {357 Contracts::get_storage(address, key)358 }359360 fn rent_projection(361 address: AccountId,362 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {363 Contracts::rent_projection(address)364 }365 }366 */367368 #[cfg(feature = "runtime-benchmarks")]369 impl frame_benchmarking::Benchmark<Block> for Runtime {370 fn benchmark_metadata(extra: bool) -> (371 Vec<frame_benchmarking::BenchmarkList>,372 Vec<frame_support::traits::StorageInfo>,373 ) {374 use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};375 use frame_support::traits::StorageInfoTrait;376377 let mut list = Vec::<BenchmarkList>::new();378379 list_benchmark!(list, extra, pallet_evm_migration, EvmMigration);380 list_benchmark!(list, extra, pallet_unique, Unique);381 list_benchmark!(list, extra, pallet_inflation, Inflation);382 list_benchmark!(list, extra, pallet_fungible, Fungible);383 list_benchmark!(list, extra, pallet_refungible, Refungible);384 list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);385 // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);386387 let storage_info = AllPalletsReversedWithSystemFirst::storage_info();388389 return (list, storage_info)390 }391392 fn dispatch_benchmark(393 config: frame_benchmarking::BenchmarkConfig394 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {395 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};396397 let allowlist: Vec<TrackedStorageKey> = vec![398 // Block Number399 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),400 // Total Issuance401 hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),402 // Execution Phase403 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),404 // Event Count405 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),406 // System Events407 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),408409 // Transactional depth410 hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),411 ];412413 let mut batches = Vec::<BenchmarkBatch>::new();414 let params = (&config, &allowlist);415416 add_benchmark!(params, batches, pallet_evm_migration, EvmMigration);417 add_benchmark!(params, batches, pallet_unique, Unique);418 add_benchmark!(params, batches, pallet_inflation, Inflation);419 add_benchmark!(params, batches, pallet_fungible, Fungible);420 add_benchmark!(params, batches, pallet_refungible, Refungible);421 add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);422 // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);423424 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }425 Ok(batches)426 }427 }428429 #[cfg(feature = "try-runtime")]430 impl frame_try_runtime::TryRuntime<Block> for Runtime {431 fn on_runtime_upgrade() -> (Weight, Weight) {432 log::info!("try-runtime::on_runtime_upgrade unique-chain.");433 let weight = Executive::try_runtime_upgrade().unwrap();434 (weight, RuntimeBlockWeights::get().max_block)435 }436437 fn execute_block_no_check(block: Block) -> Weight {438 Executive::execute_block_no_check(block)439 }440 }441 }442 }443}1#[macro_export]2macro_rules! impl_common_runtime_apis {3 (4 $(5 #![custom_apis]67 $($custom_apis:tt)+8 )?9 ) => {10 impl_runtime_apis! {11 $($($custom_apis)+)?1213 impl up_rpc::UniqueApi<Block, CrossAccountId, AccountId> for Runtime {14 fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>, DispatchError> {15 dispatch_unique_runtime!(collection.account_tokens(account))16 }17 fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool, DispatchError> {18 dispatch_unique_runtime!(collection.token_exists(token))19 }2021 fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {22 dispatch_unique_runtime!(collection.token_owner(token))23 }24 fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {25 dispatch_unique_runtime!(collection.const_metadata(token))26 }27 fn variable_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {28 dispatch_unique_runtime!(collection.variable_metadata(token))29 }3031 fn collection_tokens(collection: CollectionId) -> Result<u32, DispatchError> {32 dispatch_unique_runtime!(collection.collection_tokens())33 }34 fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {35 dispatch_unique_runtime!(collection.account_balance(account))36 }37 fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128, DispatchError> {38 dispatch_unique_runtime!(collection.balance(account, token))39 }40 fn allowance(41 collection: CollectionId,42 sender: CrossAccountId,43 spender: CrossAccountId,44 token: TokenId,45 ) -> Result<u128, DispatchError> {46 dispatch_unique_runtime!(collection.allowance(sender, spender, token))47 }4849 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {50 Ok(<pallet_common::Pallet<Runtime>>::adminlist(collection))51 }52 fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {53 Ok(<pallet_common::Pallet<Runtime>>::allowlist(collection))54 }55 fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool, DispatchError> {56 Ok(<pallet_common::Pallet<Runtime>>::allowed(collection, user))57 }58 fn last_token_id(collection: CollectionId) -> Result<TokenId, DispatchError> {59 dispatch_unique_runtime!(collection.last_token_id())60 }61 fn collection_by_id(collection: CollectionId) -> Result<Option<Collection<AccountId>>, DispatchError> {62 Ok(<pallet_common::CollectionById<Runtime>>::get(collection))63 }64 fn collection_stats() -> Result<CollectionStats, DispatchError> {65 Ok(<pallet_common::Pallet<Runtime>>::collection_stats())66 }67 fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>, DispatchError> {68 Ok(<pallet_unique::UniqueSponsorshipPredict<Runtime> as69 pallet_unique::SponsorshipPredict<Runtime>>::predict(70 collection,71 account,72 token))73 }7475 fn effective_collection_limits(collection: CollectionId) -> Result<Option<CollectionLimits>, DispatchError> {76 Ok(<pallet_common::Pallet<Runtime>>::effective_collection_limits(collection))77 }78 }7980 impl sp_api::Core<Block> for Runtime {81 fn version() -> RuntimeVersion {82 VERSION83 }8485 fn execute_block(block: Block) {86 Executive::execute_block(block)87 }8889 fn initialize_block(header: &<Block as BlockT>::Header) {90 Executive::initialize_block(header)91 }92 }9394 impl sp_api::Metadata<Block> for Runtime {95 fn metadata() -> OpaqueMetadata {96 OpaqueMetadata::new(Runtime::metadata().into())97 }98 }99100 impl sp_block_builder::BlockBuilder<Block> for Runtime {101 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {102 Executive::apply_extrinsic(extrinsic)103 }104105 fn finalize_block() -> <Block as BlockT>::Header {106 Executive::finalize_block()107 }108109 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {110 data.create_extrinsics()111 }112113 fn check_inherents(114 block: Block,115 data: sp_inherents::InherentData,116 ) -> sp_inherents::CheckInherentsResult {117 data.check_extrinsics(&block)118 }119120 // fn random_seed() -> <Block as BlockT>::Hash {121 // RandomnessCollectiveFlip::random_seed().0122 // }123 }124125 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {126 fn validate_transaction(127 source: TransactionSource,128 tx: <Block as BlockT>::Extrinsic,129 hash: <Block as BlockT>::Hash,130 ) -> TransactionValidity {131 Executive::validate_transaction(source, tx, hash)132 }133 }134135 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {136 fn offchain_worker(header: &<Block as BlockT>::Header) {137 Executive::offchain_worker(header)138 }139 }140141 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {142 fn chain_id() -> u64 {143 <Runtime as pallet_evm::Config>::ChainId::get()144 }145146 fn account_basic(address: H160) -> EVMAccount {147 EVM::account_basic(&address)148 }149150 fn gas_price() -> U256 {151 <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price()152 }153154 fn account_code_at(address: H160) -> Vec<u8> {155 EVM::account_codes(address)156 }157158 fn author() -> H160 {159 <pallet_evm::Pallet<Runtime>>::find_author()160 }161162 fn storage_at(address: H160, index: U256) -> H256 {163 let mut tmp = [0u8; 32];164 index.to_big_endian(&mut tmp);165 EVM::account_storages(address, H256::from_slice(&tmp[..]))166 }167168 #[allow(clippy::redundant_closure)]169 fn call(170 from: H160,171 to: H160,172 data: Vec<u8>,173 value: U256,174 gas_limit: U256,175 max_fee_per_gas: Option<U256>,176 max_priority_fee_per_gas: Option<U256>,177 nonce: Option<U256>,178 estimate: bool,179 access_list: Option<Vec<(H160, Vec<H256>)>>,180 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {181 let config = if estimate {182 let mut config = <Runtime as pallet_evm::Config>::config().clone();183 config.estimate = true;184 Some(config)185 } else {186 None187 };188189 let is_transactional = false;190 <Runtime as pallet_evm::Config>::Runner::call(191 CrossAccountId::from_eth(from),192 to,193 data,194 value,195 gas_limit.low_u64(),196 max_fee_per_gas,197 max_priority_fee_per_gas,198 nonce,199 access_list.unwrap_or_default(),200 is_transactional,201 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),202 ).map_err(|err| err.into())203 }204205 #[allow(clippy::redundant_closure)]206 fn create(207 from: H160,208 data: Vec<u8>,209 value: U256,210 gas_limit: U256,211 max_fee_per_gas: Option<U256>,212 max_priority_fee_per_gas: Option<U256>,213 nonce: Option<U256>,214 estimate: bool,215 access_list: Option<Vec<(H160, Vec<H256>)>>,216 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {217 let config = if estimate {218 let mut config = <Runtime as pallet_evm::Config>::config().clone();219 config.estimate = true;220 Some(config)221 } else {222 None223 };224225 let is_transactional = false;226 <Runtime as pallet_evm::Config>::Runner::create(227 CrossAccountId::from_eth(from),228 data,229 value,230 gas_limit.low_u64(),231 max_fee_per_gas,232 max_priority_fee_per_gas,233 nonce,234 access_list.unwrap_or_default(),235 is_transactional,236 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),237 ).map_err(|err| err.into())238 }239240 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {241 Ethereum::current_transaction_statuses()242 }243244 fn current_block() -> Option<pallet_ethereum::Block> {245 Ethereum::current_block()246 }247248 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {249 Ethereum::current_receipts()250 }251252 fn current_all() -> (253 Option<pallet_ethereum::Block>,254 Option<Vec<pallet_ethereum::Receipt>>,255 Option<Vec<TransactionStatus>>256 ) {257 (258 Ethereum::current_block(),259 Ethereum::current_receipts(),260 Ethereum::current_transaction_statuses()261 )262 }263264 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {265 xts.into_iter().filter_map(|xt| match xt.0.function {266 Call::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),267 _ => None268 }).collect()269 }270271 fn elasticity() -> Option<Permill> {272 None273 }274 }275276 impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {277 fn convert_transaction(transaction: pallet_ethereum::Transaction) -> <Block as BlockT>::Extrinsic {278 UncheckedExtrinsic::new_unsigned(279 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),280 )281 }282 }283284 impl sp_session::SessionKeys<Block> for Runtime {285 fn decode_session_keys(286 encoded: Vec<u8>,287 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {288 SessionKeys::decode_into_raw_public_keys(&encoded)289 }290291 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {292 SessionKeys::generate(seed)293 }294 }295296 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {297 fn slot_duration() -> sp_consensus_aura::SlotDuration {298 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())299 }300301 fn authorities() -> Vec<AuraId> {302 Aura::authorities().to_vec()303 }304 }305306 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {307 fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {308 ParachainSystem::collect_collation_info(header)309 }310 }311312 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {313 fn account_nonce(account: AccountId) -> Index {314 System::account_nonce(account)315 }316 }317318 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {319 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {320 TransactionPayment::query_info(uxt, len)321 }322 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {323 TransactionPayment::query_fee_details(uxt, len)324 }325 }326327 /*328 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>329 for Runtime330 {331 fn call(332 origin: AccountId,333 dest: AccountId,334 value: Balance,335 gas_limit: u64,336 input_data: Vec<u8>,337 ) -> pallet_contracts_primitives::ContractExecResult {338 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)339 }340341 fn instantiate(342 origin: AccountId,343 endowment: Balance,344 gas_limit: u64,345 code: pallet_contracts_primitives::Code<Hash>,346 data: Vec<u8>,347 salt: Vec<u8>,348 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>349 {350 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)351 }352353 fn get_storage(354 address: AccountId,355 key: [u8; 32],356 ) -> pallet_contracts_primitives::GetStorageResult {357 Contracts::get_storage(address, key)358 }359360 fn rent_projection(361 address: AccountId,362 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {363 Contracts::rent_projection(address)364 }365 }366 */367368 #[cfg(feature = "runtime-benchmarks")]369 impl frame_benchmarking::Benchmark<Block> for Runtime {370 fn benchmark_metadata(extra: bool) -> (371 Vec<frame_benchmarking::BenchmarkList>,372 Vec<frame_support::traits::StorageInfo>,373 ) {374 use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};375 use frame_support::traits::StorageInfoTrait;376377 let mut list = Vec::<BenchmarkList>::new();378379 list_benchmark!(list, extra, pallet_evm_migration, EvmMigration);380 list_benchmark!(list, extra, pallet_unique, Unique);381 list_benchmark!(list, extra, pallet_structure, Structure);382 list_benchmark!(list, extra, pallet_inflation, Inflation);383 list_benchmark!(list, extra, pallet_fungible, Fungible);384 list_benchmark!(list, extra, pallet_refungible, Refungible);385 list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);386 // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);387388 let storage_info = AllPalletsReversedWithSystemFirst::storage_info();389390 return (list, storage_info)391 }392393 fn dispatch_benchmark(394 config: frame_benchmarking::BenchmarkConfig395 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {396 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};397398 let allowlist: Vec<TrackedStorageKey> = vec![399 // Block Number400 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),401 // Total Issuance402 hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),403 // Execution Phase404 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),405 // Event Count406 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),407 // System Events408 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),409410 // Transactional depth411 hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),412 ];413414 let mut batches = Vec::<BenchmarkBatch>::new();415 let params = (&config, &allowlist);416417 add_benchmark!(params, batches, pallet_evm_migration, EvmMigration);418 add_benchmark!(params, batches, pallet_unique, Unique);419 add_benchmark!(params, batches, pallet_structure, Structure);420 add_benchmark!(params, batches, pallet_inflation, Inflation);421 add_benchmark!(params, batches, pallet_fungible, Fungible);422 add_benchmark!(params, batches, pallet_refungible, Refungible);423 add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);424 // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);425426 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }427 Ok(batches)428 }429 }430431 #[cfg(feature = "try-runtime")]432 impl frame_try_runtime::TryRuntime<Block> for Runtime {433 fn on_runtime_upgrade() -> (Weight, Weight) {434 log::info!("try-runtime::on_runtime_upgrade unique-chain.");435 let weight = Executive::try_runtime_upgrade().unwrap();436 (weight, RuntimeBlockWeights::get().max_block)437 }438439 fn execute_block_no_check(block: Block) -> Weight {440 Executive::execute_block_no_check(block)441 }442 }443 }444 }445}runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -29,6 +29,7 @@
'pallet-balances/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
+ 'pallet-structure/runtime-benchmarks',
'pallet-fungible/runtime-benchmarks',
'pallet-refungible/runtime-benchmarks',
'pallet-nonfungible/runtime-benchmarks',
@@ -84,6 +85,7 @@
'serde',
'pallet-inflation/std',
'pallet-common/std',
+ 'pallet-structure/std',
'pallet-fungible/std',
'pallet-refungible/std',
'pallet-nonfungible/std',
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -886,6 +886,7 @@
impl pallet_structure::Config for Runtime {
type Event = Event;
type Call = Call;
+ type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;
}
impl pallet_fungible::Config for Runtime {
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -29,6 +29,7 @@
'pallet-balances/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
+ 'pallet-structure/runtime-benchmarks',
'pallet-fungible/runtime-benchmarks',
'pallet-refungible/runtime-benchmarks',
'pallet-nonfungible/runtime-benchmarks',
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -29,6 +29,7 @@
'pallet-balances/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
+ 'pallet-structure/runtime-benchmarks',
'pallet-fungible/runtime-benchmarks',
'pallet-refungible/runtime-benchmarks',
'pallet-nonfungible/runtime-benchmarks',