Updated to official nanos SDK for firmware 2.0.0

* Updated to SDK version 2.0.0-1 * Updated to compatible speculos
jspada · May 19, 2021 · 20d53ee · 20d53ee
1 parent 6cf060d
commit 20d53ee
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -82,8 +82,8 @@ else
 EMULATOR=0
 endif
 
-ifneq ("$(EMULATOR_SDK)","")
-EMULATOR_SDK_ARG=-k $(EMULATOR_SDK)
+ifeq ("$(EMULATOR_SDK)","")
+EMULATOR_SDK=2.0
 endif
 
 ifeq ("$(NO_EMULATOR_TESTS)","")
@@ -182,9 +182,7 @@ $(info RELEASE_BUILD        $(RELEASE_BUILD))
 $(info TARGET_NAME          $(TARGET_NAME))
 $(info EMULATOR             $(EMULATOR))
 $(info EMULATOR_MODEL       $(EMULATOR_MODEL))
-ifneq ("$(EMULATOR_SDK)","")
 $(info EMULATOR_SDK         $(EMULATOR_SDK))
-endif
 $(info EMULATOR_TESTS       $(EMULATOR_TESTS))
 $(info AUTOMATION           $(AUTOMATION))
 $(info ON_DEVICE_UNIT_TESTS $(ON_DEVICE_UNIT_TESTS))
@@ -395,7 +393,7 @@ endif
 run: all dev-env/speculos/build/src/launcher
 	@if [ $(EMULATOR) -eq 1 ]; then \
 	    echo "Running $(EMULATOR_MODEL) emulator" ; \
-	    ./dev-env/speculos/speculos.py $(EMULATOR_SDK_ARG) -m $(EMULATOR_MODEL) --ontop $(EMULATOR_AUTOMATION) \
+	    ./dev-env/speculos/speculos.py -k $(EMULATOR_SDK) -m $(EMULATOR_MODEL) --ontop $(EMULATOR_AUTOMATION) \
 	                       -s "$(TEST_MNEMONIC)" \
 	                       ./bin/app.elf > emulator.log 2>&1 & \
 	    echo $$! > emulator.pid || exit 211; \

diff --git a/dev-env/speculos b/dev-env/speculos
diff --git a/prepare-devenv.sh b/prepare-devenv.sh
@@ -54,7 +54,7 @@ if [ ! -d dev-env/SDK ] ; then
     rm blue-secure-sdk.tar.gz
     mv blue-secure-sdk* dev-env/SDK/blue-secure-sdk
 
-    wget https://github.com/LedgerHQ/nanos-secure-sdk/archive/nanos-160.tar.gz -O nanos-secure-sdk.tar.gz
+    wget https://github.com/LedgerHQ/nanos-secure-sdk/archive/refs/tags/2.0.0-1.tar.gz -O nanos-secure-sdk.tar.gz
     tar xf nanos-secure-sdk.tar.gz
     rm nanos-secure-sdk.tar.gz
     mv nanos-secure-sdk* dev-env/SDK/nanos-secure-sdk

diff --git a/tests/Makefile b/tests/Makefile
@@ -3,8 +3,8 @@ EMULATOR=1
 else
 EMULATOR=0
 endif
-ifneq ("$(EMULATOR_SDK)","")
-EMULATOR_SDK_ARG=-k $(EMULATOR_SDK)
+ifeq ("$(EMULATOR_SDK)","")
+EMULATOR_SDK=2.0
 endif
 ifeq ("$(NO_EMULATOR_TESTS)","")
 EMULATOR_TESTS=1
@@ -76,7 +76,7 @@ endif
 
 define EMULATOR_TESTS_SCRIPT
 echo "Starting $(EMULATOR_MODEL) emulator"
-../dev-env/speculos/speculos.py $(EMULATOR_SDK_ARG) -m $(EMULATOR_MODEL) \
+../dev-env/speculos/speculos.py -k $(EMULATOR_SDK) -m $(EMULATOR_MODEL) \
                        $(EMULATOR_DISPLAY) $(EMULATOR_AUTOMATION) \
                        -s "$(TEST_MNEMONIC)" \
                        ../bin/app.elf > emulator_tests.log 2>&1 &