difftreelog
refactor add up-common
in: master
28 files changed
Cargo.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 = [
common-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"
common-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;
node/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'
node/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;
node/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) => {
node/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::{
node/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" }
node/rpc/src/lib.rsdiffbeforeafterboth--- 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::{
runtime/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>;
runtime/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;
runtime/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},
};
runtime/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) *
runtime/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;
runtime/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;
runtime/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;
runtime/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();
runtime/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;
runtime/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;
runtime/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 {
runtime/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;
runtime/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",
] }
runtime/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;
runtime/quartz/Cargo.tomldiffbeforeafterboth1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Quartz Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'quartz-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version = '0.9.24'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std', 'quartz-runtime']20runtime-benchmarks = [21 'hex-literal',22 'frame-benchmarking',23 'frame-support/runtime-benchmarks',24 'frame-system-benchmarking',25 'frame-system/runtime-benchmarks',26 'pallet-ethereum/runtime-benchmarks',27 'pallet-evm-migration/runtime-benchmarks',28 'pallet-evm-coder-substrate/runtime-benchmarks',29 'pallet-balances/runtime-benchmarks',30 'pallet-timestamp/runtime-benchmarks',31 'pallet-common/runtime-benchmarks',32 'pallet-structure/runtime-benchmarks',33 'pallet-fungible/runtime-benchmarks',34 'pallet-refungible/runtime-benchmarks',35 'pallet-nonfungible/runtime-benchmarks',36 'pallet-proxy-rmrk-core/runtime-benchmarks',37 'pallet-proxy-rmrk-equip/runtime-benchmarks',38 'pallet-unique/runtime-benchmarks',39 'pallet-inflation/runtime-benchmarks',40 'pallet-unique-scheduler/runtime-benchmarks',41 'pallet-xcm/runtime-benchmarks',42 'sp-runtime/runtime-benchmarks',43 'xcm-builder/runtime-benchmarks',44]45try-runtime = [46 'frame-try-runtime',47 'frame-executive/try-runtime',48 'frame-system/try-runtime',49]50std = [51 'codec/std',52 'cumulus-pallet-aura-ext/std',53 'cumulus-pallet-parachain-system/std',54 'cumulus-pallet-xcm/std',55 'cumulus-pallet-xcmp-queue/std',56 'cumulus-primitives-core/std',57 'cumulus-primitives-utility/std',58 'frame-try-runtime/std',59 'frame-executive/std',60 'frame-support/std',61 'frame-system/std',62 'frame-system-rpc-runtime-api/std',63 'pallet-aura/std',64 'pallet-balances/std',65 # 'pallet-contracts/std',66 # 'pallet-contracts-primitives/std',67 # 'pallet-contracts-rpc-runtime-api/std',68 # 'pallet-contract-helpers/std',69 'pallet-randomness-collective-flip/std',70 'pallet-sudo/std',71 'pallet-timestamp/std',72 'pallet-transaction-payment/std',73 'pallet-transaction-payment-rpc-runtime-api/std',74 'pallet-treasury/std',75 # 'pallet-vesting/std',76 'pallet-evm/std',77 'pallet-evm-migration/std',78 'pallet-evm-contract-helpers/std',79 'pallet-evm-transaction-payment/std',80 'pallet-evm-coder-substrate/std',81 'pallet-ethereum/std',82 'pallet-base-fee/std',83 'fp-rpc/std',84 'up-rpc/std',85 'fp-evm-mapping/std',86 'fp-self-contained/std',87 'parachain-info/std',88 'serde',89 'pallet-inflation/std',90 'pallet-common/std',91 'pallet-structure/std',92 'pallet-fungible/std',93 'pallet-refungible/std',94 'pallet-nonfungible/std',95 'pallet-proxy-rmrk-core/std',96 'pallet-proxy-rmrk-equip/std',97 'pallet-unique/std',98 'pallet-unique-scheduler/std',99 'pallet-charge-transaction/std',100 'up-data-structs/std',101 'sp-api/std',102 'sp-block-builder/std',103 "sp-consensus-aura/std",104 'sp-core/std',105 'sp-inherents/std',106 'sp-io/std',107 'sp-offchain/std',108 'sp-runtime/std',109 'sp-session/std',110 'sp-std/std',111 'sp-transaction-pool/std',112 'sp-version/std',113 'xcm/std',114 'xcm-builder/std',115 'xcm-executor/std',116 'common-types/std',117118 "orml-vesting/std",119]120limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']121quartz-runtime = []122123refungible = []124scheduler = []125rmrk = []126127################################################################################128# Substrate Dependencies129130[dependencies.codec]131default-features = false132features = ['derive']133package = 'parity-scale-codec'134version = '3.1.2'135136[dependencies.frame-benchmarking]137default-features = false138git = "https://github.com/paritytech/substrate"139optional = true140branch = "polkadot-v0.9.24"141142[dependencies.frame-try-runtime]143default-features = false144git = 'https://github.com/paritytech/substrate'145optional = true146branch = 'polkadot-v0.9.24'147148[dependencies.frame-executive]149default-features = false150git = "https://github.com/paritytech/substrate"151branch = "polkadot-v0.9.24"152153[dependencies.frame-support]154default-features = false155git = "https://github.com/paritytech/substrate"156branch = "polkadot-v0.9.24"157158[dependencies.frame-system]159default-features = false160git = "https://github.com/paritytech/substrate"161branch = "polkadot-v0.9.24"162163[dependencies.frame-system-benchmarking]164default-features = false165git = "https://github.com/paritytech/substrate"166optional = true167branch = "polkadot-v0.9.24"168169[dependencies.frame-system-rpc-runtime-api]170default-features = false171git = "https://github.com/paritytech/substrate"172branch = "polkadot-v0.9.24"173174[dependencies.hex-literal]175optional = true176version = '0.3.3'177178[dependencies.serde]179default-features = false180features = ['derive']181optional = true182version = '1.0.130'183184[dependencies.pallet-aura]185default-features = false186git = "https://github.com/paritytech/substrate"187branch = "polkadot-v0.9.24"188189[dependencies.pallet-balances]190default-features = false191git = "https://github.com/paritytech/substrate"192branch = "polkadot-v0.9.24"193194# Contracts specific packages195# [dependencies.pallet-contracts]196# git = 'https://github.com/paritytech/substrate'197# default-features = false198# branch = 'master'199# version = '4.0.0-dev'200201# [dependencies.pallet-contracts-primitives]202# git = 'https://github.com/paritytech/substrate'203# default-features = false204# branch = 'master'205# version = '4.0.0-dev'206207# [dependencies.pallet-contracts-rpc-runtime-api]208# git = 'https://github.com/paritytech/substrate'209# default-features = false210# branch = 'master'211# version = '4.0.0-dev'212213[dependencies.pallet-randomness-collective-flip]214default-features = false215git = "https://github.com/paritytech/substrate"216branch = "polkadot-v0.9.24"217218[dependencies.pallet-sudo]219default-features = false220git = "https://github.com/paritytech/substrate"221branch = "polkadot-v0.9.24"222223[dependencies.pallet-timestamp]224default-features = false225git = "https://github.com/paritytech/substrate"226branch = "polkadot-v0.9.24"227228[dependencies.pallet-transaction-payment]229default-features = false230git = "https://github.com/paritytech/substrate"231branch = "polkadot-v0.9.24"232233[dependencies.pallet-transaction-payment-rpc-runtime-api]234default-features = false235git = "https://github.com/paritytech/substrate"236branch = "polkadot-v0.9.24"237238[dependencies.pallet-treasury]239default-features = false240git = "https://github.com/paritytech/substrate"241branch = "polkadot-v0.9.24"242243# [dependencies.pallet-vesting]244# default-features = false245# git = 'https://github.com/paritytech/substrate'246# branch = 'master'247248[dependencies.sp-arithmetic]249default-features = false250git = "https://github.com/paritytech/substrate"251branch = "polkadot-v0.9.24"252253[dependencies.sp-api]254default-features = false255git = "https://github.com/paritytech/substrate"256branch = "polkadot-v0.9.24"257258[dependencies.sp-block-builder]259default-features = false260git = "https://github.com/paritytech/substrate"261branch = "polkadot-v0.9.24"262263[dependencies.sp-core]264default-features = false265git = "https://github.com/paritytech/substrate"266branch = "polkadot-v0.9.24"267268[dependencies.sp-consensus-aura]269default-features = false270git = "https://github.com/paritytech/substrate"271branch = "polkadot-v0.9.24"272273[dependencies.sp-inherents]274default-features = false275git = "https://github.com/paritytech/substrate"276branch = "polkadot-v0.9.24"277278[dependencies.sp-io]279default-features = false280git = "https://github.com/paritytech/substrate"281branch = "polkadot-v0.9.24"282283[dependencies.sp-offchain]284default-features = false285git = "https://github.com/paritytech/substrate"286branch = "polkadot-v0.9.24"287288[dependencies.sp-runtime]289default-features = false290git = "https://github.com/paritytech/substrate"291branch = "polkadot-v0.9.24"292293[dependencies.sp-session]294default-features = false295git = "https://github.com/paritytech/substrate"296branch = "polkadot-v0.9.24"297298[dependencies.sp-std]299default-features = false300git = "https://github.com/paritytech/substrate"301branch = "polkadot-v0.9.24"302303[dependencies.sp-transaction-pool]304default-features = false305git = "https://github.com/paritytech/substrate"306branch = "polkadot-v0.9.24"307308[dependencies.sp-version]309default-features = false310git = "https://github.com/paritytech/substrate"311branch = "polkadot-v0.9.24"312313[dependencies.smallvec]314version = '1.6.1'315316################################################################################317# Cumulus dependencies318319[dependencies.parachain-info]320default-features = false321git = "https://github.com/paritytech/cumulus"322branch = "polkadot-v0.9.24"323324[dependencies.cumulus-pallet-aura-ext]325git = "https://github.com/paritytech/cumulus"326branch = "polkadot-v0.9.24"327default-features = false328329[dependencies.cumulus-pallet-parachain-system]330git = "https://github.com/paritytech/cumulus"331branch = "polkadot-v0.9.24"332default-features = false333334[dependencies.cumulus-primitives-core]335git = "https://github.com/paritytech/cumulus"336branch = "polkadot-v0.9.24"337default-features = false338339[dependencies.cumulus-pallet-xcm]340git = "https://github.com/paritytech/cumulus"341branch = "polkadot-v0.9.24"342default-features = false343344[dependencies.cumulus-pallet-dmp-queue]345git = "https://github.com/paritytech/cumulus"346branch = "polkadot-v0.9.24"347default-features = false348349[dependencies.cumulus-pallet-xcmp-queue]350git = "https://github.com/paritytech/cumulus"351branch = "polkadot-v0.9.24"352default-features = false353354[dependencies.cumulus-primitives-utility]355git = "https://github.com/paritytech/cumulus"356branch = "polkadot-v0.9.24"357default-features = false358359[dependencies.cumulus-primitives-timestamp]360git = "https://github.com/paritytech/cumulus"361branch = "polkadot-v0.9.24"362default-features = false363364################################################################################365# Polkadot dependencies366367[dependencies.polkadot-parachain]368git = "https://github.com/paritytech/polkadot"369branch = "release-v0.9.24"370default-features = false371372[dependencies.xcm]373git = "https://github.com/paritytech/polkadot"374branch = "release-v0.9.24"375default-features = false376377[dependencies.xcm-builder]378git = "https://github.com/paritytech/polkadot"379branch = "release-v0.9.24"380default-features = false381382[dependencies.xcm-executor]383git = "https://github.com/paritytech/polkadot"384branch = "release-v0.9.24"385default-features = false386387[dependencies.pallet-xcm]388git = "https://github.com/paritytech/polkadot"389branch = "release-v0.9.24"390default-features = false391392[dependencies.orml-vesting]393git = "https://github.com/uniquenetwork/open-runtime-module-library"394branch = "unique-polkadot-v0.9.24"395version = "0.4.1-dev"396default-features = false397398################################################################################399# RMRK dependencies400401# todo git402[dependencies.rmrk-rpc]403default-features = false404path = "../../primitives/rmrk-rpc"405406################################################################################407# local dependencies408409[dependencies]410log = { version = "0.4.16", default-features = false }411common-types = { path = "../../common-types", default-features = false }412scale-info = { version = "2.0.1", default-features = false, features = [413 "derive",414] }415derivative = "2.2.0"416pallet-unique = { path = '../../pallets/unique', default-features = false }417up-rpc = { path = "../../primitives/rpc", default-features = false }418fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }419pallet-inflation = { path = '../../pallets/inflation', default-features = false }420up-data-structs = { path = '../../primitives/data-structs', default-features = false }421pallet-common = { default-features = false, path = "../../pallets/common" }422pallet-structure = { default-features = false, path = "../../pallets/structure" }423pallet-fungible = { default-features = false, path = "../../pallets/fungible" }424pallet-refungible = { default-features = false, path = "../../pallets/refungible" }425pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }426pallet-proxy-rmrk-core = { default-features = false, path = "../../pallets/proxy-rmrk-core", package = "pallet-rmrk-core" }427pallet-proxy-rmrk-equip = { default-features = false, path = "../../pallets/proxy-rmrk-equip", package = "pallet-rmrk-equip" }428pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }429# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }430pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.24", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }431pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }432pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }433pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }434pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }435pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }436pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }437pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }438fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }439fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }440evm-coder = { default-features = false, path = '../../crates/evm-coder' }441up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.24' }442443################################################################################444# Build Dependencies445446[build-dependencies.substrate-wasm-builder]447git = "https://github.com/paritytech/substrate"448branch = "polkadot-v0.9.24"runtime/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;
runtime/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' }
runtime/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",
] }
runtime/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;