Skip to content

Commit 55b7bb2

Browse files
zqhxuyuanzqhxuyuan
authored
update polkadot-v0.9.25 (#783)
* update polkadot-v0.9.25 * update sc-client-db feature * update syn * update pro-macro2 * companion substrate#11490 * companion substrate#11546 clean extrinsic transactinal * fix clippy and treasury origin * add some module transactional back * upgrade proc-macro2 * upgrade quote * update jsonrpsee * update
1 parent 5792fd2 commit 55b7bb2

File tree

41 files changed

+301
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+301
-277
lines changed

‎Cargo.dev.toml

+65-65
Large diffs are not rendered by default.

‎asset-registry/Cargo.toml

+19-19
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,37 @@ serde = { version = "1.0.136", optional = true }
1313
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
1414

1515
# substrate
16-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
17-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
18-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
19-
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
16+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
17+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
18+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
19+
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
2020

2121
# polkadot
22-
pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" }
23-
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" }
24-
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" }
25-
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" }
22+
pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" }
23+
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" }
24+
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" }
25+
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" }
2626

2727
# orml
2828
orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
2929

3030
[dev-dependencies]
3131
# substrate
32-
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
33-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
34-
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
32+
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
33+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
34+
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
3535

3636
# cumulus
37-
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" }
38-
cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" }
39-
cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" }
40-
cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" }
41-
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" }
37+
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" }
38+
cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" }
39+
cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" }
40+
cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" }
41+
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" }
4242

4343
# polkadot
44-
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" }
45-
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" }
46-
xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" }
44+
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" }
45+
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" }
46+
xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" }
4747

4848
# orml
4949
orml-tokens = { path = "../tokens" }

‎asset-registry/src/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#![allow(clippy::large_enum_variant)]
55
#![allow(clippy::too_many_arguments)]
66

7-
use frame_support::{pallet_prelude::*, traits::EnsureOriginWithArg, transactional};
7+
use frame_support::{pallet_prelude::*, traits::EnsureOriginWithArg};
88
use frame_system::pallet_prelude::*;
99
pub use orml_traits::asset_registry::AssetMetadata;
1010
use orml_traits::asset_registry::AssetProcessor;
@@ -131,7 +131,6 @@ pub mod module {
131131
#[pallet::call]
132132
impl<T: Config> Pallet<T> {
133133
#[pallet::weight(T::WeightInfo::register_asset())]
134-
#[transactional]
135134
pub fn register_asset(
136135
origin: OriginFor<T>,
137136
metadata: AssetMetadata<T::Balance, T::CustomMetadata>,
@@ -143,7 +142,6 @@ pub mod module {
143142
}
144143

145144
#[pallet::weight(T::WeightInfo::update_asset())]
146-
#[transactional]
147145
pub fn update_asset(
148146
origin: OriginFor<T>,
149147
asset_id: T::AssetId,

‎asset-registry/src/tests.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use super::*;
44
use crate as orml_asset_registry;
55
use crate::tests::para::{AdminAssetTwo, AssetRegistry, CustomMetadata, Origin, Tokens, TreasuryAccount};
66
use frame_support::{assert_noop, assert_ok};
7-
use mock::*;
7+
use mock::{para::Call, *};
88
use orml_traits::MultiCurrency;
99
use polkadot_parachain::primitives::Sibling;
1010

1111
use sp_runtime::{
12-
traits::{AccountIdConversion, BadOrigin},
12+
traits::{AccountIdConversion, BadOrigin, Dispatchable},
1313
AccountId32,
1414
};
1515
use xcm_simulator::TestExt;
@@ -346,8 +346,12 @@ fn test_register_duplicate_location_returns_error() {
346346
let metadata = dummy_metadata();
347347

348348
assert_ok!(AssetRegistry::register_asset(Origin::root(), metadata.clone(), None));
349+
let register_asset = Call::AssetRegistry(crate::Call::<para::Runtime>::register_asset {
350+
metadata: metadata.clone(),
351+
asset_id: None,
352+
});
349353
assert_noop!(
350-
AssetRegistry::register_asset(Origin::root(), metadata.clone(), None),
354+
register_asset.dispatch(Origin::root()),
351355
Error::<para::Runtime>::ConflictingLocation
352356
);
353357
});

‎auction/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive"
1212
serde = { version = "1.0.136", optional = true }
1313
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
1414

15-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
16-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
17-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
18-
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
15+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
16+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
17+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
18+
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
1919

2020
orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
2121

2222
[dev-dependencies]
23-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
24-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
23+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
24+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
2525

2626
[features]
2727
default = ["std"]

‎authority/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive"
1212
serde = { version = "1.0.136", optional = true }
1313
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
1414

15-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
16-
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
17-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
18-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
19-
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
15+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
16+
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
17+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
18+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
19+
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
2020

2121
[dev-dependencies]
22-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
23-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
24-
pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
22+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
23+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
24+
pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
2525

2626
[features]
2727
default = ["std"]

‎authority/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use frame_support::{
2424
pallet_prelude::*,
2525
traits::{
2626
schedule::{DispatchTime, Named as ScheduleNamed, Priority},
27-
EnsureOneOf, EnsureOrigin, Get, IsType, OriginTrait,
27+
EitherOfDiverse, EnsureOrigin, Get, IsType, OriginTrait,
2828
},
2929
weights::{DispatchClass, GetDispatchInfo, Pays},
3030
};
@@ -394,7 +394,7 @@ pub mod module {
394394
#[pallet::weight(T::WeightInfo::remove_authorized_call())]
395395
pub fn remove_authorized_call(origin: OriginFor<T>, hash: T::Hash) -> DispatchResult {
396396
let root_or_sigend =
397-
EnsureOneOf::<EnsureRoot<T::AccountId>, EnsureSigned<T::AccountId>>::ensure_origin(origin)?;
397+
EitherOfDiverse::<EnsureRoot<T::AccountId>, EnsureSigned<T::AccountId>>::ensure_origin(origin)?;
398398

399399
SavedCalls::<T>::try_mutate_exists(hash, |maybe_call| {
400400
let (_, maybe_caller) = maybe_call.take().ok_or(Error::<T>::CallNotAuthorized)?;

‎bencher/Cargo.toml

+12-12
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ hash-db = { version = "0.15.2", default-features = false, optional = true }
2626
bencher-procedural = { path = "bencher-procedural", default-features = false }
2727
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
2828

29-
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
30-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
31-
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
32-
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
33-
sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" }
34-
sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.24" }
35-
sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.24" }
36-
sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["with-kvdb-rocksdb"], optional = true , branch = "polkadot-v0.9.24" }
37-
sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" }
38-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
39-
sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
40-
sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" }
29+
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
30+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
31+
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
32+
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
33+
sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.25" }
34+
sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.25" }
35+
sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.25" }
36+
sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.25" }
37+
sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.25" }
38+
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
39+
sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
40+
sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.25" }
4141

4242
[features]
4343
default = ["std"]

‎bencher/bencher-procedural/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ edition = "2021"
99
proc-macro = true
1010

1111
[dependencies]
12-
proc-macro2 = "1.0.6"
13-
quote = "1.0.3"
14-
syn = { version = "1.0.58", features = ["full"] }
12+
proc-macro2 = "1.0.40"
13+
quote = "1.0.18"
14+
syn = { version = "1.0.98", features = ["full"] }
1515

1616
[features]
1717
default = ["std"]

‎bencher/src/bench_ext.rs

+18-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use core::any::{Any, TypeId};
22
use hash_db::Hasher;
3-
use sp_externalities::{Extension, ExtensionStore, Externalities};
3+
use sp_externalities::{Extension, ExtensionStore, Externalities, MultiRemovalResults};
44
use sp_state_machine::{Backend, Ext};
55
use sp_std::sync::Arc;
66
use sp_storage::{ChildInfo, StateVersion, TrackedStorageKey};
@@ -66,19 +66,30 @@ where
6666
self.ext.next_child_storage_key(child_info, key)
6767
}
6868

69-
fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option<u32>) -> (bool, u32) {
69+
fn kill_child_storage(
70+
&mut self,
71+
child_info: &ChildInfo,
72+
limit: Option<u32>,
73+
maybe_cursor: Option<&[u8]>,
74+
) -> MultiRemovalResults {
7075
self.tracker.on_kill_child_storage(child_info, limit);
71-
self.ext.kill_child_storage(child_info, limit)
76+
self.ext.kill_child_storage(child_info, limit, maybe_cursor)
7277
}
7378

74-
fn clear_prefix(&mut self, prefix: &[u8], limit: Option<u32>) -> (bool, u32) {
79+
fn clear_prefix(&mut self, prefix: &[u8], limit: Option<u32>, maybe_cursor: Option<&[u8]>) -> MultiRemovalResults {
7580
self.tracker.on_clear_prefix(prefix, limit);
76-
self.ext.clear_prefix(prefix, limit)
81+
self.ext.clear_prefix(prefix, limit, maybe_cursor)
7782
}
7883

79-
fn clear_child_prefix(&mut self, child_info: &ChildInfo, prefix: &[u8], limit: Option<u32>) -> (bool, u32) {
84+
fn clear_child_prefix(
85+
&mut self,
86+
child_info: &ChildInfo,
87+
prefix: &[u8],
88+
limit: Option<u32>,
89+
maybe_cursor: Option<&[u8]>,
90+
) -> MultiRemovalResults {
8091
self.tracker.on_clear_child_prefix(child_info, prefix, limit);
81-
self.ext.clear_child_prefix(child_info, prefix, limit)
92+
self.ext.clear_child_prefix(child_info, prefix, limit, maybe_cursor)
8293
}
8394

8495
fn place_storage(&mut self, key: Vec<u8>, value: Option<Vec<u8>>) {

‎bencher/test/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ required-features = ["bench"]
1515
serde = { version = "1.0.136", optional = true }
1616
scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
1717
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
18-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
19-
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
20-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
21-
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
22-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" }
18+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
19+
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
20+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
21+
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
22+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" }
2323
orml-bencher = { path = "..", default-features = false }
2424
orml-weight-meter = { path = "../../weight-meter", default-features = false }
2525

2626
[dev-dependencies]
27-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
27+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
2828

2929
[features]
3030
default = ["std"]

‎bencher/test/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pub mod pallet {
1111
use frame_support::{
1212
dispatch::{DispatchResult, DispatchResultWithPostInfo},
1313
pallet_prelude::*,
14-
transactional,
1514
};
1615
use frame_system::pallet_prelude::*;
1716

@@ -59,7 +58,6 @@ pub mod pallet {
5958
}
6059

6160
impl<T: Config> Pallet<T> {
62-
#[transactional]
6361
#[orml_weight_meter::weight(ModuleWeights::<T>::set_foo())]
6462
pub(crate) fn set_foo() -> frame_support::dispatch::DispatchResult {
6563
Value::<T>::put(2);

0 commit comments

Comments
 (0)