Merge pull request #448 from PureStake/master

Patch 1.9.5

README.md

@@ -14,7 +14,7 @@ Developers working with dApps may also install directly from the release package
 
 An interactive transition guide is available [here](https://purestake.github.io/algosigner-dapp-example/v1v2TransitionGuide.html).
 
-## 1.9.4 Release
+## 1.9.5 Release
 
 ### Main updates
 This update adds supports for easier transfers with the new autocomplete feature. Start typing an account, contact name or name service alias on the destination field when sending Algos or ASAs and you'll be able to select the desired address from a dropdown. This also marks the end of the support of the older signing methods that were previously available.
@@ -23,6 +23,7 @@ This update adds supports for easier transfers with the new autocomplete feature
   - Accounts and Contact names
   - External name services (NFDomains and Algorand Namespace Service)
 - `AlgoSigner.sign()` and `AlgoSigner.signMultisig()` have been deprecated
+- New Account creation now occurs in the browser, improving ease of use when saving the mnemonic
 
 ### Other updates
 - Improved Account Importing and Cache Clearing

docs/connection-issues.md

@@ -4,10 +4,12 @@ If you're having issues accessing a dApp using AlgoSigner, you can try the follo
 
 ## Connection Troubleshooting
 
-Find and press any disconnect button present on the dApp.
+Find and press any 'Disconnect' button present on the dApp.
 
 <img src="./connection_images/disconnect.png" width="300" />
 <br />
+<img src="./connection_images/disconnect2.png" width="300" />
+<br />
 
 Open the config menu and log out of AlgoSigner.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "algosigner",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "author": "https://developer.purestake.io",
   "description": "Sign Algorand transactions in your browser with PureStake.",
   "repository": "https://github.com/PureStake/algosigner",

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algosigner/common",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "author": "https://developer.purestake.io",
   "description": "Common library functions for AlgoSigner.",
   "repository": "https://github.com/PureStake/algosigner",

packages/crypto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "algosigner-crypto",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "author": "https://developer.purestake.io",
   "description": "Cryptographic wrapper for saving and retrieving extention information in AlgoSigner.",
   "repository": {

packages/dapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algosigner/dapp",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "author": "https://developer.purestake.io",
   "repository": "https://github.com/PureStake/algosigner",
   "license": "MIT",

packages/extension/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "AlgoSigner",
   "author": "https://developer.purestake.io",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "description": "Algorand Wallet Extension | Send & Receive ALGOs | Sign dApp Transactions",
   "icons": {
     "48": "icon.png"

packages/extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "algosigner-extension",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "author": "https://developer.purestake.io",
   "repository": "https://github.com/PureStake/algosigner",
   "license": "MIT",

packages/extension/src/background/messaging/task.ts

@@ -317,10 +317,10 @@ export class Task {
         let code = 4300;
 
         validationErrors.forEach((error, index) => {
-          data = data + `Validation failed for transaction ${index} due to: ${error.message}.`;
+          data = data + `Validation failed for transaction ${index} due to: ${error.message}. `;
           code = error.code && error.code < code ? error.code : code;
         });
-        throw RequestError.SigningError(code, data);
+        throw RequestError.SigningError(code, data.trim());
       } else if (
         transactionWraps.some(
           (tx) =>
@@ -1027,13 +1027,13 @@ export class Task {
                 let data = '';
                 if (transactionObjs.length > 1) {
                   signErrors.forEach((error, index) => {
-                    data += `On transaction ${index}, the error was: ${error}.`;
+                    data += `On transaction ${index}, the error was: ${error}. `;
                   });
                 } else {
                   data += signErrors[0];
                 }
                 if (!singleGroup) {
-                  data = `On group ${currentGroup}: [${data}].`;
+                  data = `On group ${currentGroup}: [${data.trim()}]. `;
                 }
                 message.error = RequestError.SigningError(4000, data);
                 logging.log(data);

packages/storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "algosigner-storage",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "author": "https://developer.purestake.io",
   "repository": "https://github.com/PureStake/algosigner",
   "license": "MIT",

packages/test-project/package.json

@@ -1,6 +1,6 @@
 {
   "name": "algorand-test-project",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "repository": "https://github.com/PureStake/algosigner",
   "license": "MIT",
   "description": "Repository for tests",
@@ -21,7 +21,8 @@
     "dapp": "jest --group=dapp",
     "dapp/signtxn": "jest --group=dapp/signtxn",
     "dapp/groups": "jest --group=dapp/groups",
+    "ledger": "jest --group=ledger",
     "coveragetest": "jest --coverage=true --coverageDirectory ../test-project/coverage --projects ../crypto ../extension ../storage ../common ../dapp --runInBand && bash -c \"start chrome \"$(realpath ./coverage/lcov-report/index.html\"\")",
-    "test": "jest -i --group=-github"
+    "test": "jest -i --group=-github --group=-ledger"
   }
 }

packages/test-project/tests/common/helpers.js

@@ -33,6 +33,23 @@ async function openAccountDetails(account) {
   await extensionPage.click('#showDetails');
 }
 
+async function verifyUITransaction(id, title, address) {
+  const txSelector = `[data-transaction-id="${id}"]`;
+  await extensionPage.waitForSelector(txSelector);
+  await extensionPage.click(txSelector);
+  await expect(extensionPage.$eval('#txTitle', (e) => e.innerText)).resolves.toBe(title);
+  await expect(
+    extensionPage.$eval('.modal.is-active [data-transaction-id]', (e) => e.dataset['transactionId'])
+  ).resolves.toBe(id);
+  await expect(
+    extensionPage.$eval(
+      '.modal.is-active [data-transaction-sender]',
+      (e) => e.dataset['transactionSender']
+    )
+  ).resolves.toBe(address);
+  await closeModal();
+}
+
 async function openSettingsMenu() {
   await extensionPage.waitForSelector('#openSettings');
   await extensionPage.click('#openSettings');
@@ -63,6 +80,15 @@ async function inputPassword() {
   await extensionPage.waitForFunction(() => !document.querySelector('#authButton'));
 }
 
+async function getOpenedTab() {
+  await dappPage.waitForTimeout(1500);
+  const pages = await browser.pages();
+  const tab = pages[pages.length - 1];
+
+  tab.on('console', (msg) => console.log('OPENED TAB LOG:', msg.text()));
+  return tab;
+}
+
 // Dapp Helpers
 async function getPopup() {
   await dappPage.waitForTimeout(1500);
@@ -155,6 +181,16 @@ function decodeAddress(address) {
   return algosdk.decodeAddress(address);
 }
 
+function buildSdkTx(tx) {
+  return new algosdk.Transaction(tx);
+}
+
+function prepareWalletTx(tx) {
+  return {
+    txn: byteArrayToBase64(tx.toByte()),
+  };
+}
+
 function mergeMultisigTransactions(signedTransactionsArray) {
   const convertedArray = signedTransactionsArray.map((s) => base64ToByteArray(s.blob));
   const mergedTx = algosdk.mergeMultisigTransactions(convertedArray);
@@ -176,11 +212,13 @@ module.exports = {
   openExtension,
   selectAccount,
   openAccountDetails,
+  verifyUITransaction,
   openSettingsMenu,
   closeSettingsMenu,
   goBack,
   closeModal,
   inputPassword,
+  getOpenedTab,
   getPopup,
   getLedgerSuggestedParams,
   sendTransaction,
@@ -190,6 +228,8 @@ module.exports = {
   decodeBase64Blob,
   encodeAddress,
   decodeAddress,
+  buildSdkTx,
+  prepareWalletTx,
   mergeMultisigTransactions,
   appendSignToMultisigTransaction,
 };

packages/test-project/tests/common/tests.js

@@ -1,5 +1,5 @@
 const { wallet, extension } = require('./constants');
-const { openAccountDetails, goBack, closeModal, inputPassword, getPopup } = require('./helpers');
+const { openAccountDetails, goBack, inputPassword, getPopup, closeModal } = require('./helpers');
 
 // Common Tests
 function WelcomePage() {

packages/test-project/tests/dapp-groups.test.js

@@ -9,24 +9,15 @@ const { accounts } = require('./common/constants');
 const {
   openExtension,
   getLedgerSuggestedParams,
-  byteArrayToBase64,
+  buildSdkTx,
+  prepareWalletTx,
 } = require('./common/helpers');
 const { CreateWallet, ConnectAlgoSigner, ImportAccount } = require('./common/tests');
 
 const account = accounts.ui;
 
 let ledgerParams;
 
-const buildSdkTx = (tx) => {
-  return new algosdk.Transaction(tx);
-};
-
-const prepareWalletTx = (tx) => {
-  return {
-    txn: byteArrayToBase64(tx.toByte()),
-  };
-};
-
 async function signTxnGroups(transactionsToSign) {
   await dappPage.waitForTimeout(2000);
   const signedGroups = await dappPage.evaluate(
@@ -65,16 +56,13 @@ describe('Wallet Setup', () => {
   });
 
   CreateWallet();
-
-  ImportAccount(account);
-});
-
-describe('dApp Setup', () => {
   ConnectAlgoSigner();
 
   test('Get TestNet params', async () => {
     ledgerParams = await getLedgerSuggestedParams();
   });
+
+  ImportAccount(account);
 });
 
 describe('Group of Groups Use cases', () => {

packages/test-project/tests/dapp-signtxn.test.js

@@ -10,8 +10,9 @@ const {
   openExtension,
   getPopup,
   getLedgerSuggestedParams,
-  byteArrayToBase64,
   decodeBase64Blob,
+  buildSdkTx,
+  prepareWalletTx,
 } = require('./common/helpers');
 const { CreateWallet, ConnectAlgoSigner, ImportAccount } = require('./common/tests');
 
@@ -22,16 +23,6 @@ const account2 = msigAccount.subaccounts[1];
 let ledgerParams;
 let unsignedTransactions = [];
 
-const buildSdkTx = (tx) => {
-  return new algosdk.Transaction(tx);
-};
-
-const prepareWalletTx = (tx) => {
-  return {
-    txn: byteArrayToBase64(tx.toByte()),
-  };
-};
-
 async function signTxn(transactionsToSign, testFunction) {
   const timestampedName = `popupTest-${new Date().getTime().toString()}`;
   if (testFunction) {
@@ -82,17 +73,14 @@ describe('Wallet Setup', () => {
   });
 
   CreateWallet();
-
-  ImportAccount(account1);
-  ImportAccount(account2);
-});
-
-describe('dApp Connecting', () => {
   ConnectAlgoSigner();
 
   test('Get TestNet params', async () => {
     ledgerParams = await getLedgerSuggestedParams();
   });
+
+  ImportAccount(account1);
+  ImportAccount(account2);
 });
 
 describe('Error Use cases', () => {
@@ -239,7 +227,7 @@ describe('Multisig Transaction Use cases', () => {
     unsignedTransactions[0].signers = [account1.address];
     const signedTransactions = await signTxn(unsignedTransactions);
 
-    // Verify correctsignature is added
+    // Verify correct signature is added
     const decodedTransaction = decodeBase64Blob(signedTransactions[0].blob);
     expect(decodedTransaction).toHaveProperty('txn');
     expect(decodedTransaction).toHaveProperty('msig');