Merge branch 'release/1.11.0-beta-2'

Author: egieseke

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.11.0-beta-2
+- Support Foreign objects as ABI arguments (#283)
+- Upgrade `jackson` packages to resolve PRs on vulnerability (#281)
+
 # 1.11.0-beta-1
 - ABI Interaction Support for JAVA SDK (#268)
 - Bug fix for `logs` on `PendingTransactionResponse` (#275)

README.md

@@ -23,7 +23,7 @@ Maven:
 <dependency>
     <groupId>com.algorand</groupId>
     <artifactId>algosdk</artifactId>
-    <version>1.11.0-beta-1</version>
+    <version>1.11.0-beta-2</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.algorand</groupId>
     <artifactId>algosdk</artifactId>
-    <version>1.11.0-beta-1</version>
+    <version>1.11.0-beta-2</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -55,17 +55,17 @@
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-annotations</artifactId>
-          <version>2.9.9</version>
+          <version>2.10.0</version>
         </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-core</artifactId>
-          <version>2.9.9</version>
+          <version>2.10.0</version>
         </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
-          <version>2.9.9.3</version>
+          <version>2.10.5.1</version>
         </dependency>
         <dependency>
           <groupId>com.google.code.gson</groupId>

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

@@ -1,7 +1,10 @@
 package com.algorand.algosdk.abi;
 
 import java.lang.reflect.Array;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.ArrayDeque;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

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

@@ -5,6 +5,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -13,19 +15,23 @@
 public class Contract {
     @JsonProperty("name")
     public String name;
-    @JsonProperty("appId")
-    public Integer appId;
+    @JsonProperty("desc")
+    public String description;
+    @JsonProperty("networks")
+    public Map<String, NetworkInfo> networks = new HashMap<>();
     @JsonProperty("methods")
     public List<Method> methods = new ArrayList<>();
 
     @JsonCreator
     public Contract(
             @JsonProperty("name") String name,
-            @JsonProperty("appId") Integer appId,
+            @JsonProperty("desc") String description,
+            @JsonProperty("networks") Map<String, NetworkInfo> networks,
             @JsonProperty("methods") List<Method> methods
     ) {
         this.name = Objects.requireNonNull(name, "name must not be null");
-        this.appId = Objects.requireNonNull(appId, "name must not be null");
+        this.description = description;
+        if (networks != null) this.networks = networks;
         if (methods != null) this.methods = methods;
     }
 
@@ -35,8 +41,13 @@ public String getName() {
     }
 
     @JsonIgnore
-    public Integer getAppId() {
-        return this.appId;
+    public String getDescription() {
+        return this.description;
+    }
+
+    @JsonIgnore
+    public NetworkInfo getNetworkInfo(String genesisHash) {
+        return this.networks.get(genesisHash);
     }
 
     @JsonIgnore
@@ -48,6 +59,25 @@ public Method getMethodByIndex(int index) {
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         Contract contract = (Contract) o;
-        return Objects.equals(name, contract.name) && Objects.equals(appId, contract.appId) && Objects.equals(methods, contract.methods);
+        return Objects.equals(name, contract.name) && Objects.equals(methods, contract.methods) &&
+                Objects.equals(description, contract.description) && Objects.equals(networks, contract.networks);
+    }
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    static public class NetworkInfo {
+        @JsonProperty("appID")
+        public Long appID;
+
+        @JsonCreator
+        public NetworkInfo(@JsonProperty("appID") Long appID) {
+            this.appID = Objects.requireNonNull(appID, "appID must not be null");
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || o.getClass() != getClass()) return false;
+            NetworkInfo other = (NetworkInfo) o;
+            return Objects.equals(appID, other.appID);
+        }
     }
 }

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

@@ -13,15 +13,19 @@
 public class Interface {
     @JsonProperty("name")
     public String name;
+    @JsonProperty("desc")
+    public String description;
     @JsonProperty("methods")
     public List<Method> methods = new ArrayList<>();
 
     @JsonCreator
     public Interface(
             @JsonProperty("name") String name,
+            @JsonProperty("desc") String description,
             @JsonProperty("methods") List<Method> methods
     ) {
         this.name = Objects.requireNonNull(name, "name must not be null");
+        this.description = description;
         if (methods != null) this.methods = methods;
     }
 
@@ -30,6 +34,11 @@ public String getName() {
         return this.name;
     }
 
+    @JsonIgnore
+    public String getDescription() {
+        return this.description;
+    }
+
     @JsonIgnore
     public Method getMethodByIndex(int index) {
         return this.methods.get(index);

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

@@ -11,23 +11,55 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.Collections;
+import java.util.Set;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.ArrayDeque;
+import java.util.List;
+import java.util.Objects;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Method {
     @JsonIgnore
-    public static final Set<String> TxArgTypes = new HashSet<>(
-            Arrays.asList(
-                    "txn",
-                    Transaction.Type.Payment.toValue(),
-                    Transaction.Type.KeyRegistration.toValue(),
-                    Transaction.Type.AssetConfig.toValue(),
-                    Transaction.Type.AssetTransfer.toValue(),
-                    Transaction.Type.AssetFreeze.toValue(),
-                    Transaction.Type.ApplicationCall.toValue()
+    public static final String TxAnyType = "txn";
+
+    @JsonIgnore
+    public static final Set<String> TxArgTypes = Collections.unmodifiableSet(
+            new HashSet<>(
+                    Arrays.asList(
+                            TxAnyType,
+                            Transaction.Type.Payment.toValue(),
+                            Transaction.Type.KeyRegistration.toValue(),
+                            Transaction.Type.AssetConfig.toValue(),
+                            Transaction.Type.AssetTransfer.toValue(),
+                            Transaction.Type.AssetFreeze.toValue(),
+                            Transaction.Type.ApplicationCall.toValue()
+                    )
+            )
+    );
+
+    @JsonIgnore
+    public static final String RefTypeAccount = "account";
+
+    @JsonIgnore
+    public static final String RefTypeAsset = "asset";
+
+    @JsonIgnore
+    public static final String RefTypeApplication = "application";
+
+    @JsonIgnore
+    public static final Set<String> RefArgTypes = Collections.unmodifiableSet(
+            new HashSet<>(
+                    Arrays.asList(RefTypeAccount, RefTypeAsset, RefTypeApplication)
             )
     );
 
+    static boolean isTxnArgOrForeignArrayArgs(String str) {
+        return TxArgTypes.contains(str) || RefArgTypes.contains(str);
+    }
+
     @JsonIgnore
     private static final String HASH_ALG = "SHA-512/256";
 
@@ -38,7 +70,7 @@ public class Method {
     @JsonProperty("args")
     public List<Arg> args = new ArrayList<>();
     @JsonProperty("returns")
-    public Returns returns = new Returns("void", null);
+    public Returns returns = new Returns(Returns.VoidRetType, null);
     @JsonIgnore
     private int txnCallCount = 1;
 
@@ -150,6 +182,9 @@ public boolean equals(Object o) {
 
     @JsonInclude(JsonInclude.Include.NON_DEFAULT)
     public static class Returns {
+        @JsonIgnore
+        public static final String VoidRetType = "void";
+
         @JsonProperty("type")
         public String type;
         @JsonProperty("desc")
@@ -201,7 +236,7 @@ public Arg(
             this.name = name;
             this.desc = desc;
             String typeStr = Objects.requireNonNull(type, "type must not be null");
-            this.parsedType = Method.TxArgTypes.contains(typeStr) ? null : ABIType.valueOf(typeStr);
+            this.parsedType = isTxnArgOrForeignArrayArgs(typeStr) ? null : ABIType.valueOf(typeStr);
             this.type = typeStr;
         }
 

src/main/java/com/algorand/algosdk/account/Account.java

@@ -695,8 +695,7 @@ public int hashCode() {
             }
 
             @Override
-            public SignedTransaction[] signTxnGroup(Transaction[] txnGroup, int[] indicesToSign)
-                    throws Exception {
+            public SignedTransaction[] signTxnGroup(Transaction[] txnGroup, int[] indicesToSign) throws Exception {
                 SignedTransaction[] sTxn = new SignedTransaction[indicesToSign.length];
                 for (int i = 0; i < indicesToSign.length; i++)
                     sTxn[i] = self.signTransaction(txnGroup[indicesToSign[i]]);