Skip to content
This repository was archived by the owner on Feb 29, 2024. It is now read-only.

Commit f9ceb50

Browse files
author
Guantong
authored
Prepare polkadot v0.9.36 for Darwinia-2.0 (#242)
* Anchor polkadot-v0.9.36 * Companion for paritytech/parity-bridges-common#1691 * Companion for paritytech/parity-bridges-common#1767 * Add call index * Companion for paritytech/substrate#12451 & fix tests * Format * Update moonbeam deps * review * Move root-testing to dev deps * Correct call_index
1 parent 81e7764 commit f9ceb50

File tree

27 files changed

+551
-185
lines changed

27 files changed

+551
-185
lines changed

‎Cargo.lock

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

‎modules/dispatch/Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ scale-info = { version = "2.1", default-features = false, features = ["derive"]
1414
bp-message-dispatch = { default-features = false, path = "../../primitives/message-dispatch" }
1515
bp-runtime = { default-features = false, path = "../../primitives/runtime" }
1616
# paritytech
17-
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
18-
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
19-
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
20-
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
21-
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
17+
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
18+
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
19+
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
20+
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
21+
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
2222

2323
[dev-dependencies]
24-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
24+
pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
25+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
2526

2627
[features]
2728
default = ["std"]

‎modules/dispatch/src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ mod tests {
542542
NodeBlock = Block,
543543
UncheckedExtrinsic = UncheckedExtrinsic,
544544
{
545+
RootTesting: pallet_root_testing,
545546
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
546547
Dispatch: call_dispatch::{Pallet, Call, Event<T>},
547548
}
@@ -554,6 +555,8 @@ mod tests {
554555
pub const AvailableBlockRatio: Perbill = Perbill::one();
555556
}
556557

558+
impl pallet_root_testing::Config for TestRuntime {}
559+
557560
impl frame_system::Config for TestRuntime {
558561
type AccountData = ();
559562
type AccountId = AccountId;
@@ -618,7 +621,7 @@ mod tests {
618621
call: &RuntimeCall,
619622
) -> Result<(), TransactionValidityError> {
620623
match call {
621-
RuntimeCall::System(frame_system::Call::fill_block { .. }) =>
624+
RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { .. }) =>
622625
Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
623626
_ => Ok(()),
624627
}
@@ -887,7 +890,7 @@ mod tests {
887890
let id = [0; 4];
888891
let relayer_account = 1;
889892

890-
let call = RuntimeCall::System(frame_system::Call::fill_block {
893+
let call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block {
891894
ratio: Perbill::from_percent(75),
892895
});
893896
let weight = call.get_dispatch_info().weight;

‎modules/fee-market/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ version = "0.1.0"
1414
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
1515
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
1616
# paritytech
17-
frame-benchmarking = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false }
18-
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false }
19-
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false }
20-
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false }
21-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false }
22-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false }
23-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false }
24-
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false }
17+
frame-benchmarking = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
18+
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
19+
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
20+
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
21+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
22+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
23+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
24+
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
2525
# darwinia-bridges-substrate
2626
bp-messages = { default-features = false, path = "../../primitives/messages" }
2727
bp-runtime = { default-features = false, path = "../../primitives/runtime" }
2828

2929
[dev-dependencies]
3030
bitvec = { version = "1" }
31-
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
31+
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
3232
pallet-bridge-messages = { path = "../messages" }
3333

3434
[features]

‎modules/fee-market/src/lib.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ pub mod pallet {
248248
/// Any accounts can enroll to be a relayer by lock collateral. The relay fee is optional,
249249
/// the default value is MinimumRelayFee in runtime. (Update market needed)
250250
/// Note: One account can enroll only once.
251+
#[pallet::call_index(0)]
251252
#[pallet::weight(<T as Config<I>>::WeightInfo::enroll_and_lock_collateral())]
252253
pub fn enroll_and_lock_collateral(
253254
origin: OriginFor<T>,
@@ -292,6 +293,7 @@ pub mod pallet {
292293
}
293294

294295
/// Increase relayer's locked collateral
296+
#[pallet::call_index(1)]
295297
#[pallet::weight(<T as Config<I>>::WeightInfo::increase_locked_collateral())]
296298
pub fn increase_locked_collateral(
297299
origin: OriginFor<T>,
@@ -329,6 +331,7 @@ pub mod pallet {
329331
}
330332

331333
/// Decrease relayer's locked collateral
334+
#[pallet::call_index(2)]
332335
#[pallet::weight(<T as Config<I>>::WeightInfo::decrease_locked_collateral())]
333336
pub fn decrease_locked_collateral(
334337
origin: OriginFor<T>,
@@ -373,6 +376,7 @@ pub mod pallet {
373376
}
374377

375378
/// Update relay fee for enrolled relayer. (Update market needed)
379+
#[pallet::call_index(3)]
376380
#[pallet::weight(<T as Config<I>>::WeightInfo::update_relay_fee())]
377381
pub fn update_relay_fee(origin: OriginFor<T>, new_fee: BalanceOf<T, I>) -> DispatchResult {
378382
let who = ensure_signed(origin)?;
@@ -393,6 +397,7 @@ pub mod pallet {
393397
}
394398

395399
/// Cancel enrolled relayer(Update market needed)
400+
#[pallet::call_index(4)]
396401
#[pallet::weight(<T as Config<I>>::WeightInfo::cancel_enrollment())]
397402
pub fn cancel_enrollment(origin: OriginFor<T>) -> DispatchResult {
398403
let who = ensure_signed(origin)?;
@@ -420,6 +425,7 @@ pub mod pallet {
420425
)
421426
}
422427

428+
#[pallet::call_index(5)]
423429
#[pallet::weight(<T as Config<I>>::WeightInfo::set_slash_protect())]
424430
pub fn set_slash_protect(
425431
origin: OriginFor<T>,
@@ -431,6 +437,7 @@ pub mod pallet {
431437
Ok(())
432438
}
433439

440+
#[pallet::call_index(6)]
434441
#[pallet::weight(<T as Config<I>>::WeightInfo::set_assigned_relayers_number())]
435442
pub fn set_assigned_relayers_number(origin: OriginFor<T>, number: u32) -> DispatchResult {
436443
ensure_root(origin)?;

‎modules/grandpa/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ bp-header-chain = { default-features = false, path = "../../primitives/header-ch
1717
bp-runtime = { default-features = false, path = "../../primitives/runtime" }
1818
bp-test-utils = { optional = true, default-features = false, path = "../../primitives/test-utils" }
1919
# paritytech
20-
frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
21-
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
22-
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
23-
sp-finality-grandpa = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
24-
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
25-
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
26-
sp-trie = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
20+
frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
21+
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
22+
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
23+
sp-finality-grandpa = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
24+
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
25+
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
26+
sp-trie = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
2727

2828
[dev-dependencies]
2929
# paritytech
30-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
31-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
30+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
31+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
3232

3333
[features]
3434
default = ["std"]

‎modules/grandpa/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ pub mod pallet {
158158
///
159159
/// If successful in verification, it will write the target header to the underlying storage
160160
/// pallet.
161+
#[pallet::call_index(0)]
161162
#[pallet::weight(T::WeightInfo::submit_finality_proof(
162163
justification.commit.precommits.len().try_into().unwrap_or(u32::MAX),
163164
justification.votes_ancestries.len().try_into().unwrap_or(u32::MAX),
@@ -245,6 +246,7 @@ pub mod pallet {
245246
/// This function is only allowed to be called from a trusted origin and writes to storage
246247
/// with practically no checks in terms of the validity of the data. It is important that
247248
/// you ensure that valid data is being passed in.
249+
#[pallet::call_index(1)]
248250
#[pallet::weight((T::DbWeight::get().reads_writes(2, 5), DispatchClass::Operational))]
249251
pub fn initialize(
250252
origin: OriginFor<T>,
@@ -268,6 +270,7 @@ pub mod pallet {
268270
/// Change `PalletOwner`.
269271
///
270272
/// May only be called either by root, or by `PalletOwner`.
273+
#[pallet::call_index(2)]
271274
#[pallet::weight((T::DbWeight::get().reads_writes(1, 1), DispatchClass::Operational))]
272275
pub fn set_owner(origin: OriginFor<T>, new_owner: Option<T::AccountId>) -> DispatchResult {
273276
<Self as OwnedBridgeModule<_>>::set_owner(origin, new_owner)
@@ -276,6 +279,7 @@ pub mod pallet {
276279
/// Halt or resume all pallet operations.
277280
///
278281
/// May only be called either by root, or by `PalletOwner`.
282+
#[pallet::call_index(3)]
279283
#[pallet::weight((T::DbWeight::get().reads_writes(1, 1), DispatchClass::Operational))]
280284
pub fn set_operating_mode(
281285
origin: OriginFor<T>,

‎modules/grandpa/src/mock.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use frame_support::{
2626
weights::Weight,
2727
};
2828
use frame_system::mocking::*;
29-
use sp_core::sr25519::Signature;
29+
use sp_core::{sr25519::Signature, ConstU64};
3030
use sp_runtime::{
3131
testing::{Header, H256},
3232
traits::{BlakeTwo256, IdentityLookup},
@@ -55,7 +55,6 @@ frame_support::construct_runtime! {
5555
}
5656

5757
frame_support::parameter_types! {
58-
pub const BlockHashCount: u64 = 250;
5958
pub const MaximumBlockWeight: Weight = Weight::from_ref_time(1024);
6059
pub const MaximumBlockLength: u32 = 2 * 1024;
6160
pub const AvailableBlockRatio: Perbill = Perbill::one();
@@ -64,7 +63,7 @@ impl frame_system::Config for TestRuntime {
6463
type AccountData = ();
6564
type AccountId = AccountId;
6665
type BaseCallFilter = Everything;
67-
type BlockHashCount = BlockHashCount;
66+
type BlockHashCount = ConstU64<250>;
6867
type BlockLength = ();
6968
type BlockNumber = u64;
7069
type BlockWeights = ();

‎modules/messages/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ bp-message-dispatch = { default-features = false, path = "../../primitives/messa
1818
bp-messages = { default-features = false, path = "../../primitives/messages" }
1919
bp-runtime = { default-features = false, path = "../../primitives/runtime" }
2020
# paritytech
21-
frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
22-
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
23-
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
24-
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
25-
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
26-
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
21+
frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
22+
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
23+
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
24+
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
25+
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
26+
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
2727

2828
[dev-dependencies]
2929
# darwinia-network
3030
bp-test-utils = { path = "../../primitives/test-utils" }
3131
# paritytech
32-
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
33-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
32+
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
33+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
3434

3535
[features]
3636
default = ["std"]

‎modules/messages/src/lib.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ pub mod pallet {
231231
/// Change `PalletOwner`.
232232
///
233233
/// May only be called either by root, or by `PalletOwner`.
234+
#[pallet::call_index(0)]
234235
#[pallet::weight((T::DbWeight::get().reads_writes(1, 1), DispatchClass::Operational))]
235236
pub fn set_owner(origin: OriginFor<T>, new_owner: Option<T::AccountId>) -> DispatchResult {
236237
<Self as OwnedBridgeModule<_>>::set_owner(origin, new_owner)
@@ -239,6 +240,7 @@ pub mod pallet {
239240
/// Halt or resume all/some pallet operations.
240241
///
241242
/// May only be called either by root, or by `PalletOwner`.
243+
#[pallet::call_index(1)]
242244
#[pallet::weight((T::DbWeight::get().reads_writes(1, 1), DispatchClass::Operational))]
243245
pub fn set_operating_mode(
244246
origin: OriginFor<T>,
@@ -253,6 +255,7 @@ pub mod pallet {
253255
///
254256
/// The weight is: single read for permissions check + 2 writes for parameter value and
255257
/// event.
258+
#[pallet::call_index(2)]
256259
#[pallet::weight((T::DbWeight::get().reads_writes(1, 2), DispatchClass::Operational))]
257260
pub fn update_pallet_parameter(
258261
origin: OriginFor<T>,
@@ -265,6 +268,7 @@ pub mod pallet {
265268
}
266269

267270
/// Send message over lane.
271+
#[pallet::call_index(3)]
268272
#[pallet::weight(T::WeightInfo::send_message_weight(payload, T::DbWeight::get()))]
269273
pub fn send_message(
270274
origin: OriginFor<T>,
@@ -286,7 +290,7 @@ pub mod pallet {
286290
/// state update. Because of that, the submitter (relayer) has no benefit of not including
287291
/// this data in the transaction, so reward confirmations lags should be minimal.
288292
#[pallet::weight(T::WeightInfo::receive_messages_proof_weight(proof, *messages_count, *dispatch_weight))]
289-
#[pallet::call_index(5)]
293+
#[pallet::call_index(4)]
290294
pub fn receive_messages_proof(
291295
origin: OriginFor<T>,
292296
relayer_id_at_bridged_chain: T::InboundRelayer,
@@ -448,7 +452,7 @@ pub mod pallet {
448452
relayers_state,
449453
T::DbWeight::get(),
450454
))]
451-
#[pallet::call_index(6)]
455+
#[pallet::call_index(5)]
452456
pub fn receive_messages_delivery_proof(
453457
origin: OriginFor<T>,
454458
proof: MessagesDeliveryProofOf<T, I>,

‎modules/messages/src/mock.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use frame_support::{
4747
weights::{RuntimeDbWeight, Weight},
4848
};
4949
use frame_system::mocking::*;
50-
use sp_core::H256;
50+
use sp_core::{ConstU64, H256};
5151
use sp_runtime::{
5252
testing::Header as SubstrateHeader,
5353
traits::{BlakeTwo256, IdentityLookup},
@@ -128,7 +128,6 @@ frame_support::construct_runtime! {
128128
}
129129

130130
parameter_types! {
131-
pub const BlockHashCount: u64 = 250;
132131
pub const MaximumBlockWeight: Weight = Weight::from_ref_time(1024);
133132
pub const MaximumBlockLength: u32 = 2 * 1024;
134133
pub const AvailableBlockRatio: Perbill = Perbill::one();
@@ -138,7 +137,7 @@ impl frame_system::Config for TestRuntime {
138137
type AccountData = pallet_balances::AccountData<Balance>;
139138
type AccountId = AccountId;
140139
type BaseCallFilter = frame_support::traits::Everything;
141-
type BlockHashCount = BlockHashCount;
140+
type BlockHashCount = ConstU64<250>;
142141
type BlockLength = ();
143142
type BlockNumber = u64;
144143
type BlockWeights = ();
@@ -161,14 +160,11 @@ impl frame_system::Config for TestRuntime {
161160
type Version = ();
162161
}
163162

164-
parameter_types! {
165-
pub const ExistentialDeposit: u64 = 1;
166-
}
167163
impl pallet_balances::Config for TestRuntime {
168164
type AccountStore = frame_system::Pallet<TestRuntime>;
169165
type Balance = Balance;
170166
type DustRemoval = ();
171-
type ExistentialDeposit = ExistentialDeposit;
167+
type ExistentialDeposit = ConstU64<1>;
172168
type MaxLocks = ();
173169
type MaxReserves = ();
174170
type ReserveIdentifier = ();

0 commit comments

Comments
 (0)