Skip to content

Fix claiming service skipping epochs #4040

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

Open
wants to merge 2 commits into
base: v8/develop
Choose a base branch
from
Open

Fix claiming service skipping epochs #4040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09df8c7
fix claiming skipping epochs
Sep 5, 2025
7f1feec
fix bigint to number conversion
Sep 5, 2025
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
4 changes: 4 additions & 0 deletions src/modules/blockchain/blockchain-module-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,10 @@ class BlockchainModuleManager extends BaseModuleManager {
]);
}

async getV81ReleaseEpoch(blockchain) {
return this.callImplementationFunction(blockchain, 'getV81ReleaseEpoch');
}

async getAssetStorageContractsAddress(blockchain) {
return this.callImplementationFunction(blockchain, 'getAssetStorageContractsAddress');
}
Expand Down
9 changes: 9 additions & 0 deletions src/modules/blockchain/implementation/web3-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,6 +1300,15 @@ class Web3Service {
});
}

async getV81ReleaseEpoch() {
return this.callContractFunction(
this.contracts.ParametersStorage,
'v81ReleaseEpoch',
[],
CONTRACTS.PARAMETERS_STORAGE,
);
}

async getAssetStorageContractsAddress() {
return Object.keys(this.assetStorageContracts);
}
Expand Down
9 changes: 6 additions & 3 deletions src/service/claim-rewards-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ class ClaimRewardsService {
// This means node never claimed and delegated before introduction of random sampling
// If he staked or claimed before the value would have been set correctly
const delegatorAddresses = lastClaimedEpochAddressesMap['0'];
const v81ReleaseEpoch = Number(
(await this.blockchainModuleManager.getV81ReleaseEpoch(blockchainId)).toString(),
);
await Promise.all(
delegatorAddresses.map(async (delegatorAddress) => {
const hasEverDelegated = await this.blockchainModuleManager.hasEverDelegated(
Expand All @@ -129,12 +132,12 @@ class ClaimRewardsService {
);
// TODO: How will this impact mainnet where this function landed at same time as proofing
if (!hasEverDelegated) {
if (lastClaimedEpochAddressesMap[`${currentEpoch - 1}`]) {
lastClaimedEpochAddressesMap[`${currentEpoch - 1}`].push(
if (lastClaimedEpochAddressesMap[`${v81ReleaseEpoch - 1}`]) {
lastClaimedEpochAddressesMap[`${v81ReleaseEpoch - 1}`].push(
...delegatorAddresses,
);
} else {
lastClaimedEpochAddressesMap[`${currentEpoch - 1}`] =
lastClaimedEpochAddressesMap[`${v81ReleaseEpoch - 1}`] =
delegatorAddresses;
}
}
Expand Down
Loading