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
1127 "unicode-width",1127 "unicode-width",
1128]1128]
1129
1130[[package]]
1131name = "common-types"
1132version = "0.9.24"
1133dependencies = [
1134 "fp-rpc",
1135 "pallet-evm",
1136 "sp-consensus-aura",
1137 "sp-core",
1138 "sp-runtime",
1139 "sp-std",
1140]
11411129
1142[[package]]1130[[package]]
1143name = "concurrent-queue"1131name = "concurrent-queue"
5294name = "opal-runtime"5282name = "opal-runtime"
5295version = "0.9.24"5283version = "0.9.24"
5296dependencies = [5284dependencies = [
5297 "common-types",
5298 "cumulus-pallet-aura-ext",5285 "cumulus-pallet-aura-ext",
5299 "cumulus-pallet-dmp-queue",5286 "cumulus-pallet-dmp-queue",
5300 "cumulus-pallet-parachain-system",5287 "cumulus-pallet-parachain-system",
5366 "sp-transaction-pool",5353 "sp-transaction-pool",
5367 "sp-version",5354 "sp-version",
5368 "substrate-wasm-builder",5355 "substrate-wasm-builder",
5356 "up-common",
5369 "up-data-structs",5357 "up-data-structs",
5370 "up-rpc",5358 "up-rpc",
5371 "up-sponsorship",5359 "up-sponsorship",
8610name = "quartz-runtime"8598name = "quartz-runtime"
8611version = "0.9.24"8599version = "0.9.24"
8612dependencies = [8600dependencies = [
8613 "common-types",
8614 "cumulus-pallet-aura-ext",8601 "cumulus-pallet-aura-ext",
8615 "cumulus-pallet-dmp-queue",8602 "cumulus-pallet-dmp-queue",
8616 "cumulus-pallet-parachain-system",8603 "cumulus-pallet-parachain-system",
8682 "sp-transaction-pool",8669 "sp-transaction-pool",
8683 "sp-version",8670 "sp-version",
8684 "substrate-wasm-builder",8671 "substrate-wasm-builder",
8672 "up-common",
8685 "up-data-structs",8673 "up-data-structs",
8686 "up-rpc",8674 "up-rpc",
8687 "up-sponsorship",8675 "up-sponsorship",
11897name = "tests"11885name = "tests"
11898version = "0.1.0"11886version = "0.1.0"
11899dependencies = [11887dependencies = [
11900 "common-types",
11901 "evm-coder",11888 "evm-coder",
11902 "fp-evm-mapping",11889 "fp-evm-mapping",
11903 "frame-support",11890 "frame-support",
12480version = "0.9.24"12467version = "0.9.24"
12481dependencies = [12468dependencies = [
12482 "clap",12469 "clap",
12483 "common-types",
12484 "cumulus-client-cli",12470 "cumulus-client-cli",
12485 "cumulus-client-collator",12471 "cumulus-client-collator",
12486 "cumulus-client-consensus-aura",12472 "cumulus-client-consensus-aura",
12559 "try-runtime-cli",12545 "try-runtime-cli",
12560 "unique-rpc",12546 "unique-rpc",
12561 "unique-runtime",12547 "unique-runtime",
12548 "up-common",
12562 "up-data-structs",12549 "up-data-structs",
12563 "up-rpc",12550 "up-rpc",
12564]12551]
12567name = "unique-rpc"12554name = "unique-rpc"
12568version = "0.1.0"12555version = "0.1.0"
12569dependencies = [12556dependencies = [
12570 "common-types",
12571 "fc-db",12557 "fc-db",
12572 "fc-mapping-sync",12558 "fc-mapping-sync",
12573 "fc-rpc",12559 "fc-rpc",
12608 "substrate-frame-rpc-system",12594 "substrate-frame-rpc-system",
12609 "tokio 0.2.25",12595 "tokio 0.2.25",
12610 "uc-rpc",12596 "uc-rpc",
12597 "up-common",
12611 "up-data-structs",12598 "up-data-structs",
12612 "up-rpc",12599 "up-rpc",
12613]12600]
12616name = "unique-runtime"12603name = "unique-runtime"
12617version = "0.9.24"12604version = "0.9.24"
12618dependencies = [12605dependencies = [
12619 "common-types",
12620 "cumulus-pallet-aura-ext",12606 "cumulus-pallet-aura-ext",
12621 "cumulus-pallet-dmp-queue",12607 "cumulus-pallet-dmp-queue",
12622 "cumulus-pallet-parachain-system",12608 "cumulus-pallet-parachain-system",
12688 "sp-transaction-pool",12674 "sp-transaction-pool",
12689 "sp-version",12675 "sp-version",
12690 "substrate-wasm-builder",12676 "substrate-wasm-builder",
12677 "up-common",
12691 "up-data-structs",12678 "up-data-structs",
12692 "up-rpc",12679 "up-rpc",
12693 "up-sponsorship",12680 "up-sponsorship",
12724source = "registry+https://github.com/rust-lang/crates.io-index"12711source = "registry+https://github.com/rust-lang/crates.io-index"
12725checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"12712checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
12713
12714[[package]]
12715name = "up-common"
12716version = "0.9.24"
12717dependencies = [
12718 "fp-rpc",
12719 "frame-support",
12720 "pallet-evm",
12721 "sp-consensus-aura",
12722 "sp-core",
12723 "sp-runtime",
12724 "sp-std",
12725]
1272612726
12727[[package]]12727[[package]]
12728name = "up-data-structs"12728name = "up-data-structs"
deletedcommon-types/Cargo.tomldiffbeforeafterboth

no changes

deletedcommon-types/src/lib.rsdiffbeforeafterboth

no changes

modifiednode/cli/Cargo.tomldiffbeforeafterboth
253################################################################################253################################################################################
254# Local dependencies254# Local dependencies
255255
256[dependencies.common-types]256[dependencies.up-common]
257path = "../../common-types"257path = "../../primitives/common"
258258
259[dependencies.unique-runtime]259[dependencies.unique-runtime]
260path = '../../runtime/unique'260path = '../../runtime/unique'
modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
23use serde::{Deserialize, Serialize};23use serde::{Deserialize, Serialize};
24use serde_json::map::Map;24use serde_json::map::Map;
2525
26use common_types::opaque::*;26use up_common::types::opaque::*;
2727
28#[cfg(feature = "unique-runtime")]28#[cfg(feature = "unique-runtime")]
29pub use unique_runtime as default_runtime;29pub use unique_runtime as default_runtime;
modifiednode/cli/src/command.rsdiffbeforeafterboth
64use sp_runtime::traits::{AccountIdConversion, Block as BlockT};64use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
65use std::{io::Write, net::SocketAddr, time::Duration};65use std::{io::Write, net::SocketAddr, time::Duration};
6666
67use common_types::opaque::Block;67use up_common::types::opaque::Block;
6868
69macro_rules! no_runtime_err {69macro_rules! no_runtime_err {
70 ($chain_name:expr) => {70 ($chain_name:expr) => {
modifiednode/cli/src/service.rsdiffbeforeafterboth
63use fc_rpc_core::types::FilterPool;63use fc_rpc_core::types::FilterPool;
64use fc_mapping_sync::{MappingSyncWorker, SyncStrategy};64use fc_mapping_sync::{MappingSyncWorker, SyncStrategy};
6565
66use common_types::opaque::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};66use up_common::types::opaque::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};
6767
68// RMRK68// RMRK
69use up_data_structs::{69use up_data_structs::{
modifiednode/rpc/Cargo.tomldiffbeforeafterboth
49fc-mapping-sync = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }49fc-mapping-sync = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }
5050
51pallet-common = { default-features = false, path = "../../pallets/common" }51pallet-common = { default-features = false, path = "../../pallets/common" }
52common-types = { path = "../../common-types" }52up-common = { path = "../../primitives/common" }
53pallet-unique = { path = "../../pallets/unique" }53pallet-unique = { path = "../../pallets/unique" }
54uc-rpc = { path = "../../client/rpc" }54uc-rpc = { path = "../../client/rpc" }
55up-rpc = { path = "../../primitives/rpc" }55up-rpc = { path = "../../primitives/rpc" }
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
40use sc_service::TransactionPool;40use sc_service::TransactionPool;
41use std::{collections::BTreeMap, sync::Arc};41use std::{collections::BTreeMap, sync::Arc};
4242
43use common_types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};43use up_common::types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};
4444
45// RMRK45// RMRK
46use up_data_structs::{46use up_data_structs::{
modifiedruntime/common/config/ethereum.rsdiffbeforeafterboth
7use sp_runtime::{RuntimeAppPublic, Perbill};7use sp_runtime::{RuntimeAppPublic, Perbill};
8use crate::{8use crate::{
9 runtime_common::{9 runtime_common::{
10 constants::*, dispatch::CollectionDispatchT, ethereum::sponsoring::EvmSponsorshipHandler,10 dispatch::CollectionDispatchT, ethereum::sponsoring::EvmSponsorshipHandler,
11 config::sponsoring::DefaultSponsoringRateLimit, DealWithFees,11 config::sponsoring::DefaultSponsoringRateLimit, DealWithFees,
12 },12 },
13 Runtime, Aura, Balances, Event, ChainId,13 Runtime, Aura, Balances, Event, ChainId,
14};14};
15use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping};15use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping};
16use up_common::constants::*;
1617
17pub type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;18pub type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
1819
modifiedruntime/common/config/orml.rsdiffbeforeafterboth
1616
17use frame_support::parameter_types;17use frame_support::parameter_types;
18use frame_system::EnsureSigned;18use frame_system::EnsureSigned;
19use crate::{runtime_common::constants::*, Runtime, Event, RelayChainBlockNumberProvider};19use crate::{Runtime, Event, RelayChainBlockNumberProvider};
20use common_types::{AccountId, Balance};20use up_common::{
21 types::{AccountId, Balance},
22 constants::*,
23};
2124
22parameter_types! {25parameter_types! {
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
18use sp_runtime::traits::AccountIdConversion;18use sp_runtime::traits::AccountIdConversion;
19use crate::{19use crate::{
20 runtime_common::{20 runtime_common::{
21 constants::*,
22 dispatch::CollectionDispatchT,21 dispatch::CollectionDispatchT,
23 config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},22 config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},
24 weights::CommonWeights,23 weights::CommonWeights,
25 RelayChainBlockNumberProvider,24 RelayChainBlockNumberProvider,
26 },25 },
27 Runtime, Event, Call, Balances,26 Runtime, Event, Call, Balances,
28};27};
29use common_types::{AccountId, Balance, BlockNumber};28use up_common::{
29 types::{AccountId, Balance, BlockNumber},
30 constants::*,
31};
30use up_data_structs::{32use up_data_structs::{
31 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},33 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
modifiedruntime/common/config/pallets/scheduler.rsdiffbeforeafterboth
22 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},22 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},
23 Runtime, Call, Event, Origin, OriginCaller, Balances,23 Runtime, Call, Event, Origin, OriginCaller, Balances,
24};24};
25use common_types::AccountId;25use up_common::types::AccountId;
2626
27parameter_types! {27parameter_types! {
28 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *28 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *
modifiedruntime/common/config/parachain.rsdiffbeforeafterboth
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17use frame_support::{weights::Weight, parameter_types};17use frame_support::{weights::Weight, parameter_types};
18use crate::{runtime_common::constants::*, Runtime, Event, XcmpQueue, DmpQueue};18use crate::{Runtime, Event, XcmpQueue, DmpQueue};
19use up_common::constants::*;
1920
20parameter_types! {21parameter_types! {
21 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;22 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
modifiedruntime/common/config/sponsoring.rsdiffbeforeafterboth
1616
17use frame_support::parameter_types;17use frame_support::parameter_types;
18use crate::{18use crate::{
19 runtime_common::{constants::*, sponsoring::UniqueSponsorshipHandler},19 runtime_common::{sponsoring::UniqueSponsorshipHandler},
20 Runtime,20 Runtime,
21};21};
22use common_types::BlockNumber;22use up_common::{types::BlockNumber, constants::*};
2323
24parameter_types! {24parameter_types! {
25 pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;25 pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
modifiedruntime/common/config/substrate.rsdiffbeforeafterboth
35use sp_arithmetic::traits::{BaseArithmetic, Unsigned};35use sp_arithmetic::traits::{BaseArithmetic, Unsigned};
36use smallvec::smallvec;36use smallvec::smallvec;
37use crate::{37use crate::{
38 runtime_common::{DealWithFees, constants::*},38 runtime_common::DealWithFees, Runtime, Event, Call, Origin, PalletInfo, System, Balances,
39 Runtime, Event, Call, Origin, PalletInfo, System, Balances, Treasury, SS58Prefix, Version,39 Treasury, SS58Prefix, Version,
40};40};
41use common_types::*;41use up_common::{types::*, constants::*};
4242
43parameter_types! {43parameter_types! {
44 pub const BlockHashCount: BlockNumber = 2400;44 pub const BlockHashCount: BlockNumber = 2400;
modifiedruntime/common/config/xcm.rsdiffbeforeafterboth
44use xcm_executor::{Config, XcmExecutor, Assets};44use xcm_executor::{Config, XcmExecutor, Assets};
45use sp_std::marker::PhantomData;45use sp_std::marker::PhantomData;
46use crate::{46use crate::{
47 runtime_common::{constants::*, config::substrate::LinearFee},47 runtime_common::config::substrate::LinearFee, Runtime, Call, Event, Origin, Balances,
48 Runtime, Call, Event, Origin, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, XcmpQueue,48 ParachainInfo, ParachainSystem, PolkadotXcm, XcmpQueue,
49};49};
50use common_types::{AccountId, Balance};50use up_common::{
51 types::{AccountId, Balance},
52 constants::*,
53};
5154
52parameter_types! {55parameter_types! {
modifiedruntime/common/constants.rsdiffbeforeafterboth
19 parameter_types,19 parameter_types,
20 weights::{Weight, constants::WEIGHT_PER_SECOND},20 weights::{Weight, constants::WEIGHT_PER_SECOND},
21};21};
22use common_types::{BlockNumber, Balance};22use up_common::types::{BlockNumber, Balance};
2323
24pub const MILLISECS_PER_BLOCK: u64 = 12000;24pub const MILLISECS_PER_BLOCK: u64 = 12000;
2525
modifiedruntime/common/instance.rsdiffbeforeafterboth
4 },4 },
5 Runtime,5 Runtime,
6};6};
7use common_types::opaque::RuntimeInstance;7use up_common::types::opaque::RuntimeInstance;
88
9impl RuntimeInstance for Runtime {9impl RuntimeInstance for Runtime {
10 type CrossAccountId = CrossAccountId;10 type CrossAccountId = CrossAccountId;
modifiedruntime/common/mod.rsdiffbeforeafterboth
41 Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,41 Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,
42 InherentDataExt,42 InherentDataExt,
43};43};
44use common_types::{AccountId, BlockNumber};44use up_common::types::{AccountId, BlockNumber};
4545
46#[macro_export]46#[macro_export]
47macro_rules! unsupported {47macro_rules! unsupported {
modifiedruntime/common/scheduler.rsdiffbeforeafterboth
25 DispatchErrorWithPostInfo, DispatchError,25 DispatchErrorWithPostInfo, DispatchError,
26};26};
27use crate::{Runtime, Call, Origin, Balances, ChargeTransactionPayment};27use crate::{Runtime, Call, Origin, Balances, ChargeTransactionPayment};
28use common_types::{AccountId, Balance};28use up_common::types::{AccountId, Balance};
29use fp_self_contained::SelfContainedCall;29use fp_self_contained::SelfContainedCall;
30use pallet_unique_scheduler::DispatchCall;30use pallet_unique_scheduler::DispatchCall;
3131
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
113 'xcm/std',113 'xcm/std',
114 'xcm-builder/std',114 'xcm-builder/std',
115 'xcm-executor/std',115 'xcm-executor/std',
116 'common-types/std',116 'up-common/std',
117 'rmrk-rpc/std',117 'rmrk-rpc/std',
118 'evm-coder/std',118 'evm-coder/std',
119 'up-sponsorship/std',119 'up-sponsorship/std',
403403
404[dependencies]404[dependencies]
405log = { version = "0.4.16", default-features = false }405log = { version = "0.4.16", default-features = false }
406common-types = { path = "../../common-types", default-features = false }406up-common = { path = "../../primitives/common", default-features = false }
407scale-info = { version = "2.0.1", default-features = false, features = [407scale-info = { version = "2.0.1", default-features = false, features = [
408 "derive",408 "derive",
409] }409] }
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
30use sp_version::RuntimeVersion;30use sp_version::RuntimeVersion;
31use sp_runtime::create_runtime_str;31use sp_runtime::create_runtime_str;
3232
33use common_types::*;33use up_common::types::*;
3434
35#[path = "../../common/mod.rs"]35#[path = "../../common/mod.rs"]
36mod runtime_common;36mod runtime_common;
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
113 'xcm/std',113 'xcm/std',
114 'xcm-builder/std',114 'xcm-builder/std',
115 'xcm-executor/std',115 'xcm-executor/std',
116 'common-types/std',116 'up-common/std',
117117
118 "orml-vesting/std",118 "orml-vesting/std",
119]119]
408408
409[dependencies]409[dependencies]
410log = { version = "0.4.16", default-features = false }410log = { version = "0.4.16", default-features = false }
411common-types = { path = "../../common-types", default-features = false }411up-common = { path = "../../primitives/common", default-features = false }
412scale-info = { version = "2.0.1", default-features = false, features = [412scale-info = { version = "2.0.1", default-features = false, features = [
413 "derive",413 "derive",
414] }414] }
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
30use sp_version::RuntimeVersion;30use sp_version::RuntimeVersion;
31use sp_runtime::create_runtime_str;31use sp_runtime::create_runtime_str;
3232
33use common_types::*;33use up_common::types::*;
3434
35#[path = "../../common/mod.rs"]35#[path = "../../common/mod.rs"]
36mod runtime_common;36mod runtime_common;
modifiedruntime/tests/Cargo.tomldiffbeforeafterboth
42] }42] }
43scale-info = "*"43scale-info = "*"
4444
45common-types = { path = "../../common-types", default-features = false }
46evm-coder = { default-features = false, path = '../../crates/evm-coder' }45evm-coder = { default-features = false, path = '../../crates/evm-coder' }
47up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.24' }46up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.24' }
4847
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
114 'xcm/std',114 'xcm/std',
115 'xcm-builder/std',115 'xcm-builder/std',
116 'xcm-executor/std',116 'xcm-executor/std',
117 'common-types/std',117 'up-common/std',
118118
119 "orml-vesting/std",119 "orml-vesting/std",
120]120]
401401
402[dependencies]402[dependencies]
403log = { version = "0.4.16", default-features = false }403log = { version = "0.4.16", default-features = false }
404common-types = { path = "../../common-types", default-features = false }404up-common = { path = "../../primitives/common", default-features = false }
405scale-info = { version = "2.0.1", default-features = false, features = [405scale-info = { version = "2.0.1", default-features = false, features = [
406 "derive",406 "derive",
407] }407] }
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
30use sp_version::RuntimeVersion;30use sp_version::RuntimeVersion;
31use sp_runtime::create_runtime_str;31use sp_runtime::create_runtime_str;
3232
33use common_types::*;33use up_common::types::*;
3434
35#[path = "../../common/mod.rs"]35#[path = "../../common/mod.rs"]
36mod runtime_common;36mod runtime_common;