AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

online accounts api call, fix level zero accounts

Browse Source 
Added online zero level accounts to the response of /addresses/online/levels api endpoints
This commit is contained in:
proto 2022-02-21 15:20:19 +01:00
parent d1a7e734dc
commit bec5b47e43
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/qortal/account/Account.java
View File

@ -272,7 +272,7 @@ public class Account {
/** /**
* Returns 'effective' minting level, or zero if reward-share does not exist. * Returns 'effective' minting level, or zero if reward-share does not exist.
* <p> * <p>
* For founder accounts, this returns "founderEffectiveMintingLevel" from blockchain config. * this is being used on src/main/java/org/qortal/api/resource/AddressesResource.java to fulfil the online accounts api call
* *
* @param repository * @param repository
* @param rewardSharePublicKey * @param rewardSharePublicKey
@ -288,5 +288,26 @@ public class Account {
Account rewardShareMinter = new Account(repository, rewardShareData.getMinter()); Account rewardShareMinter = new Account(repository, rewardShareData.getMinter());
return rewardShareMinter.getEffectiveMintingLevel(); return rewardShareMinter.getEffectiveMintingLevel();
} }
/**
* Returns 'effective' minting level, with a fix for the zero level.
* <p>
* For founder accounts, this returns "founderEffectiveMintingLevel" from blockchain config.
*
* @param repository
* @param rewardSharePublicKey
* @return 0+
* @throws DataException
*/
public static int getRewardShareEffectiveMintingLevelIncludingLevelZero(Repository repository, byte[] rewardSharePublicKey) throws DataException {
// Find actual minter and get their effective minting level
RewardShareData rewardShareData = repository.getAccountRepository().getRewardShare(rewardSharePublicKey);
if (rewardShareData == null)
return 0;
else if(!rewardShareData.getMinter().equals(rewardShareData.getRecipient()))//the minter is different than the recipient this means sponsorship
return 0;
Account rewardShareMinter = new Account(repository, rewardShareData.getMinter());
return rewardShareMinter.getEffectiveMintingLevel();
}
} }

2
src/main/java/org/qortal/api/resource/AddressesResource.java
View File

@ -198,7 +198,7 @@ public class AddressesResource {
for (OnlineAccountData onlineAccountData : onlineAccounts) { for (OnlineAccountData onlineAccountData : onlineAccounts) {
try { try {
final int minterLevel = Account.getRewardShareEffectiveMintingLevel(repository, onlineAccountData.getPublicKey()); final int minterLevel = Account.getRewardShareEffectiveMintingLevelIncludingLevelZero(repository, onlineAccountData.getPublicKey());
OnlineAccountLevel onlineAccountLevel = onlineAccountLevels.stream() OnlineAccountLevel onlineAccountLevel = onlineAccountLevels.stream()
.filter(a -> a.getLevel() == minterLevel) .filter(a -> a.getLevel() == minterLevel)