From e93a412a96403c4a89472e48620b752e24fbb3a7 Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Wed, 19 Apr 2023 12:22:38 +0000 Subject: [PATCH] feat: register pallet in runtimes --- --- a/Cargo.lock +++ b/Cargo.lock @@ -5871,6 +5871,7 @@ "pallet-aura", "pallet-authorship", "pallet-balances", + "pallet-balances-adapter", "pallet-base-fee", "pallet-collator-selection", "pallet-common", @@ -6255,13 +6256,19 @@ name = "pallet-balances-adapter" version = "0.1.0" dependencies = [ + "evm-coder", "frame-support", "frame-system", "pallet-balances", + "pallet-common", + "pallet-evm", + "pallet-evm-coder-substrate", + "pallet-evm-transaction-payment", "parity-scale-codec", "scale-info", "sp-core", "sp-std", + "up-data-structs", ] [[package]] @@ -9364,6 +9371,7 @@ "pallet-aura", "pallet-authorship", "pallet-balances", + "pallet-balances-adapter", "pallet-base-fee", "pallet-collator-selection", "pallet-common", @@ -13781,6 +13789,7 @@ "pallet-aura", "pallet-authorship", "pallet-balances", + "pallet-balances-adapter", "pallet-base-fee", "pallet-collator-selection", "pallet-common", --- a/pallets/balances-adapter/Cargo.toml +++ b/pallets/balances-adapter/Cargo.toml @@ -16,8 +16,28 @@ codec = { workspace = true, package = "parity-scale-codec" } scale-info = { workspace = true } +# Unique +evm-coder = { workspace = true } +pallet-evm = { workspace = true } + +#Local +pallet-common = { workspace = true } +pallet-evm-coder-substrate = { workspace = true } +pallet-evm-transaction-payment = { workspace = true } +up-data-structs = { workspace = true, features = ['serde1'] } + [features] default = ["std"] -std = ["frame-support/std", "frame-system/std", "pallet-balances/std", "sp-core/std", "sp-std/std"] -# stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"] +std = [ + "evm-coder/std", + "frame-support/std", + "frame-system/std", + "pallet-balances/std", + "pallet-common/std", + "pallet-evm-coder-substrate/std", + "pallet-evm/std", + "sp-core/std", + "sp-std/std", +] +stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"] try-runtime = ["frame-support/try-runtime"] --- a/pallets/balances-adapter/src/lib.rs +++ b/pallets/balances-adapter/src/lib.rs @@ -2,6 +2,8 @@ #![cfg_attr(not(feature = "std"), no_std)] #![warn(missing_docs)] +pub use pallet::*; + #[frame_support::pallet] pub mod pallet { #[pallet::config] --- a/runtime/common/config/pallets/mod.rs +++ b/runtime/common/config/pallets/mod.rs @@ -83,6 +83,9 @@ impl pallet_nonfungible::Config for Runtime { type WeightInfo = pallet_nonfungible::weights::SubstrateWeight; } +impl pallet_balances_adapter::Config for Runtime { + // type WeightInfo = pallet_nonfungible::weights::SubstrateWeight; +} parameter_types! { pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied --- a/runtime/common/construct_runtime.rs +++ b/runtime/common/construct_runtime.rs @@ -106,6 +106,8 @@ Maintenance: pallet_maintenance = 154, + BalancesAdapter: pallet_balances_adapter = 155, + #[cfg(feature = "pallet-test-utils")] TestUtils: pallet_test_utils = 255, } --- a/runtime/opal/Cargo.toml +++ b/runtime/opal/Cargo.toml @@ -18,9 +18,10 @@ [features] default = ['opal-runtime', 'std'] limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing'] -opal-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'preimage', 'pallet-test-utils', 'refungible'] +opal-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'pallet-test-utils', 'preimage', 'refungible'] pov-estimate = [] runtime-benchmarks = [ + "pallet-preimage/runtime-benchmarks", 'cumulus-pallet-parachain-system/runtime-benchmarks', 'frame-benchmarking', 'frame-support/runtime-benchmarks', @@ -41,7 +42,6 @@ 'pallet-inflation/runtime-benchmarks', 'pallet-maintenance/runtime-benchmarks', 'pallet-nonfungible/runtime-benchmarks', - "pallet-preimage/runtime-benchmarks", 'pallet-refungible/runtime-benchmarks', 'pallet-structure/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', @@ -70,8 +70,8 @@ # 'pallet-contracts-primitives/std', # 'pallet-contracts-rpc-runtime-api/std', # 'pallet-contract-helpers/std', + "pallet-authorship/std", "pallet-preimage/std", - "pallet-authorship/std", "pallet-session/std", "sp-consensus-aura/std", 'app-promotion-rpc/std', @@ -79,6 +79,7 @@ 'fp-rpc/std', 'fp-self-contained/std', 'pallet-app-promotion/std', + 'pallet-balances-adapter/std', 'pallet-base-fee/std', 'pallet-charge-transaction/std', 'pallet-collator-selection/std', @@ -128,8 +129,8 @@ "orml-tokens/std", "orml-traits/std", "orml-vesting/std", - "orml-xtokens/std", "orml-xcm-support/std", + "orml-xtokens/std", "pallet-foreign-assets/std", 'pallet-maintenance/std', @@ -139,8 +140,8 @@ "pallet-authorship/try-runtime", "pallet-collator-selection/try-runtime", "pallet-identity/try-runtime", + "pallet-preimage/try-runtime", "pallet-session/try-runtime", - "pallet-preimage/try-runtime", 'cumulus-pallet-aura-ext/try-runtime', 'cumulus-pallet-dmp-queue/try-runtime', 'cumulus-pallet-parachain-system/try-runtime', @@ -189,8 +190,8 @@ app-promotion = [] collator-selection = [] foreign-assets = [] -preimage = [] pallet-test-utils = [] +preimage = [] refungible = [] scheduler = [] @@ -216,8 +217,8 @@ orml-tokens = { workspace = true } orml-traits = { workspace = true } orml-vesting = { workspace = true } +orml-xcm-support = { workspace = true } orml-xtokens = { workspace = true } -orml-xcm-support = { workspace = true } pallet-aura = { workspace = true } pallet-authorship = { workspace = true } pallet-balances = { features = ["insecure_zero_ed"], workspace = true } @@ -258,6 +259,7 @@ log = { workspace = true } num_enum = { workspace = true } pallet-app-promotion = { workspace = true } +pallet-balances-adapter = { workspace = true } pallet-base-fee = { workspace = true } pallet-charge-transaction = { workspace = true } pallet-collator-selection = { workspace = true } @@ -291,11 +293,11 @@ ################################################################################ # Optional dependencies -frame-system-benchmarking = { workspace = true, optional = true} frame-benchmarking = { workspace = true, optional = true } +frame-system-benchmarking = { workspace = true, optional = true } frame-try-runtime = { workspace = true, optional = true } +hex-literal = { workspace = true, optional = true } serde = { workspace = true, optional = true } -hex-literal = { workspace = true, optional = true } ################################################################################ # Test dependencies --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -22,6 +22,7 @@ pov-estimate = [] quartz-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'preimage', 'refungible'] runtime-benchmarks = [ + "pallet-preimage/runtime-benchmarks", 'cumulus-pallet-parachain-system/runtime-benchmarks', 'frame-benchmarking', 'frame-support/runtime-benchmarks', @@ -42,7 +43,6 @@ 'pallet-inflation/runtime-benchmarks', 'pallet-maintenance/runtime-benchmarks', 'pallet-nonfungible/runtime-benchmarks', - "pallet-preimage/runtime-benchmarks", 'pallet-refungible/runtime-benchmarks', 'pallet-structure/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', @@ -70,9 +70,9 @@ # 'pallet-contracts-primitives/std', # 'pallet-contracts-rpc-runtime-api/std', # 'pallet-contract-helpers/std', - "pallet-preimage/std", "pallet-authorship/std", "pallet-identity/std", + "pallet-preimage/std", "pallet-session/std", "sp-consensus-aura/std", 'app-promotion-rpc/std', @@ -127,8 +127,8 @@ "orml-tokens/std", "orml-traits/std", "orml-vesting/std", + "orml-xcm-support/std", "orml-xtokens/std", - "orml-xcm-support/std", "pallet-foreign-assets/std", "pallet-maintenance/std", ] @@ -136,8 +136,8 @@ "pallet-authorship/try-runtime", "pallet-collator-selection/try-runtime", "pallet-identity/try-runtime", + "pallet-preimage/try-runtime", "pallet-session/try-runtime", - "pallet-preimage/try-runtime", 'cumulus-pallet-aura-ext/try-runtime', 'cumulus-pallet-dmp-queue/try-runtime', 'cumulus-pallet-parachain-system/try-runtime', @@ -153,6 +153,7 @@ 'orml-xtokens/try-runtime', 'pallet-app-promotion/try-runtime', 'pallet-aura/try-runtime', + 'pallet-balances-adapter/std', 'pallet-balances/try-runtime', 'pallet-charge-transaction/try-runtime', 'pallet-common/try-runtime', @@ -208,8 +209,8 @@ orml-tokens = { workspace = true } orml-traits = { workspace = true } orml-vesting = { workspace = true } +orml-xcm-support = { workspace = true } orml-xtokens = { workspace = true } -orml-xcm-support = { workspace = true } pallet-aura = { workspace = true } pallet-authorship = { workspace = true } pallet-balances = { features = ["insecure_zero_ed"], workspace = true } @@ -246,6 +247,7 @@ fp-evm = { workspace = true } log = { workspace = true } pallet-app-promotion = { workspace = true } +pallet-balances-adapter = { workspace = true } pallet-collator-selection = { workspace = true } pallet-common = { workspace = true } pallet-configuration = { workspace = true } @@ -283,11 +285,11 @@ ################################################################################ # Optional dependencies +frame-benchmarking = { workspace = true, optional = true } frame-system-benchmarking = { workspace = true, optional = true } -frame-benchmarking = { workspace = true, optional = true } frame-try-runtime = { workspace = true, optional = true } +hex-literal = { workspace = true, optional = true } serde = { workspace = true, optional = true } -hex-literal = { workspace = true, optional = true } ################################################################################ --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -20,6 +20,7 @@ limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing'] pov-estimate = [] runtime-benchmarks = [ + "pallet-preimage/runtime-benchmarks", 'frame-benchmarking', 'frame-support/runtime-benchmarks', 'frame-system-benchmarking', @@ -39,7 +40,6 @@ 'pallet-inflation/runtime-benchmarks', 'pallet-maintenance/runtime-benchmarks', 'pallet-nonfungible/runtime-benchmarks', - "pallet-preimage/runtime-benchmarks", 'pallet-refungible/runtime-benchmarks', 'pallet-structure/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', @@ -68,9 +68,9 @@ # 'pallet-contracts-primitives/std', # 'pallet-contracts-rpc-runtime-api/std', # 'pallet-contract-helpers/std', - "pallet-preimage/std", "pallet-authorship/std", "pallet-identity/std", + "pallet-preimage/std", "pallet-session/std", "sp-consensus-aura/std", 'app-promotion-rpc/std', @@ -78,6 +78,7 @@ 'fp-rpc/std', 'fp-self-contained/std', 'pallet-app-promotion/std', + 'pallet-balances-adapter/std', 'pallet-base-fee/std', 'pallet-charge-transaction/std', 'pallet-collator-selection/std', @@ -124,8 +125,8 @@ "orml-tokens/std", "orml-traits/std", "orml-vesting/std", + "orml-xcm-support/std", "orml-xtokens/std", - "orml-xcm-support/std", "pallet-foreign-assets/std", "pallet-maintenance/std", ] @@ -134,8 +135,8 @@ "pallet-authorship/try-runtime", "pallet-collator-selection/try-runtime", "pallet-identity/try-runtime", + "pallet-preimage/try-runtime", "pallet-session/try-runtime", - "pallet-preimage/try-runtime", 'cumulus-pallet-aura-ext/try-runtime', 'cumulus-pallet-dmp-queue/try-runtime', 'cumulus-pallet-parachain-system/try-runtime', @@ -207,8 +208,8 @@ orml-tokens = { workspace = true } orml-traits = { workspace = true } orml-vesting = { workspace = true } +orml-xcm-support = { workspace = true } orml-xtokens = { workspace = true } -orml-xcm-support = { workspace = true } pallet-aura = { workspace = true } pallet-authorship = { workspace = true } pallet-balances = { features = ["insecure_zero_ed"], workspace = true } @@ -244,6 +245,7 @@ derivative = { workspace = true } log = { workspace = true } pallet-app-promotion = { workspace = true } +pallet-balances-adapter = { workspace = true } pallet-collator-selection = { workspace = true } pallet-common = { workspace = true } pallet-configuration = { workspace = true } @@ -282,11 +284,11 @@ ################################################################################ # Optional dependencies +frame-benchmarking = { workspace = true, optional = true } frame-system-benchmarking = { workspace = true, optional = true } -frame-benchmarking = { workspace = true, optional = true } frame-try-runtime = { workspace = true, optional = true } +hex-literal = { workspace = true, optional = true } serde = { workspace = true, optional = true } -hex-literal = { workspace = true, optional = true } ################################################################################ # Test dependencies -- gitstuff