--- 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 = [ --- a/common-types/Cargo.toml +++ /dev/null @@ -1,50 +0,0 @@ -[package] -authors = ['Unique Network '] -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" --- 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 . - -#![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; - - /// Opaque block type. - pub type Block = generic::Block; - - pub trait RuntimeInstance { - type CrossAccountId: pallet_evm::account::CrossAccountId - + Send - + Sync - + 'static; - - type TransactionConverter: fp_rpc::ConvertTransaction - + 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 = <::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; --- 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' --- 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; --- 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) => { --- 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::{ --- 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" } --- a/node/rpc/src/lib.rs +++ b/node/rpc/src/lib.rs @@ -40,7 +40,7 @@ use sc_service::TransactionPool; use std::{collections::BTreeMap, sync::Arc}; -use common_types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance}; +use up_common::types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance}; // RMRK use up_data_structs::{ --- 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; --- 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; --- 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}, }; --- 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) * --- a/runtime/common/config/parachain.rs +++ b/runtime/common/config/parachain.rs @@ -15,7 +15,8 @@ // along with Unique Network. If not, see . 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; --- 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; --- 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; --- 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(); --- 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; --- 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; --- 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 { --- 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; --- 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", ] } --- 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; --- 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", ] } --- 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; --- 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' } --- 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", ] } --- 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;