Merge branch 'release/v1.23.2'

algorand · Nov 10, 2022 · c8d1d0a · c8d1d0a
2 parents 8504afd + 87f8cec
commit c8d1d0a
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v1.23.2
+
+## What's Changed
+
+### Bugfixes
+
+- SDK: Dryrun and transaction decoding fix for boxes by @jasonpaulos in https://github.com/algorand/js-algorand-sdk/pull/690
+
+**Full Changelog**: https://github.com/algorand/js-algorand-sdk/compare/v1.23.1...v1.23.2
+
 # v1.23.1
 
 ### Bugfixes

diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ Include a minified browser bundle directly in your HTML like so:
 
 ```html
 <script
-  src="https://unpkg.com/algosdk@v1.22.0/dist/browser/algosdk.min.js"
-  integrity="sha384-yEGXwnKn3JOtQMo5eTDgi7YeYt0O8uemu2f52V60pJcLsZf7vIKVyDjRfaK6gf1G"
+  src="https://unpkg.com/algosdk@v1.23.2/dist/browser/algosdk.min.js"
+  integrity="sha384-1gIB0FiLMNmJ7adAfBOdH20Mnw0DZarB9D3PTozUAhKn/uT9CpHdaSbBIpmZTgrU"
   crossorigin="anonymous"
 ></script>
 ```
@@ -32,8 +32,8 @@ or
 
 ```html
 <script
-  src="https://cdn.jsdelivr.net/npm/algosdk@v1.22.0/dist/browser/algosdk.min.js"
-  integrity="sha384-yEGXwnKn3JOtQMo5eTDgi7YeYt0O8uemu2f52V60pJcLsZf7vIKVyDjRfaK6gf1G"
+  src="https://cdn.jsdelivr.net/npm/algosdk@v1.23.2/dist/browser/algosdk.min.js"
+  integrity="sha384-1gIB0FiLMNmJ7adAfBOdH20Mnw0DZarB9D3PTozUAhKn/uT9CpHdaSbBIpmZTgrU"
   crossorigin="anonymous"
 ></script>
 ```

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "algosdk",
-  "version": "1.23.1",
+  "version": "1.23.2",
   "description": "The official JavaScript SDK for Algorand",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/dryrun.ts b/src/dryrun.ts
@@ -231,7 +231,7 @@ class DryrunTraceLine {
 class DryrunTrace {
   trace: DryrunTraceLine[] = [];
   constructor(t: DryrunTraceLineResponse[]) {
-    if (t === undefined) return;
+    if (t == null) return;
     this.trace = t.map((line) => new DryrunTraceLine(line));
   }
 }

diff --git a/src/transaction.ts b/src/transaction.ts
@@ -1086,11 +1086,11 @@ export class Transaction implements TransactionStorageStructure {
       }
       if (txnForEnc.apbx !== undefined) {
         txn.boxes = txnForEnc.apbx.map((box) => ({
-          // Translate foreign app index to app ID
-          appIndex:
-            box.i === 0 || box.i === txn.appIndex
-              ? txn.appIndex
-              : txn.appForeignApps[box.i - 1],
+          // We return 0 for the app ID so that it's guaranteed translateBoxReferences will
+          // translate the app index back to 0. If we instead returned the called app ID,
+          // translateBoxReferences would translate the app index to a nonzero value if the called
+          // app is also in the foreign app array.
+          appIndex: box.i ? txn.appForeignApps[box.i - 1] : 0,
           name: box.n,
         }));
       }

diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js
@@ -145,7 +145,7 @@ module.exports = function getSteps(options) {
       case 'b64':
         return makeUint8Array(Buffer.from(subArg[1], 'base64'));
       default:
-        throw Error(`did not recognize app arg of type${subArg[0]}`);
+        throw Error(`did not recognize app arg of type ${subArg[0]}`);
     }
   }
 
@@ -158,7 +158,7 @@ module.exports = function getSteps(options) {
     splitArgs.forEach((subArg) => {
       subArgs.push(subArg.split(':'));
     });
-    const appArgs = [];
+    const appArgs = makeArray();
     subArgs.forEach((subArg) => {
       appArgs.push(processAppArgs(subArg));
     });
@@ -167,10 +167,10 @@ module.exports = function getSteps(options) {
 
   function splitAndProcessBoxReferences(boxRefs) {
     if (boxRefs == null || boxRefs === '') {
-      return [];
+      return makeArray();
     }
     const splitRefs = boxRefs.split(',');
-    const boxRefArray = [];
+    const boxRefArray = makeArray();
     let appIndex = 0;
 
     for (let i = 0; i < splitRefs.length; i++) {
@@ -3157,7 +3157,7 @@ module.exports = function getSteps(options) {
       // split and process foreign apps
       let foreignApps;
       if (foreignAppsCommaSeparatedString !== '') {
-        foreignApps = [];
+        foreignApps = makeArray();
         foreignAppsCommaSeparatedString
           .split(',')
           .forEach((foreignAppAsString) => {
@@ -3167,7 +3167,7 @@ module.exports = function getSteps(options) {
       // split and process foreign assets
       let foreignAssets;
       if (foreignAssetsCommaSeparatedString !== '') {
-        foreignAssets = [];
+        foreignAssets = makeArray();
         foreignAssetsCommaSeparatedString
           .split(',')
           .forEach((foreignAssetAsString) => {
@@ -3177,7 +3177,7 @@ module.exports = function getSteps(options) {
       // split and process app accounts
       let appAccounts;
       if (appAccountsCommaSeparatedString !== '') {
-        appAccounts = appAccountsCommaSeparatedString.split(',');
+        appAccounts = makeArray(...appAccountsCommaSeparatedString.split(','));
       }
       // split and process box references
       let boxes;