Skip to content

fix: handle case of 0 vote polls returned #19

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
merged 10 commits into from
Dec 13, 2024
Merged

fix: handle case of 0 vote polls returned #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
921c9bf
fix: handle case of 0 vote polls returned
HashEngineering Dec 3, 2024
4512b70
fix: handle case of 100 vote polls returned
HashEngineering Dec 6, 2024
874d5b9
tests: add some more voting tests
HashEngineering Dec 6, 2024
f815854
tests: use StartAt instead of StartAfter
HashEngineering Dec 6, 2024
99effce
fix: don't check for assetlock transaction internals on BlockchainIde…
HashEngineering Dec 6, 2024
e7f7f07
feat: add AllContestedNames example
HashEngineering Dec 6, 2024
52d840e
feat: update ShowContactRequests to display received contact requests
HashEngineering Dec 10, 2024
b29ff42
fix: Use StartAt for paging on RegisteredNames
HashEngineering Dec 10, 2024
4cc565c
feat: add retry in DapiClient for queries
HashEngineering Dec 10, 2024
4d26198
fix: update MainNet EvoNode white list
HashEngineering Dec 10, 2024
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
47 changes: 47 additions & 0 deletions dash-sdk-java/src/test/java/org/dashj/platform/sdk/VoteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,53 @@ public void getVoteContendorsTest() throws Exception {

}

@Test
public void getVoteContendorsMainNetTest() throws Exception {
String name = "fuzzyduck";
ArrayList<PlatformValue> indexes = new ArrayList<>();
indexes.add(new PlatformValue("dash"));
indexes.add(new PlatformValue(name));
SWIGTYPE_p_DashSdk mainnetSdk = dashsdk.platformMobileSdkCreateDashSdk(BigInteger.ZERO, BigInteger.ZERO, false);
Result<Contenders, String> result = dashsdk.platformMobileVotingGetVoteContenders(
mainnetSdk,
"parentNameAndLabel",
indexes,
"domain",
new Identifier(dpnsContractId)
);
Contenders contenders = result.unwrap();
assertNotNull(contenders);
System.out.println("Username: " + name);
System.out.println("Contenders: " + contenders.getContenders().size());
TupleContestedDocumentVotePollWinnerInfoBlockInfo winner = contenders.getWinner();
System.out.println(" Winner:" + (winner != null ? "" : "none"));
if (winner != null) {
System.out.print(" " + winner.getO_0().getTag());
if (winner.getO_0().getTag() == ContestedDocumentVotePollWinnerInfo.Tag.WonByIdentity) {
System.out.print(" " + Base58.encode(winner.getO_0().getWon_by_identity().get_0().get_0().get_0()));
}
System.out.println();
}
System.out.println(" Abstain: " + contenders.getAbstainVoteTally());
System.out.println(" Lock: " + contenders.getLockVoteTally());
System.out.println(" ---------------");
for (Map.Entry<Identifier, ContenderWithSerializedDocument> entry : contenders.getContenders().entrySet()) {
System.out.println(" Identifier: " + Base58.encode(entry.getKey().get_0().get_0()));
byte [] serializedDocument = entry.getValue().getV0().get_0().getSerialized_document();
System.out.println(" Serialized: " + (serializedDocument != null ? Base64.getEncoder().encodeToString(serializedDocument) : "null"));
if (serializedDocument != null) {
Result<Document, String> result2 = dashsdk.platformMobileFetchDocumentDeserializeDocumentSdk(
sdk, serializedDocument, new Identifier(dpnsContractId), "domain");
Document document = result2.unwrap();
long createdAt = document.getV0().get_0().getCreated_at().toLong();
System.out.println(" createdAt: " + DateFormat.getDateInstance(DateFormat.LONG).format(createdAt));
}
System.out.println(" Votes: " + entry.getValue().getV0().get_0().getVoteTally());
System.out.println(" ---------------");
}
dashsdk.platformMobileSdkDestroyDashSdk(mainnetSdk);
}

@Test
public void getVoteContendorsForNonExistantTest() throws Exception {
ArrayList<PlatformValue> indexes = new ArrayList<>();
Expand Down
290 changes: 210 additions & 80 deletions dpp/src/main/java/org/dashj/platform/dapiclient/DapiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,15 +449,29 @@ class DapiClient(
): Identity? {
logger.info("getIdentity(${id.toBase58()}, $prove)")
val identityId = Identifier.from(id)
val result = dashsdk.platformMobileFetchIdentityFetchIdentityWithSdk(
rustSdk,
identityId.toNative()
)
return try {
Identity(result.unwrap().get())
} catch (e: Exception) {
null
}
val exceptionList = arrayListOf<Exception>()
var retriesLeft = retries
do {
val result = dashsdk.platformMobileFetchIdentityFetchIdentityWithSdk(
rustSdk,
identityId.toNative()
)
try {
return try {
Identity(result.unwrap().get())
} catch (e: Exception) {
null
}
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
throw e
}
}
} while(retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}

/**
Expand All @@ -467,15 +481,29 @@ class DapiClient(
*/
fun getIdentityByFirstPublicKey(pubKeyHash: ByteArray, prove: Boolean = false): Identity? {
logger.info("getIdentityByFirstPublicKey(${pubKeyHash.toHex()})")
val result = dashsdk.platformMobileFetchIdentityFetchIdentityWithKeyhashSdk(
rustSdk,
pubKeyHash
)
return try {
Identity(result.unwrap())
} catch (e: Exception) {
null
}
val exceptionList = arrayListOf<Exception>()
var retriesLeft = retries
do {
val result = dashsdk.platformMobileFetchIdentityFetchIdentityWithKeyhashSdk(
rustSdk,
pubKeyHash
)
try {
return try {
Identity(result.unwrap())
} catch (e: Exception) {
null
}
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
throw e
}
}
} while(retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}

/**
Expand Down Expand Up @@ -535,16 +563,31 @@ class DapiClient(
logger.info("getDataContract(${contractIdByteArray.toBase58()})")
val contractId = Identifier.from(contractIdByteArray)

val dataContract = dashsdk.platformMobileDataContractsFetchDataContract(
rustSdk,
contractId.toNative()
)
return try {
DataContract.from(dataContract.unwrap().get())
} catch (e: Exception) {
logger.error("get data contract error", e)
throw NotFoundException("DataContract ${contractIdByteArray.toBase58()} not found")
}
val exceptionList = arrayListOf<Exception>()
var retriesLeft = retries
do {
val dataContractResult = dashsdk.platformMobileDataContractsFetchDataContract(
rustSdk,
contractId.toNative()
)
try {
return try {
DataContract.from(dataContractResult.unwrap().get())
} catch (e: Exception) {
null
}
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
logger.error("get data contract error", e)
throw NotFoundException("DataContract ${contractIdByteArray.toBase58()} not found")
}
logger.error("get data contract error", e)
}
} while(retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}

/**
Expand Down Expand Up @@ -572,19 +615,32 @@ class DapiClient(
documentQuery.startAfter != null -> Start(documentQuery.startAfter!!.toBuffer(), false)
else -> null
}
val result = dashsdk.platformMobileFetchDocumentFetchDocumentsWithQueryAndSdk(
rustSdk,
rustContractIdentifier,
type,
documentQuery.encodeWhere(),
documentQuery.encodeOrderBy(),
if (documentQuery.limit == -1) 100 else documentQuery.limit.toLong(),
start
)
logger.info("getDocuments(...) result = {}", result)
return result.unwrap().map {
Document(it, contractIdentifier)
}
var retriesLeft = DEFAULT_RETRY_COUNT
val exceptionList = arrayListOf<Exception>()
do {
val result = dashsdk.platformMobileFetchDocumentFetchDocumentsWithQueryAndSdk(
rustSdk,
rustContractIdentifier,
type,
documentQuery.encodeWhere(),
documentQuery.encodeOrderBy(),
if (documentQuery.limit == -1) 100 else documentQuery.limit.toLong(),
start
)
try {
return result.unwrap().map {
Document(it, contractIdentifier)
}
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
throw e
}
}
} while (retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}

/* Core */
Expand Down Expand Up @@ -1062,19 +1118,48 @@ class DapiClient(

fun getIdentityBalance(identifier: Identifier) : Long {
logger.info("getIdentityBalance({})", identifier)
val result = dashsdk.platformMobileFetchIdentityFetchIdentityBalanceWithSdk(rustSdk, identifier.toNative())
return result.unwrap()
val exceptionList = arrayListOf<Exception>()
var retriesLeft = retries
do {
val result = dashsdk.platformMobileFetchIdentityFetchIdentityBalanceWithSdk(rustSdk, identifier.toNative())
try {
return result.unwrap()
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
throw e
}
}
} while(retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}

fun getVoteContenders(dataContractId: Identifier, documentType: String, indexName: String, indexes: List<String>): Contenders {
val result = dashsdk.platformMobileVotingGetVoteContenders(
rustSdk,
indexName,
indexes.map { PlatformValue(it) },
documentType,
dataContractId.toNative()
)
return Contenders(result.unwrap())
logger.info("getVoteContenders({}, {}, {}, {})", dataContractId, documentType, indexName, indexes)
val exceptionList = arrayListOf<Exception>()
var retriesLeft = retries
do {
val result = dashsdk.platformMobileVotingGetVoteContenders(
rustSdk,
indexName,
indexes.map { PlatformValue(it) },
documentType,
dataContractId.toNative()
)
try {
return Contenders(result.unwrap())
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
throw e
}
}
} while(retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}

fun getContestedResources(
Expand All @@ -1084,15 +1169,30 @@ class DapiClient(
startAt: PlatformValue? = null,
startAtInclude: Boolean = false
): ContestedResources {
val result = dashsdk.platformMobileVotingGetContestedResources(
rustSdk,
documentType,
dataContractId.toNative(),
limit,
startAt,
startAtInclude
)
return ContestedResources(result.unwrap())
logger.info("getContestedResources({}, {}, {}, ...)", dataContractId, documentType, limit)
val exceptionList = arrayListOf<Exception>()
var retriesLeft = retries
do {
val result = dashsdk.platformMobileVotingGetContestedResources(
rustSdk,
documentType,
dataContractId.toNative(),
limit,
startAt,
startAtInclude
)
try {
return ContestedResources(result.unwrap())
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
throw e
}
}
} while(retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}

fun deserializeDocument(serializedDocument: ByteArray, dataContractId: Identifier, documentType: String): Document {
Expand Down Expand Up @@ -1145,28 +1245,58 @@ class DapiClient(
limit: Int = DEFAULT_LIMIT,
orderAscending: Boolean = true
): VotePollsGroupedByTimestamp {
val result = dashsdk.platformMobileVotingGetVotePolls(
rustSdk,
startTime.toTimestampMillis(),
startTimeIncluded,
endTime.toTimestampMillis(),
endTimeIncluded,
limit,
0,
orderAscending
)
return VotePollsGroupedByTimestamp(result.unwrap());
logger.info("getVotePolls($startTime, $endTime, $limit, $orderAscending)")
val exceptionList = arrayListOf<Exception>()
var retriesLeft = retries
do {
val result = dashsdk.platformMobileVotingGetVotePolls(
rustSdk,
startTime.toTimestampMillis(),
startTimeIncluded,
endTime.toTimestampMillis(),
endTimeIncluded,
limit,
0,
orderAscending
)
try {
return VotePollsGroupedByTimestamp(result.unwrap())
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
throw e
}
}
} while(retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}

fun getLastVoteFromMasternode(protxHash: Sha256Hash, dataContractId: Identifier, documentType: String, indexName: String, indexes: List<String>): ResourceVotesByIdentity {
val result = dashsdk.platformMobileVotingGetLastVoteFromMasternode(
rustSdk,
Identifier.from(protxHash).toNative(),
indexName,
indexes.map { PlatformValue(it) },
documentType,
dataContractId.toNative()
)
return ResourceVotesByIdentity(result.unwrap())
logger.info("getLastVoteFromMasternode({}, {}, {}, {}, {})", protxHash, dataContractId, documentType, indexName, indexes)
val exceptionList = arrayListOf<Exception>()
var retriesLeft = retries
do {
val result = dashsdk.platformMobileVotingGetLastVoteFromMasternode(
rustSdk,
Identifier.from(protxHash).toNative(),
indexName,
indexes.map { PlatformValue(it) },
documentType,
dataContractId.toNative()
)
try {
return ResourceVotesByIdentity(result.unwrap())
} catch (e: Exception) {
if (e.message?.contains("context provider error: invalid quorum: quorum not found") == true) {
exceptionList.add(e)
retriesLeft--
} else {
throw e
}
}
} while(retriesLeft > 0)
throw MaxRetriesReachedException(exceptionList)
}
}
Loading