Merge pull request #33 from chcmedeiros/increase-amino-tokens

Increase AminoJSON tokens
cosmos · Jan 31, 2024 · ae910bf · ae910bf
2 parents 34501cc + 441d776
commit ae910bf
Show file tree

Hide file tree

Showing 62 changed files with 15 additions and 8 deletions.
diff --git a/app/Makefile b/app/Makefile
@@ -52,9 +52,14 @@ endif
 
 APP_LOAD_PARAMS = --curve secp256k1 $(COMMON_LOAD_PARAMS) --path $(APPPATH)
 
-NANOS_STACK_SIZE := 1890
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices
 
+# On zxlib v19.7.1, Makefile.devices will set a default value for APP_STACK_SIZE
+# to follow the most recent nanos-secure-sdk rules we will clean APP_STACK_SIZE value
+# and set a minimum value
+APP_STACK_SIZE :=
+APP_STACK_MIN_SIZE := 1444
+
 $(info TARGET_NAME  = [$(TARGET_NAME)])
 $(info ICONNAME  = [$(ICONNAME)])
 

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=34
 # This is the patch version of this release
-APPVERSION_P=12
+APPVERSION_P=13
diff --git a/app/src/chain_config.c b/app/src/chain_config.c
@@ -26,6 +26,8 @@ typedef struct {
 static const chain_config_t chainConfig[] = {
     // {118, cosmos, BECH32_COSMOS},
     {60, "inj", BECH32_ETH},
+    {60, "evmos", BECH32_ETH},
+    {60, "xpla", BECH32_ETH}
 };
 
 static const uint32_t chainConfigLen = sizeof(chainConfig) / sizeof(chainConfig[0]);

diff --git a/app/src/json/json_parser.h b/app/src/json/json_parser.h
@@ -36,7 +36,7 @@ extern "C" {
 // we must limit the number
 #if defined(TARGET_NANOS)
 #undef MAX_NUMBER_OF_TOKENS
-#define MAX_NUMBER_OF_TOKENS    70
+#define MAX_NUMBER_OF_TOKENS    96
 #endif
 
 #if defined(TARGET_STAX)

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/tests_zemu/package.json b/tests_zemu/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@zondax/ledger-cosmos-js": "^3.0.3",
-    "@zondax/zemu": "^0.43.1"
+    "@zondax/zemu": "^0.46.1"
   },
   "devDependencies": {
     "@types/jest": "^29.5.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/st-ibc_denoms/00000.png b/tests_zemu/snapshots/st-ibc_denoms/00000.png
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00001.png b/tests_zemu/snapshots/st-ibc_denoms/00001.png
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00002.png b/tests_zemu/snapshots/st-ibc_denoms/00002.png
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00003.png b/tests_zemu/snapshots/st-ibc_denoms/00003.png
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00004.png b/tests_zemu/snapshots/st-ibc_denoms/00004.png
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00005.png b/tests_zemu/snapshots/st-ibc_denoms/00005.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_huge/00000.png b/tests_zemu/snapshots/st-show_address_huge/00000.png
diff --git a/tests_zemu/snapshots/st-show_address_huge/00001.png b/tests_zemu/snapshots/st-show_address_huge/00001.png
diff --git a/tests_zemu/snapshots/st-show_address_huge/00002.png b/tests_zemu/snapshots/st-show_address_huge/00002.png
diff --git a/tests_zemu/snapshots/st-show_address_huge/00003.png b/tests_zemu/snapshots/st-show_address_huge/00003.png
diff --git a/tests_zemu/snapshots/st-show_eth_address/00000.png b/tests_zemu/snapshots/st-show_eth_address/00000.png
diff --git a/tests_zemu/snapshots/st-show_eth_address/00001.png b/tests_zemu/snapshots/st-show_eth_address/00001.png
diff --git a/tests_zemu/snapshots/st-show_eth_address/00002.png b/tests_zemu/snapshots/st-show_eth_address/00002.png
diff --git a/tests_zemu/snapshots/st-show_eth_address/00003.png b/tests_zemu/snapshots/st-show_eth_address/00003.png
diff --git a/tests_zemu/snapshots/st-sign_basic/00000.png b/tests_zemu/snapshots/st-sign_basic/00000.png
diff --git a/tests_zemu/snapshots/st-sign_basic/00001.png b/tests_zemu/snapshots/st-sign_basic/00001.png
diff --git a/tests_zemu/snapshots/st-sign_basic/00002.png b/tests_zemu/snapshots/st-sign_basic/00002.png
diff --git a/tests_zemu/snapshots/st-sign_basic/00003.png b/tests_zemu/snapshots/st-sign_basic/00003.png
diff --git a/tests_zemu/snapshots/st-sign_basic/00004.png b/tests_zemu/snapshots/st-sign_basic/00004.png
diff --git a/tests_zemu/snapshots/st-sign_basic2/00000.png b/tests_zemu/snapshots/st-sign_basic2/00000.png
diff --git a/tests_zemu/snapshots/st-sign_basic2/00001.png b/tests_zemu/snapshots/st-sign_basic2/00001.png
diff --git a/tests_zemu/snapshots/st-sign_basic2/00002.png b/tests_zemu/snapshots/st-sign_basic2/00002.png
diff --git a/tests_zemu/snapshots/st-sign_basic2/00003.png b/tests_zemu/snapshots/st-sign_basic2/00003.png
diff --git a/tests_zemu/snapshots/st-sign_basic2/00004.png b/tests_zemu/snapshots/st-sign_basic2/00004.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00000.png b/tests_zemu/snapshots/st-sign_basic_eth/00000.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00001.png b/tests_zemu/snapshots/st-sign_basic_eth/00001.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00002.png b/tests_zemu/snapshots/st-sign_basic_eth/00002.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00003.png b/tests_zemu/snapshots/st-sign_basic_eth/00003.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00004.png b/tests_zemu/snapshots/st-sign_basic_eth/00004.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00005.png b/tests_zemu/snapshots/st-sign_basic_eth/00005.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00006.png b/tests_zemu/snapshots/st-sign_basic_eth/00006.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/st-sign_basic_eth_warning/00000.png
diff --git a/tests_zemu/snapshots/st-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/st-sign_basic_eth_warning/00001.png
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00000.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00000.png
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.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
+1 −1		dockerized_build.mk
+2 −2		include/zxversion.h
+1 −0		makefiles/Makefile.platform