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

difftreelog

fix make check

Yaroslav Bolyukin2023-11-17parent: #7f81f6c.patch.diff
in: master

8 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10160,6 +10160,7 @@
  "pallet-xcm",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
  "precompile-utils-macro",
  "scale-info",
  "serde",
@@ -15037,6 +15038,7 @@
  "pallet-xcm",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
  "precompile-utils-macro",
  "scale-info",
  "serde",
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -131,13 +131,12 @@
 pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = "25.0.0" }
 pallet-treasury = { default-features = false, version = "24.0.0" }
 pallet-utility = { default-features = false, version = "25.0.0" }
-pallet-xcm = { default-features = false , version = "4.0.0" }
-staging-parachain-info = { default-features = false, version = "0.4.0" }
+pallet-xcm = { default-features = false, version = "4.0.0" }
 parity-scale-codec = { version = "3.6.5", features = ["derive"], default-features = false }
 polkadot-cli = "4.0.0"
-polkadot-parachain-primitives = { default-features = false , version = "3.0.0" }
-polkadot-runtime-common = { default-features = false , version = "4.0.0" }
+polkadot-parachain-primitives = { default-features = false, version = "3.0.0" }
 polkadot-primitives = "4.0.0"
+polkadot-runtime-common = { default-features = false, version = "4.0.0" }
 polkadot-service = "4.0.0"
 sc-basic-authorship = "0.31.0"
 sc-chain-spec = "24.0.0"
@@ -179,9 +178,10 @@
 sp-trie = { default-features = false, version = "26.0.0" }
 sp-version = { default-features = false, version = "26.0.0" }
 sp-weights = { default-features = false, version = "24.0.0" }
-staging-xcm = { default-features = false , version = "4.0.0" }
-staging-xcm-builder = { default-features = false , version = "4.0.0" }
-staging-xcm-executor = { default-features = false , version = "4.0.0" }
+staging-parachain-info = { default-features = false, version = "0.4.0" }
+staging-xcm = { default-features = false, version = "4.0.0" }
+staging-xcm-builder = { default-features = false, version = "4.0.0" }
+staging-xcm-executor = { default-features = false, version = "4.0.0" }
 substrate-frame-rpc-system = "25.0.0"
 substrate-prometheus-endpoint = "0.16.0"
 
@@ -216,4 +216,3 @@
 num_enum = { version = "0.7.0", default-features = false }
 serde = { default-features = false, features = ['derive'], version = "1.0.188" }
 smallvec = "1.11.1"
-
modifiedpallets/inflation/Cargo.tomldiffbeforeafterboth
--- a/pallets/inflation/Cargo.toml
+++ b/pallets/inflation/Cargo.toml
@@ -16,6 +16,7 @@
 
 [features]
 default = ['std']
+fast-inflation = []
 runtime-benchmarks = ['frame-benchmarking']
 std = [
 	'frame-benchmarking/std',
@@ -27,7 +28,6 @@
 	'sp-std/std',
 ]
 try-runtime = ["frame-support/try-runtime"]
-fast-inflation = []
 
 [dependencies]
 parity-scale-codec = { workspace = true }
modifiedruntime/common/config/substrate.rsdiffbeforeafterboth
--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -241,6 +241,8 @@
 	type Paymaster = PayFromAccount<Balances, TreasuryAccount>;
 	type BalanceConverter = UnityAssetBalanceConversion;
 	type PayoutPeriod = ConstU32<10>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 impl pallet_sudo::Config for Runtime {
modifiedruntime/common/tests/xcm.rsdiffbeforeafterboth
--- a/runtime/common/tests/xcm.rs
+++ b/runtime/common/tests/xcm.rs
@@ -37,7 +37,7 @@
 			Box::new(VersionedXcm::from(Xcm(vec![Transact {
 				origin_kind: OriginKind::Native,
 				require_weight_at_most: Weight::from_parts(1000, 1000),
-				call: RuntimeCall::Balances(pallet_balances::Call::<Runtime>::transfer {
+				call: RuntimeCall::Balances(pallet_balances::Call::<Runtime>::transfer_keep_alive {
 					dest: BOB.into(),
 					value: INITIAL_BALANCE / 2,
 				})
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
after · runtime/opal/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Opal Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'opal-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version.workspace = true1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['opal-runtime', 'std']20limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']21opal-runtime = [22	'app-promotion',23	'collator-selection',24	'foreign-assets',25	'governance',26	'pallet-test-utils',27	'preimage',28	'refungible',29]30pov-estimate = []31runtime-benchmarks = [32	"pallet-preimage/runtime-benchmarks",33	'cumulus-pallet-parachain-system/runtime-benchmarks',34	'frame-benchmarking',35	'frame-support/runtime-benchmarks',36	'frame-system-benchmarking',37	'frame-system/runtime-benchmarks',38	'pallet-app-promotion/runtime-benchmarks',39	'pallet-balances/runtime-benchmarks',40	'pallet-collator-selection/runtime-benchmarks',41	'pallet-collective/runtime-benchmarks',42	'pallet-common/runtime-benchmarks',43	'pallet-configuration/runtime-benchmarks',44	'pallet-democracy/runtime-benchmarks',45	'pallet-ethereum/runtime-benchmarks',46	'pallet-evm-coder-substrate/runtime-benchmarks',47	'pallet-evm-migration/runtime-benchmarks',48	'pallet-foreign-assets/runtime-benchmarks',49	'pallet-fungible/runtime-benchmarks',50	'pallet-identity/runtime-benchmarks',51	'pallet-inflation/runtime-benchmarks',52	'pallet-maintenance/runtime-benchmarks',53	'pallet-membership/runtime-benchmarks',54	'pallet-nonfungible/runtime-benchmarks',55	'pallet-ranked-collective/runtime-benchmarks',56	'pallet-referenda/runtime-benchmarks',57	'pallet-refungible/runtime-benchmarks',58	'pallet-scheduler/runtime-benchmarks',59	'pallet-structure/runtime-benchmarks',60	'pallet-timestamp/runtime-benchmarks',61	'pallet-unique/runtime-benchmarks',62	'pallet-utility/runtime-benchmarks',63	'pallet-xcm/runtime-benchmarks',64	'polkadot-runtime-common/runtime-benchmarks',65	'sp-runtime/runtime-benchmarks',66	'staging-xcm-builder/runtime-benchmarks',67]68std = [69	'cumulus-pallet-aura-ext/std',70	'cumulus-pallet-parachain-system/std',71	'cumulus-pallet-xcm/std',72	'cumulus-pallet-xcmp-queue/std',73	'cumulus-primitives-aura/std',74	'cumulus-primitives-core/std',75	'cumulus-primitives-utility/std',76	'frame-executive/std',77	'frame-support/std',78	'frame-system-rpc-runtime-api/std',79	'frame-system/std',80	'frame-try-runtime/std',81	'pallet-aura/std',82	'pallet-balances/std',83	'pallet-collective/std',84	'pallet-democracy/std',85	'pallet-gov-origins/std',86	'pallet-membership/std',87	'pallet-ranked-collective/std',88	'pallet-referenda/std',89	'pallet-scheduler/std',90	'parity-scale-codec/std',91	# 'pallet-contracts/std',92	# 'pallet-contracts-primitives/std',93	# 'pallet-contracts-rpc-runtime-api/std',94	# 'pallet-contract-helpers/std',95	"pallet-authorship/std",96	"pallet-preimage/std",97	"pallet-session/std",98	"pallet-state-trie-migration/std",99	"sp-consensus-aura/std",100	'app-promotion-rpc/std',101	'evm-coder/std',102	'fp-rpc/std',103	'fp-self-contained/std',104	'pallet-app-promotion/std',105	'pallet-balances-adapter/std',106	'pallet-base-fee/std',107	'pallet-charge-transaction/std',108	'pallet-collator-selection/std',109	'pallet-common/std',110	'pallet-configuration/std',111	'pallet-ethereum/std',112	'pallet-evm-coder-substrate/std',113	'pallet-evm-contract-helpers/std',114	'pallet-evm-migration/std',115	'pallet-evm-transaction-payment/std',116	'pallet-evm/std',117	'pallet-fungible/std',118	'pallet-identity/std',119	'pallet-inflation/std',120	'pallet-nonfungible/std',121	'pallet-refungible/std',122	'pallet-structure/std',123	'pallet-sudo/std',124	'pallet-timestamp/std',125	'pallet-transaction-payment-rpc-runtime-api/std',126	'pallet-transaction-payment/std',127	'pallet-treasury/std',128	'pallet-unique/std',129	'pallet-utility/std',130	'polkadot-runtime-common/std',131	'serde',132	'sp-api/std',133	'sp-block-builder/std',134	'sp-core/std',135	'sp-inherents/std',136	'sp-io/std',137	'sp-offchain/std',138	'sp-runtime/std',139	'sp-session/std',140	'sp-std/std',141	'sp-storage/std',142	'sp-transaction-pool/std',143	'sp-version/std',144	'staging-parachain-info/std',145	'staging-xcm-builder/std',146	'staging-xcm-executor/std',147	'staging-xcm/std',148	'up-common/std',149	'up-data-structs/std',150	'up-pov-estimate-rpc/std',151	'up-rpc/std',152	'up-sponsorship/std',153154	"orml-tokens/std",155	"orml-traits/std",156	"orml-vesting/std",157	"orml-xcm-support/std",158	"orml-xtokens/std",159	"pallet-foreign-assets/std",160161	'pallet-maintenance/std',162	'pallet-test-utils?/std',163]164try-runtime = [165	"pallet-authorship/try-runtime",166	"pallet-collator-selection/try-runtime",167	"pallet-identity/try-runtime",168	"pallet-preimage/try-runtime",169	"pallet-session/try-runtime",170	"pallet-state-trie-migration/try-runtime",171	'cumulus-pallet-aura-ext/try-runtime',172	'cumulus-pallet-dmp-queue/try-runtime',173	'cumulus-pallet-parachain-system/try-runtime',174	'cumulus-pallet-xcm/try-runtime',175	'cumulus-pallet-xcmp-queue/try-runtime',176	'fp-self-contained/try-runtime',177	'frame-executive/try-runtime',178	'frame-support/try-runtime',179	'frame-system/try-runtime',180	'frame-try-runtime',181	'frame-try-runtime?/try-runtime',182	'orml-tokens/try-runtime',183	'orml-vesting/try-runtime',184	'orml-xtokens/try-runtime',185	'pallet-app-promotion/try-runtime',186	'pallet-aura/try-runtime',187	'pallet-balances-adapter/try-runtime',188	'pallet-balances/try-runtime',189	'pallet-base-fee/try-runtime',190	'pallet-charge-transaction/try-runtime',191	'pallet-collective/try-runtime',192	'pallet-collective/try-runtime',193	'pallet-common/try-runtime',194	'pallet-configuration/try-runtime',195	'pallet-democracy/try-runtime',196	'pallet-democracy/try-runtime',197	'pallet-ethereum/try-runtime',198	'pallet-evm-coder-substrate/try-runtime',199	'pallet-evm-contract-helpers/try-runtime',200	'pallet-evm-migration/try-runtime',201	'pallet-evm-transaction-payment/try-runtime',202	'pallet-evm/try-runtime',203	'pallet-foreign-assets/try-runtime',204	'pallet-fungible/try-runtime',205	'pallet-gov-origins/try-runtime',206	'pallet-inflation/try-runtime',207	'pallet-maintenance/try-runtime',208	'pallet-membership/try-runtime',209	'pallet-membership/try-runtime',210	'pallet-nonfungible/try-runtime',211	'pallet-ranked-collective/try-runtime',212	'pallet-referenda/try-runtime',213	'pallet-refungible/try-runtime',214	'pallet-scheduler/try-runtime',215	'pallet-scheduler/try-runtime',216	'pallet-structure/try-runtime',217	'pallet-sudo/try-runtime',218	'pallet-test-utils?/try-runtime',219	'pallet-timestamp/try-runtime',220	'pallet-transaction-payment/try-runtime',221	'pallet-treasury/try-runtime',222	'pallet-unique/try-runtime',223	'pallet-utility/try-runtime',224	'pallet-xcm/try-runtime',225	'polkadot-runtime-common/try-runtime',226	'staging-parachain-info/try-runtime',227]228229app-promotion = []230collator-selection = []231fast-inflation = []232foreign-assets = []233gov-test-timings = []234governance = []235lookahead = ['cumulus-pallet-parachain-system/parameterized-consensus-hook', 'pallet-aura/experimental']236preimage = []237refungible = []238session-test-timings = []239240################################################################################241# local dependencies242243[dependencies]244cumulus-pallet-aura-ext = { workspace = true }245cumulus-pallet-dmp-queue = { workspace = true }246cumulus-pallet-parachain-system = { workspace = true }247cumulus-pallet-xcm = { workspace = true }248cumulus-pallet-xcmp-queue = { workspace = true }249cumulus-primitives-aura = { workspace = true }250cumulus-primitives-core = { workspace = true }251cumulus-primitives-timestamp = { workspace = true }252cumulus-primitives-utility = { workspace = true }253frame-executive = { workspace = true }254frame-support = { workspace = true }255frame-system = { workspace = true }256frame-system-rpc-runtime-api = { workspace = true }257orml-tokens = { workspace = true }258orml-traits = { workspace = true }259orml-vesting = { workspace = true }260orml-xcm-support = { workspace = true }261orml-xtokens = { workspace = true }262pallet-aura = { workspace = true }263pallet-authorship = { workspace = true }264pallet-balances = { features = ["insecure_zero_ed"], workspace = true }265pallet-preimage = { workspace = true }266pallet-session = { workspace = true }267pallet-state-trie-migration = { workspace = true }268pallet-sudo = { workspace = true }269pallet-timestamp = { workspace = true }270pallet-transaction-payment = { workspace = true }271pallet-transaction-payment-rpc-runtime-api = { workspace = true }272pallet-treasury = { workspace = true }273pallet-utility = { workspace = true }274pallet-xcm = { workspace = true }275parity-scale-codec = { workspace = true }276polkadot-parachain-primitives = { workspace = true }277polkadot-runtime-common = { workspace = true }278smallvec = { workspace = true }279sp-api = { workspace = true }280sp-arithmetic = { workspace = true }281sp-block-builder = { workspace = true }282sp-consensus-aura = { workspace = true }283sp-core = { workspace = true }284sp-inherents = { workspace = true }285sp-io = { workspace = true }286sp-offchain = { workspace = true }287sp-runtime = { workspace = true }288sp-session = { workspace = true }289sp-std = { workspace = true }290sp-storage = { workspace = true }291sp-transaction-pool = { workspace = true }292sp-version = { workspace = true }293staging-parachain-info = { workspace = true }294staging-xcm = { workspace = true }295staging-xcm-builder = { workspace = true }296staging-xcm-executor = { workspace = true }297298app-promotion-rpc = { workspace = true }299derivative = { workspace = true }300evm-coder = { workspace = true }301fp-evm = { workspace = true }302fp-rpc = { workspace = true }303fp-self-contained = { workspace = true }304log = { workspace = true }305num_enum = { workspace = true }306pallet-app-promotion = { workspace = true }307pallet-balances-adapter = { workspace = true }308pallet-base-fee = { workspace = true }309pallet-charge-transaction = { workspace = true }310pallet-collator-selection = { workspace = true }311pallet-collective = { workspace = true }312pallet-common = { workspace = true }313pallet-configuration = { workspace = true }314pallet-democracy = { workspace = true }315pallet-ethereum = { workspace = true }316pallet-evm = { workspace = true }317pallet-evm-coder-substrate = { workspace = true }318pallet-evm-contract-helpers = { workspace = true }319pallet-evm-migration = { workspace = true }320pallet-evm-precompile-simple = { workspace = true }321pallet-evm-transaction-payment = { workspace = true }322pallet-foreign-assets = { workspace = true }323pallet-fungible = { workspace = true }324pallet-gov-origins = { workspace = true }325pallet-identity = { workspace = true }326pallet-inflation = { workspace = true }327pallet-maintenance = { workspace = true }328pallet-membership = { workspace = true }329pallet-nonfungible = { workspace = true }330pallet-ranked-collective = { workspace = true }331pallet-referenda = { workspace = true }332pallet-refungible = { workspace = true }333pallet-scheduler = { workspace = true }334pallet-structure = { workspace = true }335pallet-unique = { workspace = true }336precompile-utils-macro = { workspace = true }337scale-info = { workspace = true }338up-common = { workspace = true }339up-data-structs = { workspace = true }340up-pov-estimate-rpc = { workspace = true }341up-rpc = { workspace = true }342up-sponsorship = { workspace = true }343344################################################################################345# Optional dependencies346347frame-benchmarking = { workspace = true, optional = true }348frame-system-benchmarking = { workspace = true, optional = true }349frame-try-runtime = { workspace = true, optional = true }350serde = { workspace = true, optional = true }351352################################################################################353# Test dependencies354355pallet-test-utils = { workspace = true, optional = true }356357################################################################################358# Other Dependencies359360hex-literal = { workspace = true }361impl-trait-for-tuples = { workspace = true }362363[build-dependencies]364substrate-wasm-builder = { workspace = true }
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -58,6 +58,7 @@
 	'pallet-unique/runtime-benchmarks',
 	'pallet-utility/runtime-benchmarks',
 	'pallet-xcm/runtime-benchmarks',
+	'polkadot-runtime-common/runtime-benchmarks',
 	'sp-runtime/runtime-benchmarks',
 	'staging-xcm-builder/runtime-benchmarks',
 ]
@@ -126,7 +127,7 @@
 	'pallet-treasury/std',
 	'pallet-unique/std',
 	'pallet-utility/std',
-	'staging-parachain-info/std',
+	'polkadot-runtime-common/std',
 	'serde',
 	'sp-api/std',
 	'sp-block-builder/std',
@@ -139,6 +140,7 @@
 	'sp-std/std',
 	'sp-transaction-pool/std',
 	'sp-version/std',
+	'staging-parachain-info/std',
 	'staging-xcm-builder/std',
 	'staging-xcm-executor/std',
 	'staging-xcm/std',
@@ -210,18 +212,19 @@
 	'pallet-unique/try-runtime',
 	'pallet-utility/try-runtime',
 	'pallet-xcm/try-runtime',
+	'polkadot-runtime-common/try-runtime',
 	'staging-parachain-info/try-runtime',
 ]
 
 app-promotion = []
 collator-selection = []
+fast-inflation = []
 foreign-assets = []
 gov-test-timings = []
 governance = []
 preimage = []
 refungible = []
 session-test-timings = []
-fast-inflation = []
 
 ################################################################################
 # local dependencies
@@ -257,9 +260,9 @@
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-xcm = { workspace = true }
-staging-parachain-info = { workspace = true }
 parity-scale-codec = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 smallvec = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
@@ -275,6 +278,7 @@
 sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
+staging-parachain-info = { workspace = true }
 staging-xcm = { workspace = true }
 staging-xcm-builder = { workspace = true }
 staging-xcm-executor = { workspace = true }
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -55,6 +55,7 @@
 	'pallet-unique/runtime-benchmarks',
 	'pallet-utility/runtime-benchmarks',
 	'pallet-xcm/runtime-benchmarks',
+	'polkadot-runtime-common/runtime-benchmarks',
 	'sp-runtime/runtime-benchmarks',
 	'staging-xcm-builder/runtime-benchmarks',
 	'up-data-structs/runtime-benchmarks',
@@ -124,7 +125,7 @@
 	'pallet-treasury/std',
 	'pallet-unique/std',
 	'pallet-utility/std',
-	'staging-parachain-info/std',
+	'polkadot-runtime-common/std',
 	'sp-api/std',
 	'sp-block-builder/std',
 	'sp-core/std',
@@ -136,6 +137,7 @@
 	'sp-std/std',
 	'sp-transaction-pool/std',
 	'sp-version/std',
+	'staging-parachain-info/std',
 	'staging-xcm-builder/std',
 	'staging-xcm-executor/std',
 	'staging-xcm/std',
@@ -212,19 +214,20 @@
 	'pallet-unique/try-runtime',
 	'pallet-utility/try-runtime',
 	'pallet-xcm/try-runtime',
+	'polkadot-runtime-common/try-runtime',
 	'staging-parachain-info/try-runtime',
 ]
-unique-runtime = ['app-promotion', 'foreign-assets', 'refungible', 'governance', 'preimage']
+unique-runtime = ['app-promotion', 'foreign-assets', 'governance', 'preimage', 'refungible']
 
 app-promotion = []
 collator-selection = []
+fast-inflation = []
 foreign-assets = []
 gov-test-timings = []
 governance = []
 preimage = []
 refungible = []
 session-test-timings = []
-fast-inflation = []
 
 ################################################################################
 # local dependencies
@@ -260,9 +263,9 @@
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-xcm = { workspace = true }
-staging-parachain-info = { workspace = true }
 parity-scale-codec = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 smallvec = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
@@ -278,6 +281,7 @@
 sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
+staging-parachain-info = { workspace = true }
 staging-xcm = { workspace = true }
 staging-xcm-builder = { workspace = true }
 staging-xcm-executor = { workspace = true }