Merge pull request #12 from Zondax/update

Update
Zondax · Apr 29, 2022 · cc1af9f · cc1af9f
2 parents 8a24d12 + 654d401
commit cc1af9f
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 51 deletions.
diff --git a/app/Makefile b/app/Makefile
@@ -91,9 +91,8 @@ OUTPUT_INSTALLER:= $(CURDIR)/pkg/installer_x.sh
 endif
 
 ifeq ($(TARGET_NAME),TARGET_NANOS2)
-APP_LOAD_PARAMS += --appFlags 0x200
+APP_LOAD_PARAMS += --appFlags 0x000
 APP_STACK_SIZE:=4096
-# SCRIPT_LD:=$(CURDIR)/script_s2.ld
 ICONNAME:=$(CURDIR)/nanox_icon.gif
 OUTPUT_ELF ?= $(CURDIR)/output/app_s2.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/installer_s2.sh

diff --git a/app/src/coin.h b/app/src/coin.h
@@ -42,7 +42,7 @@ typedef enum {
 #define APPVERSION_LINE1                   "Version:"
 #define APPVERSION_LINE2                   ("v" APPVERSION)
 
-#define COIN_DEFAULT_CHAINID                "axelarhub-4"
+#define COIN_DEFAULT_CHAINID                "axelar-dojo-1"
 
 #define COIN_DEFAULT_DENOM_BASE             "uaxl"
 #define COIN_DEFAULT_DENOM_REPR             "AXL"

diff --git a/js/package.json b/js/package.json
@@ -25,7 +25,7 @@
     "url": "https://github.com/zondax/ledger-axelar/issues"
   },
   "dependencies": {
-    "@ledgerhq/hw-transport": "^6.11.2"
+    "@ledgerhq/hw-transport": "^6.27.1"
   },
   "devDependencies": {
     "@types/ledgerhq__hw-transport": "^4.21.4",

diff --git a/js/yarn.lock b/js/yarn.lock
@@ -516,10 +516,10 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@ledgerhq/devices@^6.11.2":
-  version "6.11.2"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-6.11.2.tgz#a0413b087f7c07adf2a91d23f84a4580cdbb36fe"
-  integrity sha512-j2SoG0Ifm7khsPKC2UFhJIoi1oCDCvJemmO+pz7Oc9jx8JRhIGtCfqEIUhL+ZIl0TrIYuApPLaSqJjiFi7VGCQ==
+"@ledgerhq/devices@^6.27.1":
+  version "6.27.1"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-6.27.1.tgz#3b13ab1d1ba8201e9e74a08f390560483978c962"
+  integrity sha512-jX++oy89jtv7Dp2X6gwt3MMkoajel80JFWcdc0HCouwDsV1mVJ3SQdwl/bQU0zd8HI6KebvUP95QTwbQLLK/RQ==
   dependencies:
     "@ledgerhq/errors" "^6.10.0"
     "@ledgerhq/logs" "^6.10.0"
@@ -531,12 +531,12 @@
   resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.10.0.tgz#dda9127b65f653fbb2f74a55e8f0e550d69de6e4"
   integrity sha512-fQFnl2VIXh9Yd41lGjReCeK+Q2hwxQJvLZfqHnKqWapTz68NHOv5QcI0OHuZVNEbv0xhgdLhi5b65kgYeQSUVg==
 
-"@ledgerhq/hw-transport@^6.11.2":
-  version "6.11.2"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.11.2.tgz#247d0297f96db9d255672a453a1e621ade92096f"
-  integrity sha512-VZbGfyQ8iFl2W6TUkVmQ3rz8kyOXMbOdFiht3VNlglMe3KBGJWOjW9s/5LhOR348NJs797B1gl4V0Zqmn11kUg==
+"@ledgerhq/hw-transport@^6.27.1":
+  version "6.27.1"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.27.1.tgz#88072278f69c279cb6569352acd4ae2fec33ace3"
+  integrity sha512-hnE4/Fq1YzQI4PA1W0H8tCkI99R3UWDb3pJeZd6/Xs4Qw/q1uiQO+vNLC6KIPPhK0IajUfuI/P2jk0qWcMsuAQ==
   dependencies:
-    "@ledgerhq/devices" "^6.11.2"
+    "@ledgerhq/devices" "^6.27.1"
     "@ledgerhq/errors" "^6.10.0"
     events "^3.3.0"
 
@@ -2838,9 +2838,9 @@ minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 [email protected]:
   version "2.0.0"

diff --git a/tests/testcases/manual.json b/tests/testcases/manual.json
@@ -89,7 +89,7 @@
     "name": "completeTransferExpert",
     "tx": {
       "account_number": "0",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -131,7 +131,7 @@
     "parsingErr": "No error",
     "validationErr": "No error",
     "expected": [
-      "0 | Chain ID : axelarhub-4",
+      "0 | Chain ID : axelar-dojo-1",
       "1 | Account : 0",
       "2 | Sequence : 1",
       "3 | Source Address : axelaraccaddr1d9h8qat5e4ehc5",
@@ -148,7 +148,7 @@
     "name": "completeTransfer",
     "tx": {
       "account_number": "0",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -260,7 +260,7 @@
     "name": "completeTransferNoMemo",
     "tx": {
       "account_number": "0",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -371,7 +371,7 @@
     "name": "completeTransferEmptyMemo",
     "tx": {
       "account_number": "0",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -512,7 +512,7 @@
     "name": "multipleTransfers",
     "tx": {
       "account_number": "0",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -595,7 +595,7 @@
     "name": "delegationExpert",
     "tx": {
       "account_number": "6571",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -624,7 +624,7 @@
     "parsingErr": "No error",
     "validationErr": "No error",
     "expected": [
-      "0 | Chain ID : axelarhub-4",
+      "0 | Chain ID : axelar-dojo-1",
       "1 | Account : 6571",
       "2 | Sequence : 1",
       "3 | Type : Delegate",
@@ -691,7 +691,7 @@
     "name": "delegation",
     "tx": {
       "account_number": "6571",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -780,7 +780,7 @@
     "name": "proposal",
     "tx": {
       "account_number": "2",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [],
         "gas": "500000"
@@ -821,7 +821,7 @@
     "name": "delegation2Expert",
     "tx": {
       "account_number": "6571",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -850,7 +850,7 @@
     "parsingErr": "No error",
     "validationErr": "No error",
     "expected": [
-      "0 | Chain ID : axelarhub-4",
+      "0 | Chain ID : axelar-dojo-1",
       "1 | Account : 6571",
       "2 | Sequence : 0",
       "3 | Type : Delegate",
@@ -869,7 +869,7 @@
     "name": "delegation2",
     "tx": {
       "account_number": "6571",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -927,7 +927,7 @@
     "name": "badcase2",
     "tx": {
       "account_number": "6571",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -956,7 +956,7 @@
     "parsingErr": "No error",
     "validationErr": "No error",
     "expected": [
-      "0 | Chain ID : axelarhub-4",
+      "0 | Chain ID : axelar-dojo-1",
       "1 | Account : 6571",
       "2 | Sequence : 0",
       "3 | Type : Delegate",
@@ -1012,7 +1012,7 @@
     "name": "groupingSmallExpert",
     "tx": {
       "account_number": "108",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -1044,7 +1044,7 @@
     "parsingErr": "No error",
     "validationErr": "No error",
     "expected": [
-      "0 | Chain ID : axelarhub-4",
+      "0 | Chain ID : axelar-dojo-1",
       "1 | Account : 108",
       "2 | Sequence : 106",
       "3 | Type : Withdraw Reward",
@@ -1065,7 +1065,7 @@
     "name": "groupingSmall",
     "tx": {
       "account_number": "108",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -1112,7 +1112,7 @@
     "name": "groupingExpert",
     "tx": {
       "account_number": "108",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -1158,7 +1158,7 @@
     "parsingErr": "No error",
     "validationErr": "No error",
     "expected": [
-      "0 | Chain ID : axelarhub-4",
+      "0 | Chain ID : axelar-dojo-1",
       "1 | Account : 108",
       "2 | Sequence : 106",
       "3 | Type : Withdraw Reward",
@@ -1187,7 +1187,7 @@
     "name": "grouping_ledger_testcase",
     "tx": {
       "account_number": "108",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -1233,7 +1233,7 @@
     "parsingErr": "No error",
     "validationErr": "No error",
     "expected": [
-      "0 | Chain ID : axelarhub-4",
+      "0 | Chain ID : axelar-dojo-1",
       "1 | Account : 108",
       "2 | Sequence : 106",
       "3 | Type : Withdraw Reward",
@@ -1262,7 +1262,7 @@
     "name": "massive",
     "tx": {
       "account_number": "108",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {
@@ -1392,7 +1392,7 @@
     "parsingErr": "No error",
     "validationErr": "No error",
     "expected": [
-      "0 | Chain ID : axelarhub-4",
+      "0 | Chain ID : axelar-dojo-1",
       "1 | Account : 108",
       "2 | Sequence : 106",
       "3 | Type : Withdraw Reward",
@@ -1469,7 +1469,7 @@
     "name": "combined",
     "tx": {
       "account_number": "108",
-      "chain_id": "axelarhub-4",
+      "chain_id": "axelar-dojo-1",
       "fee": {
         "amount": [
           {

diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@zondax/ledger-axelar": "^0.0.1",
-    "@zondax/zemu": "^0.27.4"
+    "@zondax/zemu": "^0.29.0"
   },
   "devDependencies": {
     "@types/jest": "^27.4.0",

diff --git a/tests_zemu/tests/common.ts b/tests_zemu/tests/common.ts
@@ -38,7 +38,7 @@ export const DEVICE_MODELS: DeviceModel[] = [
 
 export const example_tx_str_basic = {
   account_number: '108',
-  chain_id: 'axelarhub-4',
+  chain_id: 'axelar-dojo-1',
   fee: {
     amount: [
       {
@@ -70,7 +70,7 @@ export const example_tx_str_basic = {
 
 export const example_tx_str_expert = {
   account_number: '108',
-  chain_id: 'axelarhub-4',
+  chain_id: 'axelar-dojo-1',
   fee: {
     amount: [
       {
@@ -102,7 +102,7 @@ export const example_tx_str_expert = {
 
 export const example_tx_str_combined = {
   account_number: '108',
-  chain_id: 'axelarhub-4',
+  chain_id: 'axelar-dojo-1',
   fee: {
     amount: [
       {
@@ -138,7 +138,7 @@ export const example_tx_str_combined = {
 
 export const example_tx_str_basic2 = {
   account_number: '482',
-  chain_id: 'axelarhub-4',
+  chain_id: 'axelar-dojo-1',
   fee: {
     amount: [],
     gas: '10000000',

diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts
@@ -107,8 +107,7 @@ describe('Standard', function () {
       const respRequest = app.showAddressAndPubKey(path, 'axelar')
       // Wait until we are not in the main menu
       await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-
-      await sim.compareSnapshotsAndAccept('.', `${m.prefix.toLowerCase()}-show_address`, 2)
+      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-show_address`)
 
       const resp = await respRequest
       console.log(resp)
@@ -163,7 +162,7 @@ describe('Standard', function () {
       await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
 
       // Now navigate the address / path
-      await sim.compareSnapshotsAndAccept('.', `${m.prefix.toLowerCase()}-show_address_huge`, 3)
+      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-show_address_huge`)
 
       const resp = await respRequest
       console.log(resp)
@@ -203,7 +202,7 @@ describe('Standard', function () {
       await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
 
       // Now navigate the address / path
-      await sim.compareSnapshotsAndAccept('.', `${m.prefix.toLowerCase()}-sign_basic`, m.prefix == 'S' ? 8 : 6)
+      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-sign_basic`)
 
       const resp = await signatureRequest
       console.log(resp)
@@ -250,7 +249,7 @@ describe('Standard', function () {
       await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
 
       // Now navigate the address / path
-      await sim.compareSnapshotsAndAccept('.', `${m.prefix.toLowerCase()}-sign_basic2`, m.prefix == 'S' ? 7 : 6)
+      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-sign_basic2`)
 
       const resp = await signatureRequest
       console.log(resp)