git.delta.rocks / unique-network / refs/commits / 0525582f3c41

412	}412	}
413}413}
414414
415pub struct Unique<C, P> {415macro_rules! define_struct_for_server_api {
416	client: Arc<C>,416	($name:ident) => {
417	_marker: std::marker::PhantomData<P>,417		pub struct $name<C, P> {
418}418			client: Arc<C>,
419419			_marker: std::marker::PhantomData<P>,
420		}
421		
420impl<C, P> Unique<C, P> {422		impl<C, P> $name<C, P> {
421	pub fn new(client: Arc<C>) -> Self {423			pub fn new(client: Arc<C>) -> Self {
422		Self {424				Self {
423			client,425					client,
424			_marker: Default::default(),426					_marker: Default::default(),
425		}427				}
426	}428			}
427}429		}
428430	};
429pub struct AppPromotion<C, P> {431}
430	client: Arc<C>,432
431	_marker: std::marker::PhantomData<P>,433define_struct_for_server_api!(Unique);
432}
433
434impl<C, P> AppPromotion<C, P> {434define_struct_for_server_api!(AppPromotion);
435	pub fn new(client: Arc<C>) -> Self {
436		Self {
437			client,
438			_marker: Default::default(),
439		}
440	}
441}
442
443pub struct Rmrk<C, P> {
444	client: Arc<C>,
445	_marker: std::marker::PhantomData<P>,
446}
447
448impl<C, P> Rmrk<C, P> {435define_struct_for_server_api!(Rmrk);
449	pub fn new(client: Arc<C>) -> Self {
450		Self {
451			client,
452			_marker: Default::default(),
453		}
454	}
455}
456436
457macro_rules! pass_method {437macro_rules! pass_method {
458	(438	(
605		|v| v585		|v| v
606		.into_iter()586		.into_iter()
607		.map(|(b, a)| (b, a.to_string()))587		.map(|(b, a)| (b, a.to_string()))
608		.collect::<Vec<_>>(), unique_api);588		.collect::<Vec<_>>(), app_promotion_api);
609	pass_method!(total_staking_locked(staker: CrossAccountId) -> String => |v| v.to_string(), unique_api);589	pass_method!(total_staking_locked(staker: CrossAccountId) -> String => |v| v.to_string(), app_promotion_api);
610	pass_method!(pending_unstake(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), unique_api);590	pass_method!(pending_unstake(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), app_promotion_api);
611	pass_method!(pending_unstake_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>591	pass_method!(pending_unstake_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>
612		|v| v592		|v| v
613		.into_iter()593		.into_iter()
614		.map(|(b, a)| (b, a.to_string()))594		.map(|(b, a)| (b, a.to_string()))
615		.collect::<Vec<_>>(), unique_api);595		.collect::<Vec<_>>(), app_promotion_api);
616}596}
617597
618#[allow(deprecated)]598#[allow(deprecated)]

--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -38,7 +38,6 @@
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sc_service::TransactionPool;
-use uc_rpc::AppPromotion;
 use std::{collections::BTreeMap, sync::Arc};
 
 use up_common::types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};
@@ -232,7 +231,7 @@
 
 	io.merge(Unique::new(client.clone()).into_rpc())?;
 
-	// #[cfg(not(feature = "unique-runtime"))]
+	#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
 	io.merge(AppPromotion::new(client.clone()).into_rpc())?;
 
 	#[cfg(not(feature = "unique-runtime"))]

--- a/tests/src/interfaces/augment-api-query.ts
+++ b/tests/src/interfaces/augment-api-query.ts
@@ -6,7 +6,7 @@
 import '@polkadot/api-base/types/storage';
 
 import type { ApiTypes, AugmentedQuery, QueryableStorageEntry } from '@polkadot/api-base/types';
-import type { BTreeMap, Bytes, Option, U256, U8aFixed, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types-codec';
+import type { BTreeMap, Bytes, Option, U256, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
 import type { AccountId32, H160, H256 } from '@polkadot/types/interfaces/runtime';
 import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueQueueConfigData, EthereumBlock, EthereumLog, EthereumReceiptReceiptV3, EthereumTransactionTransactionV2, FpRpcTransactionStatus, FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmContractHelpersSponsoringModeT, PalletNonfungibleItemData, PalletRefungibleItemData, PalletTransactionPaymentReleases, PalletTreasuryProposal, PalletUniqueSchedulerScheduledV3, PhantomTypeUpDataStructs, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, UpDataStructsCollection, UpDataStructsCollectionStats, UpDataStructsProperties, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild } from '@polkadot/types/lookup';
@@ -513,10 +513,10 @@
     promotion: {
       admin: AugmentedQuery<ApiType, () => Observable<Option<AccountId32>>, []> & QueryableStorageEntry<ApiType, []>;
       /**
-       * Stores the address of the staker for which the last revenue recalculation was performed.
+       * Stores hash a record for which the last revenue recalculation was performed.
        * If `None`, then recalculation has not yet been performed or calculations have been completed for all stakers.
        **/
-      lastCalcucaltedStaker: AugmentedQuery<ApiType, () => Observable<Option<AccountId32>>, []> & QueryableStorageEntry<ApiType, []>;
+      nextCalculatedRecord: AugmentedQuery<ApiType, () => Observable<Option<ITuple<[AccountId32, u32]>>>, []> & QueryableStorageEntry<ApiType, []>;
       /**
        * Next target block when interest is recalculated
        **/
@@ -530,6 +530,10 @@
        **/
       staked: AugmentedQuery<ApiType, (arg1: AccountId32 | string | Uint8Array, arg2: u32 | AnyNumber | Uint8Array) => Observable<ITuple<[u128, u32]>>, [AccountId32, u32]> & QueryableStorageEntry<ApiType, [AccountId32, u32]>;
       /**
+       * Amount of stakes for an Account
+       **/
+      stakesPerAccount: AugmentedQuery<ApiType, (arg: AccountId32 | string | Uint8Array) => Observable<u8>, [AccountId32]> & QueryableStorageEntry<ApiType, [AccountId32]>;
+      /**
        * A block when app-promotion has started .I think this is redundant, because we only need `NextInterestBlock`.
        **/
       startBlock: AugmentedQuery<ApiType, () => Observable<u32>, []> & QueryableStorageEntry<ApiType, []>;