Merge pull request #146 from Zondax/dev

Add Filecoin calibration testnet
Zondax · Dec 19, 2023 · 59ba927 · 59ba927
2 parents 9ba16aa + 1c53033
commit 59ba927
Show file tree

Hide file tree

Showing 11 changed files with 198 additions and 180 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=0
 # This is the minor version of this release
 APPVERSION_N=23
 # This is the patch version of this release
-APPVERSION_P=10
+APPVERSION_P=11
diff --git a/app/src/parser_impl_eth.c b/app/src/parser_impl_eth.c
@@ -26,6 +26,7 @@
 
 eth_tx_t eth_tx_obj;
 #define FILECOIN_MAINNET_CHAINID 314
+#define FILECOIN_CALIBRATION_CHAINID 314159
 
 static parser_error_t parse_field(parser_context_t *ctx, uint32_t *fieldOffset,
                                   uint32_t *len) {
@@ -56,7 +57,7 @@ static parser_error_t readChainID(parser_context_t *ctx, chain_id_t *chain_id) {
   const uint8_t *chain = ctx->buffer + chain_id->offset;
   uint64_t id = 0;
   if (be_bytes_to_u64(chain, chain_id->len, &id) != 0 ||
-      id != FILECOIN_MAINNET_CHAINID) {
+     (id != FILECOIN_MAINNET_CHAINID && id != FILECOIN_CALIBRATION_CHAINID)) {
     return parser_invalid_chain_id;
   }
 

diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -18,34 +18,34 @@
   },
   "dependencies": {
     "@zondax/ledger-filecoin": "^0.13.0",
-    "@zondax/zemu": "^0.44.2"
+    "@zondax/zemu": "^0.46.0"
   },
   "devDependencies": {
     "@ethereumjs/common": "^2.4.0",
     "@ethereumjs/tx": "^3.2.0",
     "@ledgerhq/hw-app-eth": "6.33.7",
-    "@types/elliptic": "^6.4.17",
-    "@types/jest": "^29.5.7",
+    "@types/elliptic": "^6.4.18",
+    "@types/jest": "^29.5.11",
     "@types/ledgerhq__hw-transport": "^4.21.7",
-    "@types/secp256k1": "^4.0.5",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
+    "@types/secp256k1": "^4.0.6",
+    "@typescript-eslint/eslint-plugin": "^6.15.0",
+    "@typescript-eslint/parser": "^6.15.0",
     "blakejs": "^1.2.1",
     "bn.js": "^5.2.0",
     "crypto-js": "4.2.0",
     "elliptic": "^6.5.4",
-    "eslint": "^8.53.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^27.6.0",
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "29.7.0",
     "jest-serial-runner": "^1.1.0",
     "js-sha256": "0.10.1",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.1",
     "secp256k1": "^5.0.0",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   }
 }
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-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/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/yarn.lock b/tests_zemu/yarn.lock
+1 −0		app/ui/view.c
+1 −0		app/ui/view.h
+1 −0		app/ui/view_inspect_s.c
+1 −0		app/ui/view_inspect_x.c
+0 −1		app/ui/view_internal.h
+1 −0		app/ui/view_nano_inspect.c
+1 −1		include/zxversion.h