crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added "maximumCount" parameter to HSQLDBATRepository.getMatchingFinalATStatesQuorum() and use it to limit the number of ATs being returned in the query.

Browse Source 
Initially set to 10 when used by the /crosschain/price/{blockchain} API, so that the price is based on the last 10 trades rather than every trade that has ever taken place.
This commit is contained in:
CalDescent 2021-05-09 15:56:15 +01:00
parent f4520e2752
commit 8260cec713
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/qortal/api/resource/CrossChainResource.java
View File

@ -262,6 +262,7 @@ public class CrossChainResource {
// We want both a minimum of 5 trades and enough trades to span at least 4 hours // We want both a minimum of 5 trades and enough trades to span at least 4 hours
int minimumCount = 5; int minimumCount = 5;
int maximumCount = 10;
long minimumPeriod = 4 * 60 * 60 * 1000L; // ms long minimumPeriod = 4 * 60 * 60 * 1000L; // ms
Boolean isFinished = Boolean.TRUE; Boolean isFinished = Boolean.TRUE;
@ -276,7 +277,7 @@ public class CrossChainResource {
ACCT acct = acctInfo.getValue().get(); ACCT acct = acctInfo.getValue().get();
List<ATStateData> atStates = repository.getATRepository().getMatchingFinalATStatesQuorum(codeHash, List<ATStateData> atStates = repository.getATRepository().getMatchingFinalATStatesQuorum(codeHash,
isFinished, acct.getModeByteOffset(), (long) AcctMode.REDEEMED.value, minimumCount, minimumPeriod); isFinished, acct.getModeByteOffset(), (long) AcctMode.REDEEMED.value, minimumCount, maximumCount, minimumPeriod);
for (ATStateData atState : atStates) { for (ATStateData atState : atStates) {
CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atState); CrossChainTradeData crossChainTradeData = acct.populateTradeData(repository, atState);

2
src/main/java/org/qortal/repository/ATRepository.java
View File

@ -98,7 +98,7 @@ public interface ATRepository {
*/ */
public List<ATStateData> getMatchingFinalATStatesQuorum(byte[] codeHash, Boolean isFinished, public List<ATStateData> getMatchingFinalATStatesQuorum(byte[] codeHash, Boolean isFinished,
Integer dataByteOffset, Long expectedValue, Integer dataByteOffset, Long expectedValue,
int minimumCount, long minimumPeriod) throws DataException; int minimumCount, int maximumCount, long minimumPeriod) throws DataException;
/** /**
* Returns all ATStateData for a given block height. * Returns all ATStateData for a given block height.

5
src/main/java/org/qortal/repository/hsqldb/HSQLDBATRepository.java
View File

@ -454,7 +454,7 @@ public class HSQLDBATRepository implements ATRepository {
@Override @Override
public List<ATStateData> getMatchingFinalATStatesQuorum(byte[] codeHash, Boolean isFinished, public List<ATStateData> getMatchingFinalATStatesQuorum(byte[] codeHash, Boolean isFinished,
Integer dataByteOffset, Long expectedValue, Integer dataByteOffset, Long expectedValue,
int minimumCount, long minimumPeriod) throws DataException { int minimumCount, int maximumCount, long minimumPeriod) throws DataException {
// We need most recent entry first so we can use its timestamp to slice further results // We need most recent entry first so we can use its timestamp to slice further results
List<ATStateData> mostRecentStates = this.getMatchingFinalATStates(codeHash, isFinished, List<ATStateData> mostRecentStates = this.getMatchingFinalATStates(codeHash, isFinished,
dataByteOffset, expectedValue, null, dataByteOffset, expectedValue, null,
@ -510,7 +510,8 @@ public class HSQLDBATRepository implements ATRepository {
bindParams.add(minimumHeight); bindParams.add(minimumHeight);
bindParams.add(minimumCount); bindParams.add(minimumCount);
sql.append("ORDER BY FinalATStates.height DESC"); sql.append("ORDER BY FinalATStates.height DESC LIMIT ?");
bindParams.add(maximumCount);
List<ATStateData> atStates = new ArrayList<>(); List<ATStateData> atStates = new ArrayList<>();