difftreelog
fix make check
in: master
8 files changed
Cargo.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",
Cargo.tomldiffbeforeafterboth1[workspace]2default-members = ['client/*', 'node/*', 'runtime/opal']3members = [4 'client/*',5 'crates/*',6 'node/*',7 'pallets/*',8 'primitives/*',9 'runtime/opal',10 'runtime/quartz',11 'runtime/tests',12 'runtime/unique',13]14package.version = "1.2.0"15resolver = "2"1617[profile.release]18# Runtime requires unwinding19panic = "unwind"2021[profile.production]22codegen-units = 123inherits = "release"24lto = true25opt-level = 32627[profile.integration-tests]28debug-assertions = true29inherits = "release"3031[workspace.dependencies]32# Unique33app-promotion-rpc = { path = "primitives/app_promotion_rpc", default-features = false }34evm-coder = { version = "0.4.2", default-features = false, features = ['bondrewd'] }35pallet-app-promotion = { path = "pallets/app-promotion", default-features = false }36pallet-balances-adapter = { default-features = false, path = "pallets/balances-adapter" }37pallet-charge-transaction = { package = "pallet-template-transaction-payment", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v1.3.0" }38pallet-collator-selection = { default-features = false, path = "pallets/collator-selection" }39pallet-common = { default-features = false, path = "pallets/common" }40pallet-configuration = { default-features = false, path = "pallets/configuration" }41pallet-evm-coder-substrate = { default-features = false, path = "pallets/evm-coder-substrate" }42pallet-evm-contract-helpers = { path = "pallets/evm-contract-helpers", default-features = false }43pallet-evm-migration = { path = "pallets/evm-migration", default-features = false }44pallet-evm-transaction-payment = { path = "pallets/evm-transaction-payment", default-features = false }45pallet-foreign-assets = { default-features = false, path = "pallets/foreign-assets" }46pallet-fungible = { default-features = false, path = "pallets/fungible" }47pallet-gov-origins = { default-features = false, path = "pallets/gov-origins" }48pallet-identity = { default-features = false, path = "pallets/identity" }49pallet-inflation = { path = "pallets/inflation", default-features = false }50pallet-maintenance = { default-features = false, path = "pallets/maintenance" }51pallet-nonfungible = { default-features = false, path = "pallets/nonfungible" }52pallet-refungible = { default-features = false, path = "pallets/refungible" }53pallet-structure = { default-features = false, path = "pallets/structure" }54pallet-test-utils = { default-features = false, path = "test-pallets/utils" }55pallet-unique = { path = "pallets/unique", default-features = false }56precompile-utils-macro = { path = "runtime/common/ethereum/precompiles/utils/macro" }57struct-versioning = { path = "crates/struct-versioning" }58uc-rpc = { path = "client/rpc" }59unique-rpc = { path = "node/rpc" }60up-common = { path = "primitives/common", default-features = false }61up-data-structs = { path = "primitives/data-structs", default-features = false }62up-pov-estimate-rpc = { path = "primitives/pov-estimate-rpc", default-features = false }63up-rpc = { path = "primitives/rpc", default-features = false }64up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v1.3.0" }6566# Unique: Runtimes67opal-runtime = { path = "runtime/opal" }68quartz-runtime = { path = "runtime/quartz" }69unique-runtime = { path = "runtime/unique" }7071# Frontier (Unique patches over the Parity version)72fc-api = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }73fc-consensus = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }74fc-db = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }75fc-mapping-sync = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }76fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }77fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }78fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }79fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }80fp-self-contained = { default-features = false, features = [81 "serde",82], git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }83fp-storage = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }84pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }85pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }86pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }87pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.3.0" }8889# Parity90codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = "3.6.5" }91cumulus-client-cli = "0.4.0"92cumulus-client-collator = "0.4.0"93cumulus-client-consensus-aura = "0.4.0"94cumulus-client-consensus-common = "0.4.0"95cumulus-client-consensus-proposer = "0.4.0"96cumulus-client-network = "0.4.0"97cumulus-client-service = "0.4.0"98cumulus-pallet-aura-ext = { default-features = false, version = "0.4.0" }99cumulus-pallet-dmp-queue = { default-features = false, version = "0.4.0" }100cumulus-pallet-parachain-system = { default-features = false, version = "0.4.0" }101cumulus-pallet-xcm = { default-features = false, version = "0.4.0" }102cumulus-pallet-xcmp-queue = { default-features = false, version = "0.4.0" }103cumulus-primitives-aura = { default-features = false, version = "0.4.0" }104cumulus-primitives-core = { default-features = false, version = "0.4.0" }105cumulus-primitives-parachain-inherent = { default-features = false, version = "0.4.0" }106cumulus-primitives-timestamp = { default-features = false, version = "0.4.0" }107cumulus-primitives-utility = { default-features = false, version = "0.4.0" }108cumulus-relay-chain-inprocess-interface = "0.4.0"109cumulus-relay-chain-interface = "0.4.0"110cumulus-relay-chain-minimal-node = "0.4.0"111frame-executive = { default-features = false, version = "25.0.0" }112frame-support = { default-features = false, version = "25.0.0" }113frame-system = { default-features = false, version = "25.0.0" }114frame-system-rpc-runtime-api = { default-features = false, version = "23.0.0" }115pallet-aura = { default-features = false, version = "24.0.0" }116pallet-authorship = { default-features = false, version = "25.0.0" }117pallet-balances = { default-features = false, version = "25.0.0" }118pallet-collective = { default-features = false, version = "25.0.0" }119pallet-democracy = { default-features = false, version = "25.0.0" }120pallet-membership = { default-features = false, version = "25.0.0" }121pallet-preimage = { default-features = false, version = "25.0.0" }122pallet-ranked-collective = { default-features = false, version = "25.0.0" }123pallet-referenda = { default-features = false, version = "25.0.0" }124pallet-scheduler = { default-features = false, version = "26.0.0" }125pallet-session = { default-features = false, version = "25.0.0" }126pallet-state-trie-migration = { default-features = false, version = "26.0.0" }127pallet-sudo = { default-features = false, version = "25.0.0" }128pallet-timestamp = { default-features = false, version = "24.0.0" }129pallet-transaction-payment = { default-features = false, version = "25.0.0" }130pallet-transaction-payment-rpc = "27.0.0"131pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = "25.0.0" }132pallet-treasury = { default-features = false, version = "24.0.0" }133pallet-utility = { default-features = false, version = "25.0.0" }134pallet-xcm = { default-features = false , version = "4.0.0" }135staging-parachain-info = { default-features = false, version = "0.4.0" }136parity-scale-codec = { version = "3.6.5", features = ["derive"], default-features = false }137polkadot-cli = "4.0.0"138polkadot-parachain-primitives = { default-features = false , version = "3.0.0" }139polkadot-runtime-common = { default-features = false , version = "4.0.0" }140polkadot-primitives = "4.0.0"141polkadot-service = "4.0.0"142sc-basic-authorship = "0.31.0"143sc-chain-spec = "24.0.0"144sc-cli = "0.33.0"145sc-client-api = "25.0.0"146sc-consensus = "0.30.0"147sc-consensus-manual-seal = "0.32.0"148sc-executor = "0.29.0"149sc-network = "0.31.0"150sc-network-sync = "0.30.0"151sc-rpc = "26.0.0"152sc-rpc-api = "0.30.0"153sc-service = "0.32.0"154sc-sysinfo = "24.0.0"155sc-telemetry = "12.0.0"156sc-tracing = "25.0.0"157sc-transaction-pool = "25.0.0"158scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }159sp-api = { default-features = false, version = "23.0.0" }160sp-arithmetic = { default-features = false, version = "20.0.0" }161sp-block-builder = { default-features = false, version = "23.0.0" }162sp-blockchain = "25.0.0"163sp-consensus-aura = { default-features = false, version = "0.29.0" }164sp-core = { default-features = false, version = "25.0.0" }165sp-externalities = "0.23.0"166sp-inherents = { default-features = false, version = "23.0.0" }167sp-io = { default-features = false, version = "27.0.0" }168sp-keystore = "0.31.0"169sp-offchain = { default-features = false, version = "23.0.0" }170sp-runtime = { default-features = false, version = "28.0.0" }171sp-session = { default-features = false, version = "24.0.0" }172sp-staking = { default-features = false, version = "23.0.0" }173sp-state-machine = "0.32.0"174sp-std = { default-features = false, version = "12.0.0" }175sp-storage = { default-features = false, version = "17.0.0" }176sp-timestamp = "23.0.0"177sp-tracing = "14.0.0"178sp-transaction-pool = { default-features = false, version = "23.0.0" }179sp-trie = { default-features = false, version = "26.0.0" }180sp-version = { default-features = false, version = "26.0.0" }181sp-weights = { default-features = false, version = "24.0.0" }182staging-xcm = { default-features = false , version = "4.0.0" }183staging-xcm-builder = { default-features = false , version = "4.0.0" }184staging-xcm-executor = { default-features = false , version = "4.0.0" }185substrate-frame-rpc-system = "25.0.0"186substrate-prometheus-endpoint = "0.16.0"187188# Parity: Build utils189substrate-build-script-utils = "9.0.0"190substrate-wasm-builder = "14.0.0"191192# Parity: Benchmarking193frame-benchmarking = { default-features = false, version = "25.0.0" }194frame-benchmarking-cli = "29.0.0"195frame-system-benchmarking = { default-features = false, version = "25.0.0" }196197# Parity: Try Runtime198frame-try-runtime = { default-features = false, version = "0.31.0" }199try-runtime-cli = "0.35.0"200201# ORML202orml-tokens = { default-features = false, git = "https://github.com/uniquenetwork/open-runtime-module-library", branch = "unique-polkadot-v1.3.0" }203orml-traits = { default-features = false, git = "https://github.com/uniquenetwork/open-runtime-module-library", branch = "unique-polkadot-v1.3.0" }204orml-vesting = { default-features = false, git = "https://github.com/uniquenetwork/open-runtime-module-library", branch = "unique-polkadot-v1.3.0" }205orml-xcm-support = { default-features = false, git = "https://github.com/uniquenetwork/open-runtime-module-library", branch = "unique-polkadot-v1.3.0" }206orml-xtokens = { default-features = false, git = "https://github.com/uniquenetwork/open-runtime-module-library", branch = "unique-polkadot-v1.3.0" }207208# Other209derivative = { version = "2.2.0", features = ["use_core"] }210ethereum = { version = "0.14.0", default-features = false }211evm-core = { git = "https://github.com/rust-blockchain/evm", rev = "b7b82c7e1fc57b7449d6dfa6826600de37cc1e65", default-features = false }212hex-literal = "0.4.1"213impl-trait-for-tuples = "0.2.2"214jsonrpsee = { version = "0.16.3", features = ["macros", "server"] }215log = { version = "0.4.20", default-features = false }216num_enum = { version = "0.7.0", default-features = false }217serde = { default-features = false, features = ['derive'], version = "1.0.188" }218smallvec = "1.11.1"219pallets/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 }
runtime/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 {
runtime/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,
})
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -61,6 +61,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,6 @@
'pallet-treasury/std',
'pallet-unique/std',
'pallet-utility/std',
- 'staging-parachain-info/std',
'polkadot-runtime-common/std',
'serde',
'sp-api/std',
@@ -141,6 +141,7 @@
'sp-storage/std',
'sp-transaction-pool/std',
'sp-version/std',
+ 'staging-parachain-info/std',
'staging-xcm-builder/std',
'staging-xcm-executor/std',
'staging-xcm/std',
@@ -221,12 +222,13 @@
'pallet-unique/try-runtime',
'pallet-utility/try-runtime',
'pallet-xcm/try-runtime',
+ 'polkadot-runtime-common/try-runtime',
'staging-parachain-info/try-runtime',
- 'polkadot-runtime-common/try-runtime',
]
app-promotion = []
collator-selection = []
+fast-inflation = []
foreign-assets = []
gov-test-timings = []
governance = []
@@ -234,7 +236,6 @@
preimage = []
refungible = []
session-test-timings = []
-fast-inflation = []
################################################################################
# local dependencies
@@ -271,7 +272,6 @@
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 }
@@ -290,6 +290,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 }
runtime/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 }
runtime/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 }