From 1cddf72dfc4228991185d64ec17113ffe0fbb8e0 Mon Sep 17 00:00:00 2001 From: TamtamHero <10632523+TamtamHero@users.noreply.github.com> Date: Tue, 28 Aug 2018 11:19:41 +0200 Subject: [PATCH] Rebrand Horizen --- Makefile | 10 +++++----- blue_app_horizen.gif | Bin 0 -> 654 bytes blue_app_zencash.gif | Bin 544 -> 0 bytes include/btchip_context.h | 2 +- nanos_app_horizen.gif | Bin 0 -> 75 bytes nanos_app_zencash.gif | Bin 71 -> 0 bytes src/btchip_helpers.c | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 blue_app_horizen.gif delete mode 100644 blue_app_zencash.gif create mode 100644 nanos_app_horizen.gif delete mode 100644 nanos_app_zencash.gif diff --git a/Makefile b/Makefile index 2581a27..fe315a5 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) endif endif diff --git a/blue_app_horizen.gif b/blue_app_horizen.gif new file mode 100644 index 0000000000000000000000000000000000000000..9828e14bac7f94407599492b3a6ec6db72af4700 GIT binary patch literal 654 zcmV;90&)FENk%w1VKM+R0J8u9M^$vr(%KXzPBB1ZWN?aqiJ$NB^WWj-k(#XP>+YYX zwvLvmz{Sw{`T76<{{$C8A^8LV00000EC2ui05SkF000F4u*pf=Q3Q;~yZ_w)5Xw=V zXp<}(=)T~vB5d7*DFKtuPrci?XvX8ZH2BrMzAT1`G1lQ&!*D59xR>{2W88j zcX}W&iUAj{kca{D1;Qi`un!oD4BFE`v3}_)irw)~fju8H^>Hxc^8&(^b{A3%bjg+F*kC9U>dHPoCtMilfWPZwZ>AzT?}NFW<_h(%GsgAjsn oMG8Yy_?Uz#+%R7*J~SA_3f@&AgNQ*;a6twoCNn|_DMkPQJKh@+L;wH) literal 0 HcmV?d00001 diff --git a/blue_app_zencash.gif b/blue_app_zencash.gif deleted file mode 100644 index 1e1dcfe77bbc2f74f420e5ab399255fb66f5b1da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmV+*0^j{dNk%w1VKM+R0J9GO3X*N_)o2MvBU1$_hn8aWtT3{k6!j~JZ*2Tx0mY5p{%5sL`;NMT244|TN2|(2y-d&u;-H6<^$JpxH5g^v< zSuO+7B9U{FuS2JKAB+Lur>{yw4ssUyyH&1Yl8YP7Hc`X%!1bZ~(OL~->D5hLw`I0)YTs#1{ z23*}WzyTtz1Q$#iOO_G>v^dzdJphDL*cQsLvhWxr70rmw^n#G-q#y#qh6!hC&_$0W z4GE6^#W7+`oJ8XQxfx^5k768m%>E)i9J$S6 i$%!AlIS}dbVAbs%#KEX&3uAS13Kuk02{D3r1OPh_6X~P? 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/nanos_app_horizen.gif b/nanos_app_horizen.gif new file mode 100644 index 0000000000000000000000000000000000000000..1f4b3df521b7849d3c613a551aad3336a504adba GIT binary patch literal 75 zcmZ?wbhEHbkind == 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,