git.delta.rocks / unique-network / refs/commits / 1cbdff92adea

difftreelog

refactor add up-common

Daniel Shiposha2022-08-11parent: #7a36e4c.patch.diff
in: master

28 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1128,18 +1128,6 @@
 ]
 
 [[package]]
-name = "common-types"
-version = "0.9.24"
-dependencies = [
- "fp-rpc",
- "pallet-evm",
- "sp-consensus-aura",
- "sp-core",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
 name = "concurrent-queue"
 version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5294,7 +5282,6 @@
 name = "opal-runtime"
 version = "0.9.24"
 dependencies = [
- "common-types",
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -5366,6 +5353,7 @@
  "sp-transaction-pool",
  "sp-version",
  "substrate-wasm-builder",
+ "up-common",
  "up-data-structs",
  "up-rpc",
  "up-sponsorship",
@@ -8610,7 +8598,6 @@
 name = "quartz-runtime"
 version = "0.9.24"
 dependencies = [
- "common-types",
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -8682,6 +8669,7 @@
  "sp-transaction-pool",
  "sp-version",
  "substrate-wasm-builder",
+ "up-common",
  "up-data-structs",
  "up-rpc",
  "up-sponsorship",
@@ -11897,7 +11885,6 @@
 name = "tests"
 version = "0.1.0"
 dependencies = [
- "common-types",
  "evm-coder",
  "fp-evm-mapping",
  "frame-support",
@@ -12480,7 +12467,6 @@
 version = "0.9.24"
 dependencies = [
  "clap",
- "common-types",
  "cumulus-client-cli",
  "cumulus-client-collator",
  "cumulus-client-consensus-aura",
@@ -12559,6 +12545,7 @@
  "try-runtime-cli",
  "unique-rpc",
  "unique-runtime",
+ "up-common",
  "up-data-structs",
  "up-rpc",
 ]
@@ -12567,7 +12554,6 @@
 name = "unique-rpc"
 version = "0.1.0"
 dependencies = [
- "common-types",
  "fc-db",
  "fc-mapping-sync",
  "fc-rpc",
@@ -12608,6 +12594,7 @@
  "substrate-frame-rpc-system",
  "tokio 0.2.25",
  "uc-rpc",
+ "up-common",
  "up-data-structs",
  "up-rpc",
 ]
@@ -12616,7 +12603,6 @@
 name = "unique-runtime"
 version = "0.9.24"
 dependencies = [
- "common-types",
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -12688,6 +12674,7 @@
  "sp-transaction-pool",
  "sp-version",
  "substrate-wasm-builder",
+ "up-common",
  "up-data-structs",
  "up-rpc",
  "up-sponsorship",
@@ -12725,6 +12712,19 @@
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
+name = "up-common"
+version = "0.9.24"
+dependencies = [
+ "fp-rpc",
+ "frame-support",
+ "pallet-evm",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
 name = "up-data-structs"
 version = "0.2.1"
 dependencies = [
deletedcommon-types/Cargo.tomldiffbeforeafterboth
--- a/common-types/Cargo.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-[package]
-authors = ['Unique Network <support@uniquenetwork.io>']
-description = 'Unique Runtime Common'
-edition = '2021'
-homepage = 'https://unique.network'
-license = 'All Rights Reserved'
-name = 'common-types'
-repository = 'https://github.com/UniqueNetwork/unique-chain'
-version = '0.9.24'
-
-[features]
-default = ['std']
-std = [
-    'sp-std/std',
-    'sp-runtime/std',
-    'sp-core/std',
-    'sp-consensus-aura/std',
-    'fp-rpc/std',
-    'pallet-evm/std',
-]
-
-[dependencies.sp-std]
-default-features = false
-git = "https://github.com/paritytech/substrate"
-branch = "polkadot-v0.9.24"
-
-[dependencies.sp-runtime]
-default-features = false
-git = "https://github.com/paritytech/substrate"
-branch = "polkadot-v0.9.24"
-
-[dependencies.sp-core]
-default-features = false
-git = "https://github.com/paritytech/substrate"
-branch = "polkadot-v0.9.24"
-
-[dependencies.sp-consensus-aura]
-default-features = false
-git = "https://github.com/paritytech/substrate"
-branch = "polkadot-v0.9.24"
-
-[dependencies.fp-rpc]
-default-features = false
-git = "https://github.com/uniquenetwork/frontier"
-branch = "unique-polkadot-v0.9.24"
-
-[dependencies.pallet-evm]
-default-features = false
-git = "https://github.com/uniquenetwork/frontier"
-branch = "unique-polkadot-v0.9.24"
deletedcommon-types/src/lib.rsdiffbeforeafterboth
--- a/common-types/src/lib.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2019-2022 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/>.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use sp_runtime::{
-	generic,
-	traits::{Verify, IdentifyAccount},
-	MultiSignature,
-};
-
-/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
-/// the specifics of the runtime. They can then be made to be agnostic over specific formats
-/// of data like extrinsics, allowing for them to continue syncing the network through upgrades
-/// to even the core data structures.
-pub mod opaque {
-	pub use sp_runtime::{generic, traits::BlakeTwo256, OpaqueExtrinsic as UncheckedExtrinsic};
-
-	pub use super::{BlockNumber, Signature, AccountId, Balance, Index, Hash, AuraId};
-
-	/// Opaque block header type.
-	pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
-
-	/// Opaque block type.
-	pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-
-	pub trait RuntimeInstance {
-		type CrossAccountId: pallet_evm::account::CrossAccountId<sp_runtime::AccountId32>
-			+ Send
-			+ Sync
-			+ 'static;
-
-		type TransactionConverter: fp_rpc::ConvertTransaction<UncheckedExtrinsic>
-			+ Send
-			+ Sync
-			+ 'static;
-
-		fn get_transaction_converter() -> Self::TransactionConverter;
-	}
-}
-
-pub type SessionHandlers = ();
-
-/// An index to a block.
-pub type BlockNumber = u32;
-
-/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = MultiSignature;
-
-/// Some way of identifying an account on the chain. We intentionally make it equivalent
-/// to the public key of our transaction signing scheme.
-pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;
-
-/// The type for looking up accounts. We don't expect more than 4 billion of them, but you
-/// never know...
-pub type AccountIndex = u32;
-
-/// Balance of an account.
-pub type Balance = u128;
-
-/// Index of a transaction in the chain.
-pub type Index = u32;
-
-/// A hash of some data used by the chain.
-pub type Hash = sp_core::H256;
-
-/// Digest item type.
-pub type DigestItem = generic::DigestItem;
-
-pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
modifiednode/cli/Cargo.tomldiffbeforeafterboth
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -253,8 +253,8 @@
 ################################################################################
 # Local dependencies
 
-[dependencies.common-types]
-path = "../../common-types"
+[dependencies.up-common]
+path = "../../primitives/common"
 
 [dependencies.unique-runtime]
 path = '../../runtime/unique'
modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -23,7 +23,7 @@
 use serde::{Deserialize, Serialize};
 use serde_json::map::Map;
 
-use common_types::opaque::*;
+use up_common::types::opaque::*;
 
 #[cfg(feature = "unique-runtime")]
 pub use unique_runtime as default_runtime;
modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -64,7 +64,7 @@
 use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
 use std::{io::Write, net::SocketAddr, time::Duration};
 
-use common_types::opaque::Block;
+use up_common::types::opaque::Block;
 
 macro_rules! no_runtime_err {
 	($chain_name:expr) => {
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -63,7 +63,7 @@
 use fc_rpc_core::types::FilterPool;
 use fc_mapping_sync::{MappingSyncWorker, SyncStrategy};
 
-use common_types::opaque::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};
+use up_common::types::opaque::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};
 
 // RMRK
 use up_data_structs::{
modifiednode/rpc/Cargo.tomldiffbeforeafterboth
--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -49,7 +49,7 @@
 fc-mapping-sync = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }
 
 pallet-common = { default-features = false, path = "../../pallets/common" }
-common-types = { path = "../../common-types" }
+up-common = { path = "../../primitives/common" }
 pallet-unique = { path = "../../pallets/unique" }
 uc-rpc = { path = "../../client/rpc" }
 up-rpc = { path = "../../primitives/rpc" }
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
before · node/rpc/src/lib.rs
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/>.1617use sp_runtime::traits::BlakeTwo256;18use fc_rpc::{19	EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,20	StorageOverride, SchemaV2Override, SchemaV3Override,21};22use jsonrpsee::RpcModule;23use fc_rpc_core::types::{FilterPool, FeeHistoryCache};24use fp_storage::EthereumStorageSchema;25use sc_client_api::{26	backend::{AuxStore, StorageProvider},27	client::BlockchainEvents,28	StateBackend, Backend,29};30use sc_finality_grandpa::{31	FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,32};33use sc_network::NetworkService;34use sc_rpc::SubscriptionTaskExecutor;35pub use sc_rpc_api::DenyUnsafe;36use sc_transaction_pool::{ChainApi, Pool};37use sp_api::ProvideRuntimeApi;38use sp_block_builder::BlockBuilder;39use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};40use sc_service::TransactionPool;41use std::{collections::BTreeMap, sync::Arc};4243use common_types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};4445// RMRK46use up_data_structs::{47	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,48	RmrkPartType, RmrkTheme,49};5051/// Extra dependencies for GRANDPA52pub struct GrandpaDeps<B> {53	/// Voting round info.54	pub shared_voter_state: SharedVoterState,55	/// Authority set info.56	pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,57	/// Receives notifications about justification events from Grandpa.58	pub justification_stream: GrandpaJustificationStream<Block>,59	/// Executor to drive the subscription manager in the Grandpa RPC handler.60	pub subscription_executor: SubscriptionTaskExecutor,61	/// Finality proof provider.62	pub finality_provider: Arc<FinalityProofProvider<B, Block>>,63}6465/// Full client dependencies.66pub struct FullDeps<C, P, SC, CA: ChainApi> {67	/// The client instance to use.68	pub client: Arc<C>,69	/// Transaction pool instance.70	pub pool: Arc<P>,71	/// Graph pool instance.72	pub graph: Arc<Pool<CA>>,73	/// The SelectChain Strategy74	pub select_chain: SC,75	/// The Node authority flag76	pub is_authority: bool,77	/// Whether to enable dev signer78	pub enable_dev_signer: bool,79	/// Network service80	pub network: Arc<NetworkService<Block, Hash>>,81	/// Whether to deny unsafe calls82	pub deny_unsafe: DenyUnsafe,83	/// EthFilterApi pool.84	pub filter_pool: Option<FilterPool>,85	/// Backend.86	pub backend: Arc<fc_db::Backend<Block>>,87	/// Maximum number of logs in a query.88	pub max_past_logs: u32,89	/// Maximum fee history cache size.90	pub fee_history_limit: u64,91	/// Fee history cache.92	pub fee_history_cache: FeeHistoryCache,93	/// Cache for Ethereum block data.94	pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,95}9697pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>98where99	C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,100	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,101	C: Send + Sync + 'static,102	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,103	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,104	BE: Backend<Block> + 'static,105	BE::State: StateBackend<BlakeTwo256>,106	R: RuntimeInstance + Send + Sync + 'static,107{108	let mut overrides_map = BTreeMap::new();109	overrides_map.insert(110		EthereumStorageSchema::V1,111		Box::new(SchemaV1Override::new(client.clone()))112			as Box<dyn StorageOverride<_> + Send + Sync>,113	);114	overrides_map.insert(115		EthereumStorageSchema::V2,116		Box::new(SchemaV2Override::new(client.clone()))117			as Box<dyn StorageOverride<_> + Send + Sync>,118	);119	overrides_map.insert(120		EthereumStorageSchema::V3,121		Box::new(SchemaV3Override::new(client.clone()))122			as Box<dyn StorageOverride<_> + Send + Sync>,123	);124125	Arc::new(OverrideHandle {126		schemas: overrides_map,127		fallback: Box::new(RuntimeApiStorageOverride::new(client)),128	})129}130131/// Instantiate all Full RPC extensions.132pub fn create_full<C, P, SC, CA, R, A, B>(133	deps: FullDeps<C, P, SC, CA>,134	subscription_task_executor: SubscriptionTaskExecutor,135) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>136where137	C: ProvideRuntimeApi<Block> + StorageProvider<Block, B> + AuxStore,138	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,139	C: Send + Sync + 'static,140	C: BlockchainEvents<Block>,141	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,142	C::Api: BlockBuilder<Block>,143	// C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,144	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,145	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,146	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,147	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,148	C::Api: rmrk_rpc::RmrkApi<149		Block,150		AccountId,151		RmrkCollectionInfo<AccountId>,152		RmrkInstanceInfo<AccountId>,153		RmrkResourceInfo,154		RmrkPropertyInfo,155		RmrkBaseInfo<AccountId>,156		RmrkPartType,157		RmrkTheme,158	>,159	B: sc_client_api::Backend<Block> + Send + Sync + 'static,160	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,161	P: TransactionPool<Block = Block> + 'static,162	CA: ChainApi<Block = Block> + 'static,163	R: RuntimeInstance + Send + Sync + 'static,164	<R as RuntimeInstance>::CrossAccountId: serde::Serialize,165	for<'de> <R as RuntimeInstance>::CrossAccountId: serde::Deserialize<'de>,166{167	use fc_rpc::{168		Eth, EthApiServer, EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub,169		EthPubSubApiServer, EthSigner, Net, NetApiServer, Web3, Web3ApiServer,170	};171	use uc_rpc::{UniqueApiServer, Unique};172173	#[cfg(not(feature = "unique-runtime"))]174	use uc_rpc::{RmrkApiServer, Rmrk};175176	// use pallet_contracts_rpc::{Contracts, ContractsApi};177	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};178	use substrate_frame_rpc_system::{System, SystemApiServer};179180	let mut io = RpcModule::new(());181	let FullDeps {182		client,183		pool,184		graph,185		select_chain: _,186		fee_history_limit,187		fee_history_cache,188		block_data_cache,189		enable_dev_signer,190		is_authority,191		network,192		deny_unsafe,193		filter_pool,194		backend,195		max_past_logs,196	} = deps;197198	io.merge(System::new(Arc::clone(&client), Arc::clone(&pool), deny_unsafe).into_rpc())?;199	io.merge(TransactionPayment::new(Arc::clone(&client)).into_rpc())?;200201	// io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));202203	let mut signers = Vec::new();204	if enable_dev_signer {205		signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);206	}207208	let overrides = overrides_handle::<_, _, R>(client.clone());209210	io.merge(211		Eth::new(212			client.clone(),213			pool.clone(),214			graph,215			Some(<R as RuntimeInstance>::get_transaction_converter()),216			network.clone(),217			signers,218			overrides.clone(),219			backend.clone(),220			is_authority,221			block_data_cache.clone(),222			fee_history_cache,223			fee_history_limit,224		)225		.into_rpc(),226	)?;227228	io.merge(Unique::new(client.clone()).into_rpc())?;229230	#[cfg(not(feature = "unique-runtime"))]231	io.merge(Rmrk::new(client.clone()).into_rpc())?;232233	if let Some(filter_pool) = filter_pool {234		io.merge(235			EthFilter::new(236				client.clone(),237				backend,238				filter_pool,239				500_usize, // max stored filters240				max_past_logs,241				block_data_cache,242			)243			.into_rpc(),244		)?;245	}246247	io.merge(248		Net::new(249			client.clone(),250			network.clone(),251			// Whether to format the `peer_count` response as Hex (default) or not.252			true,253		)254		.into_rpc(),255	)?;256257	io.merge(Web3::new(client.clone()).into_rpc())?;258259	io.merge(260		EthPubSub::new(pool, client, network, subscription_task_executor, overrides).into_rpc(),261	)?;262263	Ok(io)264}
after · node/rpc/src/lib.rs
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/>.1617use sp_runtime::traits::BlakeTwo256;18use fc_rpc::{19	EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,20	StorageOverride, SchemaV2Override, SchemaV3Override,21};22use jsonrpsee::RpcModule;23use fc_rpc_core::types::{FilterPool, FeeHistoryCache};24use fp_storage::EthereumStorageSchema;25use sc_client_api::{26	backend::{AuxStore, StorageProvider},27	client::BlockchainEvents,28	StateBackend, Backend,29};30use sc_finality_grandpa::{31	FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,32};33use sc_network::NetworkService;34use sc_rpc::SubscriptionTaskExecutor;35pub use sc_rpc_api::DenyUnsafe;36use sc_transaction_pool::{ChainApi, Pool};37use sp_api::ProvideRuntimeApi;38use sp_block_builder::BlockBuilder;39use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};40use sc_service::TransactionPool;41use std::{collections::BTreeMap, sync::Arc};4243use up_common::types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};4445// RMRK46use up_data_structs::{47	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,48	RmrkPartType, RmrkTheme,49};5051/// Extra dependencies for GRANDPA52pub struct GrandpaDeps<B> {53	/// Voting round info.54	pub shared_voter_state: SharedVoterState,55	/// Authority set info.56	pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,57	/// Receives notifications about justification events from Grandpa.58	pub justification_stream: GrandpaJustificationStream<Block>,59	/// Executor to drive the subscription manager in the Grandpa RPC handler.60	pub subscription_executor: SubscriptionTaskExecutor,61	/// Finality proof provider.62	pub finality_provider: Arc<FinalityProofProvider<B, Block>>,63}6465/// Full client dependencies.66pub struct FullDeps<C, P, SC, CA: ChainApi> {67	/// The client instance to use.68	pub client: Arc<C>,69	/// Transaction pool instance.70	pub pool: Arc<P>,71	/// Graph pool instance.72	pub graph: Arc<Pool<CA>>,73	/// The SelectChain Strategy74	pub select_chain: SC,75	/// The Node authority flag76	pub is_authority: bool,77	/// Whether to enable dev signer78	pub enable_dev_signer: bool,79	/// Network service80	pub network: Arc<NetworkService<Block, Hash>>,81	/// Whether to deny unsafe calls82	pub deny_unsafe: DenyUnsafe,83	/// EthFilterApi pool.84	pub filter_pool: Option<FilterPool>,85	/// Backend.86	pub backend: Arc<fc_db::Backend<Block>>,87	/// Maximum number of logs in a query.88	pub max_past_logs: u32,89	/// Maximum fee history cache size.90	pub fee_history_limit: u64,91	/// Fee history cache.92	pub fee_history_cache: FeeHistoryCache,93	/// Cache for Ethereum block data.94	pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,95}9697pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>98where99	C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,100	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,101	C: Send + Sync + 'static,102	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,103	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,104	BE: Backend<Block> + 'static,105	BE::State: StateBackend<BlakeTwo256>,106	R: RuntimeInstance + Send + Sync + 'static,107{108	let mut overrides_map = BTreeMap::new();109	overrides_map.insert(110		EthereumStorageSchema::V1,111		Box::new(SchemaV1Override::new(client.clone()))112			as Box<dyn StorageOverride<_> + Send + Sync>,113	);114	overrides_map.insert(115		EthereumStorageSchema::V2,116		Box::new(SchemaV2Override::new(client.clone()))117			as Box<dyn StorageOverride<_> + Send + Sync>,118	);119	overrides_map.insert(120		EthereumStorageSchema::V3,121		Box::new(SchemaV3Override::new(client.clone()))122			as Box<dyn StorageOverride<_> + Send + Sync>,123	);124125	Arc::new(OverrideHandle {126		schemas: overrides_map,127		fallback: Box::new(RuntimeApiStorageOverride::new(client)),128	})129}130131/// Instantiate all Full RPC extensions.132pub fn create_full<C, P, SC, CA, R, A, B>(133	deps: FullDeps<C, P, SC, CA>,134	subscription_task_executor: SubscriptionTaskExecutor,135) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>136where137	C: ProvideRuntimeApi<Block> + StorageProvider<Block, B> + AuxStore,138	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,139	C: Send + Sync + 'static,140	C: BlockchainEvents<Block>,141	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,142	C::Api: BlockBuilder<Block>,143	// C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,144	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,145	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,146	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,147	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,148	C::Api: rmrk_rpc::RmrkApi<149		Block,150		AccountId,151		RmrkCollectionInfo<AccountId>,152		RmrkInstanceInfo<AccountId>,153		RmrkResourceInfo,154		RmrkPropertyInfo,155		RmrkBaseInfo<AccountId>,156		RmrkPartType,157		RmrkTheme,158	>,159	B: sc_client_api::Backend<Block> + Send + Sync + 'static,160	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,161	P: TransactionPool<Block = Block> + 'static,162	CA: ChainApi<Block = Block> + 'static,163	R: RuntimeInstance + Send + Sync + 'static,164	<R as RuntimeInstance>::CrossAccountId: serde::Serialize,165	for<'de> <R as RuntimeInstance>::CrossAccountId: serde::Deserialize<'de>,166{167	use fc_rpc::{168		Eth, EthApiServer, EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub,169		EthPubSubApiServer, EthSigner, Net, NetApiServer, Web3, Web3ApiServer,170	};171	use uc_rpc::{UniqueApiServer, Unique};172173	#[cfg(not(feature = "unique-runtime"))]174	use uc_rpc::{RmrkApiServer, Rmrk};175176	// use pallet_contracts_rpc::{Contracts, ContractsApi};177	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};178	use substrate_frame_rpc_system::{System, SystemApiServer};179180	let mut io = RpcModule::new(());181	let FullDeps {182		client,183		pool,184		graph,185		select_chain: _,186		fee_history_limit,187		fee_history_cache,188		block_data_cache,189		enable_dev_signer,190		is_authority,191		network,192		deny_unsafe,193		filter_pool,194		backend,195		max_past_logs,196	} = deps;197198	io.merge(System::new(Arc::clone(&client), Arc::clone(&pool), deny_unsafe).into_rpc())?;199	io.merge(TransactionPayment::new(Arc::clone(&client)).into_rpc())?;200201	// io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));202203	let mut signers = Vec::new();204	if enable_dev_signer {205		signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);206	}207208	let overrides = overrides_handle::<_, _, R>(client.clone());209210	io.merge(211		Eth::new(212			client.clone(),213			pool.clone(),214			graph,215			Some(<R as RuntimeInstance>::get_transaction_converter()),216			network.clone(),217			signers,218			overrides.clone(),219			backend.clone(),220			is_authority,221			block_data_cache.clone(),222			fee_history_cache,223			fee_history_limit,224		)225		.into_rpc(),226	)?;227228	io.merge(Unique::new(client.clone()).into_rpc())?;229230	#[cfg(not(feature = "unique-runtime"))]231	io.merge(Rmrk::new(client.clone()).into_rpc())?;232233	if let Some(filter_pool) = filter_pool {234		io.merge(235			EthFilter::new(236				client.clone(),237				backend,238				filter_pool,239				500_usize, // max stored filters240				max_past_logs,241				block_data_cache,242			)243			.into_rpc(),244		)?;245	}246247	io.merge(248		Net::new(249			client.clone(),250			network.clone(),251			// Whether to format the `peer_count` response as Hex (default) or not.252			true,253		)254		.into_rpc(),255	)?;256257	io.merge(Web3::new(client.clone()).into_rpc())?;258259	io.merge(260		EthPubSub::new(pool, client, network, subscription_task_executor, overrides).into_rpc(),261	)?;262263	Ok(io)264}
modifiedruntime/common/config/ethereum.rsdiffbeforeafterboth
--- a/runtime/common/config/ethereum.rs
+++ b/runtime/common/config/ethereum.rs
@@ -7,12 +7,13 @@
 use sp_runtime::{RuntimeAppPublic, Perbill};
 use crate::{
 	runtime_common::{
-		constants::*, dispatch::CollectionDispatchT, ethereum::sponsoring::EvmSponsorshipHandler,
+		dispatch::CollectionDispatchT, ethereum::sponsoring::EvmSponsorshipHandler,
 		config::sponsoring::DefaultSponsoringRateLimit, DealWithFees,
 	},
 	Runtime, Aura, Balances, Event, ChainId,
 };
 use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping};
+use up_common::constants::*;
 
 pub type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
modifiedruntime/common/config/orml.rsdiffbeforeafterboth
--- a/runtime/common/config/orml.rs
+++ b/runtime/common/config/orml.rs
@@ -16,8 +16,11 @@
 
 use frame_support::parameter_types;
 use frame_system::EnsureSigned;
-use crate::{runtime_common::constants::*, Runtime, Event, RelayChainBlockNumberProvider};
-use common_types::{AccountId, Balance};
+use crate::{Runtime, Event, RelayChainBlockNumberProvider};
+use up_common::{
+	types::{AccountId, Balance},
+	constants::*,
+};
 
 parameter_types! {
 	pub const MinVestedTransfer: Balance = 10 * UNIQUE;
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -18,7 +18,6 @@
 use sp_runtime::traits::AccountIdConversion;
 use crate::{
 	runtime_common::{
-		constants::*,
 		dispatch::CollectionDispatchT,
 		config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},
 		weights::CommonWeights,
@@ -26,7 +25,10 @@
 	},
 	Runtime, Event, Call, Balances,
 };
-use common_types::{AccountId, Balance, BlockNumber};
+use up_common::{
+	types::{AccountId, Balance, BlockNumber},
+	constants::*,
+};
 use up_data_structs::{
 	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
 };
modifiedruntime/common/config/pallets/scheduler.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/scheduler.rs
+++ b/runtime/common/config/pallets/scheduler.rs
@@ -22,7 +22,7 @@
 	runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},
 	Runtime, Call, Event, Origin, OriginCaller, Balances,
 };
-use common_types::AccountId;
+use up_common::types::AccountId;
 
 parameter_types! {
 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *
modifiedruntime/common/config/parachain.rsdiffbeforeafterboth
--- a/runtime/common/config/parachain.rs
+++ b/runtime/common/config/parachain.rs
@@ -15,7 +15,8 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{weights::Weight, parameter_types};
-use crate::{runtime_common::constants::*, Runtime, Event, XcmpQueue, DmpQueue};
+use crate::{Runtime, Event, XcmpQueue, DmpQueue};
+use up_common::constants::*;
 
 parameter_types! {
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
modifiedruntime/common/config/sponsoring.rsdiffbeforeafterboth
--- a/runtime/common/config/sponsoring.rs
+++ b/runtime/common/config/sponsoring.rs
@@ -16,10 +16,10 @@
 
 use frame_support::parameter_types;
 use crate::{
-	runtime_common::{constants::*, sponsoring::UniqueSponsorshipHandler},
+	runtime_common::{sponsoring::UniqueSponsorshipHandler},
 	Runtime,
 };
-use common_types::BlockNumber;
+use up_common::{types::BlockNumber, constants::*};
 
 parameter_types! {
 	pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
modifiedruntime/common/config/substrate.rsdiffbeforeafterboth
--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -35,10 +35,10 @@
 use sp_arithmetic::traits::{BaseArithmetic, Unsigned};
 use smallvec::smallvec;
 use crate::{
-	runtime_common::{DealWithFees, constants::*},
-	Runtime, Event, Call, Origin, PalletInfo, System, Balances, Treasury, SS58Prefix, Version,
+	runtime_common::DealWithFees, Runtime, Event, Call, Origin, PalletInfo, System, Balances,
+	Treasury, SS58Prefix, Version,
 };
-use common_types::*;
+use up_common::{types::*, constants::*};
 
 parameter_types! {
 	pub const BlockHashCount: BlockNumber = 2400;
modifiedruntime/common/config/xcm.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm.rs
+++ b/runtime/common/config/xcm.rs
@@ -44,10 +44,13 @@
 use xcm_executor::{Config, XcmExecutor, Assets};
 use sp_std::marker::PhantomData;
 use crate::{
-	runtime_common::{constants::*, config::substrate::LinearFee},
-	Runtime, Call, Event, Origin, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, XcmpQueue,
+	runtime_common::config::substrate::LinearFee, Runtime, Call, Event, Origin, Balances,
+	ParachainInfo, ParachainSystem, PolkadotXcm, XcmpQueue,
+};
+use up_common::{
+	types::{AccountId, Balance},
+	constants::*,
 };
-use common_types::{AccountId, Balance};
 
 parameter_types! {
 	pub const RelayLocation: MultiLocation = MultiLocation::parent();
modifiedruntime/common/constants.rsdiffbeforeafterboth
--- a/runtime/common/constants.rs
+++ b/runtime/common/constants.rs
@@ -19,7 +19,7 @@
 	parameter_types,
 	weights::{Weight, constants::WEIGHT_PER_SECOND},
 };
-use common_types::{BlockNumber, Balance};
+use up_common::types::{BlockNumber, Balance};
 
 pub const MILLISECS_PER_BLOCK: u64 = 12000;
modifiedruntime/common/instance.rsdiffbeforeafterboth
--- a/runtime/common/instance.rs
+++ b/runtime/common/instance.rs
@@ -4,7 +4,7 @@
 	},
 	Runtime,
 };
-use common_types::opaque::RuntimeInstance;
+use up_common::types::opaque::RuntimeInstance;
 
 impl RuntimeInstance for Runtime {
 	type CrossAccountId = CrossAccountId;
modifiedruntime/common/mod.rsdiffbeforeafterboth
--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -41,7 +41,7 @@
 	Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,
 	InherentDataExt,
 };
-use common_types::{AccountId, BlockNumber};
+use up_common::types::{AccountId, BlockNumber};
 
 #[macro_export]
 macro_rules! unsupported {
modifiedruntime/common/scheduler.rsdiffbeforeafterboth
--- a/runtime/common/scheduler.rs
+++ b/runtime/common/scheduler.rs
@@ -25,7 +25,7 @@
 	DispatchErrorWithPostInfo, DispatchError,
 };
 use crate::{Runtime, Call, Origin, Balances, ChargeTransactionPayment};
-use common_types::{AccountId, Balance};
+use up_common::types::{AccountId, Balance};
 use fp_self_contained::SelfContainedCall;
 use pallet_unique_scheduler::DispatchCall;
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -113,7 +113,7 @@
     'xcm/std',
     'xcm-builder/std',
     'xcm-executor/std',
-    'common-types/std',
+    'up-common/std',
     'rmrk-rpc/std',
     'evm-coder/std',
     'up-sponsorship/std',
@@ -403,7 +403,7 @@
 
 [dependencies]
 log = { version = "0.4.16", default-features = false }
-common-types = { path = "../../common-types", default-features = false }
+up-common = { path = "../../primitives/common", default-features = false }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -30,7 +30,7 @@
 use sp_version::RuntimeVersion;
 use sp_runtime::create_runtime_str;
 
-use common_types::*;
+use up_common::types::*;
 
 #[path = "../../common/mod.rs"]
 mod runtime_common;
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -113,7 +113,7 @@
     'xcm/std',
     'xcm-builder/std',
     'xcm-executor/std',
-    'common-types/std',
+    'up-common/std',
 
     "orml-vesting/std",
 ]
@@ -408,7 +408,7 @@
 
 [dependencies]
 log = { version = "0.4.16", default-features = false }
-common-types = { path = "../../common-types", default-features = false }
+up-common = { path = "../../primitives/common", default-features = false }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -30,7 +30,7 @@
 use sp_version::RuntimeVersion;
 use sp_runtime::create_runtime_str;
 
-use common_types::*;
+use up_common::types::*;
 
 #[path = "../../common/mod.rs"]
 mod runtime_common;
modifiedruntime/tests/Cargo.tomldiffbeforeafterboth
--- a/runtime/tests/Cargo.toml
+++ b/runtime/tests/Cargo.toml
@@ -42,6 +42,5 @@
 ] }
 scale-info = "*"
 
-common-types = { path = "../../common-types", default-features = false }
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
 up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.24' }
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -114,7 +114,7 @@
     'xcm/std',
     'xcm-builder/std',
     'xcm-executor/std',
-    'common-types/std',
+    'up-common/std',
 
     "orml-vesting/std",
 ]
@@ -401,7 +401,7 @@
 
 [dependencies]
 log = { version = "0.4.16", default-features = false }
-common-types = { path = "../../common-types", default-features = false }
+up-common = { path = "../../primitives/common", default-features = false }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -30,7 +30,7 @@
 use sp_version::RuntimeVersion;
 use sp_runtime::create_runtime_str;
 
-use common_types::*;
+use up_common::types::*;
 
 #[path = "../../common/mod.rs"]
 mod runtime_common;