Merge pull request #32 from unicitynetwork/issue-30

Update SDK to work with Android 12

Author: b3y0urs3lf

build.gradle.kts

@@ -39,8 +39,19 @@ dependencies {
     "android"("com.google.guava:guava:33.0.0-android")
     "jvm"("com.google.guava:guava:33.0.0-jre")
 
-    // Animal Sniffer signatures
-    signature("com.toasttab.android:gummy-bears-api-34:0.7.0@signature")
+    // Animal Sniffer signature for Android API 31
+    // Note: This SDK uses Java 9-11 APIs (List.of, Map.of, Stream enhancements, etc.)
+    // which require core library desugaring to be enabled in consuming Android apps.
+    // Apps using this SDK must add to their build.gradle:
+    //   android {
+    //     compileOptions {
+    //       coreLibraryDesugaringEnabled true
+    //     }
+    //   }
+    //   dependencies {
+    //     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    //   }
+    signature("com.toasttab.android:gummy-bears-api-31:0.11.0@signature")
 
     // Testing
     testImplementation(platform("org.junit:junit-bom:5.10.2"))

config/checkstyle/checkstyle.xml

@@ -54,7 +54,7 @@
 
   <module name="LineLength">
     <property name="fileExtensions" value="java"/>
-    <property name="max" value="100"/>
+    <property name="max" value="120"/>
     <property name="ignorePattern"
       value="^package.*|^import.*|href\s*=\s*&quot;[^&quot;]*&quot;|http://|https://|ftp://"/>
   </module>

src/main/java/org/unicitylabs/sdk/address/ProxyAddress.java

@@ -85,7 +85,7 @@ public static Address resolve(Address inputAddress, List<Token<?>> nametags) {
     Address targetAddress = inputAddress;
     while (targetAddress.getScheme() != AddressScheme.DIRECT) {
       Token<?> nametag = nametagMap.get(targetAddress);
-      if (nametag == null || nametag.getData().isEmpty()) {
+      if (nametag == null || !nametag.getData().isPresent()) {
         return null;
       }
 

src/main/java/org/unicitylabs/sdk/api/JsonRpcAggregatorClient.java

@@ -2,7 +2,6 @@
 
 import static com.google.common.net.HttpHeaders.AUTHORIZATION;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -89,8 +88,7 @@ public CompletableFuture<InclusionProofResponse> getInclusionProof(RequestId req
    * @return block height
    */
   public CompletableFuture<Long> getBlockHeight() {
-    return this.transport.request("get_block_height", Collections.emptyMap(),
-            BlockHeightResponse.class)
+    return this.transport.request("get_block_height", Map.of(), BlockHeightResponse.class)
         .thenApply(BlockHeightResponse::getBlockNumber);
   }
 }

src/main/java/org/unicitylabs/sdk/bft/RootTrustBase.java

@@ -56,12 +56,10 @@ public class RootTrustBase {
         ? null
         : Arrays.copyOf(previousEntryHash, previousEntryHash.length);
     this.signatures = signatures.entrySet().stream()
-        .collect(
-            Collectors.toUnmodifiableMap(
-                Map.Entry::getKey,
-                e -> Arrays.copyOf(e.getValue(), e.getValue().length)
-            )
-        );
+        .collect(Collectors.toMap(
+            Map.Entry::getKey,
+            e -> Arrays.copyOf(e.getValue(), e.getValue().length)
+        ));
   }
 
   /**
@@ -159,13 +157,13 @@ public byte[] getPreviousEntryHash() {
    * @return signatures
    */
   public Map<String, byte[]> getSignatures() {
-    return this.signatures.entrySet().stream()
-        .collect(
-            Collectors.toUnmodifiableMap(
+    return Map.copyOf(
+        this.signatures.entrySet().stream()
+            .collect(Collectors.toMap(
                 Map.Entry::getKey,
                 e -> Arrays.copyOf(e.getValue(), e.getValue().length)
-            )
-        );
+            ))
+    );
   }
 
   /**

src/main/java/org/unicitylabs/sdk/bft/verification/rule/UnicitySealHashMatchesWithRootHashRule.java

@@ -3,6 +3,8 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
+
+import com.google.common.primitives.UnsignedBytes;
 import org.unicitylabs.sdk.bft.UnicityCertificate;
 import org.unicitylabs.sdk.bft.UnicityTreeCertificate;
 import org.unicitylabs.sdk.bft.verification.UnicityCertificateVerificationContext;
@@ -89,7 +91,7 @@ public VerificationResult verify(UnicityCertificateVerificationContext context)
           .update(CborSerializer.encodeByteString(new byte[]{(byte) 0x00})) // NODE
           .update(CborSerializer.encodeByteString(stepKey));
 
-      if (Arrays.compare(key, stepKey) > 0) {
+      if (UnsignedBytes.lexicographicalComparator().compare(key, stepKey) > 0) {
         hasher
             .update(CborSerializer.encodeByteString(step.getHash()))
             .update(CborSerializer.encodeByteString(result.getData()));
@@ -104,7 +106,8 @@ public VerificationResult verify(UnicityCertificateVerificationContext context)
 
     byte[] unicitySealHash = context.getUnicityCertificate().getUnicitySeal().getHash();
 
-    if (Arrays.compare(unicitySealHash, result.getData()) != 0) {
+    if (UnsignedBytes.lexicographicalComparator().compare(unicitySealHash, result.getData())
+        != 0) {
       return VerificationResult.fail("Unicity seal hash does not match tree root.");
     }
 

src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreePath.java

@@ -62,10 +62,10 @@ public List<SparseMerkleTreePathStep> getSteps() {
    * Verify merkle tree path against given path.
    *
    * @param requestId path
-   * @return true if successful
+   * @return MerkleTreePathVerificationResult
    */
   public MerkleTreePathVerificationResult verify(BigInteger requestId) {
-    if (this.steps.size() == 0) {
+    if (this.steps.isEmpty()) {
       return new MerkleTreePathVerificationResult(false, false);
     }
 

src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreeRootNode.java

@@ -2,7 +2,6 @@
 
 import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import org.unicitylabs.sdk.hash.DataHash;
@@ -127,6 +126,6 @@ private static List<SparseMerkleTreePathStep> generatePath(
         )
     );
 
-    return Collections.unmodifiableList(list);
+    return List.copyOf(list);
   }
 }

src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreeRootNode.java

@@ -129,8 +129,7 @@ private static List<SparseMerkleSumTreePathStep> generatePath(
       FinalizedNodeBranch nodeBranch = (FinalizedNodeBranch) branch;
 
       if (remainingPath.shiftRight(commonPath.getLength()).compareTo(BigInteger.ONE) == 0) {
-        return List.of(
-            new SparseMerkleSumTreePathStep(branch.getPath(), siblingBranch, nodeBranch));
+        return List.of(new SparseMerkleSumTreePathStep(branch.getPath(), siblingBranch, nodeBranch));
       }
 
       return List.copyOf(

src/main/java/org/unicitylabs/sdk/serializer/json/BigIntegerAsStringSerializer.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-
 import java.io.IOException;
 import java.math.BigInteger;