Merge pull request #11 from Zondax/dev

Zondax · Apr 17, 2024 · 2f83494 · 2f83494
2 parents c82cfae + 7a6a214
commit 2f83494
Show file tree

Hide file tree

Showing 98 changed files with 46 additions and 16 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=0
 # This is the minor version
 APPVERSION_N=0
 # This is the patch version
-APPVERSION_P=12
+APPVERSION_P=13
diff --git a/app/src/parser_impl_eth.c b/app/src/parser_impl_eth.c
@@ -251,8 +251,14 @@ static parser_error_t printERC20(const parser_context_t *ctx, uint8_t displayIdx
 
         case 7:
             snprintf(outKey, outKeyLen, "Data");
-            array_to_hexstr(data_array, sizeof(data_array), eth_tx_obj.legacy.data.ptr, DATA_BYTES_TO_PRINT);
-            snprintf(data_array + (2 * DATA_BYTES_TO_PRINT), 4, "...");
+            array_to_hexstr(
+                data_array, sizeof(data_array), eth_tx_obj.legacy.data.ptr,
+                eth_tx_obj.legacy.data.rlpLen > DATA_BYTES_TO_PRINT ? DATA_BYTES_TO_PRINT : eth_tx_obj.legacy.data.rlpLen);
+
+            if (eth_tx_obj.legacy.data.rlpLen > DATA_BYTES_TO_PRINT) {
+                snprintf(data_array + (2 * DATA_BYTES_TO_PRINT), 4, "...");
+            }
+
             pageString(outVal, outValLen, data_array, pageIdx, pageCount);
             break;
 
@@ -295,8 +301,14 @@ static parser_error_t printGeneric(const parser_context_t *ctx, uint8_t displayI
 
         case 2:
             snprintf(outKey, outKeyLen, "Data");
-            array_to_hexstr(data_array, sizeof(data_array), eth_tx_obj.legacy.data.ptr, DATA_BYTES_TO_PRINT);
-            snprintf(data_array + (2 * DATA_BYTES_TO_PRINT), 4, "...");
+            array_to_hexstr(
+                data_array, sizeof(data_array), eth_tx_obj.legacy.data.ptr,
+                eth_tx_obj.legacy.data.rlpLen > DATA_BYTES_TO_PRINT ? DATA_BYTES_TO_PRINT : eth_tx_obj.legacy.data.rlpLen);
+
+            if (eth_tx_obj.legacy.data.rlpLen > DATA_BYTES_TO_PRINT) {
+                snprintf(data_array + (2 * DATA_BYTES_TO_PRINT), 4, "...");
+            }
+
             pageString(outVal, outValLen, data_array, pageIdx, pageCount);
             break;
 

diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk
diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk
diff --git a/deps/nanox-secure-sdk b/deps/nanox-secure-sdk
diff --git a/deps/stax-secure-sdk b/deps/stax-secure-sdk
diff --git a/js/package.json b/js/package.json
@@ -25,8 +25,8 @@
     "url": "https://github.com/zondax/ledger-flare/issues"
   },
   "dependencies": {
-    "@zondax/ledger-js": "^0.2.1",
-    "@ledgerhq/hw-app-eth": "6.29.7"
+    "@ledgerhq/hw-app-eth": "6.35.7",
+    "@zondax/ledger-js": "^0.2.1"
   },
   "devDependencies": {
     "@types/node": "^18.11.18",
@@ -38,8 +38,8 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-n": "^15.6.0",
     "eslint-plugin-promise": "^6.1.1",
-    "prettier": "^2.8.1",
-    "typescript": "^5.3.3"
+    "prettier": "^3.2.5",
+    "typescript": "^5.4.5"
   },
   "files": [
     "dist/**/*"

diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@zondax/ledger-flare": "../js",
-    "@zondax/zemu": "^0.47.0"
+    "@zondax/zemu": "^0.48.0"
   },
   "devDependencies": {
     "@ethereumjs/common": "^2.4.0",
@@ -45,6 +45,6 @@
     "secp256k1": "^5.0.0",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   }
 }
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00000.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00000.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00001.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00001.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00002.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00002.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00003.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00003.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00004.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00004.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00005.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00005.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00006.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00006.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00007.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00007.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00008.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00008.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00009.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00009.png
diff --git a/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00010.png b/tests_zemu/snapshots/s-eth-deposit_dummy_contract/00010.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00000.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00000.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00001.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00001.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00002.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00002.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00003.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00003.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00004.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00004.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00005.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00005.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00006.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00006.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00007.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00007.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00008.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00008.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00009.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00009.png
diff --git a/tests_zemu/snapshots/s-eth-undelegate_contract/00010.png b/tests_zemu/snapshots/s-eth-undelegate_contract/00010.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00000.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00000.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00001.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00001.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00002.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00002.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00003.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00003.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00004.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00004.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00005.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00005.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00006.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00006.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00007.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00007.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00008.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00008.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00009.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00009.png
diff --git a/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00010.png b/tests_zemu/snapshots/sp-eth-deposit_dummy_contract/00010.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00000.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00000.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00001.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00001.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00002.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00002.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00003.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00003.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00004.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00004.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00005.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00005.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00006.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00006.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00007.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00007.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00008.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00008.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00009.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00009.png
diff --git a/tests_zemu/snapshots/sp-eth-undelegate_contract/00010.png b/tests_zemu/snapshots/sp-eth-undelegate_contract/00010.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00000.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00000.png
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00001.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00001.png
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00002.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00002.png
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00003.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00003.png
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00004.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00004.png
diff --git a/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00005.png b/tests_zemu/snapshots/st-eth-deposit_dummy_contract/00005.png
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00000.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00000.png
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00001.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00001.png
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00002.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00002.png
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00003.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00003.png
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00004.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00004.png
diff --git a/tests_zemu/snapshots/st-eth-undelegate_contract/00005.png b/tests_zemu/snapshots/st-eth-undelegate_contract/00005.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00002.png b/tests_zemu/snapshots/st-mainmenu/00002.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00003.png b/tests_zemu/snapshots/st-mainmenu/00003.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00000.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00000.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00001.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00001.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00002.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00002.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00003.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00003.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00004.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00004.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00005.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00005.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00006.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00006.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00007.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00007.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00008.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00008.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00009.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00009.png
diff --git a/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00010.png b/tests_zemu/snapshots/x-eth-deposit_dummy_contract/00010.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00000.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00000.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00001.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00001.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00002.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00002.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00003.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00003.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00004.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00004.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00005.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00005.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00006.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00006.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00007.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00007.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00008.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00008.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00009.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00009.png
diff --git a/tests_zemu/snapshots/x-eth-undelegate_contract/00010.png b/tests_zemu/snapshots/x-eth-undelegate_contract/00010.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
diff --git a/tests_zemu/tests/eth_legacy.test.ts b/tests_zemu/tests/eth_legacy.test.ts
@@ -80,6 +80,24 @@ const SIGN_TEST_DATA = [
     },
     chainId: 14,
   },
+  {
+    name: 'undelegate_contract',
+    op: {
+      to: 'c67dce33d7a8efa5ffeb961899c73fe01bce9273',
+      value: '03e8',
+      data: 'b302f393',
+    },
+    chainId: 14,
+  },
+  {
+    name: 'deposit_dummy_contract',
+    op: {
+      to: 'c67dce33d7a8efa5ffeb961899c73fe01bce9273',
+      value: '03e8',
+      data: 'b302f3930001',
+    },
+    chainId: 14,
+  },
 ]
 
 const rawUnsignedLegacyTransaction = (params: any, chainId: number | undefined) => {