Skip to content

Commit

Permalink
Merge pull request #12 from Zondax/fix_derivation
Browse files Browse the repository at this point in the history
fix derivation restrictions
  • Loading branch information
jleni authored Sep 6, 2021
2 parents 9e6be02 + 20db24b commit 770c975
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 23 deletions.
14 changes: 7 additions & 7 deletions app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,27 @@ $(info ************ FULL PARSER ENABLED ************)
endif

ifndef COIN
COIN=KSM
COIN=NODL
endif

include $(CURDIR)/Makefile.version

$(info COIN = [$(COIN)])

ifeq ($(COIN),KSM)
ifeq ($(COIN),NODL)
# Main app configuration
DEFINES += APP_STANDARD
ifeq ($(TARGET_NAME),TARGET_NANOX)
DEFINES += SUBSTRATE_PARSER_FULL
endif
APPNAME = "Nodle"
APPPATH = "44'/434'" --path "44'/354'"
APPPATH = "44'/1003'"

else ifeq ($(COIN),KSM_XL)
else ifeq ($(COIN),NODL_XL)
# XL app configuration
DEFINES += APP_STANDARD SUBSTRATE_PARSER_FULL
APPNAME = "Nodle XL"
APPPATH = "44'/434'" --path "44'/354'"
APPPATH = "44'/1003'"

else
define error_message
Expand Down Expand Up @@ -241,7 +241,7 @@ dep/%.d: %.c Makefile
.PHONY: listvariants
listvariants:
ifeq ($(TARGET_NAME),TARGET_NANOS)
@echo VARIANTS COIN KSM KSM_XL
@echo VARIANTS COIN NODL NODL_XL
else ifeq ($(TARGET_NAME),TARGET_NANOX)
@echo VARIANTS COIN KSM
@echo VARIANTS COIN NODL
endif
2 changes: 1 addition & 1 deletion app/Makefile.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ APPVERSION_M=3
# This is the `spec_version` field of `Runtime`
APPVERSION_N=53
# This is the patch version of this release
APPVERSION_P=2
APPVERSION_P=4
16 changes: 2 additions & 14 deletions node_modules/.yarn-integrity

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified tests_zemu/snapshots/s-mainmenu/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-mainmenu/00011.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/x-mainmenu/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/x-mainmenu/00011.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests_zemu/tests/standard.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const defaultOptions = {
...DEFAULT_START_OPTIONS,
logging: true,
custom: `-s "${APP_SEED}"`,
X11: true,
X11: false,
}

jest.setTimeout(60000)
Expand Down

0 comments on commit 770c975

Please sign in to comment.