Skip to content

Update deps from v0.9.22 to v0.9.26 #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghzlatarev merged 22 commits into from
Aug 2, 2022
Merged

Update deps from v0.9.22 to v0.9.26 #720

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9e00d98
Update deps to v0.9.26
ghzlatarev Jul 27, 2022
b14a172
Revert rust verison
ghzlatarev Jul 27, 2022
45992a9
Clean up
ghzlatarev Jul 27, 2022
0b9b586
Allow deprecad in migrations
ghzlatarev Jul 27, 2022
05ae8cd
Fix tests
ghzlatarev Jul 27, 2022
0ec7752
Allow deprecated only for remove_storage_prefix
ghzlatarev Jul 27, 2022
8b6b4dc
Fix linters
ghzlatarev Jul 27, 2022
7f6f6a7
Add CollatorsCount storage and fix linters
ghzlatarev Jul 27, 2022
3d15f66
Fix RPC builder
ghzlatarev Jul 28, 2022
40c3834
Get rid of redundant collatos count storage item
ghzlatarev Jul 28, 2022
765b151
Use clear call properly
ghzlatarev Jul 28, 2022
59da9a5
Import sp_std::vec
ghzlatarev Jul 28, 2022
ac21ff3
Merge branch 'manta' into ghzlatarev/v0.9.26
ghzlatarev Jul 29, 2022
9906f00
Merge branch 'manta' into ghzlatarev/v0.9.26
ghzlatarev Jul 29, 2022
6af044b
Use explicit call indices in custom pallets
ghzlatarev Aug 1, 2022
520cc53
Note about temp garandor/polkadot-v0.9.26 branch
ghzlatarev Aug 1, 2022
c9fbcfb
Clarification comment on SpendOrigin
ghzlatarev Aug 1, 2022
fc7469c
Remove unnecessary deps and clean up
ghzlatarev Aug 1, 2022
ed95ce0
Resolve merge conflicts with manta. Add Wasm execution explicitly in …
ghzlatarev Aug 1, 2022
0585589
Bump scale-infol in pallet-asset-manager
ghzlatarev Aug 1, 2022
6950c65
Use vendored ORML.xTokens
ghzlatarev Aug 1, 2022
b293e89
Use manta-network fork for orml in general
ghzlatarev Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add CollatorsCount storage and fix linters 
Signed-off-by: Georgi Zlatarev <georgi.zlatarev@manta.network>
  • Loading branch information
@ghzlatarev
ghzlatarev committed Jul 27, 2022
commit 7f6f6a7040061ce8a94b6db1531bffbaebf364e3
9 changes: 7 additions & 2 deletions pallets/collator-selection/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,11 @@ pub mod pallet {
#[pallet::getter(fn candidacy_bond)]
pub type CandidacyBond<T> = StorageValue<_, BalanceOf<T>, ValueQuery>;

/// The collators count.
#[pallet::storage]
#[pallet::getter(fn collators_count)]
pub type CollatorsCount<T: Config> = StorageValue<_, u32, ValueQuery>;

#[pallet::genesis_config]
pub struct GenesisConfig<T: Config> {
pub invulnerables: Vec<T::AccountId>,
Expand Down Expand Up @@ -635,7 +640,7 @@ pub mod pallet {

/// Reset the performance map to the currently active validators at 0 blocks
pub fn reset_collator_performance() {
let _ = <BlocksPerCollatorThisSession<T>>::clear(<DesiredCandidates<T>>::get(), None);
let _ = <BlocksPerCollatorThisSession<T>>::clear(<CollatorsCount<T>>::get(), None);
let validators = T::ValidatorRegistration::validators();
for validator_id in validators {
let account_id = T::AccountIdOf::convert(validator_id.clone().into());
Expand Down Expand Up @@ -699,7 +704,7 @@ pub mod pallet {
})
.collect::<Vec<_>>();
let result = Self::assemble_collators(active_candidate_ids);

<CollatorsCount<T>>::set(result.len() as u32);
frame_system::Pallet::<T>::register_extra_weight_unchecked(
T::WeightInfo::new_session(candidates_len_before as u32),
DispatchClass::Mandatory,
Expand Down
4 changes: 2 additions & 2 deletions runtime/calamari/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-feat
xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" }

# Third party (vendored) dependencies
orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" }
orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" }

# Self dependencies
calamari-vesting = { path = '../../pallets/vesting', default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions runtime/dolphin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ runtime-common = { path = '../common', default-features = false }
session-key-primitives = { path = '../../primitives/session-keys', default-features = false }

# Third party (vendored) dependencies
orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" }
orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" }

[package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu']
Expand Down