Merge branch 'release/1.22.0'

Author: algobarb

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.22.0
+
+### Bugfixes
+* BugFix: Fix incorrect reference to global schema by @barnjamin in https://github.com/algorand/java-algorand-sdk/pull/427
+* Bug-Fix: parsing type strings for tuples containing static arrays of tuples by @ahangsu in https://github.com/algorand/java-algorand-sdk/pull/431
+### Enhancements
+* REST API: Add KV counts to NodeStatusResponse by @github-actions in https://github.com/algorand/java-algorand-sdk/pull/428
+* Enhancement: Migrate v1 algod dependencies to v2 in cucumber tests by @ahangsu in https://github.com/algorand/java-algorand-sdk/pull/425
+* Enhancement: Allowing zero length in static array by @ahangsu in https://github.com/algorand/java-algorand-sdk/pull/432
+
+
+**Full Changelog**: https://github.com/algorand/java-algorand-sdk/compare/1.21.1...1.22.0
+
 # 1.21.1
 
 ## What's Changed

README.md

@@ -19,7 +19,7 @@ Maven:
 <dependency>
     <groupId>com.algorand</groupId>
     <artifactId>algosdk</artifactId>
-    <version>1.21.1</version>
+    <version>1.22.0</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.algorand</groupId>
     <artifactId>algosdk</artifactId>
-    <version>1.21.1</version>
+    <version>1.22.0</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

src/main/java/com/algorand/algosdk/abi/ABIType.java

@@ -9,7 +9,7 @@
 
 public abstract class ABIType {
     public static final int ABI_DYNAMIC_HEAD_BYTE_LEN = 2;
-    private static final Pattern staticArrayPattern = Pattern.compile("^(?<elemT>[a-z\\d\\[\\](),]+)\\[(?<len>[1-9][\\d]*)]$");
+    private static final Pattern staticArrayPattern = Pattern.compile("^(?<elemT>[a-z\\d\\[\\](),]+)\\[(?<len>0|[1-9][\\d]*)]$");
     private static final Pattern ufixedPattern = Pattern.compile("^ufixed(?<size>[1-9][\\d]*)x(?<precision>[1-9][\\d]*)$");
 
     /**
@@ -103,7 +103,7 @@ public static List<String> parseTupleContent(String str) {
             return new ArrayList<>();
 
         if (str.startsWith(",") || str.endsWith(","))
-            throw new IllegalArgumentException("parsing error: tuple content should not start with comma");
+            throw new IllegalArgumentException("parsing error: tuple content should not start or end with comma");
 
         if (str.contains(",,"))
             throw new IllegalArgumentException("parsing error: tuple content should not have consecutive commas");
@@ -118,8 +118,15 @@ else if (str.charAt(i) == ')') {
                 if (parenStack.isEmpty())
                     throw new IllegalArgumentException("parsing error: tuple parentheses are not balanced: " + str);
                 int leftParenIndex = parenStack.pop();
-                if (parenStack.isEmpty())
+                if (parenStack.isEmpty()) {
+                    // iterate through the byte str, include all the bytes after closing round bracket, for array indicator
+                    // increase the index until it meets comma, or end of string
+                    int forwardIndex = i + 1;
+                    while (forwardIndex < str.length() && str.charAt(forwardIndex) != ',')
+                        forwardIndex++;
+                    i = forwardIndex - 1;
                     parenSegments.add(new Segment(leftParenIndex, i));
+                }
             }
         }
         if (!parenStack.isEmpty())

src/main/java/com/algorand/algosdk/abi/TypeArrayStatic.java

@@ -7,8 +7,8 @@ public class TypeArrayStatic extends ABIType {
     public final int length;
 
     public TypeArrayStatic(ABIType elemType, int length) {
-        if (length < 1)
-            throw new IllegalArgumentException("static-array initialize failure: array length should be at least 1");
+        if (length < 0)
+            throw new IllegalArgumentException("static-array initialize failure: array length should be non-negative");
         this.elemType = elemType;
         this.length = length;
     }

src/main/java/com/algorand/algosdk/transaction/Transaction.java

@@ -948,7 +948,7 @@ public Transaction(
         if (foreignAssets != null) this.foreignAssets = foreignAssets;
         if (globalStateSchema != null) this.globalStateSchema = globalStateSchema;
         if (applicationId != null) this.applicationId = applicationId;
-        if (localStateSchema != null) this.localStateSchema = globalStateSchema;
+        if (localStateSchema != null) this.localStateSchema = localStateSchema;
         if (clearStateProgram != null) this.clearStateProgram = clearStateProgram;
         if (extraPages != null) this.extraPages = extraPages;
     }

src/main/java/com/algorand/algosdk/v2/client/model/NodeStatusResponse.java

@@ -27,6 +27,13 @@ public class NodeStatusResponse extends PathResponse {
     @JsonProperty("catchpoint-processed-accounts")
     public Long catchpointProcessedAccounts;
 
+    /**
+     * The number of key-values (KVs) from the current catchpoint that have been
+     * processed so far as part of the catchup
+     */
+    @JsonProperty("catchpoint-processed-kvs")
+    public Long catchpointProcessedKvs;
+
     /**
      * The total number of accounts included in the current catchpoint
      */
@@ -40,13 +47,26 @@ public class NodeStatusResponse extends PathResponse {
     @JsonProperty("catchpoint-total-blocks")
     public Long catchpointTotalBlocks;
 
+    /**
+     * The total number of key-values (KVs) included in the current catchpoint
+     */
+    @JsonProperty("catchpoint-total-kvs")
+    public Long catchpointTotalKvs;
+
     /**
      * The number of accounts from the current catchpoint that have been verified so
      * far as part of the catchup
      */
     @JsonProperty("catchpoint-verified-accounts")
     public Long catchpointVerifiedAccounts;
 
+    /**
+     * The number of key-values (KVs) from the current catchpoint that have been
+     * verified so far as part of the catchup
+     */
+    @JsonProperty("catchpoint-verified-kvs")
+    public Long catchpointVerifiedKvs;
+
     /**
      * CatchupTime in nanoseconds
      */
@@ -113,9 +133,12 @@ public boolean equals(Object o) {
         if (!Objects.deepEquals(this.catchpoint, other.catchpoint)) return false;
         if (!Objects.deepEquals(this.catchpointAcquiredBlocks, other.catchpointAcquiredBlocks)) return false;
         if (!Objects.deepEquals(this.catchpointProcessedAccounts, other.catchpointProcessedAccounts)) return false;
+        if (!Objects.deepEquals(this.catchpointProcessedKvs, other.catchpointProcessedKvs)) return false;
         if (!Objects.deepEquals(this.catchpointTotalAccounts, other.catchpointTotalAccounts)) return false;
         if (!Objects.deepEquals(this.catchpointTotalBlocks, other.catchpointTotalBlocks)) return false;
+        if (!Objects.deepEquals(this.catchpointTotalKvs, other.catchpointTotalKvs)) return false;
         if (!Objects.deepEquals(this.catchpointVerifiedAccounts, other.catchpointVerifiedAccounts)) return false;
+        if (!Objects.deepEquals(this.catchpointVerifiedKvs, other.catchpointVerifiedKvs)) return false;
         if (!Objects.deepEquals(this.catchupTime, other.catchupTime)) return false;
         if (!Objects.deepEquals(this.lastCatchpoint, other.lastCatchpoint)) return false;
         if (!Objects.deepEquals(this.lastRound, other.lastRound)) return false;

src/test/java/com/algorand/algosdk/abi/TestTypes.java

@@ -238,6 +238,54 @@ public void TestTypeFromStringValid() {
                         )
                 )
         );
+        assertThat(ABIType.valueOf("(uint32,(uint64,bool)[10],byte)")).isEqualTo(
+                new TypeTuple(
+                        Arrays.asList(
+                                new TypeUint(32),
+                                new TypeArrayStatic(
+                                        new TypeTuple(
+                                                Arrays.asList(
+                                                        new TypeUint(64),
+                                                        new TypeBool()
+                                                )
+                                        ),
+                                        10),
+                                new TypeByte()
+                        )
+                )
+        );
+        assertThat(ABIType.valueOf("(uint32,byte,(uint64,bool)[10])")).isEqualTo(
+                new TypeTuple(
+                        Arrays.asList(
+                                new TypeUint(32),
+                                new TypeByte(),
+                                new TypeArrayStatic(
+                                        new TypeTuple(
+                                                Arrays.asList(
+                                                        new TypeUint(64),
+                                                        new TypeBool()
+                                                )
+                                        ),
+                                        10)
+                        )
+                )
+        );
+        assertThat(ABIType.valueOf("((uint64,bool)[10],uint32,byte)")).isEqualTo(
+                new TypeTuple(
+                        Arrays.asList(
+                                new TypeArrayStatic(
+                                        new TypeTuple(
+                                                Arrays.asList(
+                                                        new TypeUint(64),
+                                                        new TypeBool()
+                                                )
+                                        ),
+                                        10),
+                                new TypeUint(32),
+                                new TypeByte()
+                        )
+                )
+        );
     }
 
     @Test
@@ -266,7 +314,7 @@ public void TestTypeFromStringInvalid() {
                 "[][][]",
                 "stuff[]",
                 // static array
-                "ufixed32x10[0]",
+                "bool[01]",
                 "byte[10 ]",
                 "uint64[0x21]",
                 // tuple