--- a/Cargo.lock +++ b/Cargo.lock @@ -1128,6 +1128,18 @@ ] [[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" @@ -5282,6 +5294,7 @@ name = "opal-runtime" version = "0.9.24" dependencies = [ + "common-types", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -5291,6 +5304,7 @@ "cumulus-primitives-timestamp", "cumulus-primitives-utility", "derivative", + "evm-coder", "fp-evm-mapping", "fp-rpc", "fp-self-contained", @@ -5352,9 +5366,9 @@ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "unique-runtime-common", "up-data-structs", "up-rpc", + "up-sponsorship", "xcm", "xcm-builder", "xcm-executor", @@ -8596,6 +8610,7 @@ name = "quartz-runtime" version = "0.9.24" dependencies = [ + "common-types", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -8605,6 +8620,7 @@ "cumulus-primitives-timestamp", "cumulus-primitives-utility", "derivative", + "evm-coder", "fp-evm-mapping", "fp-rpc", "fp-self-contained", @@ -8666,9 +8682,9 @@ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "unique-runtime-common", "up-data-structs", "up-rpc", + "up-sponsorship", "xcm", "xcm-builder", "xcm-executor", @@ -11881,6 +11897,8 @@ name = "tests" version = "0.1.0" dependencies = [ + "common-types", + "evm-coder", "fp-evm-mapping", "frame-support", "frame-system", @@ -11902,8 +11920,8 @@ "sp-io", "sp-runtime", "sp-std", - "unique-runtime-common", "up-data-structs", + "up-sponsorship", ] [[package]] @@ -12387,7 +12405,6 @@ "sp-core", "sp-rpc", "sp-runtime", - "unique-runtime-common", "up-data-structs", "up-rpc", ] @@ -12463,6 +12480,7 @@ version = "0.9.24" dependencies = [ "clap", + "common-types", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", @@ -12541,7 +12559,6 @@ "try-runtime-cli", "unique-rpc", "unique-runtime", - "unique-runtime-common", "up-data-structs", "up-rpc", ] @@ -12550,6 +12567,7 @@ name = "unique-rpc" version = "0.1.0" dependencies = [ + "common-types", "fc-db", "fc-mapping-sync", "fc-rpc", @@ -12590,7 +12608,6 @@ "substrate-frame-rpc-system", "tokio 0.2.25", "uc-rpc", - "unique-runtime-common", "up-data-structs", "up-rpc", ] @@ -12599,6 +12616,7 @@ name = "unique-runtime" version = "0.9.24" dependencies = [ + "common-types", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -12608,6 +12626,7 @@ "cumulus-primitives-timestamp", "cumulus-primitives-utility", "derivative", + "evm-coder", "fp-evm-mapping", "fp-rpc", "fp-self-contained", @@ -12669,38 +12688,12 @@ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "unique-runtime-common", "up-data-structs", "up-rpc", + "up-sponsorship", "xcm", "xcm-builder", "xcm-executor", -] - -[[package]] -name = "unique-runtime-common" -version = "0.9.24" -dependencies = [ - "evm-coder", - "fp-rpc", - "frame-support", - "frame-system", - "pallet-common", - "pallet-evm", - "pallet-fungible", - "pallet-nonfungible", - "pallet-refungible", - "pallet-unique", - "pallet-unique-scheduler", - "parity-scale-codec 3.1.5", - "rmrk-rpc", - "scale-info", - "sp-consensus-aura", - "sp-core", - "sp-runtime", - "sp-std", - "up-data-structs", - "up-sponsorship", ] [[package]] --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -113,7 +113,7 @@ 'xcm/std', 'xcm-builder/std', 'xcm-executor/std', - 'unique-runtime-common/std', + 'common-types/std', "orml-vesting/std", ] @@ -407,7 +407,7 @@ [dependencies] log = { version = "0.4.16", default-features = false } -unique-runtime-common = { path = "../common", default-features = false } +common-types = { path = "../../common-types", default-features = false } scale-info = { version = "2.0.1", default-features = false, features = [ "derive", ] } @@ -436,6 +436,8 @@ pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" } fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" } fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" } +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' } ################################################################################ # Build Dependencies --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -114,7 +114,7 @@ 'xcm/std', 'xcm-builder/std', 'xcm-executor/std', - 'unique-runtime-common/std', + 'common-types/std', "orml-vesting/std", ] @@ -400,7 +400,7 @@ [dependencies] log = { version = "0.4.16", default-features = false } -unique-runtime-common = { path = "../common", default-features = false } +common-types = { path = "../../common-types", default-features = false } scale-info = { version = "2.0.1", default-features = false, features = [ "derive", ] } @@ -430,6 +430,8 @@ fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" } fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" } fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" } +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' } ################################################################################ # Build Dependencies