diff --git a/Makefile b/Makefile index 2581a27..270f70d 100755 --- a/Makefile +++ b/Makefile @@ -80,10 +80,10 @@ else ifeq ($(COIN),zcash) DEFINES += COIN_P2PKH_VERSION=7352 COIN_P2SH_VERSION=7357 COIN_FAMILY=1 COIN_COINID=\"Zcash\" COIN_COINID_HEADER=\"ZCASH\" COIN_COLOR_HDR=0x3790CA COIN_COLOR_DB=0x9BC8E5 COIN_COINID_NAME=\"Zcash\" COIN_COINID_SHORT=\"ZEC\" COIN_KIND=COIN_KIND_ZCASH APPNAME ="Zcash" APP_LOAD_PARAMS += --path $(APP_PATH) -else ifeq ($(COIN),zencash) -# ZenCash -DEFINES += COIN_P2PKH_VERSION=8329 COIN_P2SH_VERSION=8342 COIN_FAMILY=4 COIN_COINID=\"Zencash\" COIN_COINID_HEADER=\"ZENCASH\" COIN_COLOR_HDR=0xFF4300 COIN_COLOR_DB=0xFF8356 COIN_COINID_NAME=\"Zencash\" COINID=$(COIN) COIN_COINID_SHORT=\"ZEN\" COIN_KIND=COIN_KIND_ZENCASH -APPNAME ="ZenCash" +else ifeq ($(COIN),horizen) +# Horizen +DEFINES += COIN_P2PKH_VERSION=8329 COIN_P2SH_VERSION=8342 COIN_FAMILY=4 COIN_COINID=\"Horizen\" COIN_COINID_HEADER=\"HORIZEN\" COIN_COLOR_HDR=0xFF4300 COIN_COLOR_DB=0xFF8356 COIN_COINID_NAME=\"Horizen\" COINID=$(COIN) COIN_COINID_SHORT=\"ZEN\" COIN_KIND=COIN_KIND_HORIZEN +APPNAME ="Horizen" APP_LOAD_PARAMS += --path $(APP_PATH) else ifeq ($(COIN),komodo) # Komodo @@ -149,7 +149,7 @@ APPNAME ="Bitcoin Private" APP_LOAD_PARAMS += --path $(APP_PATH) else ifeq ($(filter clean,$(MAKECMDGOALS)),) -$(error Unsupported COIN - use bitcoin_testnet, bitcoin, bitcoin_cash, bitcoin_gold, litecoin, dogecoin, dash, zcash, zencash, komodo, stratis, peercoin, posw, pivx, viacoin, vertcoin, stealth, digibyte, qtum, hcash, bitcoin_private) +$(error Unsupported COIN - use bitcoin_testnet, bitcoin, bitcoin_cash, bitcoin_gold, litecoin, dogecoin, dash, zcash, horizen, komodo, stratis, peercoin, posw, pivx, viacoin, vertcoin, stealth, digibyte, qtum, hcash, bitcoin_private, zcoin) endif endif @@ -236,3 +236,5 @@ include $(BOLOS_SDK)/Makefile.rules #add dependency on custom makefile filename dep/%.d: %.c Makefile +listvariants: + @echo VARIANTS COIN bitcoin_testnet bitcoin bitcoin_cash bitcoin_gold litecoin dogecoin dash zcash horizen komodo stratis peercoin posw pivx viacoin vertcoin stealth digibyte qtum hcash bitcoin_private zcoin \ No newline at end of file diff --git a/bitcoin.png b/bitcoin.png new file mode 100755 index 0000000..32778bc Binary files /dev/null and b/bitcoin.png differ diff --git a/bitcoin_cash.png b/bitcoin_cash.png new file mode 100755 index 0000000..c26f03e Binary files /dev/null and b/bitcoin_cash.png differ diff --git a/bitcoin_gold.png b/bitcoin_gold.png new file mode 100755 index 0000000..6f1d0fd Binary files /dev/null and b/bitcoin_gold.png differ diff --git a/bitcoin_private.png b/bitcoin_private.png new file mode 100755 index 0000000..e132ee6 Binary files /dev/null and b/bitcoin_private.png differ diff --git a/bitcoin_testnet.png b/bitcoin_testnet.png new file mode 100755 index 0000000..32778bc Binary files /dev/null and b/bitcoin_testnet.png differ diff --git a/blue_app_horizen.gif b/blue_app_horizen.gif new file mode 100644 index 0000000..9828e14 Binary files /dev/null and b/blue_app_horizen.gif differ diff --git a/blue_app_zencash.gif b/blue_app_zencash.gif deleted file mode 100644 index 1e1dcfe..0000000 Binary files a/blue_app_zencash.gif and /dev/null differ diff --git a/dash.png b/dash.png new file mode 100755 index 0000000..779385d Binary files /dev/null and b/dash.png differ diff --git a/digibyte.png b/digibyte.png new file mode 100755 index 0000000..0efa85d Binary files /dev/null and b/digibyte.png differ diff --git a/dogecoin.png b/dogecoin.png new file mode 100755 index 0000000..8c26b2d Binary files /dev/null and b/dogecoin.png differ diff --git a/hcash.png b/hcash.png new file mode 100755 index 0000000..4dd3e10 Binary files /dev/null and b/hcash.png differ diff --git a/horizen.png b/horizen.png new file mode 100644 index 0000000..4416484 Binary files /dev/null and b/horizen.png differ diff --git a/include/btchip_context.h b/include/btchip_context.h index 9338b6e..b8df5ad 100644 --- a/include/btchip_context.h +++ b/include/btchip_context.h @@ -266,7 +266,7 @@ typedef enum btchip_coin_kind_e { COIN_KIND_QTUM, COIN_KIND_HCASH, COIN_KIND_BITCOIN_PRIVATE, - COIN_KIND_ZENCASH, + COIN_KIND_HORIZEN, COIN_KIND_ZCOIN } btchip_coin_kind_t; diff --git a/komodo.png b/komodo.png new file mode 100755 index 0000000..c6e4f20 Binary files /dev/null and b/komodo.png differ diff --git a/litecoin.png b/litecoin.png new file mode 100755 index 0000000..c1ffffb Binary files /dev/null and b/litecoin.png differ diff --git a/nanos_app_horizen.gif b/nanos_app_horizen.gif new file mode 100644 index 0000000..c8e2bd0 Binary files /dev/null and b/nanos_app_horizen.gif differ diff --git a/nanos_app_zencash.gif b/nanos_app_zencash.gif deleted file mode 100644 index aecd4e0..0000000 Binary files a/nanos_app_zencash.gif and /dev/null differ diff --git a/peercoin.png b/peercoin.png new file mode 100755 index 0000000..55d3c46 Binary files /dev/null and b/peercoin.png differ diff --git a/pivx.png b/pivx.png new file mode 100755 index 0000000..87ad725 Binary files /dev/null and b/pivx.png differ diff --git a/posw.png b/posw.png new file mode 100755 index 0000000..9e11d7a Binary files /dev/null and b/posw.png differ diff --git a/qtum.png b/qtum.png new file mode 100755 index 0000000..0f154f9 Binary files /dev/null and b/qtum.png differ diff --git a/src/btchip_helpers.c b/src/btchip_helpers.c index 3573047..1d50cb9 100644 --- a/src/btchip_helpers.c +++ b/src/btchip_helpers.c @@ -67,7 +67,7 @@ unsigned char btchip_output_script_is_regular(unsigned char *buffer) { return 1; } } - if (G_coin_config->kind == COIN_KIND_ZENCASH) { + if (G_coin_config->kind == COIN_KIND_HORIZEN) { if ((os_memcmp(buffer, ZEN_OUTPUT_SCRIPT_PRE, sizeof(ZEN_OUTPUT_SCRIPT_PRE)) == 0) && (os_memcmp(buffer + sizeof(ZEN_OUTPUT_SCRIPT_PRE) + 20, @@ -88,7 +88,7 @@ unsigned char btchip_output_script_is_regular(unsigned char *buffer) { } unsigned char btchip_output_script_is_p2sh(unsigned char *buffer) { - if (G_coin_config->kind == COIN_KIND_ZENCASH) { + if (G_coin_config->kind == COIN_KIND_HORIZEN) { if ((os_memcmp(buffer, ZEN_TRANSACTION_OUTPUT_SCRIPT_P2SH_PRE, sizeof(ZEN_TRANSACTION_OUTPUT_SCRIPT_P2SH_PRE)) == 0) && (os_memcmp(buffer + sizeof(ZEN_TRANSACTION_OUTPUT_SCRIPT_P2SH_PRE) + 20, diff --git a/stealth.png b/stealth.png new file mode 100755 index 0000000..6cac62b Binary files /dev/null and b/stealth.png differ diff --git a/stratis.png b/stratis.png new file mode 100755 index 0000000..53afb78 Binary files /dev/null and b/stratis.png differ diff --git a/vertcoin.png b/vertcoin.png new file mode 100755 index 0000000..8ed0793 Binary files /dev/null and b/vertcoin.png differ diff --git a/viacoin.png b/viacoin.png new file mode 100755 index 0000000..caae567 Binary files /dev/null and b/viacoin.png differ diff --git a/zcash.png b/zcash.png new file mode 100755 index 0000000..015ec40 Binary files /dev/null and b/zcash.png differ diff --git a/zcoin.png b/zcoin.png new file mode 100644 index 0000000..ed21b50 Binary files /dev/null and b/zcoin.png differ