difftreelog
remove: getTotalStakingLocked from RPC.
in: master
5 files changed
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -270,14 +270,6 @@
at: Option<BlockHash>,
) -> Result<Vec<(BlockNumber, String)>>;
- /// Returns the total amount locked by staking tokens.
- #[method(name = "appPromotion_totalStakingLocked")]
- fn total_staking_locked(
- &self,
- staker: CrossAccountId,
- at: Option<BlockHash>,
- ) -> Result<String>;
-
/// Returns the total amount of tokens pending withdrawal from staking.
#[method(name = "appPromotion_pendingUnstake")]
fn pending_unstake(
@@ -594,7 +586,6 @@
.into_iter()
.map(|(b, a)| (b, a.to_string()))
.collect::<Vec<_>>(), app_promotion_api);
- pass_method!(total_staking_locked(staker: CrossAccountId) -> String => |v| v.to_string(), app_promotion_api);
pass_method!(pending_unstake(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), app_promotion_api);
pass_method!(pending_unstake_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>
|v| v
primitives/app_promotion_rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/app_promotion_rpc/src/lib.rs
+++ b/primitives/app_promotion_rpc/src/lib.rs
@@ -35,7 +35,6 @@
{
fn total_staked(staker: Option<CrossAccountId>) -> Result<u128>;
fn total_staked_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>>;
- fn total_staking_locked(staker: CrossAccountId) -> Result<u128>;
fn pending_unstake(staker: Option<CrossAccountId>) -> Result<u128>;
fn pending_unstake_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>>;
}
runtime/common/runtime_apis.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#[macro_export]18macro_rules! dispatch_unique_runtime {19 ($collection:ident.$method:ident($($name:ident),*)) => {{20 let collection = <Runtime as pallet_common::Config>::CollectionDispatch::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);21 let dispatch = collection.as_dyn();2223 Ok::<_, DispatchError>(dispatch.$method($($name),*))24 }};25}2627#[macro_export]28macro_rules! impl_common_runtime_apis {29 (30 $(31 #![custom_apis]3233 $($custom_apis:tt)+34 )?35 ) => {36 use sp_std::prelude::*;37 use sp_api::impl_runtime_apis;38 use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};39 use sp_runtime::{40 Permill,41 traits::Block as BlockT,42 transaction_validity::{TransactionSource, TransactionValidity},43 ApplyExtrinsicResult, DispatchError,44 };45 use fp_rpc::TransactionStatus;46 use pallet_transaction_payment::{47 FeeDetails, RuntimeDispatchInfo,48 };49 use pallet_evm::{50 Runner, account::CrossAccountId as _,51 Account as EVMAccount, FeeCalculator,52 };53 use runtime_common::{54 sponsoring::{SponsorshipPredict, UniqueSponsorshipPredict},55 dispatch::CollectionDispatch,56 config::ethereum::CrossAccountId,57 };58 use up_data_structs::*;596061 impl_runtime_apis! {62 $($($custom_apis)+)?6364 impl up_rpc::UniqueApi<Block, CrossAccountId, AccountId> for Runtime {65 fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>, DispatchError> {66 dispatch_unique_runtime!(collection.account_tokens(account))67 }68 fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>, DispatchError> {69 dispatch_unique_runtime!(collection.collection_tokens())70 }71 fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool, DispatchError> {72 dispatch_unique_runtime!(collection.token_exists(token))73 }7475 fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {76 dispatch_unique_runtime!(collection.token_owner(token))77 }7879 fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec::<CrossAccountId>, DispatchError> {80 dispatch_unique_runtime!(collection.token_owners(token))81 }8283 fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {84 let budget = up_data_structs::budget::Value::new(10);8586 Ok(Some(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?))87 }88 fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {89 Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))90 }91 fn collection_properties(92 collection: CollectionId,93 keys: Option<Vec<Vec<u8>>>94 ) -> Result<Vec<Property>, DispatchError> {95 let keys = keys.map(96 |keys| Common::bytes_keys_to_property_keys(keys)97 ).transpose()?;9899 Common::filter_collection_properties(collection, keys)100 }101102 fn token_properties(103 collection: CollectionId,104 token_id: TokenId,105 keys: Option<Vec<Vec<u8>>>106 ) -> Result<Vec<Property>, DispatchError> {107 let keys = keys.map(108 |keys| Common::bytes_keys_to_property_keys(keys)109 ).transpose()?;110111 dispatch_unique_runtime!(collection.token_properties(token_id, keys))112 }113114 fn property_permissions(115 collection: CollectionId,116 keys: Option<Vec<Vec<u8>>>117 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {118 let keys = keys.map(119 |keys| Common::bytes_keys_to_property_keys(keys)120 ).transpose()?;121122 Common::filter_property_permissions(collection, keys)123 }124125 fn token_data(126 collection: CollectionId,127 token_id: TokenId,128 keys: Option<Vec<Vec<u8>>>129 ) -> Result<TokenData<CrossAccountId>, DispatchError> {130 let token_data = TokenData {131 properties: Self::token_properties(collection, token_id, keys)?,132 owner: Self::token_owner(collection, token_id)?,133 pieces: Self::total_pieces(collection, token_id)?.unwrap_or(0),134 };135136 Ok(token_data)137 }138139 fn total_supply(collection: CollectionId) -> Result<u32, DispatchError> {140 dispatch_unique_runtime!(collection.total_supply())141 }142 fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {143 dispatch_unique_runtime!(collection.account_balance(account))144 }145 fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128, DispatchError> {146 dispatch_unique_runtime!(collection.balance(account, token))147 }148 fn allowance(149 collection: CollectionId,150 sender: CrossAccountId,151 spender: CrossAccountId,152 token: TokenId,153 ) -> Result<u128, DispatchError> {154 dispatch_unique_runtime!(collection.allowance(sender, spender, token))155 }156157 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {158 Ok(<pallet_common::Pallet<Runtime>>::adminlist(collection))159 }160 fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {161 Ok(<pallet_common::Pallet<Runtime>>::allowlist(collection))162 }163 fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool, DispatchError> {164 Ok(<pallet_common::Pallet<Runtime>>::allowed(collection, user))165 }166 fn last_token_id(collection: CollectionId) -> Result<TokenId, DispatchError> {167 dispatch_unique_runtime!(collection.last_token_id())168 }169 fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>, DispatchError> {170 Ok(<pallet_common::Pallet<Runtime>>::rpc_collection(collection))171 }172 fn collection_stats() -> Result<CollectionStats, DispatchError> {173 Ok(<pallet_common::Pallet<Runtime>>::collection_stats())174 }175 fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>, DispatchError> {176 Ok(<UniqueSponsorshipPredict<Runtime> as SponsorshipPredict<Runtime>>::predict(177 collection,178 account,179 token180 ))181 }182183 fn effective_collection_limits(collection: CollectionId) -> Result<Option<CollectionLimits>, DispatchError> {184 Ok(<pallet_common::Pallet<Runtime>>::effective_collection_limits(collection))185 }186187 fn total_pieces(collection: CollectionId, token_id: TokenId) -> Result<Option<u128>, DispatchError> {188 dispatch_unique_runtime!(collection.total_pieces(token_id))189 }190 }191192 impl app_promotion_rpc::AppPromotionApi<Block, BlockNumber, CrossAccountId, AccountId> for Runtime {193 fn total_staked(staker: Option<CrossAccountId>) -> Result<u128, DispatchError> {194 #[cfg(not(feature = "app-promotion"))]195 return unsupported!();196197 #[cfg(feature = "app-promotion")]198 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_total_staked(staker).unwrap_or_default());199 }200201 fn total_staked_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>, DispatchError> {202 #[cfg(not(feature = "app-promotion"))]203 return unsupported!();204205 #[cfg(feature = "app-promotion")]206 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_total_staked_per_block(staker));207 }208209 fn total_staking_locked(staker: CrossAccountId) -> Result<u128, DispatchError> {210 #[cfg(not(feature = "app-promotion"))]211 return unsupported!();212213 #[cfg(feature = "app-promotion")]214 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_locked_balance(staker));215 }216217 fn pending_unstake(staker: Option<CrossAccountId>) -> Result<u128, DispatchError> {218 #[cfg(not(feature = "app-promotion"))]219 return unsupported!();220221 #[cfg(feature = "app-promotion")]222 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_pending_unstake(staker));223 }224225 fn pending_unstake_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>, DispatchError> {226 #[cfg(not(feature = "app-promotion"))]227 return unsupported!();228229 #[cfg(feature = "app-promotion")]230 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_pending_unstake_per_block(staker))231 }232 }233234 impl rmrk_rpc::RmrkApi<235 Block,236 AccountId,237 RmrkCollectionInfo<AccountId>,238 RmrkInstanceInfo<AccountId>,239 RmrkResourceInfo,240 RmrkPropertyInfo,241 RmrkBaseInfo<AccountId>,242 RmrkPartType,243 RmrkTheme244 > for Runtime {245 fn last_collection_idx() -> Result<RmrkCollectionId, DispatchError> {246 #[cfg(feature = "rmrk")]247 return pallet_proxy_rmrk_core::rpc::last_collection_idx::<Runtime>();248249 #[cfg(not(feature = "rmrk"))]250 return unsupported!();251 }252253 #[allow(unused_variables)]254 fn collection_by_id(collection_id: RmrkCollectionId) -> Result<Option<RmrkCollectionInfo<AccountId>>, DispatchError> {255 #[cfg(feature = "rmrk")]256 return pallet_proxy_rmrk_core::rpc::collection_by_id::<Runtime>(collection_id);257258 #[cfg(not(feature = "rmrk"))]259 return unsupported!();260 }261262 #[allow(unused_variables)]263 fn nft_by_id(collection_id: RmrkCollectionId, nft_by_id: RmrkNftId) -> Result<Option<RmrkInstanceInfo<AccountId>>, DispatchError> {264 #[cfg(feature = "rmrk")]265 return pallet_proxy_rmrk_core::rpc::nft_by_id::<Runtime>(collection_id, nft_by_id);266267 #[cfg(not(feature = "rmrk"))]268 return unsupported!();269 }270271 #[allow(unused_variables)]272 fn account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Result<Vec<RmrkNftId>, DispatchError> {273 #[cfg(feature = "rmrk")]274 return pallet_proxy_rmrk_core::rpc::account_tokens::<Runtime>(account_id, collection_id);275276 #[cfg(not(feature = "rmrk"))]277 return unsupported!();278 }279280 #[allow(unused_variables)]281 fn nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Result<Vec<RmrkNftChild>, DispatchError> {282 #[cfg(feature = "rmrk")]283 return pallet_proxy_rmrk_core::rpc::nft_children::<Runtime>(collection_id, nft_id);284285 #[cfg(not(feature = "rmrk"))]286 return unsupported!();287 }288289 #[allow(unused_variables)]290 fn collection_properties(291 collection_id: RmrkCollectionId,292 filter_keys: Option<Vec<RmrkPropertyKey>>293 ) -> Result<Vec<RmrkPropertyInfo>, DispatchError> {294 #[cfg(feature = "rmrk")]295 return pallet_proxy_rmrk_core::rpc::collection_properties::<Runtime>(collection_id, filter_keys);296297 #[cfg(not(feature = "rmrk"))]298 return unsupported!();299 }300301 #[allow(unused_variables)]302 fn nft_properties(303 collection_id: RmrkCollectionId,304 nft_id: RmrkNftId,305 filter_keys: Option<Vec<RmrkPropertyKey>>306 ) -> Result<Vec<RmrkPropertyInfo>, DispatchError> {307 #[cfg(feature = "rmrk")]308 return pallet_proxy_rmrk_core::rpc::nft_properties::<Runtime>(collection_id, nft_id, filter_keys);309310 #[cfg(not(feature = "rmrk"))]311 return unsupported!();312 }313314 #[allow(unused_variables)]315 fn nft_resources(collection_id: RmrkCollectionId,nft_id: RmrkNftId) -> Result<Vec<RmrkResourceInfo>, DispatchError> {316 #[cfg(feature = "rmrk")]317 return pallet_proxy_rmrk_core::rpc::nft_resources::<Runtime>(collection_id, nft_id);318319 #[cfg(not(feature = "rmrk"))]320 return unsupported!();321 }322323 #[allow(unused_variables)]324 fn nft_resource_priority(325 collection_id: RmrkCollectionId,326 nft_id: RmrkNftId,327 resource_id: RmrkResourceId328 ) -> Result<Option<u32>, DispatchError> {329 #[cfg(feature = "rmrk")]330 return pallet_proxy_rmrk_core::rpc::nft_resource_priority::<Runtime>(collection_id, nft_id, resource_id);331332 #[cfg(not(feature = "rmrk"))]333 return unsupported!();334 }335336 #[allow(unused_variables)]337 fn base(base_id: RmrkBaseId) -> Result<Option<RmrkBaseInfo<AccountId>>, DispatchError> {338 #[cfg(feature = "rmrk")]339 return pallet_proxy_rmrk_equip::rpc::base::<Runtime>(base_id);340341 #[cfg(not(feature = "rmrk"))]342 return unsupported!();343 }344345 #[allow(unused_variables)]346 fn base_parts(base_id: RmrkBaseId) -> Result<Vec<RmrkPartType>, DispatchError> {347 #[cfg(feature = "rmrk")]348 return pallet_proxy_rmrk_equip::rpc::base_parts::<Runtime>(base_id);349350 #[cfg(not(feature = "rmrk"))]351 return unsupported!();352 }353354 #[allow(unused_variables)]355 fn theme_names(base_id: RmrkBaseId) -> Result<Vec<RmrkThemeName>, DispatchError> {356 #[cfg(feature = "rmrk")]357 return pallet_proxy_rmrk_equip::rpc::theme_names::<Runtime>(base_id);358359 #[cfg(not(feature = "rmrk"))]360 return unsupported!();361 }362363 #[allow(unused_variables)]364 fn theme(365 base_id: RmrkBaseId,366 theme_name: RmrkThemeName,367 filter_keys: Option<Vec<RmrkPropertyKey>>368 ) -> Result<Option<RmrkTheme>, DispatchError> {369 #[cfg(feature = "rmrk")]370 return pallet_proxy_rmrk_equip::rpc::theme::<Runtime>(base_id, theme_name, filter_keys);371372 #[cfg(not(feature = "rmrk"))]373 return unsupported!();374 }375 }376377 impl sp_api::Core<Block> for Runtime {378 fn version() -> RuntimeVersion {379 VERSION380 }381382 fn execute_block(block: Block) {383 Executive::execute_block(block)384 }385386 fn initialize_block(header: &<Block as BlockT>::Header) {387 Executive::initialize_block(header)388 }389 }390391 impl sp_api::Metadata<Block> for Runtime {392 fn metadata() -> OpaqueMetadata {393 OpaqueMetadata::new(Runtime::metadata().into())394 }395 }396397 impl sp_block_builder::BlockBuilder<Block> for Runtime {398 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {399 Executive::apply_extrinsic(extrinsic)400 }401402 fn finalize_block() -> <Block as BlockT>::Header {403 Executive::finalize_block()404 }405406 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {407 data.create_extrinsics()408 }409410 fn check_inherents(411 block: Block,412 data: sp_inherents::InherentData,413 ) -> sp_inherents::CheckInherentsResult {414 data.check_extrinsics(&block)415 }416417 // fn random_seed() -> <Block as BlockT>::Hash {418 // RandomnessCollectiveFlip::random_seed().0419 // }420 }421422 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {423 fn validate_transaction(424 source: TransactionSource,425 tx: <Block as BlockT>::Extrinsic,426 hash: <Block as BlockT>::Hash,427 ) -> TransactionValidity {428 Executive::validate_transaction(source, tx, hash)429 }430 }431432 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {433 fn offchain_worker(header: &<Block as BlockT>::Header) {434 Executive::offchain_worker(header)435 }436 }437438 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {439 fn chain_id() -> u64 {440 <Runtime as pallet_evm::Config>::ChainId::get()441 }442443 fn account_basic(address: H160) -> EVMAccount {444 let (account, _) = EVM::account_basic(&address);445 account446 }447448 fn gas_price() -> U256 {449 let (price, _) = <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price();450 price451 }452453 fn account_code_at(address: H160) -> Vec<u8> {454 EVM::account_codes(address)455 }456457 fn author() -> H160 {458 <pallet_evm::Pallet<Runtime>>::find_author()459 }460461 fn storage_at(address: H160, index: U256) -> H256 {462 let mut tmp = [0u8; 32];463 index.to_big_endian(&mut tmp);464 EVM::account_storages(address, H256::from_slice(&tmp[..]))465 }466467 #[allow(clippy::redundant_closure)]468 fn call(469 from: H160,470 to: H160,471 data: Vec<u8>,472 value: U256,473 gas_limit: U256,474 max_fee_per_gas: Option<U256>,475 max_priority_fee_per_gas: Option<U256>,476 nonce: Option<U256>,477 estimate: bool,478 access_list: Option<Vec<(H160, Vec<H256>)>>,479 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {480 let config = if estimate {481 let mut config = <Runtime as pallet_evm::Config>::config().clone();482 config.estimate = true;483 Some(config)484 } else {485 None486 };487488 let is_transactional = false;489 <Runtime as pallet_evm::Config>::Runner::call(490 CrossAccountId::from_eth(from),491 to,492 data,493 value,494 gas_limit.low_u64(),495 max_fee_per_gas,496 max_priority_fee_per_gas,497 nonce,498 access_list.unwrap_or_default(),499 is_transactional,500 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),501 ).map_err(|err| err.error.into())502 }503504 #[allow(clippy::redundant_closure)]505 fn create(506 from: H160,507 data: Vec<u8>,508 value: U256,509 gas_limit: U256,510 max_fee_per_gas: Option<U256>,511 max_priority_fee_per_gas: Option<U256>,512 nonce: Option<U256>,513 estimate: bool,514 access_list: Option<Vec<(H160, Vec<H256>)>>,515 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {516 let config = if estimate {517 let mut config = <Runtime as pallet_evm::Config>::config().clone();518 config.estimate = true;519 Some(config)520 } else {521 None522 };523524 let is_transactional = false;525 <Runtime as pallet_evm::Config>::Runner::create(526 CrossAccountId::from_eth(from),527 data,528 value,529 gas_limit.low_u64(),530 max_fee_per_gas,531 max_priority_fee_per_gas,532 nonce,533 access_list.unwrap_or_default(),534 is_transactional,535 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),536 ).map_err(|err| err.error.into())537 }538539 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {540 Ethereum::current_transaction_statuses()541 }542543 fn current_block() -> Option<pallet_ethereum::Block> {544 Ethereum::current_block()545 }546547 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {548 Ethereum::current_receipts()549 }550551 fn current_all() -> (552 Option<pallet_ethereum::Block>,553 Option<Vec<pallet_ethereum::Receipt>>,554 Option<Vec<TransactionStatus>>555 ) {556 (557 Ethereum::current_block(),558 Ethereum::current_receipts(),559 Ethereum::current_transaction_statuses()560 )561 }562563 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {564 xts.into_iter().filter_map(|xt| match xt.0.function {565 Call::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),566 _ => None567 }).collect()568 }569570 fn elasticity() -> Option<Permill> {571 None572 }573 }574575 impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {576 fn convert_transaction(transaction: pallet_ethereum::Transaction) -> <Block as BlockT>::Extrinsic {577 UncheckedExtrinsic::new_unsigned(578 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),579 )580 }581 }582583 impl sp_session::SessionKeys<Block> for Runtime {584 fn decode_session_keys(585 encoded: Vec<u8>,586 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {587 SessionKeys::decode_into_raw_public_keys(&encoded)588 }589590 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {591 SessionKeys::generate(seed)592 }593 }594595 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {596 fn slot_duration() -> sp_consensus_aura::SlotDuration {597 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())598 }599600 fn authorities() -> Vec<AuraId> {601 Aura::authorities().to_vec()602 }603 }604605 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {606 fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {607 ParachainSystem::collect_collation_info(header)608 }609 }610611 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {612 fn account_nonce(account: AccountId) -> Index {613 System::account_nonce(account)614 }615 }616617 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {618 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {619 TransactionPayment::query_info(uxt, len)620 }621 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {622 TransactionPayment::query_fee_details(uxt, len)623 }624 }625626 /*627 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>628 for Runtime629 {630 fn call(631 origin: AccountId,632 dest: AccountId,633 value: Balance,634 gas_limit: u64,635 input_data: Vec<u8>,636 ) -> pallet_contracts_primitives::ContractExecResult {637 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)638 }639640 fn instantiate(641 origin: AccountId,642 endowment: Balance,643 gas_limit: u64,644 code: pallet_contracts_primitives::Code<Hash>,645 data: Vec<u8>,646 salt: Vec<u8>,647 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>648 {649 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)650 }651652 fn get_storage(653 address: AccountId,654 key: [u8; 32],655 ) -> pallet_contracts_primitives::GetStorageResult {656 Contracts::get_storage(address, key)657 }658659 fn rent_projection(660 address: AccountId,661 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {662 Contracts::rent_projection(address)663 }664 }665 */666667 #[cfg(feature = "runtime-benchmarks")]668 impl frame_benchmarking::Benchmark<Block> for Runtime {669 fn benchmark_metadata(extra: bool) -> (670 Vec<frame_benchmarking::BenchmarkList>,671 Vec<frame_support::traits::StorageInfo>,672 ) {673 use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};674 use frame_support::traits::StorageInfoTrait;675676 let mut list = Vec::<BenchmarkList>::new();677678 list_benchmark!(list, extra, pallet_evm_migration, EvmMigration);679 list_benchmark!(list, extra, pallet_common, Common);680 list_benchmark!(list, extra, pallet_unique, Unique);681 list_benchmark!(list, extra, pallet_structure, Structure);682 list_benchmark!(list, extra, pallet_inflation, Inflation);683 list_benchmark!(list, extra, pallet_app_promotion, AppPromotion);684 list_benchmark!(list, extra, pallet_fungible, Fungible);685 list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);686687 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]688 list_benchmark!(list, extra, pallet_refungible, Refungible);689690 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]691 list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);692693 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]694 list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore);695696 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]697 list_benchmark!(list, extra, pallet_proxy_rmrk_equip, RmrkEquip);698699 // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);700701 let storage_info = AllPalletsReversedWithSystemFirst::storage_info();702703 return (list, storage_info)704 }705706 fn dispatch_benchmark(707 config: frame_benchmarking::BenchmarkConfig708 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {709 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};710711 let allowlist: Vec<TrackedStorageKey> = vec![712 // Total Issuance713 hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),714715 // Block Number716 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),717 // Execution Phase718 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),719 // Event Count720 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),721 // System Events722 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),723724 // Evm CurrentLogs725 hex_literal::hex!("1da53b775b270400e7e61ed5cbc5a146547f210cec367e9af919603343b9cb56").to_vec().into(),726727 // Transactional depth728 hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),729 ];730731 let mut batches = Vec::<BenchmarkBatch>::new();732 let params = (&config, &allowlist);733734 add_benchmark!(params, batches, pallet_evm_migration, EvmMigration);735 add_benchmark!(params, batches, pallet_common, Common);736 add_benchmark!(params, batches, pallet_unique, Unique);737 add_benchmark!(params, batches, pallet_structure, Structure);738 add_benchmark!(params, batches, pallet_inflation, Inflation);739 add_benchmark!(params, batches, pallet_app_promotion, AppPromotion);740 add_benchmark!(params, batches, pallet_fungible, Fungible);741 add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);742743 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]744 add_benchmark!(params, batches, pallet_refungible, Refungible);745746 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]747 add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);748749 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]750 add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);751752 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]753 add_benchmark!(params, batches, pallet_proxy_rmrk_equip, RmrkEquip);754755 // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);756757 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }758 Ok(batches)759 }760 }761762 #[cfg(feature = "try-runtime")]763 impl frame_try_runtime::TryRuntime<Block> for Runtime {764 fn on_runtime_upgrade() -> (frame_support::pallet_prelude::Weight, frame_support::pallet_prelude::Weight) {765 log::info!("try-runtime::on_runtime_upgrade unique-chain.");766 let weight = Executive::try_runtime_upgrade().unwrap();767 (weight, crate::config::substrate::RuntimeBlockWeights::get().max_block)768 }769770 fn execute_block_no_check(block: Block) -> frame_support::pallet_prelude::Weight {771 Executive::execute_block_no_check(block)772 }773 }774 }775 }776}tests/src/interfaces/appPromotion/definitions.tsdiffbeforeafterboth--- a/tests/src/interfaces/appPromotion/definitions.ts
+++ b/tests/src/interfaces/appPromotion/definitions.ts
@@ -22,9 +22,6 @@
const CROSS_ACCOUNT_ID_TYPE = 'PalletEvmAccountBasicCrossAccountIdRepr';
-const collectionParam = {name: 'collection', type: 'u32'};
-const tokenParam = {name: 'tokenId', type: 'u32'};
-const propertyKeysParam = {name: 'propertyKeys', type: 'Vec<String>', isOptional: true};
const crossAccountParam = (name = 'account') => ({name, type: CROSS_ACCOUNT_ID_TYPE});
const atParam = {name: 'at', type: 'Hash', isOptional: true};
@@ -46,11 +43,6 @@
'Returns the total amount of staked tokens per block when staked',
[crossAccountParam('staker')],
'Vec<(u32, u128)>',
- ),
- totalStakingLocked: fun(
- 'Return the total amount locked by staking tokens',
- [crossAccountParam('staker')],
- 'u128',
),
pendingUnstake: fun(
'Returns the total amount of unstaked tokens',
tests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -52,10 +52,6 @@
* Returns the total amount of staked tokens per block when staked
**/
totalStakedPerBlock: AugmentedRpc<(staker: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<ITuple<[u32, u128]>>>>;
- /**
- * Return the total amount locked by staking tokens
- **/
- totalStakingLocked: AugmentedRpc<(staker: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
};
author: {
/**