Merge branch 'release/1.8.0'

Author: algojack

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: "\U0001F41C Bug report"
+about: Report a reproducible bug.
+title: ''
+labels: new-bug
+assignees: ''
+
+---
+
+### Subject of the issue
+
+<!-- Describe your issue here. -->
+
+### Your environment
+
+<!--
+* Software version: `algod -v`
+* Node status if applicable: `goal node status`
+* Operating System details. 
+* In many cases log files and cadaver files are also useful to include. Since these files may be large, an Algorand developer may request them later. These files may include public addresses that you're participating with. If that is a concern please be sure to scrub that data.
+-->
+
+### Steps to reproduce
+
+1.
+2.
+
+### Expected behaviour
+
+### Actual behaviour

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: "\U0001F514 Feature Request"
+about: Suggestions for how we can improve the algorand platform.
+title: ''
+labels: new-feature-request
+assignees: ''
+---
+
+## Problem
+
+<!-- What is the problem that we’re trying to solve? -->
+
+## Solution
+
+<!-- Do you have a potential/suggested solution? Document more than one if possible. -->
+
+## Dependencies
+
+<!-- Does the solution have any team or design dependencies? -->
+
+## Urgency
+
+<!-- What is the urgency here and why? -->

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.8.0
+- Added toSeed() method in Account.java
+- Regenerate  HTTP Client (Asset b64 fields + App extra pages)
+- Set default header for base execute
+
 # 1.7.0
 - Implement dynamic opcode accounting, backward jumps, loops, callsub, retsub
 - Implement ability to pool fees
@@ -7,8 +12,6 @@
 
 # 1.6.0
 - Add static qualifiers to json creators for onCompletion enum serialization.
-- Bump guava from 28.2-android to 29.0-android in /generator.
-- Bump guava from 28.2-android to 29.0-android.
 - Corrected Exception message for Keccak-256 hash function.
 - Add TEAL 3 support.
 - Regenerated comment.

README.md

@@ -23,7 +23,7 @@ Maven:
 <dependency>
     <groupId>com.algorand</groupId>
     <artifactId>algosdk</artifactId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
 </dependency>
 ```
 

generator/pom.xml

@@ -168,7 +168,7 @@
         <dependency>
             <groupId>com.algorand</groupId>
             <artifactId>algosdk</artifactId>
-            <version>1.7.0</version>
+            <version>1.8.0</version>
         </dependency>
 
         <!-- testing -->

pom.xml

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

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

@@ -559,6 +559,16 @@ public Signature tealSignFromProgram(byte[] data, byte[] program) throws NoSuchA
         return this.tealSign(data, lsig.toAddress());
     }
 
+    /**
+     * 25 word mnemonic is obtained and converted to 32 byte private key.
+     *
+     * @return 32 byte private key
+     */
+    public byte[] toSeed() throws GeneralSecurityException {
+        String mnemonic = toMnemonic();
+        return Mnemonic.toKey(mnemonic);
+    }
+
     // Return a pre-set seed in response to nextBytes or generateSeed
     private static class FixedSecureRandom extends SecureRandom {
         private final byte[] fixedValue;

src/main/java/com/algorand/algosdk/v2/client/common/Client.java

@@ -103,6 +103,7 @@ public Response executeCall(QueryData qData, HttpMethod httpMethod, String[] hea
                     MediaType.parse("Binary data"),
                     qData.bodySegments.isEmpty() ? new byte[0] : qData.bodySegments.get(0));
             reqBuilder.post(rb);
+            reqBuilder.addHeader("Content-Type","application/x-binary");
             break;
         }
 

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

@@ -53,6 +53,12 @@ public String address() throws NoSuchAlgorithmException {
     @JsonProperty("apps-local-state")
     public List<ApplicationLocalState> appsLocalState = new ArrayList<ApplicationLocalState>();
 
+    /**
+     * (teap) the sum of all extra application program pages for this account.
+     */
+    @JsonProperty("apps-total-extra-pages")
+    public Long appsTotalExtraPages;
+
     /**
      * (tsch) stores the sum of all of the local schemas and global schemas in this
      * account.
@@ -184,6 +190,7 @@ public boolean equals(Object o) {
         if (!Objects.deepEquals(this.amount, other.amount)) return false;
         if (!Objects.deepEquals(this.amountWithoutPendingRewards, other.amountWithoutPendingRewards)) return false;
         if (!Objects.deepEquals(this.appsLocalState, other.appsLocalState)) return false;
+        if (!Objects.deepEquals(this.appsTotalExtraPages, other.appsTotalExtraPages)) return false;
         if (!Objects.deepEquals(this.appsTotalSchema, other.appsTotalSchema)) return false;
         if (!Objects.deepEquals(this.assets, other.assets)) return false;
         if (!Objects.deepEquals(this.authAddr, other.authAddr)) return false;

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

@@ -59,6 +59,12 @@ public String creator() throws NoSuchAlgorithmException {
     }
     public Address creator;
 
+    /**
+     * (epp) the amount of extra program pages available to this app.
+     */
+    @JsonProperty("extra-program-pages")
+    public Long extraProgramPages;
+
     /**
      * [\gs) global schema
      */
@@ -87,6 +93,7 @@ public boolean equals(Object o) {
         if (!Objects.deepEquals(this.approvalProgram, other.approvalProgram)) return false;
         if (!Objects.deepEquals(this.clearStateProgram, other.clearStateProgram)) return false;
         if (!Objects.deepEquals(this.creator, other.creator)) return false;
+        if (!Objects.deepEquals(this.extraProgramPages, other.extraProgramPages)) return false;
         if (!Objects.deepEquals(this.globalState, other.globalState)) return false;
         if (!Objects.deepEquals(this.globalStateSchema, other.globalStateSchema)) return false;
         if (!Objects.deepEquals(this.localStateSchema, other.localStateSchema)) return false;

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

@@ -72,11 +72,25 @@ public String metadataHash() {
     public byte[] metadataHash;
 
     /**
-     * (an) Name of this asset, as supplied by the creator.
+     * (an) Name of this asset, as supplied by the creator. Included only when the
+     * asset name is composed of printable utf-8 characters.
      */
     @JsonProperty("name")
     public String name;
 
+    /**
+     * Base64 encoded name of this asset, as supplied by the creator.
+     */
+    @JsonProperty("name-b64")
+    public void nameB64(String base64Encoded) {
+        this.nameB64 = Encoder.decodeFromBase64(base64Encoded);
+    }
+    @JsonProperty("name-b64")
+    public String nameB64() {
+        return Encoder.encodeToBase64(this.nameB64);
+    }
+    public byte[] nameB64;
+
     /**
      * (r) Address of account holding reserve (non-minted) units of this asset.
      */
@@ -90,17 +104,45 @@ public String metadataHash() {
     public java.math.BigInteger total;
 
     /**
-     * (un) Name of a unit of this asset, as supplied by the creator.
+     * (un) Name of a unit of this asset, as supplied by the creator. Included only
+     * when the name of a unit of this asset is composed of printable utf-8 characters.
      */
     @JsonProperty("unit-name")
     public String unitName;
 
     /**
-     * (au) URL where more information about the asset can be retrieved.
+     * Base64 encoded name of a unit of this asset, as supplied by the creator.
+     */
+    @JsonProperty("unit-name-b64")
+    public void unitNameB64(String base64Encoded) {
+        this.unitNameB64 = Encoder.decodeFromBase64(base64Encoded);
+    }
+    @JsonProperty("unit-name-b64")
+    public String unitNameB64() {
+        return Encoder.encodeToBase64(this.unitNameB64);
+    }
+    public byte[] unitNameB64;
+
+    /**
+     * (au) URL where more information about the asset can be retrieved. Included only
+     * when the URL is composed of printable utf-8 characters.
      */
     @JsonProperty("url")
     public String url;
 
+    /**
+     * Base64 encoded URL where more information about the asset can be retrieved.
+     */
+    @JsonProperty("url-b64")
+    public void urlB64(String base64Encoded) {
+        this.urlB64 = Encoder.decodeFromBase64(base64Encoded);
+    }
+    @JsonProperty("url-b64")
+    public String urlB64() {
+        return Encoder.encodeToBase64(this.urlB64);
+    }
+    public byte[] urlB64;
+
     @Override
     public boolean equals(Object o) {
 
@@ -116,10 +158,13 @@ public boolean equals(Object o) {
         if (!Objects.deepEquals(this.manager, other.manager)) return false;
         if (!Objects.deepEquals(this.metadataHash, other.metadataHash)) return false;
         if (!Objects.deepEquals(this.name, other.name)) return false;
+        if (!Objects.deepEquals(this.nameB64, other.nameB64)) return false;
         if (!Objects.deepEquals(this.reserve, other.reserve)) return false;
         if (!Objects.deepEquals(this.total, other.total)) return false;
         if (!Objects.deepEquals(this.unitName, other.unitName)) return false;
+        if (!Objects.deepEquals(this.unitNameB64, other.unitNameB64)) return false;
         if (!Objects.deepEquals(this.url, other.url)) return false;
+        if (!Objects.deepEquals(this.urlB64, other.urlB64)) return false;
 
         return true;
     }

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

@@ -97,6 +97,12 @@ public String clearStateProgram() {
     }
     public byte[] clearStateProgram;
 
+    /**
+     * (epp) specifies the additional app program len requested in pages.
+     */
+    @JsonProperty("extra-program-pages")
+    public Long extraProgramPages;
+
     /**
      * (apfa) Lists the applications in addition to the application-id whose global
      * states may be accessed by this application's approval-program and
@@ -156,6 +162,7 @@ public boolean equals(Object o) {
         if (!Objects.deepEquals(this.applicationId, other.applicationId)) return false;
         if (!Objects.deepEquals(this.approvalProgram, other.approvalProgram)) return false;
         if (!Objects.deepEquals(this.clearStateProgram, other.clearStateProgram)) return false;
+        if (!Objects.deepEquals(this.extraProgramPages, other.extraProgramPages)) return false;
         if (!Objects.deepEquals(this.foreignApps, other.foreignApps)) return false;
         if (!Objects.deepEquals(this.foreignAssets, other.foreignAssets)) return false;
         if (!Objects.deepEquals(this.globalStateSchema, other.globalStateSchema)) return false;

src/test/java/com/algorand/algosdk/account/TestAccount.java

@@ -326,4 +326,12 @@ public void testTealSign() throws Exception {
         }
         assertThat(verified).isTrue();
     }
+
+    @Test
+    void testToSeed() throws Exception {
+        final String FROM_SK = "actress tongue harbor tray suspect odor load topple vocal avoid ignore apple lunch unknown tissue museum once switch captain place lemon sail outdoor absent creek";
+        byte[] seed = Mnemonic.toKey(FROM_SK);
+        Account account = new Account(seed);
+        assertThat(account.toSeed()).isEqualTo(seed);
+    }
 }

templates/Dockerfile

@@ -0,0 +1 @@
+FROM algorand-generator

templates/generate.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -e
+
+# Navigate back to the project directory
+rootdir=`dirname $0`
+pushd $rootdir/.. > /dev/null
+
+$GENERATOR \
+       java \
+       -c  "src/main/java/com/algorand/algosdk/v2/client/common" \
+       -cp "com.algorand.algosdk.v2.client.common" \
+       -m  "src/main/java/com/algorand/algosdk/v2/client/model" \
+       -mp "com.algorand.algosdk.v2.client.model" \
+       -n  "AlgodClient" \
+       -p  "src/main/java/com/algorand/algosdk/v2/client/algod" \
+       -pp "com.algorand.algosdk.v2.client.algod" \
+       -t  "X-Algo-API-Token" \
+       -tr \
+       -s  "$ALGOD_SPEC"
+
+# There is one enum only defined by indexer. Run this second to avoid
+# overwriting the second one.
+$GENERATOR \
+       java \
+       -c  "src/main/java/com/algorand/algosdk/v2/client/common" \
+       -cp "com.algorand.algosdk.v2.client.common" \
+       -m  "src/main/java/com/algorand/algosdk/v2/client/model" \
+       -mp "com.algorand.algosdk.v2.client.model" \
+       -n  "IndexerClient" \
+       -p  "src/main/java/com/algorand/algosdk/v2/client/indexer" \
+       -pp "com.algorand.algosdk.v2.client.indexer" \
+       -t  "X-Indexer-API-Token" \
+       -s  "$INDEXER_SPEC"