Skip to content
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

Jump to bottom

Bump staking and nomination pools #318

Merged
merged 7 commits into from
May 21, 2024
Merged

Bump staking and nomination pools #318

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73cf29a
bump pools and staking
Ank4n May 20, 2024
c3b0b72
add to changelog
Ank4n May 20, 2024
4b275bc
Merge branch 'main' into bump-staking-pools
Ank4n May 20, 2024
a7668ed
Merge branch 'main' into bump-staking-pools
Ank4n May 20, 2024
a03c34e
fix changelog
Ank4n May 20, 2024
37cf266
fmt
Ank4n May 20, 2024
7c2cafe
minor modification
Ank4n May 20, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Add Pay Salary Collectives test ([polkadot-fellows/runtimes#260](https://github.com/polkadot-fellows/runtimes/pull/260))
- Add `pallet-xcm::transfer_assets_using_type_and_then()` for complex asset transfers ([polkadot-fellows/runtimes#311](https://github.com/polkadot-fellows/runtimes/pull/311))
- The Ambassador Program ([polkadot-fellows/runtimes#291](https://github.com/polkadot-fellows/runtimes/pull/291))
- Add new staking runtime api to check if reward is pending for an era. - Handle extra consumer reference when pool is destroyed ([polkadot-fellows/runtimes#318](https://github.com/polkadot-fellows/runtimes/pull/318))

### Removed

Expand All @@ -29,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Include patch to release stuck collator bonds ([polkadot-fellows/runtimes#289](https://github.com/polkadot-fellows/runtimes/pull/289))
- Safeguard pallet-balances against consumer ref underflow ([polkadot-fellows/runtimes#309](https://github.com/polkadot-fellows/runtimes/pull/309))
- Polkadot Bridge Hub: Unstuck Snowbridge ([polkadot-fellows/runtimes#313](https://github.com/polkadot-fellows/runtimes/pull/313))
- Handle extra consumer reference when pool is destroyed. ([polkadot-fellows/runtimes#318](https://github.com/polkadot-fellows/runtimes/pull/318))

## [1.2.3] 29.04.2024

Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ pallet-nft-fractionalization = { version = "11.0.0", default-features = false }
pallet-nfts = { version = "23.0.0", default-features = false }
pallet-nfts-runtime-api = { version = "15.0.0", default-features = false }
pallet-nis = { version = "29.0.0", default-features = false }
pallet-nomination-pools = { version = "26.0.0", default-features = false }
pallet-nomination-pools = { version = "26.0.1", default-features = false }
pallet-nomination-pools-benchmarking = { version = "27.0.0", default-features = false }
pallet-nomination-pools-runtime-api = { version = "24.0.0", default-features = false }
pallet-offences = { version = "28.0.0", default-features = false }
Expand All @@ -143,10 +143,10 @@ pallet-scheduler = { version = "30.0.0", default-features = false }
pallet-session = { version = "29.0.0", default-features = false }
pallet-session-benchmarking = { version = "29.0.0", default-features = false }
pallet-society = { version = "29.0.0", default-features = false }
pallet-staking = { version = "29.0.2", default-features = false }
pallet-staking = { version = "29.0.3", default-features = false }
pallet-staking-reward-curve = { version = "11.0.0" }
pallet-staking-reward-fn = { version = "20.0.0", default-features = false }
pallet-staking-runtime-api = { version = "15.0.0", default-features = false }
pallet-staking-runtime-api = { version = "15.0.1", default-features = false }
pallet-state-trie-migration = { version = "30.0.0", default-features = false }
pallet-sudo = { version = "29.0.0", default-features = false }
pallet-timestamp = { version = "28.0.0", default-features = false }
Expand Down
4 changes: 4 additions & 0 deletions relay/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2565,6 +2565,10 @@ sp_api::impl_runtime_apis! {
fn eras_stakers_page_count(era: sp_staking::EraIndex, account: AccountId) -> sp_staking::Page {
Staking::api_eras_stakers_page_count(era, account)
}

fn pending_rewards(era: sp_staking::EraIndex, account: AccountId) -> bool {
Staking::api_pending_rewards(era, account)
}
}

impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
Expand Down
4 changes: 4 additions & 0 deletions relay/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,6 +2037,10 @@ sp_api::impl_runtime_apis! {
fn eras_stakers_page_count(era: sp_staking::EraIndex, account: AccountId) -> sp_staking::Page {
Staking::api_eras_stakers_page_count(era, account)
}

fn pending_rewards(era: sp_staking::EraIndex, account: AccountId) -> bool {
Staking::api_pending_rewards(era, account)
}
}

impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
Expand Down
Loading