Merge branch 'release/v1.13.1'

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 1.13.1
+
+## Added:
+
+- Add app creator to dryrun request (#499)
+
+## Changed:
+
+- Adding note to use bigint (#501)
+
+## Fixed:
+
+- Fix JSON decoding (#502)
+
 # 1.13.0
 
 ## Added:

README.md

@@ -20,8 +20,8 @@ Include a minified browser bundle directly in your HTML like so:
 
 ```html
 <script
-  src="https://unpkg.com/algosdk@1.13.0/dist/browser/algosdk.min.js"
-  integrity="sha384-3IaxTgktbWGiqPkr5oZQMM4H99ziYzoEUb6sznk03coGR2Cdf1r0I1GWPUL37iu8"
+  src="https://unpkg.com/algosdk@1.13.1/dist/browser/algosdk.min.js"
+  integrity="sha384-0BSEzBpLxqFWYBI+sOGhv3W91/wPf+jFwCiuXNrC52XZav2qb3Rz+pfq3AFI0CrL"
   crossorigin="anonymous"
 ></script>
 ```
@@ -30,8 +30,8 @@ or
 
 ```html
 <script
-  src="https://cdn.jsdelivr.net/npm/algosdk@1.13.0/dist/browser/algosdk.min.js"
-  integrity="sha384-3IaxTgktbWGiqPkr5oZQMM4H99ziYzoEUb6sznk03coGR2Cdf1r0I1GWPUL37iu8"
+  src="https://cdn.jsdelivr.net/npm/algosdk@1.13.1/dist/browser/algosdk.min.js"
+  integrity="sha384-0BSEzBpLxqFWYBI+sOGhv3W91/wPf+jFwCiuXNrC52XZav2qb3Rz+pfq3AFI0CrL"
   crossorigin="anonymous"
 ></script>
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "algosdk",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "The official JavaScript SDK for Algorand",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

src/client/client.ts

@@ -140,15 +140,14 @@ export default class HTTPClient {
    * @param status Status of the response (used in case parseJSON fails)
    * @param jsonOptions Options object to use to decode JSON responses. See
    *   utils.parseJSON for the options available.
-   * @private
    */
-  private static parseJSON(
+  public static parseJSON(
     text: string,
     status: number,
     jsonOptions: utils.JSONOptions = {}
   ) {
     try {
-      if (Object.keys(jsonOptions).length !== 0) {
+      if (Object.keys(jsonOptions).length === 0) {
         return text && JSON.parse(text);
       }
       return text && utils.parseJSON(text, jsonOptions);

src/dryrun.ts

@@ -16,6 +16,7 @@ const defaultAppId = 1380011588;
 interface AppParamsWithPrograms {
   ['approval-program']: string | Uint8Array;
   ['clear-state-program']: string | Uint8Array;
+  ['creator']: string;
 }
 
 interface AppWithAppParams {
@@ -131,9 +132,11 @@ export async function createDryrun({
         .then((appInfo) => {
           const ai = decodePrograms(appInfo as AppWithAppParams);
           appInfos.push(ai);
+          accts.push(ai.params.creator);
         })
     );
   }
+  await Promise.all(appPromises);
 
   const acctPromises = [];
   for (const acct of [...new Set(accts)]) {
@@ -152,7 +155,7 @@ export async function createDryrun({
         })
     );
   }
-  await Promise.all([...appPromises, ...acctPromises]);
+  await Promise.all(acctPromises);
 
   return new DryrunRequest({
     txns: txns.map((st) => ({ ...st, txn: st.txn.get_obj_for_encoding() })),

src/transaction.ts

@@ -251,7 +251,9 @@ export class Transaction implements TransactionStorageStructure {
       ) ||
         txn.amount < 0)
     )
-      throw Error('Amount must be a positive number and smaller than 2^64-1');
+      throw Error(
+        'Amount must be a positive number and smaller than 2^64-1. If the number is larger than 2^53-1, use bigint.'
+      );
     if (!Number.isSafeInteger(txn.fee) || txn.fee < 0)
       throw Error('fee must be a positive number and smaller than 2^53-1');
     if (!Number.isSafeInteger(txn.firstRound) || txn.firstRound < 0)
@@ -275,7 +277,7 @@ export class Transaction implements TransactionStorageStructure {
         txn.assetTotal < 0)
     )
       throw Error(
-        'Total asset issuance must be a positive number and smaller than 2^64-1'
+        'Total asset issuance must be a positive number and smaller than 2^64-1. If the number is larger than 2^53-1, use bigint.'
       );
     if (
       txn.assetDecimals !== undefined &&

tests/5.Transaction.js

@@ -785,7 +785,9 @@ describe('Sign', () => {
       };
       assert.throws(
         () => new algosdk.Transaction(o),
-        new Error('Amount must be a positive number and smaller than 2^64-1')
+        new Error(
+          'Amount must be a positive number and smaller than 2^64-1. If the number is larger than 2^53-1, use bigint.'
+        )
       );
     });
 
@@ -1152,7 +1154,7 @@ describe('Sign', () => {
       assert.throws(
         () => new algosdk.Transaction(o),
         new Error(
-          'Total asset issuance must be a positive number and smaller than 2^64-1'
+          'Total asset issuance must be a positive number and smaller than 2^64-1. If the number is larger than 2^53-1, use bigint.'
         )
       );
     });

tests/9.Client.ts

@@ -1,6 +1,8 @@
 import assert from 'assert';
 import HTTPClient from '../src/client/client';
 import { URLTokenBaseHTTPClient } from '../src/client/urlTokenBaseHTTPClient';
+import IntDecoding from '../src/types/intDecoding';
+import * as utils from '../src/utils/utils';
 
 describe('client', () => {
   describe('url construction', () => {
@@ -33,6 +35,40 @@ describe('client', () => {
       assert.strictEqual(actual, expected);
     });
 
+    it('should encode and decode values correctly', () => {
+      const j = '{"total":18446744073709551615, "base":42}';
+
+      let options = {
+        // intDecoding: IntDecoding.DEFAULT,
+      };
+      let actual = HTTPClient.parseJSON(j, 200, options);
+      let expected = JSON.parse(j);
+      assert.strictEqual(actual.total, expected.total);
+      assert.strictEqual(typeof actual.total, 'number');
+
+      options = {
+        intDecoding: IntDecoding.BIGINT,
+      };
+      actual = HTTPClient.parseJSON(j, 200, options);
+      expected = utils.parseJSON(j, options);
+      assert.strictEqual(actual.total, expected.total);
+      assert.strictEqual(typeof actual.total, 'bigint');
+
+      options = {
+        intDecoding: IntDecoding.MIXED,
+      };
+      actual = HTTPClient.parseJSON(j, 200, options);
+      expected = utils.parseJSON(j, options);
+      assert.strictEqual(actual.total, expected.total);
+      assert.strictEqual(typeof actual.total, 'bigint');
+      assert.strictEqual(typeof actual.base, 'number');
+
+      options = {
+        intDecoding: IntDecoding.SAFE,
+      };
+      assert.throws(() => HTTPClient.parseJSON(j, 200, options), Error);
+    });
+
     it('should handle slash variations on complex paths', () => {
       const regularBase = 'https://localhost/absolute';
       const regularBaseWithFinalSlash = `${regularBase}/`;