Skip to content

fix: optimize rewards query #474

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
AntonAndell merged 1 commit into from
Feb 28, 2025
Merged

fix: optimize rewards query #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions core-contracts/Rewards/src/main/java/network/balanced/score/core/rewards/DataSourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,17 +257,7 @@ public void addRewardToken(Address token) {

@SuppressWarnings("unchecked")
public Map<String, BigInteger> loadCurrentSupply(String owner) {
// Bad handling that is only relevant during migration, otherwise it will always succeed on first scenario
try {
return (Map<String, BigInteger>) Context.call(getContractAddress(), "getBalanceAndSupply", getName(), owner);
} catch (Exception e) {
try {
return (Map<String, BigInteger>) Context.call(getContractAddress(), "getBalanceAndSupply", getName(), Address.fromString(owner));
} catch (Exception _e) {
return Map.of("_totalSupply", BigInteger.ZERO,
"_balance", BigInteger.ZERO);
}
}
return (Map<String, BigInteger>) Context.call(getContractAddress(), "getBalanceAndSupply", getName(), owner);
}

public Map<Address, BigInteger> updateSingleUserData(BigInteger currentTime, BalanceData balances, String user, boolean readOnlyContext) {
Expand Down
11 changes: 8 additions & 3 deletions core-contracts/Rewards/src/main/java/network/balanced/score/core/rewards/RewardsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,20 @@ public BigInteger getBalnHolding(String _holder) {
public Map<String, BigInteger> getRewards(String _holder) {
Map<String, BigInteger> accruedRewards = getHoldings(_holder);
int dataSourcesCount = DataSourceDB.size();
BigInteger currentTime = getTime();

for (int i = 0; i < dataSourcesCount; i++) {
String name = DataSourceDB.names.get(i);
DataSourceImpl dataSource = DataSourceDB.get(name);
BigInteger currentTime = getTime();
BalanceData balances = new BalanceData();
balances.prevWorkingBalance = dataSource.getWorkingBalance(_holder);
if (balances.prevWorkingBalance.compareTo(BigInteger.ZERO) <= 0) {
continue;
}

balances.prevBalance = dataSource.getBalance(_holder);
balances.prevSupply = dataSource.getTotalSupply();
balances.prevWorkingBalance = dataSource.getWorkingBalance(_holder, true);
balances.prevWorkingSupply = dataSource.getWorkingSupply(true);
balances.prevWorkingSupply = dataSource.getWorkingSupply();
Map<Address, BigInteger> sourceRewards = dataSource.updateSingleUserData(currentTime, balances, _holder, true);
for (Map.Entry<Address, BigInteger> entry : sourceRewards.entrySet()) {
accruedRewards.put(entry.getKey().toString(), accruedRewards.get(entry.getKey().toString()).add(entry.getValue()));
Expand Down
Loading