diff --git a/app/Makefile b/app/Makefile index 49765798..09e1d8a7 100755 --- a/app/Makefile +++ b/app/Makefile @@ -114,7 +114,7 @@ OUTPUT_INSTALLER:= $(CURDIR)/pkg/installer_x.sh endif ifeq ($(TARGET_NAME),TARGET_NANOS2) -APP_LOAD_PARAMS += --appFlags 0x200 +APP_LOAD_PARAMS += --appFlags 0x000 SCRIPT_LD:=$(CURDIR)/script_s2.ld ICONNAME:=$(CURDIR)/nanox_icon.gif OUTPUT_ELF ?= $(CURDIR)/output/app_s2.elf diff --git a/app/Makefile.version b/app/Makefile.version index 9391170b..93d7be98 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -3,4 +3,4 @@ APPVERSION_M=12 # This is the `spec_version` field of `Runtime` APPVERSION_N=9180 # This is the patch version of this release -APPVERSION_P=0 +APPVERSION_P=1 diff --git a/cmake/cmake-modules b/cmake/cmake-modules index 770145a3..03be0c7e 160000 --- a/cmake/cmake-modules +++ b/cmake/cmake-modules @@ -1 +1 @@ -Subproject commit 770145a3338408bff34e2e7bdec15ee4e4ae2b79 +Subproject commit 03be0c7e1ad14d4e9767c72e26a4515024aec5ae diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk index dd4684c3..9da334cd 160000 --- a/deps/nanosplus-secure-sdk +++ b/deps/nanosplus-secure-sdk @@ -1 +1 @@ -Subproject commit dd4684c36592ddbdfc1df78e045d93376beaba96 +Subproject commit 9da334cdcde521bc54d0a50172e167a09f94eec5 diff --git a/tests_tools/Cargo.lock b/tests_tools/Cargo.lock index 3af1228b..f6c985a7 100644 --- a/tests_tools/Cargo.lock +++ b/tests_tools/Cargo.lock @@ -59,12 +59,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cslice" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697c714f50560202b1f4e2e09cd50a421881c83e9025db75d15f276616f04f40" - [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -140,11 +134,10 @@ dependencies = [ [[package]] name = "neon" -version = "0.10.0-alpha.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6891a6eb04860d1d72dfab16ab0175d3dfc92b6e06f33c2687cedbd394f055f" +checksum = "544694d02bbff81f78dba5ef7d29341cc6d256edcae4fbb2d684491d5755c748" dependencies = [ - "cslice", "neon-build", "neon-runtime", "semver", @@ -153,18 +146,18 @@ dependencies = [ [[package]] name = "neon-build" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9febc63f515156d4311a0c43899d3ace46352ecdd591c21b98ca3974f2a0d0" +checksum = "cd4ec682b1a7837c84d9866c342ac6ffe2ce9712e844e4015f31d01bdeb73608" dependencies = [ "neon-sys", ] [[package]] name = "neon-runtime" -version = "0.10.0-alpha.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4181b65d551a5ff98b180a86102249e04529d620bf98e804ab4f533318868cbc" +checksum = "5c4b1a7f8f569b4e43feff04931924cebe40a630fa258d2a28147525d247defe" dependencies = [ "cfg-if", "neon-sys", @@ -173,9 +166,9 @@ dependencies = [ [[package]] name = "neon-sys" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fd32e08c4681b0004b3dce16a9f647a8023af7b8dde3bb3ac423034803830" +checksum = "c376c75ccf632a20d2f18fd2bde0b10f36a9cc5c8c7c4921f629147ebf59aeb6" dependencies = [ "cc", "regex", diff --git a/tests_tools/neon/native/Cargo.toml b/tests_tools/neon/native/Cargo.toml index d2eef198..ef3cc947 100644 --- a/tests_tools/neon/native/Cargo.toml +++ b/tests_tools/neon/native/Cargo.toml @@ -12,8 +12,8 @@ name = "teststools" crate-type = ["cdylib"] [build-dependencies] -neon-build = "0.9.1" +neon-build = "0.10.0" [dependencies] -neon = "0.10.0-alpha.2" +neon = "0.10.0" schnorrkel = "0.10.2" diff --git a/tests_tools/neon/package.json b/tests_tools/neon/package.json index d04c00bb..34ef4480 100644 --- a/tests_tools/neon/package.json +++ b/tests_tools/neon/package.json @@ -7,7 +7,7 @@ "license": "Apache-2.0", "private": true, "dependencies": { - "neon-cli": "^0.5.1" + "neon-cli": "^0.10.0" }, "scripts": { "install": "node_modules/.bin/neon build", diff --git a/tests_tools/neon/yarn.lock b/tests_tools/neon/yarn.lock index 215d7909..5837d7ce 100644 --- a/tests_tools/neon/yarn.lock +++ b/tests_tools/neon/yarn.lock @@ -321,10 +321,10 @@ neo-async@^2.6.0: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -neon-cli@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/neon-cli/-/neon-cli-0.5.1.tgz#a8568f64878687c7c95e1aad0ff99256b3daf65f" - integrity sha512-j8y4BvCoKn+sBabMbFe4on5ZZkuJOvBRNdPnE61etWixQFWCaBJOa0ZUH9UQM1+2FfPFDQlHNb/alpzSWz+b9w== +neon-cli@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/neon-cli/-/neon-cli-0.10.0.tgz#b588fceb0d5c0a5c1b140381f38511fc3be5f431" + integrity sha512-eiyn+XDlZEauVcPZkGSW+Iw2RwidrEoPrW0LfLntOkUecLHZgfm9dOainQI074ZMi75825VV/GCSTrv4J70TpA== dependencies: chalk "^4.1.0" command-line-args "^5.1.1" diff --git a/tests_zemu/package.json b/tests_zemu/package.json index 968caac2..9a87e48a 100644 --- a/tests_zemu/package.json +++ b/tests_zemu/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@zondax/ledger-substrate": "^0.24.0", - "@zondax/zemu": "^0.27.0-rc2" + "@zondax/zemu": "^0.27.4" }, "devDependencies": { "@types/jest": "^27.0.3", diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png index 4979f3a0..9fd2633b 100644 Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png index 4979f3a0..9fd2633b 100644 Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and b/tests_zemu/snapshots/s-mainmenu/00010.png differ diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png index 3611a7e3..01b060b2 100644 Binary files a/tests_zemu/snapshots/sp-mainmenu/00004.png and b/tests_zemu/snapshots/sp-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png index 3611a7e3..01b060b2 100644 Binary files a/tests_zemu/snapshots/sp-mainmenu/00010.png and b/tests_zemu/snapshots/sp-mainmenu/00010.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png index 3611a7e3..01b060b2 100644 Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png index 3611a7e3..01b060b2 100644 Binary files a/tests_zemu/snapshots/x-mainmenu/00010.png and b/tests_zemu/snapshots/x-mainmenu/00010.png differ