fix: use ClaimedRewards storage for staking-payouts claimed status post-AHM#1922
Merged
fix: use ClaimedRewards storage for staking-payouts claimed status post-AHM#1922
Conversation
TarikGul
approved these changes
Mar 20, 2026
Member
TarikGul
left a comment
There was a problem hiding this comment.
Looks good 👍 Thanks for the fix.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix
accounts/{address}/staking-payoutsreturning already-claimed payouts as unclaimed on Asset Hub (post-AHM).Root cause: After the Asset Hub Migration,
pallet-staking-asyncrecords claimed rewards in theStaking.ClaimedRewards(era, validator)storage map. The legacylegacyClaimedRewardsfield in the staking ledger is no longer updated. Sidecar was only reading the legacy field, so it always sawclaimed: falsefor post-AHM eras.Fix: In
deriveEraPayouts, checkClaimedRewardsstorage first, comparing claimed pages againstpageCountfromErasStakersOverview. Fall back to the legacy ledger fields only when the new storage doesn't exist in the runtime (pre-AHM). This matches the approach used by polkadot-rest-api and already present in sidecar's ownAccountsStakingInfoService.Changes:
deriveEraPayoutsmade async, receiveshistoricApi(required) to query storage at the correct blockfetchAccountStakingPayout,fetchErasFromRelayChain,fetchErasFromAssetHub)Before (sidecar): era 2101 returned with
claimed: falseand payout data, even though the reward was already claimed.After (sidecar): era 2101 correctly returns
"payouts": []withunclaimedOnly=true, matching polkadot-rest-api.