Skip to content

Commit bd94744

Browse files
zjb0807zjb0807
committed
update polkadot-stable2503
1 parent 069ed19 commit bd94744

File tree

96 files changed

+5741
-2869
lines changed

Some content is hidden

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

96 files changed

+5741
-2869
lines changed

‎Cargo.lock‎

Lines changed: 3255 additions & 1583 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ rand_chacha = { version = "0.3.1", default-features = false }
120120
env_logger = { version = "0.10.0" }
121121
smallvec = { version = "1.4.1" }
122122
ripemd = { version = "0.1.3", default-features = false }
123-
rlp = { version = "0.5.2", default-features = false }
123+
rlp = { version = "0.6.1", default-features = false }
124124
sha3 = { version = "0.10.8", default-features = false }
125125
tiny-keccak = { version = "2.0" }
126126
num = { version = "0.4", default-features = false }
127127
bn = { package = "substrate-bn", version = "0.6", default-features = false }
128128
libsecp256k1 = { version = "0.7", default-features = false }
129129
impl-trait-for-tuples = { version = "0.2.2" }
130-
ethereum-types = { version = "0.14.0", default-features = false }
130+
ethereum-types = { version = "0.15.1", default-features = false }
131131
num_enum = { version = "0.5.1", default-features = false }
132132
quote = { version = "1.0.20" }
133133
syn = { version = "1.0.98" }
@@ -137,7 +137,7 @@ bstringify = { version = "0.1.2" }
137137
enumflags2 = { version = "0.7.7" }
138138
paste = { version = "1.0" }
139139
static_assertions = { version = "1.1.0" }
140-
ethabi = { version = "18.0.0", default-features = false }
140+
ethabi = { git = "https://github.com/AcalaNetwork/ethabi", branch = "acala", default-features = false }
141141
insta = { version = "1.31.0", features = ["json"] }
142142

143143
# Dependencies are split into 2 groups: wasm and client.
@@ -214,92 +214,92 @@ module-evm-utility-macro = { path = "modules/evm-utility/macro" }
214214
orml-build-script-utils = { path = "orml/build-script-utils" }
215215

216216
# polkadot-sdk (wasm)
217-
cumulus-pallet-aura-ext = { version = "0.16.0", default-features = false }
218-
cumulus-pallet-parachain-system = { version = "0.16.0", default-features = false }
219-
cumulus-pallet-xcm = { version = "0.16.0", default-features = false }
220-
cumulus-pallet-xcmp-queue = { version = "0.16.0", default-features = false }
221-
cumulus-primitives-core = { version = "0.15.0", default-features = false }
222-
cumulus-primitives-parachain-inherent = { version = "0.15.0", default-features = false }
223-
cumulus-primitives-timestamp = { version = "0.15.1", default-features = false }
224-
cumulus-primitives-utility = { version = "0.16.0", default-features = false }
225-
cumulus-test-relay-sproof-builder = { version = "0.15.0", default-features = false }
226-
frame-benchmarking = { version = "37.0.0", default-features = false }
227-
frame-executive = { version = "37.0.0", default-features = false }
228-
frame-metadata-hash-extension = { version = "0.5.0", default-features = false }
229-
frame-support = { version = "37.0.0", default-features = false }
230-
frame-system = { version = "37.1.0", default-features = false }
231-
frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false }
232-
frame-try-runtime = { version = "0.43.0", default-features = false }
233-
pallet-aura = { version = "36.0.0", default-features = false }
234-
pallet-authority-discovery = { version = "37.0.0", default-features = false }
235-
pallet-authorship = { version = "37.0.0", default-features = false }
236-
pallet-balances = { version = "38.0.0", default-features = false }
237-
pallet-bounties = { version = "36.0.0", default-features = false }
238-
pallet-collective = { version = "37.0.0", default-features = false }
239-
pallet-democracy = { version = "37.0.0", default-features = false }
240-
pallet-elections-phragmen = { version = "38.0.0", default-features = false }
241-
pallet-indices = { version = "37.0.0", default-features = false }
242-
pallet-membership = { version = "37.0.0", default-features = false }
243-
pallet-message-queue = { version = "40.0.0", default-features = false }
244-
pallet-multisig = { version = "37.0.0", default-features = false }
245-
pallet-preimage = { version = "37.0.0", default-features = false }
246-
pallet-proxy = { version = "37.0.0", default-features = false }
247-
pallet-recovery = { version = "37.0.0", default-features = false }
248-
pallet-root-testing = { version = "13.0.0", default-features = false }
249-
pallet-scheduler = { version = "38.0.0", default-features = false }
250-
pallet-session = { version = "37.0.0", default-features = false }
251-
pallet-state-trie-migration = { version = "39.0.0", default-features = false }
252-
pallet-sudo = { version = "37.0.0", default-features = false }
253-
pallet-timestamp = { version = "36.0.0", default-features = false }
254-
pallet-tips = { version = "36.0.0", default-features = false }
255-
pallet-transaction-payment = { version = "37.0.0", default-features = false }
256-
pallet-transaction-payment-rpc-runtime-api = { version = "37.0.0", default-features = false }
257-
pallet-treasury = { version = "36.0.0", default-features = false }
258-
pallet-utility = { version = "37.0.0", default-features = false }
259-
pallet-xcm = { version = "16.0.0", default-features = false }
260-
pallet-xcm-benchmarks = { version = "16.0.0", default-features = false }
261-
parachain-info = { version = "0.16.0", package = "staging-parachain-info", default-features = false }
262-
parachains-common = { version = "17.0.0", default-features = false }
263-
polkadot-core-primitives = { version = "15.0.0", default-features = false }
264-
polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
265-
polkadot-primitives = { version = "15.0.0", default-features = false }
266-
polkadot-runtime-common = { version = "16.0.0", default-features = false }
267-
polkadot-runtime-parachains = { version = "16.0.1", default-features = false }
268-
sp-api = { version = "34.0.0", default-features = false }
269-
sp-application-crypto = { version = "38.0.0", default-features = false }
270-
sp-arithmetic = { version = "26.0.0", default-features = false }
271-
sp-block-builder = { version = "34.0.0", default-features = false }
272-
sp-blockchain = { version = "37.0.1", default-features = false }
273-
sp-consensus = { version = "0.40.0", default-features = false }
274-
sp-consensus-aura = { version = "0.40.0", default-features = false }
275-
sp-consensus-slots = { version = "0.40.0", default-features = false }
276-
sp-core = { version = "34.0.0", default-features = false }
217+
cumulus-pallet-aura-ext = { version = "0.20.0", default-features = false }
218+
cumulus-pallet-parachain-system = { version = "0.20.0", default-features = false }
219+
cumulus-pallet-xcm = { version = "0.19.1", default-features = false }
220+
cumulus-pallet-xcmp-queue = { version = "0.20.0", default-features = false }
221+
cumulus-primitives-core = { version = "0.18.1", default-features = false }
222+
cumulus-primitives-parachain-inherent = { version = "0.18.1", default-features = false }
223+
cumulus-primitives-timestamp = { version = "0.19.0", default-features = false }
224+
cumulus-primitives-utility = { version = "0.20.0", default-features = false }
225+
cumulus-test-relay-sproof-builder = { version = "0.19.0", default-features = false }
226+
frame-benchmarking = { version = "40.0.0", default-features = false }
227+
frame-executive = { version = "40.0.0", default-features = false }
228+
frame-metadata-hash-extension = { version = "0.8.0", default-features = false }
229+
frame-support = { version = "40.1.0", default-features = false }
230+
frame-system = { version = "40.1.0", default-features = false }
231+
frame-system-rpc-runtime-api = { version = "36.0.0", default-features = false }
232+
frame-try-runtime = { version = "0.46.0", default-features = false }
233+
pallet-aura = { version = "39.0.0", default-features = false }
234+
pallet-authority-discovery = { version = "40.0.0", default-features = false }
235+
pallet-authorship = { version = "40.0.0", default-features = false }
236+
pallet-balances = { version = "41.1.0", default-features = false }
237+
pallet-bounties = { version = "39.0.0", default-features = false }
238+
pallet-collective = { version = "40.1.0", default-features = false }
239+
pallet-democracy = { version = "40.1.0", default-features = false }
240+
pallet-elections-phragmen = { version = "41.1.0", default-features = false }
241+
pallet-indices = { version = "40.0.0", default-features = false }
242+
pallet-membership = { version = "40.0.0", default-features = false }
243+
pallet-message-queue = { version = "43.1.0", default-features = false }
244+
pallet-multisig = { version = "40.1.0", default-features = false }
245+
pallet-preimage = { version = "40.0.0", default-features = false }
246+
pallet-proxy = { version = "40.1.0", default-features = false }
247+
pallet-recovery = { version = "40.0.0", default-features = false }
248+
pallet-root-testing = { version = "16.0.0", default-features = false }
249+
pallet-scheduler = { version = "41.0.0", default-features = false }
250+
pallet-session = { version = "40.0.0", default-features = false }
251+
pallet-state-trie-migration = { version = "44.1.0", default-features = false }
252+
pallet-sudo = { version = "40.0.0", default-features = false }
253+
pallet-timestamp = { version = "39.0.0", default-features = false }
254+
pallet-tips = { version = "39.0.0", default-features = false }
255+
pallet-transaction-payment = { version = "40.0.0", default-features = false }
256+
pallet-transaction-payment-rpc-runtime-api = { version = "40.0.0", default-features = false }
257+
pallet-treasury = { version = "39.0.0", default-features = false }
258+
pallet-utility = { version = "40.0.0", default-features = false }
259+
pallet-xcm = { version = "19.1.0", default-features = false }
260+
pallet-xcm-benchmarks = { version = "20.0.0", default-features = false }
261+
parachain-info = { version = "0.20.0", package = "staging-parachain-info", default-features = false }
262+
parachains-common = { version = "21.0.0", default-features = false }
263+
polkadot-core-primitives = { version = "17.1.0", default-features = false }
264+
polkadot-parachain-primitives = { version = "16.1.0", default-features = false }
265+
polkadot-primitives = { version = "18.1.0", default-features = false }
266+
polkadot-runtime-common = { version = "19.1.0", default-features = false }
267+
polkadot-runtime-parachains = { version = "19.1.0", default-features = false }
268+
sp-api = { version = "36.0.1", default-features = false }
269+
sp-application-crypto = { version = "40.1.0", default-features = false }
270+
sp-arithmetic = { version = "26.1.0", default-features = false }
271+
sp-block-builder = { version = "36.0.0", default-features = false }
272+
sp-blockchain = { version = "39.0.0", default-features = false }
273+
sp-consensus = { version = "0.42.0", default-features = false }
274+
sp-consensus-aura = { version = "0.42.0", default-features = false }
275+
sp-consensus-slots = { version = "0.42.1", default-features = false }
276+
sp-core = { version = "36.1.0", default-features = false }
277277
sp-debug-derive = { version = "14.0.0", default-features = false }
278-
sp-externalities = { version = "0.29.0", default-features = false }
279-
sp-genesis-builder = { version = "0.15.0", default-features = false }
280-
sp-inherents = { version = "34.0.0", default-features = false }
281-
sp-io = { version = "38.0.0", default-features = false }
282-
sp-keyring = { version = "39.0.0", default-features = false }
283-
sp-keystore = { version = "0.40.0", default-features = false }
284-
sp-offchain = { version = "34.0.0", default-features = false }
285-
sp-runtime = { version = "39.0.0", default-features = false }
286-
sp-runtime-interface = { version = "28.0.0", default-features = false }
287-
sp-session = { version = "35.0.0", default-features = false }
288-
sp-staking = { version = "34.0.0", default-features = false }
289-
sp-state-machine = { version = "0.43.0", default-features = false }
278+
sp-externalities = { version = "0.30.0", default-features = false }
279+
sp-genesis-builder = { version = "0.17.0", default-features = false }
280+
sp-inherents = { version = "36.0.0", default-features = false }
281+
sp-io = { version = "40.0.0", default-features = false }
282+
sp-keyring = { version = "41.0.0", default-features = false }
283+
sp-keystore = { version = "0.42.0", default-features = false }
284+
sp-offchain = { version = "36.0.0", default-features = false }
285+
sp-runtime = { version = "41.1.0", default-features = false }
286+
sp-runtime-interface = { version = "29.0.1", default-features = false }
287+
sp-session = { version = "38.1.0", default-features = false }
288+
sp-staking = { version = "38.0.0", default-features = false }
289+
sp-state-machine = { version = "0.45.0", default-features = false }
290290
sp-std = { version = "14.0.0", default-features = false }
291-
sp-storage = { version = "21.0.0", default-features = false }
292-
sp-timestamp = { version = "34.0.0", default-features = false }
293-
sp-tracing = { version = "17.0.0", default-features = false }
294-
sp-transaction-pool = { version = "34.0.0", default-features = false }
295-
sp-trie = { version = "37.0.0", default-features = false }
296-
sp-version = { version = "37.0.0", default-features = false }
297-
sp-wasm-interface = { version = "21.0.0", default-features = false }
298-
sp-weights = { version = "31.0.0", default-features = false }
299-
xcm = { version = "14.1.0", package = "staging-xcm", default-features = false }
300-
xcm-builder = { version = "16.0.0", package = "staging-xcm-builder", default-features = false }
301-
xcm-executor = { version = "16.0.0", package = "staging-xcm-executor", default-features = false }
291+
sp-storage = { version = "22.0.0", default-features = false }
292+
sp-timestamp = { version = "36.0.0", default-features = false }
293+
sp-tracing = { version = "17.1.0", default-features = false }
294+
sp-transaction-pool = { version = "36.0.0", default-features = false }
295+
sp-trie = { version = "39.1.0", default-features = false }
296+
sp-version = { version = "39.0.0", default-features = false }
297+
sp-wasm-interface = { version = "21.0.1", default-features = false }
298+
sp-weights = { version = "31.1.0", default-features = false }
299+
xcm = { version = "16.1.0", package = "staging-xcm", default-features = false }
300+
xcm-builder = { version = "20.0.0", package = "staging-xcm-builder", default-features = false }
301+
xcm-executor = { version = "19.1.0", package = "staging-xcm-executor", default-features = false }
302302

303303
# polkadot-sdk (client)
304-
substrate-wasm-builder = { version = "24.0.0", features = ["metadata-hash"] }
305-
xcm-simulator = { version = "16.0.0" }
304+
substrate-wasm-builder = { version = "26.0.0", features = ["metadata-hash"] }
305+
xcm-simulator = { version = "20.0.0" }

‎modules/asset-registry/src/lib.rs‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use scale_info::prelude::format;
4747
use sp_runtime::{traits::One, ArithmeticError, FixedPointNumber, FixedU128};
4848
use sp_std::{boxed::Box, vec::Vec};
4949

50-
use xcm::{v3, v4::prelude::*, VersionedLocation};
50+
use xcm::{v3, v4, v5::prelude::*, VersionedLocation};
5151

5252
mod mock;
5353
mod tests;
@@ -369,7 +369,8 @@ impl<T: Config> Pallet<T> {
369369
metadata: &AssetMetadata<BalanceOf<T>>,
370370
) -> Result<ForeignAssetId, DispatchError> {
371371
let foreign_asset_id = Self::get_next_foreign_asset_id()?;
372-
let v3_location = v3::Location::try_from(location.clone()).map_err(|()| Error::<T>::BadLocation)?;
372+
let v4_location = v4::Location::try_from(location.clone()).map_err(|()| Error::<T>::BadLocation)?;
373+
let v3_location = v3::Location::try_from(v4_location).map_err(|()| Error::<T>::BadLocation)?;
373374
LocationToCurrencyIds::<T>::try_mutate(v3_location, |maybe_currency_ids| -> DispatchResult {
374375
ensure!(maybe_currency_ids.is_none(), Error::<T>::LocationExisted);
375376
*maybe_currency_ids = Some(CurrencyId::ForeignAsset(foreign_asset_id));
@@ -398,7 +399,8 @@ impl<T: Config> Pallet<T> {
398399
location: &Location,
399400
metadata: &AssetMetadata<BalanceOf<T>>,
400401
) -> DispatchResult {
401-
let v3_location = v3::Location::try_from(location.clone()).map_err(|()| Error::<T>::BadLocation)?;
402+
let v4_location = v4::Location::try_from(location.clone()).map_err(|()| Error::<T>::BadLocation)?;
403+
let v3_location = v3::Location::try_from(v4_location).map_err(|()| Error::<T>::BadLocation)?;
402404
ForeignAssetLocations::<T>::try_mutate(foreign_asset_id, |maybe_locations| -> DispatchResult {
403405
let old_locations = maybe_locations.as_mut().ok_or(Error::<T>::AssetIdNotExists)?;
404406

@@ -534,11 +536,15 @@ impl<T: Config> AssetIdMapping<ForeignAssetId, Location, AssetMetadata<BalanceOf
534536
}
535537

536538
fn get_location(foreign_asset_id: ForeignAssetId) -> Option<Location> {
537-
Pallet::<T>::foreign_asset_locations(foreign_asset_id).map(|l| l.try_into().ok())?
539+
Pallet::<T>::foreign_asset_locations(foreign_asset_id).map(|l| {
540+
let v4_location = v4::Location::try_from(l).ok()?;
541+
Location::try_from(v4_location).ok()
542+
})?
538543
}
539544

540545
fn get_currency_id(location: Location) -> Option<CurrencyId> {
541-
let v3_location = v3::Location::try_from(location).ok()?;
546+
let v4_location = v4::Location::try_from(location).ok()?;
547+
let v3_location = v3::Location::try_from(v4_location).ok()?;
542548
Pallet::<T>::location_to_currency_ids(v3_location)
543549
}
544550
}
@@ -560,7 +566,8 @@ where
560566
BalanceOf<T>: Into<u128>,
561567
{
562568
fn calculate_rate(location: Location) -> Option<Ratio> {
563-
let v3_location = v3::Location::try_from(location).ok()?;
569+
let v4_location = v4::Location::try_from(location).ok()?;
570+
let v3_location = v3::Location::try_from(v4_location).ok()?;
564571
if let Some(CurrencyId::ForeignAsset(foreign_asset_id)) = Pallet::<T>::location_to_currency_ids(v3_location) {
565572
if let Some(asset_metadata) = Pallet::<T>::asset_metadatas(AssetIds::ForeignAssetId(foreign_asset_id)) {
566573
let minimum_balance = asset_metadata.minimal_balance.into();

‎modules/asset-registry/src/mock.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ impl pallet_balances::Config for Runtime {
5959
type RuntimeFreezeReason = RuntimeFreezeReason;
6060
type FreezeIdentifier = ();
6161
type MaxFreezes = ();
62+
type DoneSlashHandler = ();
6263
}
6364

6465
impl pallet_timestamp::Config for Runtime {
@@ -182,7 +183,7 @@ pub fn deploy_contracts() {
182183
],
183184
data: {
184185
let mut buf = [0u8; 32];
185-
U256::from(ALICE_BALANCE).to_big_endian(&mut buf);
186+
U256::from(ALICE_BALANCE).write_as_big_endian(&mut buf);
186187
H256::from_slice(&buf).as_bytes().to_vec()
187188
},
188189
}],
@@ -218,7 +219,7 @@ pub fn deploy_contracts_same_prefix() {
218219
],
219220
data: {
220221
let mut buf = [0u8; 32];
221-
U256::from(ALICE_BALANCE).to_big_endian(&mut buf);
222+
U256::from(ALICE_BALANCE).write_as_big_endian(&mut buf);
222223
H256::from_slice(&buf).as_bytes().to_vec()
223224
},
224225
}],
@@ -256,6 +257,7 @@ impl ExtBuilder {
256257

257258
pallet_balances::GenesisConfig::<Runtime> {
258259
balances: self.balances.into_iter().collect::<Vec<_>>(),
260+
..Default::default()
259261
}
260262
.assimilate_storage(&mut t)
261263
.unwrap();

0 commit comments

Comments
 (0)