Sapphire Support & Import Private Key

.gitignore

@@ -78,6 +78,9 @@ nb-configuration.xml
 ##############################
 ## OS X
 ##############################
-.DS_Store
+**/*.DS_Store
 
-*.pem
+##############################
+## Misc
+##############################
+**/*.pem

.run/AllTests.run.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Tests" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":test" />
+          <option value="--tests" />
+          <option value="&quot;org.torusresearch.torusutilstest.*&quot;" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>

README.md

@@ -9,13 +9,12 @@ Since Torus nodes operate on a threshold assumption, we need to ensure that API
 This is to prevent malicious nodes from withholding shares, or deliberately slowing down the entire process.
 
 This utility library allows for early exits in optimistic scenarios, while handling rejection of invalid inputs from nodes in malicious/offline scenarios.
-The general approach is to evaluate predicates against a list of (potentially incomplete) results, and exit when the predicate passes.
+The general approach is to evaluate a threshold number of results instead of a list of (potentially incomplete) results, and then exit once a threshold number of valid results have been evaluated.
 
 README.md
 ## Features
 - Handles up to threshold number of failures.
-- Optimistic early exit (eg. 5/9 nodes return valid shares = complete)
-- All API's return `CompletableFutures`
+- Optimistic early exit (eg. threshold number of nodes return valid shares = complete)
 
 ## Getting Started
 
@@ -29,11 +28,11 @@ repositories {
         maven { url "https://jitpack.io" }
    }
    dependencies {
-         implementation 'org.torusresearch:torus-utils-java:3.1.2'
+         implementation 'org.torusresearch:torus-utils-java:4.0.0'
    }
 ```
 
 ## Requirements
 
 - Android - API level 24
-- Java 8 / 1.8
+- Java 11

build.gradle

@@ -1,13 +1,14 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id "org.gradle.test-retry" version "1.5.10"
 }
 
 group 'org.torusresearch'
-version '3.2.2'
+version '4.0.0'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
 
 repositories {
     mavenCentral()
@@ -19,14 +20,19 @@ dependencies {
     implementation 'org.web3j:core:4.8.8-android'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+    implementation 'org.json:json:20240303'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-    testImplementation 'org.slf4j:slf4j-simple:1.7.36'
+    testImplementation 'org.assertj:assertj-core:3.6.1'
     testImplementation 'com.auth0:java-jwt:3.19.2'
     testImplementation 'net.andreinc:mockneat:0.4.8'
 }
 
 test {
+    retry {
+        maxRetries = 3
+    }
+
     useJUnitPlatform()
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists