added shimmer variant

iotaledger · Oct 25, 2022 · 34064a5 · 34064a5
1 parent a6b2bff
commit 34064a5
Show file tree

Hide file tree

Showing 31 changed files with 58,283 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -21,22 +21,15 @@ endif
 
 include $(BOLOS_SDK)/Makefile.defines
 
-APPNAME      = "IOTA"
-APPVERSION_M = 0
-APPVERSION_N = 8
-APPVERSION_P = 0
-APPVERSION   = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
-
-APP_LOAD_PARAMS = --path "44'/1'" --curve ed25519 --appFlags 0x240 $(COMMON_LOAD_PARAMS)
-
-DEFINES += APP_IOTA
-# IOTA BIP-path
-APP_LOAD_PARAMS += --path "44'/4218'"
+ifeq ($(CHAIN),)
+CHAIN=iota
+endif
 
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-    ICONNAME=icons/nanos_app_iota.gif
+# Check if chain is available
+ifeq ($(shell test -s ./makefile_conf/chain/$(CHAIN).mk && echo -n yes), yes)
+include ./makefile_conf/chain/$(CHAIN).mk
 else
-    ICONNAME=icons/nanox_app_iota.gif
+$(error Unsupported CHAIN - use $(SUPPORTED_CHAINS))
 endif
 
 all: default
@@ -145,4 +138,4 @@ include $(BOLOS_SDK)/Makefile.rules
 dep/%.d: %.c Makefile
 
 listvariants:
-	@echo VARIANTS COIN iota
+	@echo VARIANTS COIN iota shimmer
diff --git a/docs/images/address.png b/docs/images/address.png
diff --git a/docs/images/blindsigning_1.png b/docs/images/blindsigning_1.png
diff --git a/docs/images/blindsigning_ne.png b/docs/images/blindsigning_ne.png
diff --git a/docs/images/claim_smr_1.png b/docs/images/claim_smr_1.png
diff --git a/docs/images/claim_smr_2.png b/docs/images/claim_smr_2.png
diff --git a/docs/images/internal_transfer_1.png b/docs/images/internal_transfer_1.png
diff --git a/docs/images/internal_transfer_2.png b/docs/images/internal_transfer_2.png
diff --git a/icons/nanos_app_shimmer.gif b/icons/nanos_app_shimmer.gif
diff --git a/icons/nanox_app_shimmer.gif b/icons/nanox_app_shimmer.gif
diff --git a/makefile_conf/chain/iota.mk b/makefile_conf/chain/iota.mk
@@ -0,0 +1,18 @@
+APPNAME      = "IOTA"
+APPVERSION_M = 0
+APPVERSION_N = 8
+APPVERSION_P = 0
+APPVERSION   = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
+
+APP_LOAD_PARAMS = --path "44'/1'" --curve ed25519 --appFlags 0x240 $(COMMON_LOAD_PARAMS)
+
+DEFINES += APP_IOTA
+# IOTA BIP-path
+APP_LOAD_PARAMS += --path "44'/4218'"
+
+ifeq ($(TARGET_NAME),TARGET_NANOS)
+    ICONNAME=icons/nanos_app_iota.gif
+else
+    ICONNAME=icons/nanox_app_iota.gif
+endif
+
diff --git a/makefile_conf/chain/shimmer.mk b/makefile_conf/chain/shimmer.mk
@@ -0,0 +1,20 @@
+APPNAME      = "Shimmer"
+APPVERSION_M = 0
+APPVERSION_N = 8
+APPVERSION_P = 2
+APPVERSION   = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
+
+APP_LOAD_PARAMS = --path "44'/1'" --curve ed25519 --appFlags 0x240 $(COMMON_LOAD_PARAMS)
+
+DEFINES += APP_SHIMMER
+# IOTA BIP-path for claiming Shimmer from IOTA addresses
+APP_LOAD_PARAMS += --path "44'/4218'"
+# Shimmer BIP-path
+APP_LOAD_PARAMS += --path "44'/4219'"
+
+ifeq ($(TARGET_NAME),TARGET_NANOS)
+    ICONNAME=icons/nanos_app_shimmer.gif
+else
+    ICONNAME=icons/nanox_app_shimmer.gif
+endif
+
diff --git a/src/main.c b/src/main.c
@@ -110,7 +110,7 @@ static void IOTA_main()
                     break;
                 default:
                     // reset states and UI
-                    api_initialize(APP_MODE_IOTA_CHRYSALIS, 0);
+                    api_initialize(APP_MODE_INIT, 0);
                     ui_reset();
                 }
 

diff --git a/tests/reference_nanos.bin → tests/chain/iota/reference_nanos.bin b/tests/reference_nanos.bin → tests/chain/iota/reference_nanos.bin
diff --git a/tests/reference_nanos.hex → tests/chain/iota/reference_nanos.hex b/tests/reference_nanos.hex → tests/chain/iota/reference_nanos.hex
diff --git a/tests/reference_nanos.json → tests/chain/iota/reference_nanos.json b/tests/reference_nanos.json → tests/chain/iota/reference_nanos.json
diff --git a/tests/reference_nanosplus.bin → tests/chain/iota/reference_nanosplus.bin b/tests/reference_nanosplus.bin → tests/chain/iota/reference_nanosplus.bin
diff --git a/tests/reference_nanosplus.hex → tests/chain/iota/reference_nanosplus.hex b/tests/reference_nanosplus.hex → tests/chain/iota/reference_nanosplus.hex
diff --git a/tests/reference_nanosplus.json → tests/chain/iota/reference_nanosplus.json b/tests/reference_nanosplus.json → tests/chain/iota/reference_nanosplus.json
diff --git a/tests/reference_nanox.bin → tests/chain/iota/reference_nanox.bin b/tests/reference_nanox.bin → tests/chain/iota/reference_nanox.bin
diff --git a/tests/reference_nanox.hex → tests/chain/iota/reference_nanox.hex b/tests/reference_nanox.hex → tests/chain/iota/reference_nanox.hex
diff --git a/tests/reference_nanox.json → tests/chain/iota/reference_nanox.json b/tests/reference_nanox.json → tests/chain/iota/reference_nanox.json
diff --git a/tests/chain/shimmer/reference_nanos.bin b/tests/chain/shimmer/reference_nanos.bin
diff --git a/tests/chain/shimmer/reference_nanos.hex b/tests/chain/shimmer/reference_nanos.hex
diff --git a/tests/chain/shimmer/reference_nanos.json b/tests/chain/shimmer/reference_nanos.json
diff --git a/tests/chain/shimmer/reference_nanosplus.bin b/tests/chain/shimmer/reference_nanosplus.bin
diff --git a/tests/chain/shimmer/reference_nanosplus.hex b/tests/chain/shimmer/reference_nanosplus.hex
diff --git a/tests/chain/shimmer/reference_nanosplus.json b/tests/chain/shimmer/reference_nanosplus.json
diff --git a/tests/chain/shimmer/reference_nanox.bin b/tests/chain/shimmer/reference_nanox.bin
diff --git a/tests/chain/shimmer/reference_nanox.hex b/tests/chain/shimmer/reference_nanox.hex
diff --git a/tests/chain/shimmer/reference_nanox.json b/tests/chain/shimmer/reference_nanox.json