git.delta.rocks / unique-network / refs/commits / e93a412a9640

difftreelog

feat register pallet in runtimes

Trubnikov Sergey2023-04-19parent: #c0114cb.patch.diff
in: master

8 files changed

modifiedCargo.lockdiffbeforeafterboth
--- 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",
modifiedpallets/balances-adapter/Cargo.tomldiffbeforeafterboth
--- 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"]
modifiedpallets/balances-adapter/src/lib.rsdiffbeforeafterboth
--- 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]
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
--- 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<Self>;
 }
+impl pallet_balances_adapter::Config for Runtime {
+	// type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
+}
 
 parameter_types! {
 	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied
modifiedruntime/common/construct_runtime.rsdiffbeforeafterboth
before · runtime/common/construct_runtime.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#[macro_export]18macro_rules! construct_runtime {19	() => {20		frame_support::construct_runtime! {2122			pub enum Runtime where23				Block = Block,24				NodeBlock = opaque::Block,25				UncheckedExtrinsic = UncheckedExtrinsic26			{27				System: frame_system = 0,2829				ParachainSystem: cumulus_pallet_parachain_system = 20,30				ParachainInfo: parachain_info = 21,3132				#[cfg(feature = "collator-selection")]33				Authorship: pallet_authorship = 22,3435				#[cfg(feature = "collator-selection")]36				CollatorSelection: pallet_collator_selection = 23,3738				#[cfg(feature = "collator-selection")]39				Session: pallet_session = 24,4041				Aura: pallet_aura = 25,42				AuraExt: cumulus_pallet_aura_ext = 26,4344				Balances: pallet_balances = 30,45				// RandomnessCollectiveFlip = 3146				Timestamp: pallet_timestamp = 32,47				TransactionPayment: pallet_transaction_payment = 33,48				Treasury: pallet_treasury = 34,49				Sudo: pallet_sudo = 35,50				Vesting: orml_vesting = 37,5152				XTokens: orml_xtokens = 38,53				Tokens: orml_tokens = 39,54				// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,5556				#[cfg(feature = "collator-selection")]57				Identity: pallet_identity = 40,5859				#[cfg(feature = "preimage")]60				Preimage: pallet_preimage = 41,6162				// XCM helpers.63				XcmpQueue: cumulus_pallet_xcmp_queue = 50,64				PolkadotXcm: pallet_xcm = 51,65				CumulusXcm: cumulus_pallet_xcm = 52,66				DmpQueue: cumulus_pallet_dmp_queue = 53,6768				// Unique Pallets69				Inflation: pallet_inflation = 60,70				Unique: pallet_unique::{Pallet, Call, Storage} = 61,7172				// #[cfg(feature = "scheduler")]73				// Scheduler: pallet_unique_scheduler_v2 = 62,7475				Configuration: pallet_configuration = 63,7677				Charging: pallet_charge_transaction = 64,78				// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,79				Common: pallet_common = 66,80				Fungible: pallet_fungible = 67,8182				#[cfg(feature = "refungible")]83				Refungible: pallet_refungible = 68,8485				Nonfungible: pallet_nonfungible = 69,86				Structure: pallet_structure = 70,8788				// RmrkCore: pallet_proxy_rmrk_core = 71,8990				// RmrkEquip: pallet_proxy_rmrk_equip = 72,9192				#[cfg(feature = "app-promotion")]93				AppPromotion: pallet_app_promotion = 73,9495				#[cfg(feature = "foreign-assets")]96				ForeignAssets: pallet_foreign_assets = 80,9798				// Frontier99				EVM: pallet_evm = 100,100				Ethereum: pallet_ethereum = 101,101102				EvmCoderSubstrate: pallet_evm_coder_substrate = 150,103				EvmContractHelpers: pallet_evm_contract_helpers = 151,104				EvmTransactionPayment: pallet_evm_transaction_payment = 152,105				EvmMigration: pallet_evm_migration = 153,106107				Maintenance: pallet_maintenance = 154,108109				#[cfg(feature = "pallet-test-utils")]110				TestUtils: pallet_test_utils = 255,111			}112		}113	};114}
after · runtime/common/construct_runtime.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#[macro_export]18macro_rules! construct_runtime {19	() => {20		frame_support::construct_runtime! {2122			pub enum Runtime where23				Block = Block,24				NodeBlock = opaque::Block,25				UncheckedExtrinsic = UncheckedExtrinsic26			{27				System: frame_system = 0,2829				ParachainSystem: cumulus_pallet_parachain_system = 20,30				ParachainInfo: parachain_info = 21,3132				#[cfg(feature = "collator-selection")]33				Authorship: pallet_authorship = 22,3435				#[cfg(feature = "collator-selection")]36				CollatorSelection: pallet_collator_selection = 23,3738				#[cfg(feature = "collator-selection")]39				Session: pallet_session = 24,4041				Aura: pallet_aura = 25,42				AuraExt: cumulus_pallet_aura_ext = 26,4344				Balances: pallet_balances = 30,45				// RandomnessCollectiveFlip = 3146				Timestamp: pallet_timestamp = 32,47				TransactionPayment: pallet_transaction_payment = 33,48				Treasury: pallet_treasury = 34,49				Sudo: pallet_sudo = 35,50				Vesting: orml_vesting = 37,5152				XTokens: orml_xtokens = 38,53				Tokens: orml_tokens = 39,54				// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,5556				#[cfg(feature = "collator-selection")]57				Identity: pallet_identity = 40,5859				#[cfg(feature = "preimage")]60				Preimage: pallet_preimage = 41,6162				// XCM helpers.63				XcmpQueue: cumulus_pallet_xcmp_queue = 50,64				PolkadotXcm: pallet_xcm = 51,65				CumulusXcm: cumulus_pallet_xcm = 52,66				DmpQueue: cumulus_pallet_dmp_queue = 53,6768				// Unique Pallets69				Inflation: pallet_inflation = 60,70				Unique: pallet_unique::{Pallet, Call, Storage} = 61,7172				// #[cfg(feature = "scheduler")]73				// Scheduler: pallet_unique_scheduler_v2 = 62,7475				Configuration: pallet_configuration = 63,7677				Charging: pallet_charge_transaction = 64,78				// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,79				Common: pallet_common = 66,80				Fungible: pallet_fungible = 67,8182				#[cfg(feature = "refungible")]83				Refungible: pallet_refungible = 68,8485				Nonfungible: pallet_nonfungible = 69,86				Structure: pallet_structure = 70,8788				// RmrkCore: pallet_proxy_rmrk_core = 71,8990				// RmrkEquip: pallet_proxy_rmrk_equip = 72,9192				#[cfg(feature = "app-promotion")]93				AppPromotion: pallet_app_promotion = 73,9495				#[cfg(feature = "foreign-assets")]96				ForeignAssets: pallet_foreign_assets = 80,9798				// Frontier99				EVM: pallet_evm = 100,100				Ethereum: pallet_ethereum = 101,101102				EvmCoderSubstrate: pallet_evm_coder_substrate = 150,103				EvmContractHelpers: pallet_evm_contract_helpers = 151,104				EvmTransactionPayment: pallet_evm_transaction_payment = 152,105				EvmMigration: pallet_evm_migration = 153,106107				Maintenance: pallet_maintenance = 154,108109				BalancesAdapter: pallet_balances_adapter = 155,110111				#[cfg(feature = "pallet-test-utils")]112				TestUtils: pallet_test_utils = 255,113			}114		}115	};116}
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- 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
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- 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 }
 
 
 ################################################################################
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- 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