Merge pull request #27 from Zondax/extra_check

Extra pages check
algorand · Sep 25, 2023 · c12bdab · c12bdab
2 parents f201ec1 + e7a2821
commit c12bdab
Show file tree

Hide file tree

Showing 89 changed files with 16 additions and 15 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=1
 # This is the patch version of this release
-APPVERSION_P=9
+APPVERSION_P=10
diff --git a/app/src/parser_impl.c b/app/src/parser_impl.c
@@ -1121,7 +1121,8 @@ static parser_error_t _readTxApplication(parser_context_t *c, parser_tx_t *v)
        DISPLAY_ITEM(IDX_CLEAR, 1, tx_num_items)
    }
 
-    if (application->cprog_len + application->aprog_len > PAGE_LEN *(1+application->extra_pages)){
+    if (application->id == 0 && application->cprog_len + application->aprog_len > PAGE_LEN *(1+application->extra_pages)){
+        // ExtraPages needs to be checked only on application creation
         return parser_program_fields_too_long;
     }
 

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/tests_zemu/package.json b/tests_zemu/package.json
@@ -19,26 +19,26 @@
   },
   "dependencies": {
     "@zondax/ledger-algorand": "../js",
-    "@zondax/zemu": "^0.43.1"
+    "@zondax/zemu": "^0.44.2"
   },
   "devDependencies": {
     "@types/jest": "^29.4.0",
     "@types/ledgerhq__hw-transport": "^4.21.4",
-    "@typescript-eslint/eslint-plugin": "^5.52.0",
-    "@typescript-eslint/parser": "^5.52.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
     "blakejs": "^1.1.1",
     "crypto-js": "4.1.1",
     "ed25519-supercop": "^2.0.1",
     "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-prettier": "^4.0.0",
-    "jest": "29.5.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "jest": "29.7.0",
     "jssha": "^3.2.0",
-    "prettier": "^2.4.1",
+    "prettier": "^3.0.3",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
-    "typescript": "^4.4.3"
+    "typescript": "^5.2.2"
   }
 }
diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00005.png b/tests_zemu/snapshots/sp-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00011.png b/tests_zemu/snapshots/sp-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00000.png b/tests_zemu/snapshots/st-mainmenu/00000.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/st-mainmenu/00005.png b/tests_zemu/snapshots/st-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/st-show_address/00000.png b/tests_zemu/snapshots/st-show_address/00000.png
diff --git a/tests_zemu/snapshots/st-show_address/00001.png b/tests_zemu/snapshots/st-show_address/00001.png
diff --git a/tests_zemu/snapshots/st-show_address/00002.png b/tests_zemu/snapshots/st-show_address/00002.png
diff --git a/tests_zemu/snapshots/st-show_address_reject/00000.png b/tests_zemu/snapshots/st-show_address_reject/00000.png
diff --git a/tests_zemu/snapshots/st-show_address_reject/00001.png b/tests_zemu/snapshots/st-show_address_reject/00001.png
diff --git a/tests_zemu/snapshots/st-show_address_reject/00002.png b/tests_zemu/snapshots/st-show_address_reject/00002.png
diff --git a/tests_zemu/snapshots/st-show_address_reject/00003.png b/tests_zemu/snapshots/st-show_address_reject/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application/00000.png b/tests_zemu/snapshots/st-sign_application/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application/00001.png b/tests_zemu/snapshots/st-sign_application/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application/00002.png b/tests_zemu/snapshots/st-sign_application/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application/00003.png b/tests_zemu/snapshots/st-sign_application/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application/00004.png b/tests_zemu/snapshots/st-sign_application/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application/00005.png b/tests_zemu/snapshots/st-sign_application/00005.png
diff --git a/tests_zemu/snapshots/st-sign_application/00006.png b/tests_zemu/snapshots/st-sign_application/00006.png
diff --git a/tests_zemu/snapshots/st-sign_application/00007.png b/tests_zemu/snapshots/st-sign_application/00007.png
diff --git a/tests_zemu/snapshots/st-sign_application/00008.png b/tests_zemu/snapshots/st-sign_application/00008.png
diff --git a/tests_zemu/snapshots/st-sign_application/00009.png b/tests_zemu/snapshots/st-sign_application/00009.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00000.png b/tests_zemu/snapshots/st-sign_application_big/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00001.png b/tests_zemu/snapshots/st-sign_application_big/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00002.png b/tests_zemu/snapshots/st-sign_application_big/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00003.png b/tests_zemu/snapshots/st-sign_application_big/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00004.png b/tests_zemu/snapshots/st-sign_application_big/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00005.png b/tests_zemu/snapshots/st-sign_application_big/00005.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00006.png b/tests_zemu/snapshots/st-sign_application_big/00006.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00007.png b/tests_zemu/snapshots/st-sign_application_big/00007.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00008.png b/tests_zemu/snapshots/st-sign_application_big/00008.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00009.png b/tests_zemu/snapshots/st-sign_application_big/00009.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00010.png b/tests_zemu/snapshots/st-sign_application_big/00010.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00011.png b/tests_zemu/snapshots/st-sign_application_big/00011.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00012.png b/tests_zemu/snapshots/st-sign_application_big/00012.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00013.png b/tests_zemu/snapshots/st-sign_application_big/00013.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00014.png b/tests_zemu/snapshots/st-sign_application_big/00014.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00015.png b/tests_zemu/snapshots/st-sign_application_big/00015.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00000.png b/tests_zemu/snapshots/st-sign_asset_config/00000.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00001.png b/tests_zemu/snapshots/st-sign_asset_config/00001.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00002.png b/tests_zemu/snapshots/st-sign_asset_config/00002.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00003.png b/tests_zemu/snapshots/st-sign_asset_config/00003.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00004.png b/tests_zemu/snapshots/st-sign_asset_config/00004.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00005.png b/tests_zemu/snapshots/st-sign_asset_config/00005.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00006.png b/tests_zemu/snapshots/st-sign_asset_config/00006.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00007.png b/tests_zemu/snapshots/st-sign_asset_config/00007.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00008.png b/tests_zemu/snapshots/st-sign_asset_config/00008.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00000.png b/tests_zemu/snapshots/st-sign_asset_freeze/00000.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00001.png b/tests_zemu/snapshots/st-sign_asset_freeze/00001.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00002.png b/tests_zemu/snapshots/st-sign_asset_freeze/00002.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00003.png b/tests_zemu/snapshots/st-sign_asset_freeze/00003.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00004.png b/tests_zemu/snapshots/st-sign_asset_freeze/00004.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00005.png b/tests_zemu/snapshots/st-sign_asset_freeze/00005.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00000.png b/tests_zemu/snapshots/st-sign_asset_transfer/00000.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00001.png b/tests_zemu/snapshots/st-sign_asset_transfer/00001.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00002.png b/tests_zemu/snapshots/st-sign_asset_transfer/00002.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00003.png b/tests_zemu/snapshots/st-sign_asset_transfer/00003.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00004.png b/tests_zemu/snapshots/st-sign_asset_transfer/00004.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00005.png b/tests_zemu/snapshots/st-sign_asset_transfer/00005.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00000.png b/tests_zemu/snapshots/st-sign_keyreg/00000.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00001.png b/tests_zemu/snapshots/st-sign_keyreg/00001.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00002.png b/tests_zemu/snapshots/st-sign_keyreg/00002.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00003.png b/tests_zemu/snapshots/st-sign_keyreg/00003.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00004.png b/tests_zemu/snapshots/st-sign_keyreg/00004.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00005.png b/tests_zemu/snapshots/st-sign_keyreg/00005.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00006.png b/tests_zemu/snapshots/st-sign_keyreg/00006.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00007.png b/tests_zemu/snapshots/st-sign_keyreg/00007.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00000.png b/tests_zemu/snapshots/st-sign_payment/00000.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00001.png b/tests_zemu/snapshots/st-sign_payment/00001.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00002.png b/tests_zemu/snapshots/st-sign_payment/00002.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00003.png b/tests_zemu/snapshots/st-sign_payment/00003.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00004.png b/tests_zemu/snapshots/st-sign_payment/00004.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00005.png b/tests_zemu/snapshots/st-sign_payment/00005.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00006.png b/tests_zemu/snapshots/st-sign_payment/00006.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00005.png b/tests_zemu/snapshots/x-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png
+32 −0		app/ui/view.h
+163 −0		app/ui/view_inspect_s.c
+197 −0		app/ui/view_inspect_x.c
+12 −0		app/ui/view_internal.h
+2 −0		app/ui/view_nano.h
+176 −0		app/ui/view_nano_inspect.c
+32 −0		app/ui/view_nano_inspect.h
+7 −4		app/ui/view_s.c
+9 −1		app/ui/view_x.c
+1 −1		dockerized_build.mk
+10 −6		include/zxformat.h
+12 −12		include/zxmacros_ledger.h
+2 −2		include/zxversion.h
+16 −0		makefiles/Makefile.devices
+1 −0		makefiles/Makefile.platform
+3 −2		Makefile.defines
+2 −0		Makefile.rules
+6 −1		Makefile.rules_generic
+19 −3		Makefile.standard_app
+2 −2		include/os_seed.h
+1 −3		lib_standard_app/buffer.c
+2 −2		lib_standard_app/crypto_helpers.c
+76 −0		lib_standard_app/debug.c
+3 −0		lib_standard_app/debug.h
+19 −1		lib_standard_app/format.c
+17 −0		lib_standard_app/format.h
+29 −4		lib_standard_app/main.c
+22 −0		plugin_script.ld
+5 −2		script.ld
+18 −1		src/os.c
+8 −4		src/os_io_task.c