Skip to content

chore: add safety guard for negative cycle index #6527

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

Closed
operagxsasha wants to merge 6 commits into from
Closed

chore: add safety guard for negative cycle index #6527

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b733257
chore: add safety guard for negative cycle index
operagxsasha Jan 26, 2026
c9e2299
chore: move guard to method level
operagxsasha Mar 2, 2026
3e334c7
chore: fix return type for beginCycle guard
operagxsasha Mar 2, 2026
dad308a
style: fix checkstyle LineLength in ShieldedReceiveTest
operagxsasha Mar 2, 2026
5b426c6
Merge branch 'develop' into patch-3
operagxsasha Mar 2, 2026
8077531
chore: remove redundant beginCycle guard
operagxsasha Mar 2, 2026
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
7 changes: 6 additions & 1 deletion chainbase/src/main/java/org/tron/core/service/MortgageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,12 @@ private long computeReward(long beginCycle, long endCycle, AccountCapsule accoun
beginCycle = oldEndCycle;
}
if (beginCycle < endCycle) {
for (Pair<byte[], Long> vote : srAddresses) {
if (beginCycle <= 0) {
Comment thread
operagxsasha marked this conversation as resolved.
Outdated
return 0L;
}

for (Pair<byte[], Long> vote : srAddresses) {

@warku123 warku123 Mar 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@operagxsasha

The PR title mentions adding a "safety guard for negative cycle index", but the diff only shows formatting changes.

Could you double-check if the intended logic changes are missing from this PR?

@operagxsasha operagxsasha Mar 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing this out. I'll double-check the intended logic change and update the PR if something is missing.


byte[] srAddress = vote.getKey();
BigInteger beginVi = delegationStore.getWitnessVi(beginCycle - 1, srAddress);
BigInteger endVi = delegationStore.getWitnessVi(endCycle - 1, srAddress);
Expand Down
Loading