From 33b4403e8674cf2939f5fecc6f48519a59a3faee Mon Sep 17 00:00:00 2001 From: GopherJ Date: Tue, 26 Dec 2023 23:55:05 +0800 Subject: [PATCH 1/3] fix: min nominator bond Signed-off-by: GopherJ --- pallets/evm-signatures/src/tests.rs | 1 + pallets/prices/src/mock.rs | 1 + precompiles/assets-erc20/src/mock.rs | 1 + runtime/heiko/src/lib.rs | 2 +- runtime/parallel/src/lib.rs | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pallets/evm-signatures/src/tests.rs b/pallets/evm-signatures/src/tests.rs index d68feb400..8ea450a80 100644 --- a/pallets/evm-signatures/src/tests.rs +++ b/pallets/evm-signatures/src/tests.rs @@ -125,6 +125,7 @@ impl pallet_assets::Config for Runtime { type Freezer = (); type Extra = (); type WeightInfo = (); + type BenchmarkHelper = (); type RemoveItemsLimit = frame_support::traits::ConstU32<1000>; type CallbackHandle = (); #[cfg(feature = "runtime-benchmarks")] diff --git a/pallets/prices/src/mock.rs b/pallets/prices/src/mock.rs index 243368597..f830746a6 100644 --- a/pallets/prices/src/mock.rs +++ b/pallets/prices/src/mock.rs @@ -233,6 +233,7 @@ impl pallet_assets::Config for Test { type Freezer = (); type Extra = (); type WeightInfo = (); + type BenchmarkHelper = (); type RemoveItemsLimit = frame_support::traits::ConstU32<1000>; type CallbackHandle = (); #[cfg(feature = "runtime-benchmarks")] diff --git a/precompiles/assets-erc20/src/mock.rs b/precompiles/assets-erc20/src/mock.rs index e0994b476..00cd708c4 100644 --- a/precompiles/assets-erc20/src/mock.rs +++ b/precompiles/assets-erc20/src/mock.rs @@ -252,6 +252,7 @@ impl pallet_assets::Config for Runtime { type StringLimit = AssetsStringLimit; type Freezer = (); type Extra = (); + type BenchmarkHelper = (); type WeightInfo = pallet_assets::weights::SubstrateWeight; type RemoveItemsLimit = frame_support::traits::ConstU32<1000>; type CallbackHandle = (); diff --git a/runtime/heiko/src/lib.rs b/runtime/heiko/src/lib.rs index 8900176cb..6a5943737 100644 --- a/runtime/heiko/src/lib.rs +++ b/runtime/heiko/src/lib.rs @@ -524,7 +524,7 @@ impl pallet_loans::Config for Runtime { parameter_types! { pub const StakingPalletId: PalletId = PalletId(*b"par/lqsk"); pub const EraLength: BlockNumber = 6 * 1 * 3600 / 6; // 6HOURS - pub const MinStake: Balance = 100_000_000_000; // 0.1KSM + pub const MinStake: Balance = 1100_000_000_000; // 1.1KSM pub const MinUnstake: Balance = 50_000_000_000; // 0.05sKSM pub const StakingCurrency: CurrencyId = KSM; pub const LiquidCurrency: CurrencyId = SKSM; diff --git a/runtime/parallel/src/lib.rs b/runtime/parallel/src/lib.rs index 4782cda92..ec8ff3ef2 100644 --- a/runtime/parallel/src/lib.rs +++ b/runtime/parallel/src/lib.rs @@ -538,7 +538,7 @@ parameter_types! { pub LoansInstantUnstakeFee: Rate = Rate::saturating_from_rational(38u32, 1000u32); // (1.45 ** (3600 * 4 * 36 / 5256000) - 1) * 100% ~= 3.732% pub MatchingPoolFastUnstakeFee: Rate = Rate::saturating_from_rational(1u32, 100u32); pub const BondingDuration: EraIndex = 28; // 28Days - pub const MinNominatorBond: Balance = 100_000_000_000; // 10DOT + pub const MinNominatorBond: Balance = 10_010_000_000_000; // 1001DOT pub const NumSlashingSpans: u32 = 0; pub DerivativeIndexList: Vec = vec![0, 1, 2, 3, 4, 5]; pub const ElectionSolutionStoredOffset: BlockNumber = 12600; From 72dff28f4822f865d63a13ff2747d8e592c7fac5 Mon Sep 17 00:00:00 2001 From: GopherJ Date: Wed, 27 Dec 2023 00:35:09 +0800 Subject: [PATCH 2/3] feat: handle transact error Signed-off-by: GopherJ --- Cargo.toml | 315 +++++++++++---------- pallets/liquid-staking/src/benchmarking.rs | 2 +- pallets/liquid-staking/src/lib.rs | 13 +- pallets/xcm-helper/src/lib.rs | 2 +- runtime/heiko/src/lib.rs | 4 +- runtime/kerria/src/lib.rs | 4 +- runtime/parallel/src/lib.rs | 4 +- runtime/vanilla/src/lib.rs | 4 +- 8 files changed, 180 insertions(+), 168 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6bef863f3..c36a22ba5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,33 +11,40 @@ inherits = 'release' lto = true [workspace] -members = ['node/*', 'pallets/*', 'runtime/*', 'support', 'precompiles/*','integration-tests'] +members = [ + 'node/*', + 'pallets/*', + 'runtime/*', + 'support', + 'precompiles/*', + 'integration-tests', +] [workspace.package] -authors = ['Parallel Team'] -repository = 'https://github.com/parallel-finance/parallel' -version = '2.0.3' +authors = ['Parallel Team'] +repository = 'https://github.com/parallel-finance/parallel' +version = '2.0.4' [workspace.dependencies] # Substrate dependencies -sc-basic-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-chain-spec = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-client-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-executor = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-rpc-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-service = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-telemetry = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-transaction-pool-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-network = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-network-common = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sc-consensus-manual-seal = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-basic-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-chain-spec = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-client-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-consensus-manual-seal = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-executor = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-network = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-network-common = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-rpc-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-service = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-telemetry = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sc-transaction-pool-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } frame-executive = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } @@ -48,8 +55,8 @@ frame-system-rpc-runtime-api = { git = 'https://github.com/parityt frame-try-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } -pallet-babe = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } +pallet-babe = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } pallet-collective = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } pallet-democracy = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } @@ -68,35 +75,35 @@ pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/parityt pallet-treasury = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } +sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } +sp-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } -sp-version = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } -sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } sp-trie = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } -sp-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } +sp-version = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38', default-features = false } -try-runtime-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +try-runtime-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -substrate-prometheus-endpoint = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +substrate-prometheus-endpoint = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sp-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sp-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sp-keyring = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sp-storage = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sp-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } -sp-state-machine = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sp-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sp-keyring = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sp-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sp-state-machine = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sp-storage = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } +sp-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.38' } @@ -113,25 +120,25 @@ xcm = { git = 'https://github.com/paritytech/polkadot.git', xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38', default-features = false } xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38', default-features = false } -kusama-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } -polkadot-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } -polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } -polkadot-core-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } -xcm-simulator = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } +kusama-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } +polkadot-core-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } +polkadot-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } +polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } +xcm-simulator = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.38' } # Cumulus dependencies cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-client-collator = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } +cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } +cumulus-client-consensus-relay-chain = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-client-network = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-client-service = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-relay-chain-inprocess-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-relay-chain-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } -cumulus-relay-chain-rpc-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } -cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } -cumulus-client-consensus-relay-chain = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-relay-chain-minimal-node = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } +cumulus-relay-chain-rpc-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-test-relay-sproof-builder = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38', default-features = false } @@ -145,110 +152,114 @@ cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38', default-features = false } parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38', default-features = false } -statemine-runtime = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } -statemint-runtime = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } +statemine-runtime = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } +statemint-runtime = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.38' } # ORML dependencies orml-oracle = { version = '0.4.1-dev', default-features = false } +orml-oracle-rpc = { version = '0.4.1-dev', default-features = false } orml-oracle-rpc-runtime-api = { version = '0.4.1-dev', default-features = false } orml-traits = { version = '0.4.1-dev', default-features = false } orml-vesting = { version = '0.4.1-dev', default-features = false } orml-xcm = { version = '0.4.1-dev', default-features = false } orml-xcm-support = { version = '0.4.1-dev', default-features = false } orml-xtokens = { version = '0.4.1-dev', default-features = false } -orml-oracle-rpc = { version = '0.4.1-dev', default-features = false } # Frontier dependencies -evm = { version = '0.37.0', default-features = false } -fc-consensus = { version = '2.0.0-dev' } -fc-db = { version = '2.0.0-dev' } -fc-mapping-sync = { version = '2.0.0-dev' } -fc-rpc = { version = '2.0.0-dev' } -fc-rpc-core = { version = '1.1.0-dev' } -fp-consensus = { version = '2.0.0-dev' } -fp-evm = { version = '3.0.0-dev', default-features = false } -fp-storage = { version = '2.0.0' } -fp-dynamic-fee = { version = '1.0.0' } -fp-rpc = { version = '3.0.0-dev', default-features = false } -fp-self-contained = { version = '1.0.0-dev', default-features = false } +evm = { version = '0.37.0', default-features = false } +fc-consensus = { version = '2.0.0-dev' } +fc-db = { version = '2.0.0-dev' } +fc-mapping-sync = { version = '2.0.0-dev' } +fc-rpc = { version = '2.0.0-dev' } +fc-rpc-core = { version = '1.1.0-dev' } +fp-consensus = { version = '2.0.0-dev' } +fp-dynamic-fee = { version = '1.0.0' } +fp-evm = { version = '3.0.0-dev', default-features = false } +fp-rpc = { version = '3.0.0-dev', default-features = false } +fp-self-contained = { version = '1.0.0-dev', default-features = false } +fp-storage = { version = '2.0.0' } -pallet-base-fee = { version = '1.0.0', default-features = false } -pallet-ethereum = { version = '4.0.0-dev', default-features = false, features = ['forbid-evm-reentrancy'] } -pallet-evm = { version = '6.0.0-dev', default-features = false, features = ['forbid-evm-reentrancy'] } -pallet-evm-precompile-blake2 = { version = '2.0.0-dev', default-features = false } -pallet-evm-precompile-bn128 = { version = '2.0.0-dev', default-features = false } -pallet-evm-precompile-dispatch = { version = '2.0.0-dev', default-features = false } -pallet-evm-precompile-ed25519 = { version = '2.0.0-dev', default-features = false } -pallet-evm-precompile-modexp = { version = '2.0.0-dev', default-features = false } -pallet-evm-precompile-sha3fips = { version = '2.0.0-dev', default-features = false } -pallet-evm-precompile-simple = { version = '2.0.0-dev', default-features = false } +pallet-base-fee = { version = '1.0.0', default-features = false } +pallet-ethereum = { version = '4.0.0-dev', default-features = false, features = [ + 'forbid-evm-reentrancy', +] } +pallet-evm = { version = '6.0.0-dev', default-features = false, features = [ + 'forbid-evm-reentrancy', +] } +pallet-evm-precompile-blake2 = { version = '2.0.0-dev', default-features = false } +pallet-evm-precompile-bn128 = { version = '2.0.0-dev', default-features = false } +pallet-evm-precompile-dispatch = { version = '2.0.0-dev', default-features = false } +pallet-evm-precompile-ed25519 = { version = '2.0.0-dev', default-features = false } +pallet-evm-precompile-modexp = { version = '2.0.0-dev', default-features = false } +pallet-evm-precompile-sha3fips = { version = '2.0.0-dev', default-features = false } +pallet-evm-precompile-simple = { version = '2.0.0-dev', default-features = false } # Parallel dependencies -runtime-common = { path = './runtime/common', default-features = false } -pallet-amm = { path = './pallets/amm', default-features = false } -pallet-asset-registry = { path = './pallets/asset-registry', default-features = false } -pallet-bridge = { path = './pallets/bridge', default-features = false } -pallet-crowdloans = { path = './pallets/crowdloans', default-features = false } -pallet-currency-adapter = { path = './pallets/currency-adapter', default-features = false } -pallet-emergency-shutdown = { path = './pallets/emergency-shutdown', default-features = false } -pallet-farming = { path = './pallets/farming', default-features = false } -pallet-liquid-staking = { path = './pallets/liquid-staking', default-features = false } -pallet-loans = { path = './pallets/loans', default-features = false } -pallet-loans-rpc-runtime-api = { path = './pallets/loans/rpc/runtime-api', default-features = false } -pallet-prices = { path = './pallets/prices', default-features = false } -pallet-router = { path = './pallets/router', default-features = false } -pallet-router-rpc-runtime-api = { path = './pallets/router/rpc/runtime-api', default-features = false } -pallet-stableswap = { path = './pallets/stableswap', default-features = false } -pallet-streaming = { path = './pallets/streaming', default-features = false } -pallet-traits = { path = './pallets/traits', default-features = false } -pallet-xcm-helper = { path = './pallets/xcm-helper', default-features = false } -primitives = { path = './primitives', package = 'parallel-primitives', default-features = false } -parallel-support = { path = './support', default-features = false } -pallet-evm-signatures = { path = './pallets/evm-signatures', default-features = false } -pallet-evm-precompile-assets-erc20 = { path = './precompiles/assets-erc20', default-features = false } -pallet-evm-precompile-balances-erc20 = { path = './precompiles/balances-erc20', default-features = false } -precompile-utils = { path = './precompiles/utils', default-features = false } +pallet-amm = { path = './pallets/amm', default-features = false } +pallet-asset-registry = { path = './pallets/asset-registry', default-features = false } +pallet-bridge = { path = './pallets/bridge', default-features = false } +pallet-crowdloans = { path = './pallets/crowdloans', default-features = false } +pallet-currency-adapter = { path = './pallets/currency-adapter', default-features = false } +pallet-emergency-shutdown = { path = './pallets/emergency-shutdown', default-features = false } +pallet-evm-precompile-assets-erc20 = { path = './precompiles/assets-erc20', default-features = false } +pallet-evm-precompile-balances-erc20 = { path = './precompiles/balances-erc20', default-features = false } +pallet-evm-signatures = { path = './pallets/evm-signatures', default-features = false } +pallet-farming = { path = './pallets/farming', default-features = false } +pallet-liquid-staking = { path = './pallets/liquid-staking', default-features = false } +pallet-loans = { path = './pallets/loans', default-features = false } +pallet-loans-rpc-runtime-api = { path = './pallets/loans/rpc/runtime-api', default-features = false } +pallet-prices = { path = './pallets/prices', default-features = false } +pallet-router = { path = './pallets/router', default-features = false } +pallet-router-rpc-runtime-api = { path = './pallets/router/rpc/runtime-api', default-features = false } +pallet-stableswap = { path = './pallets/stableswap', default-features = false } +pallet-streaming = { path = './pallets/streaming', default-features = false } +pallet-traits = { path = './pallets/traits', default-features = false } +pallet-xcm-helper = { path = './pallets/xcm-helper', default-features = false } +parallel-support = { path = './support', default-features = false } +precompile-utils = { path = './precompiles/utils', default-features = false } +primitives = { path = './primitives', package = 'parallel-primitives', default-features = false } +runtime-common = { path = './runtime/common', default-features = false } -pallet-loans-rpc = { path = './pallets/loans/rpc' } -pallet-router-rpc = { path = './pallets/router/rpc' } -heiko-runtime = { path = './runtime/heiko' } -parallel-runtime = { path = './runtime/parallel' } -kerria-runtime = { path = './runtime/kerria' } -vanilla-runtime = { path = './runtime/vanilla' } +heiko-runtime = { path = './runtime/heiko' } +kerria-runtime = { path = './runtime/kerria' } +pallet-loans-rpc = { path = './pallets/loans/rpc' } +pallet-router-rpc = { path = './pallets/router/rpc' } +parallel-runtime = { path = './runtime/parallel' } +vanilla-runtime = { path = './runtime/vanilla' } # Others -codec = { package = 'parity-scale-codec', version = '3.1.5', default-features = false } -derive_more = '0.99.17' -hex = '0.4.3' -hex-literal = '0.3.4' -jsonrpsee = '0.16.2' -futures = '0.3.1' -async-trait = '0.1.42' -clap = '4.0.9' -serde = '1.0.136' -serde_json = '1.0.79' -tracing-core = '0.1.30' -static_assertions = '1.1.0' -smallvec = '1.6.1' -env_logger = '0.9.0' -paste = '1.0.6' -slices = '0.2.0' -sha3 = '0.10.7' -libsecp256k1 = '0.7.1' -impl-trait-for-tuples = '0.2.2' -similar-asserts = '1.1.0' -bytes = '1.1.0' -proc-macro2 = '1.0.56' -quote = '1.0.26' -syn = '1.0.109' -log = { version = '0.4.17', default-features = false } -num-bigint = { version = '0.4.3', default-features = false } -num-traits = { version = '0.2.15', default-features = false } -num_enum = { version = '0.5.3', default-features = false } -scale-info = { version = '2.1.2', default-features = false } +async-trait = '0.1.42' +bytes = '1.1.0' +clap = '4.0.9' +codec = { package = 'parity-scale-codec', version = '3.1.5', default-features = false } +derive_more = '0.99.17' +env_logger = '0.9.0' +futures = '0.3.1' +hex = '0.4.3' +hex-literal = '0.3.4' +impl-trait-for-tuples = '0.2.2' +jsonrpsee = '0.16.2' +libsecp256k1 = '0.7.1' +log = { version = '0.4.17', default-features = false } +num-bigint = { version = '0.4.3', default-features = false } +num-traits = { version = '0.2.15', default-features = false } +num_enum = { version = '0.5.3', default-features = false } +paste = '1.0.6' +proc-macro2 = '1.0.56' +quote = '1.0.26' +scale-info = { version = '2.1.2', default-features = false } +serde = '1.0.136' +serde_json = '1.0.79' +sha3 = '0.10.7' +similar-asserts = '1.1.0' +slices = '0.2.0' +smallvec = '1.6.1' +static_assertions = '1.1.0' +syn = '1.0.109' +tracing-core = '0.1.30' -xcm-emulator = { git = 'https://github.com/shaunxw/xcm-simulator.git', rev = '92d371839f6d5c52dd35b7e3d61cbdefc792cc42' } substrate-fixed = { git = 'https://github.com/encointer/substrate-fixed.git', default-features = false } +xcm-emulator = { git = 'https://github.com/shaunxw/xcm-simulator.git', rev = '92d371839f6d5c52dd35b7e3d61cbdefc792cc42' } [patch.crates-io] #orml @@ -262,24 +273,24 @@ orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-r orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', rev = '241d5cdc98cca53b8cf990853943c9ae1193a70e' } #evm -fc-consensus = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fc-db = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fc-mapping-sync = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fc-rpc = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fc-rpc-core = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fp-consensus = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fp-evm = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fp-rpc = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fp-storage = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fp-dynamic-fee = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-ethereum = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-evm = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -fp-self-contained = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-base-fee = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-evm-precompile-blake2 = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-evm-precompile-bn128 = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-evm-precompile-dispatch = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-evm-precompile-ed25519 = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-evm-precompile-modexp = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-evm-precompile-sha3fips = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } -pallet-evm-precompile-simple = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fc-consensus = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fc-db = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fc-mapping-sync = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fc-rpc = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fc-rpc-core = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fp-consensus = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fp-dynamic-fee = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fp-evm = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fp-rpc = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fp-self-contained = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +fp-storage = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-base-fee = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-ethereum = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-evm = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-evm-precompile-blake2 = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-evm-precompile-bn128 = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-evm-precompile-dispatch = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-evm-precompile-ed25519 = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-evm-precompile-modexp = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-evm-precompile-sha3fips = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } +pallet-evm-precompile-simple = { git = 'https://github.com/parallel-finance/frontier.git', rev = '5644279da588baab7caa9f3a4eb69363e1606461' } diff --git a/pallets/liquid-staking/src/benchmarking.rs b/pallets/liquid-staking/src/benchmarking.rs index a5e55bf83..9d63f3695 100644 --- a/pallets/liquid-staking/src/benchmarking.rs +++ b/pallets/liquid-staking/src/benchmarking.rs @@ -289,7 +289,7 @@ benchmarks! { Response::ExecutionResult(None) ) verify { - assert_last_event::(Event::::NotificationReceived(Box::new(MultiLocation::parent()), 0u64, None).into()); + assert_last_event::(Event::::NotificationReceived(Box::new(MultiLocation::parent()), 0u64, MaybeErrorCode::Success).into()); } claim_for { diff --git a/pallets/liquid-staking/src/lib.rs b/pallets/liquid-staking/src/lib.rs index 018329a2a..a40085418 100644 --- a/pallets/liquid-staking/src/lib.rs +++ b/pallets/liquid-staking/src/lib.rs @@ -266,7 +266,7 @@ pub mod pallet { ExchangeRateUpdated(Rate), /// Notification received /// [multi_location, query_id, res] - NotificationReceived(Box, QueryId, Option<(u32, XcmError)>), + NotificationReceived(Box, QueryId, MaybeErrorCode), /// Claim user's unbonded staking assets /// [account_id, amount] ClaimedFor(T::AccountId, BalanceOf), @@ -771,9 +771,9 @@ pub mod pallet { .or_else(|_| { T::UpdateOrigin::ensure_origin(origin).map(|_| MultiLocation::here()) })?; - if let Response::ExecutionResult(res) = response { + if let Response::DispatchResult(res) = response { if let Some(request) = Self::xcm_request(query_id) { - Self::do_notification_received(query_id, request, res)?; + Self::do_notification_received(query_id, request, res.clone())?; } Self::deposit_event(Event::::NotificationReceived( @@ -1708,7 +1708,7 @@ pub mod pallet { fn do_notification_received( query_id: QueryId, req: XcmRequest, - res: Option<(u32, XcmError)>, + res: MaybeErrorCode, ) -> DispatchResult { use XcmRequest::*; @@ -1719,8 +1719,9 @@ pub mod pallet { &res ); - let executed = res.is_none(); - if !executed { + XcmRequests::::remove(query_id); + + if !matches!(res, MaybeErrorCode::Success) { return Ok(()); } diff --git a/pallets/xcm-helper/src/lib.rs b/pallets/xcm-helper/src/lib.rs index cde4af9ac..f8f635a92 100644 --- a/pallets/xcm-helper/src/lib.rs +++ b/pallets/xcm-helper/src/lib.rs @@ -268,7 +268,7 @@ impl Pallet { let notify: ::RuntimeCall = notify.into(); let max_weight = notify.get_dispatch_info().weight; let query_id = pallet_xcm::Pallet::::new_notify_query(responder, notify, timeout, Here); - let report_error = Xcm(vec![ReportError(QueryResponseInfo { + let report_error = Xcm(vec![ReportTransactStatus(QueryResponseInfo { destination, query_id, max_weight, diff --git a/runtime/heiko/src/lib.rs b/runtime/heiko/src/lib.rs index 6a5943737..4b5a56741 100644 --- a/runtime/heiko/src/lib.rs +++ b/runtime/heiko/src/lib.rs @@ -180,10 +180,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("heiko"), impl_name: create_runtime_str!("heiko"), authoring_version: 1, - spec_version: 203, + spec_version: 204, impl_version: 33, apis: RUNTIME_API_VERSIONS, - transaction_version: 17, + transaction_version: 18, state_version: 0, }; diff --git a/runtime/kerria/src/lib.rs b/runtime/kerria/src/lib.rs index b33d7c37e..21902bdf0 100644 --- a/runtime/kerria/src/lib.rs +++ b/runtime/kerria/src/lib.rs @@ -180,10 +180,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kerria"), impl_name: create_runtime_str!("kerria"), authoring_version: 1, - spec_version: 203, + spec_version: 204, impl_version: 33, apis: RUNTIME_API_VERSIONS, - transaction_version: 17, + transaction_version: 18, state_version: 0, }; diff --git a/runtime/parallel/src/lib.rs b/runtime/parallel/src/lib.rs index ec8ff3ef2..88cec8846 100644 --- a/runtime/parallel/src/lib.rs +++ b/runtime/parallel/src/lib.rs @@ -184,10 +184,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("parallel"), impl_name: create_runtime_str!("parallel"), authoring_version: 1, - spec_version: 203, + spec_version: 204, impl_version: 33, apis: RUNTIME_API_VERSIONS, - transaction_version: 17, + transaction_version: 18, state_version: 0, }; diff --git a/runtime/vanilla/src/lib.rs b/runtime/vanilla/src/lib.rs index ad0a4d66d..72474e272 100644 --- a/runtime/vanilla/src/lib.rs +++ b/runtime/vanilla/src/lib.rs @@ -180,10 +180,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("vanilla"), impl_name: create_runtime_str!("vanilla"), authoring_version: 1, - spec_version: 203, + spec_version: 204, impl_version: 33, apis: RUNTIME_API_VERSIONS, - transaction_version: 17, + transaction_version: 18, state_version: 0, }; From f438f61cfb3b900c47103f2a5686ef3ac48fce41 Mon Sep 17 00:00:00 2001 From: GopherJ Date: Wed, 27 Dec 2023 00:37:23 +0800 Subject: [PATCH 3/3] fix: typo and duplicated def Signed-off-by: GopherJ --- Cargo.lock | 66 ++++++++++++++-------------- pallets/evm-signatures/src/tests.rs | 2 - pallets/liquid-staking/src/lib.rs | 2 +- pallets/prices/src/mock.rs | 2 - precompiles/assets-erc20/src/mock.rs | 2 - 5 files changed, 34 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b223115e..ab2589f6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3747,7 +3747,7 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heiko-runtime" -version = "2.0.3" +version = "2.0.4" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -4472,7 +4472,7 @@ dependencies = [ [[package]] name = "kerria-runtime" -version = "2.0.3" +version = "2.0.4" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -6285,7 +6285,7 @@ dependencies = [ [[package]] name = "pallet-amm" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-benchmarking", "frame-support", @@ -6308,7 +6308,7 @@ dependencies = [ [[package]] name = "pallet-asset-registry" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-benchmarking", "frame-support", @@ -6537,7 +6537,7 @@ dependencies = [ [[package]] name = "pallet-bridge" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-benchmarking", "frame-support", @@ -6629,7 +6629,7 @@ dependencies = [ [[package]] name = "pallet-crowdloans" -version = "2.0.3" +version = "2.0.4" dependencies = [ "bytes", "cumulus-pallet-dmp-queue", @@ -6675,7 +6675,7 @@ dependencies = [ [[package]] name = "pallet-currency-adapter" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-support", "frame-system", @@ -6759,7 +6759,7 @@ dependencies = [ [[package]] name = "pallet-emergency-shutdown" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-support", "frame-system", @@ -6824,7 +6824,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-assets-erc20" -version = "2.0.3" +version = "2.0.4" dependencies = [ "derive_more", "fp-evm", @@ -6851,7 +6851,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-balances-erc20" -version = "2.0.3" +version = "2.0.4" dependencies = [ "derive_more", "fp-evm", @@ -6944,7 +6944,7 @@ dependencies = [ [[package]] name = "pallet-evm-signatures" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-support", "frame-system", @@ -6966,7 +6966,7 @@ dependencies = [ [[package]] name = "pallet-farming" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7082,7 +7082,7 @@ dependencies = [ [[package]] name = "pallet-liquid-staking" -version = "2.0.3" +version = "2.0.4" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -7130,7 +7130,7 @@ dependencies = [ [[package]] name = "pallet-loans" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7157,7 +7157,7 @@ dependencies = [ [[package]] name = "pallet-loans-rpc" -version = "2.0.3" +version = "2.0.4" dependencies = [ "jsonrpsee", "pallet-loans-rpc-runtime-api", @@ -7173,7 +7173,7 @@ dependencies = [ [[package]] name = "pallet-loans-rpc-runtime-api" -version = "2.0.3" +version = "2.0.4" dependencies = [ "parallel-primitives", "parity-scale-codec", @@ -7354,7 +7354,7 @@ dependencies = [ [[package]] name = "pallet-prices" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-support", "frame-system", @@ -7445,7 +7445,7 @@ dependencies = [ [[package]] name = "pallet-router" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7466,7 +7466,7 @@ dependencies = [ [[package]] name = "pallet-router-rpc" -version = "2.0.3" +version = "2.0.4" dependencies = [ "jsonrpsee", "pallet-router-rpc-runtime-api", @@ -7483,7 +7483,7 @@ dependencies = [ [[package]] name = "pallet-router-rpc-runtime-api" -version = "2.0.3" +version = "2.0.4" dependencies = [ "parallel-primitives", "parity-scale-codec", @@ -7562,7 +7562,7 @@ dependencies = [ [[package]] name = "pallet-stableswap" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7645,7 +7645,7 @@ dependencies = [ [[package]] name = "pallet-streaming" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7720,7 +7720,7 @@ dependencies = [ [[package]] name = "pallet-traits" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-support", "frame-system", @@ -7903,7 +7903,7 @@ dependencies = [ [[package]] name = "pallet-xcm-helper" -version = "2.0.3" +version = "2.0.4" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -7981,7 +7981,7 @@ dependencies = [ [[package]] name = "parallel" -version = "2.0.3" +version = "2.0.4" dependencies = [ "async-trait", "clap", @@ -8081,7 +8081,7 @@ dependencies = [ [[package]] name = "parallel-primitives" -version = "2.0.3" +version = "2.0.4" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -8100,7 +8100,7 @@ dependencies = [ [[package]] name = "parallel-runtime" -version = "2.0.3" +version = "2.0.4" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -8194,7 +8194,7 @@ dependencies = [ [[package]] name = "parallel-support" -version = "2.0.3" +version = "2.0.4" dependencies = [ "frame-support", "log", @@ -9693,7 +9693,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precompile-utils" -version = "2.0.3" +version = "2.0.4" dependencies = [ "evm", "fp-evm", @@ -9717,7 +9717,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" -version = "2.0.3" +version = "2.0.4" dependencies = [ "num_enum", "proc-macro2", @@ -10500,7 +10500,7 @@ dependencies = [ [[package]] name = "runtime-common" -version = "2.0.3" +version = "2.0.4" dependencies = [ "fp-rpc", "fp-self-contained", @@ -10531,7 +10531,7 @@ dependencies = [ [[package]] name = "runtime-integration-tests" -version = "2.0.3" +version = "2.0.4" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -14283,7 +14283,7 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vanilla-runtime" -version = "2.0.3" +version = "2.0.4" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", diff --git a/pallets/evm-signatures/src/tests.rs b/pallets/evm-signatures/src/tests.rs index 8ea450a80..6bd424a2b 100644 --- a/pallets/evm-signatures/src/tests.rs +++ b/pallets/evm-signatures/src/tests.rs @@ -125,10 +125,8 @@ impl pallet_assets::Config for Runtime { type Freezer = (); type Extra = (); type WeightInfo = (); - type BenchmarkHelper = (); type RemoveItemsLimit = frame_support::traits::ConstU32<1000>; type CallbackHandle = (); - #[cfg(feature = "runtime-benchmarks")] type BenchmarkHelper = (); } diff --git a/pallets/liquid-staking/src/lib.rs b/pallets/liquid-staking/src/lib.rs index a40085418..4acc83899 100644 --- a/pallets/liquid-staking/src/lib.rs +++ b/pallets/liquid-staking/src/lib.rs @@ -1799,7 +1799,7 @@ pub mod pallet { } Nominate { targets: _, .. } => {} } - XcmRequests::::remove(query_id); + Ok(()) } diff --git a/pallets/prices/src/mock.rs b/pallets/prices/src/mock.rs index f830746a6..4d623a8de 100644 --- a/pallets/prices/src/mock.rs +++ b/pallets/prices/src/mock.rs @@ -233,10 +233,8 @@ impl pallet_assets::Config for Test { type Freezer = (); type Extra = (); type WeightInfo = (); - type BenchmarkHelper = (); type RemoveItemsLimit = frame_support::traits::ConstU32<1000>; type CallbackHandle = (); - #[cfg(feature = "runtime-benchmarks")] type BenchmarkHelper = (); } diff --git a/precompiles/assets-erc20/src/mock.rs b/precompiles/assets-erc20/src/mock.rs index 00cd708c4..acca0eb70 100644 --- a/precompiles/assets-erc20/src/mock.rs +++ b/precompiles/assets-erc20/src/mock.rs @@ -252,11 +252,9 @@ impl pallet_assets::Config for Runtime { type StringLimit = AssetsStringLimit; type Freezer = (); type Extra = (); - type BenchmarkHelper = (); type WeightInfo = pallet_assets::weights::SubstrateWeight; type RemoveItemsLimit = frame_support::traits::ConstU32<1000>; type CallbackHandle = (); - #[cfg(feature = "runtime-benchmarks")] type BenchmarkHelper = (); }