From a8877b319a389043f5b2e9b5dc953ee8f5ba6e49 Mon Sep 17 00:00:00 2001 From: Michael Ira Krufky Date: Sun, 5 Aug 2018 02:21:03 -0400 Subject: [PATCH 1/4] Add graphic assets for Ether-1 (ETHO) --- blue_app_ether1.gif | Bin 0 -> 276 bytes glyphs/blue_badge_ether1.gif | Bin 0 -> 347 bytes glyphs/nanos_badge_ether1.gif | Bin 0 -> 1132 bytes nanos_app_ether1.gif | Bin 0 -> 1125 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 blue_app_ether1.gif create mode 100644 glyphs/blue_badge_ether1.gif create mode 100644 glyphs/nanos_badge_ether1.gif create mode 100644 nanos_app_ether1.gif diff --git a/blue_app_ether1.gif b/blue_app_ether1.gif new file mode 100644 index 0000000000000000000000000000000000000000..afe559dcbdfb793c213120cc35b4052b759d6d5e GIT binary patch literal 276 zcmZ?wbh9u|G-5DfIK;}3#$cRgY&`*BWD`2G7+? z9rqmjEpo2oO`+F!HMHDIQu6%IJf5b#c?ec`7qNe z-Yq*I@`4rjnKZXw6WrD}tv)O%D1Ov0iSfl+PK$?Drx)itPOmjH$ZQlZl5G_$H%RCd z>EZ4ZZm*fd(5*R5uVR*P3xm0#@%&C^BN3+g=9QfmYZ%l^riE_cj_jMkyJS{<_FU0+ zzwOpBT!&4QeY@A&NTqCYPu;Jqep&h0HL;j8`vY!@^4yuW_jun??hCV~6kmS5XxhS_ YM`3$EJ#|-`puwLTE%jAKh=IWx0Bas~qW}N^ literal 0 HcmV?d00001 diff --git a/glyphs/blue_badge_ether1.gif b/glyphs/blue_badge_ether1.gif new file mode 100644 index 0000000000000000000000000000000000000000..5174214f342c9938ccb2b1ebf96701f5d698edfb GIT binary patch literal 347 zcmV-h0i^y%Nk%w1VKM+R0FeLy-QC^o?d{CW%=!8GA^8LV00000EC2ui05SkF00092 zoR4`C00N^6s@j`e++5;sHQhJ@6bL@tbQ+AdqF1oCpSaobphD)p=m`KoUapv+d1O5z zveHCFpO)#Rr=up973EO-!CJWBYXo{OgUADK_U7EV5vus^VVC+4kvC>8muB=;w2_yx zH_%rkB;Xfv=2hgiQ3%11xI=P?p@PF{M)Igo=Ltk22%;p$gqnHN5$Jj;6I(m`ieZaF zi8{*1!H5bv#__9w!=@@hE7h|4eB9+eyhIT>_Cr6{}d=wluJ#9R0zBjq{0eKK!x@aF0`n{N~eP?Pc()( tqJ`2!I)>^s6f$y4$$5=TN;G7`#*0S!z$C*}gQ7s394XFB7ZXVV06SD}p<)04 literal 0 HcmV?d00001 diff --git a/glyphs/nanos_badge_ether1.gif b/glyphs/nanos_badge_ether1.gif new file mode 100644 index 0000000000000000000000000000000000000000..776f6454b3f247e94570e722dd801ddd5f5f5ced GIT binary patch literal 1132 zcmZ?wbhEHbh+i z#(Mch>H3D2mX`VkM*2oZx|Z5PFSp>IEf;+ybD@E~!PCWvMA{Mftf3V2@j6VsVR^ zk&}_JqpJzfJY(!`f#^-a?G^)^ZqWxiMjsTtNYM=w0;VAl6P|d19C-3i%>$zB`;K7M%r?(Lh`uU@`*{_N?K$B!O9xPR~No!hr=-nf44>Xplv zE?zi)?(CVz2)%Hf~tIZta@Yt5&X9zHI4| z#fug$m_KjsoY}Kx&X_)J>XgZoCQj(@>+R|8>g;H5Yi((6YHX;ltF5W7s;nq4D=jH5 zDlEv)%gxEo%FIYlOHD~mN=%54i;annii`*k3k?Yl3Jmb~^Y!ue^7L?bb9Hfca&)k_ zv$e6dva~QaGc_?bGBnWF)78<|($r8_Q&mw`QdE$ala-N{l9Uh^6BQ8_5)|O)#mZm}0O8n;egFUf literal 0 HcmV?d00001 diff --git a/nanos_app_ether1.gif b/nanos_app_ether1.gif new file mode 100644 index 0000000000000000000000000000000000000000..8f8fa310bac0bf66875ff867705033cf5c9331ca GIT binary patch literal 1125 zcmZ?wbhEHb6krfwXkcLY|NlP&1B2p!?g-xi1((Eh+i z#(Mch>H3D2mX`VkM*2oZx|Z5PB_f>IEf;+ybD@E~!PCWvMA{Mftf3V2@j6VsVS1 zi=~sRi7RgNpn6lVxCN@$5vN=9fsWA!MK4lx!-Rlo2*iXZULXga{8RIQX}$=UxEcTd z`}^njub)4@fBX97^QVs=-oJbM=Jl(WFP=Yp`sDGWhY#-GyL;#Mt(!NlU%Ptc@}-Lx z&YwGb=JctPCypOGdgSn-g9rBS+q-A?uAMu!Z`-%OrteG>WPn$Yr@}!9q`ulo&y1P0%+S^)NnwuIM>g#H2s;eq1%F9Yiii-*h z^7C?Yva>QX($i8?l9Lh>;^SgtqN5@s!oxyCf`bAB{QZ1=yuCa<+}&JVoShsU?CorA ztgS39%*{+qjExKp^!0Rgw6!!f)YVi~l$8_} Date: Sun, 5 Aug 2018 02:19:44 -0400 Subject: [PATCH 2/4] Add support for Ether-1 (ETHO) --- Makefile.genericwallet | 4 ++++ src_genericwallet/chainConfig.h | 3 ++- src_genericwallet/main.c | 6 ++++++ src_genericwallet/tokens.c | 2 ++ src_genericwallet/tokens.h | 2 ++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile.genericwallet b/Makefile.genericwallet index 8d81a03..8275bad 100755 --- a/Makefile.genericwallet +++ b/Makefile.genericwallet @@ -54,6 +54,10 @@ else ifeq ($(CHAIN),ethersocial) APP_LOAD_PARAMS += --path "44'/31102'" DEFINES += CHAINID_UPCASE=\"ETHERSOCIAL\" CHAINID_COINNAME=\"ESN\" CHAIN_KIND=CHAIN_KIND_ETHERSOCIAL CHAIN_ID=31102 APPNAME = "Ethersocial" +else ifeq ($(CHAIN),ether1) +APP_LOAD_PARAMS += --path "44'/1313114'" +DEFINES += CHAINID_UPCASE=\"ETHER1\" CHAINID_COINNAME=\"ETHO\" CHAIN_KIND=CHAIN_KIND_ETHER1 CHAIN_ID=1313114 +APPNAME = "Ether-1" else ifeq ($(CHAIN),expanse) APP_LOAD_PARAMS += --path "44'/40'" DEFINES += CHAINID_UPCASE=\"EXPANSE\" CHAINID_COINNAME=\"EXP\" CHAIN_KIND=CHAIN_KIND_EXPANSE CHAIN_ID=2 diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h index 88a896d..de49fcc 100644 --- a/src_genericwallet/chainConfig.h +++ b/src_genericwallet/chainConfig.h @@ -18,7 +18,8 @@ typedef enum chain_kind_e { CHAIN_KIND_MUSICOIN, CHAIN_KIND_CALLISTO, CHAIN_KIND_ETHERSOCIAL, - CHAIN_KIND_ELLAISM + CHAIN_KIND_ELLAISM, + CHAIN_KIND_ETHER1 } chain_kind_t; typedef struct chain_config_s { diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c index 0a6ab32..90b6ef3 100644 --- a/src_genericwallet/main.c +++ b/src_genericwallet/main.c @@ -1552,6 +1552,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_ELLAISM: numTokens = NUM_TOKENS_ELLAISM; break; + case CHAIN_KIND_ETHER1: + numTokens = NUM_TOKENS_ETHER1; + break; } for (i=0; ikind) { @@ -1597,6 +1600,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_ELLAISM: currentToken = PIC(&TOKENS_ELLAISM[i]); break; + case CHAIN_KIND_ETHER1: + currentToken = PIC(&TOKENS_ETHER1[i]); + break; } if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) { return currentToken; diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c index f43429b..9c105c1 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -707,6 +707,8 @@ const tokenDefinition_t const TOKENS_ETHEREUM_CLASSIC[NUM_TOKENS_ETHEREUM_CLASSI const tokenDefinition_t const TOKENS_ETHERSOCIAL[NUM_TOKENS_ETHERSOCIAL] = {}; +const tokenDefinition_t const TOKENS_ETHER1[NUM_TOKENS_ETHER1] = {}; + const tokenDefinition_t const TOKENS_PIRL[NUM_TOKENS_PIRL] = {}; const tokenDefinition_t const TOKENS_POA[NUM_TOKENS_POA] = {}; diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h index f576378..443c4f7 100644 --- a/src_genericwallet/tokens.h +++ b/src_genericwallet/tokens.h @@ -28,6 +28,7 @@ typedef struct tokenDefinition_t { #define NUM_TOKENS_ETHEREUM 677 #define NUM_TOKENS_ETHEREUM_CLASSIC 0 #define NUM_TOKENS_ETHERSOCIAL 0 +#define NUM_TOKENS_ETHER1 0 #define NUM_TOKENS_PIRL 0 #define NUM_TOKENS_POA 0 #define NUM_TOKENS_RSK 0 @@ -43,6 +44,7 @@ extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM]; extern tokenDefinition_t const TOKENS_ETHEREUM[NUM_TOKENS_ETHEREUM]; extern tokenDefinition_t const TOKENS_ETHEREUM_CLASSIC[NUM_TOKENS_ETHEREUM_CLASSIC]; extern tokenDefinition_t const TOKENS_ETHERSOCIAL[NUM_TOKENS_ETHERSOCIAL]; +extern tokenDefinition_t const TOKENS_ETHER1[NUM_TOKENS_ETHER1]; extern tokenDefinition_t const TOKENS_PIRL[NUM_TOKENS_PIRL]; extern tokenDefinition_t const TOKENS_POA[NUM_TOKENS_POA]; extern tokenDefinition_t const TOKENS_RSK[NUM_TOKENS_RSK]; From 5757cf13741b4038a76763d254f7ff17cd0dee13 Mon Sep 17 00:00:00 2001 From: Michael Ira Krufky Date: Tue, 7 Aug 2018 08:15:38 -0400 Subject: [PATCH 3/4] Makefile.genericwallet: add akroma, pirl & ether1 to error debug & listvariants --- Makefile.genericwallet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.genericwallet b/Makefile.genericwallet index 8275bad..b2e39f8 100755 --- a/Makefile.genericwallet +++ b/Makefile.genericwallet @@ -104,7 +104,7 @@ DEFINES += CHAINID_UPCASE=\"CALLISTO\" CHAINID_COINNAME=\"CLO\" CHAIN_KIND=CHAIN APPNAME = "Callisto" else ifeq ($(filter clean,$(MAKECMDGOALS)),) -$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto, ethersocial, ellaism) +$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto, ethersocial, ellaism, pirl, akroma, ether1) endif endif @@ -196,4 +196,4 @@ include $(BOLOS_SDK)/Makefile.rules dep/%.d: %.c Makefile.genericwallet listvariants: - @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk ubiq wanchain kusd #musicoin callisto ethersocial ellaism + @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk ubiq wanchain kusd #musicoin callisto ethersocial ellaism pirl akroma ether1 From 5a6174398e36985d9a138ea3dd6b68d773ad3468 Mon Sep 17 00:00:00 2001 From: Michael Ira Krufky Date: Tue, 7 Aug 2018 08:46:14 -0400 Subject: [PATCH 4/4] Include ether1.png for Ether-1 (ETHO) --- ether1.png | Bin 0 -> 1948 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ether1.png diff --git a/ether1.png b/ether1.png new file mode 100644 index 0000000000000000000000000000000000000000..82edd7fcf73943f8ef798de1bf25e1c6b75cbf8f GIT binary patch literal 1948 zcmV;N2V?k&P)7O?EY zKK|zSFdsThhLAwO`E>3%dk&fu zsswOLU#c3tUXdR9xJVZlLWZf5(poX2HTz$Uj+v`Oa*0hi5b~TVxv~;2MchVy{U)LR zW0Gjt!bgLWGW+FV2}~^osc1AaZRb}7Yt_W!s_ava}5I_+hJ~}M=sxH z8H=KOY31tZoby0P1?drGZPrC#zsL8qim!y+*_qr##64`6cdOHT&9urCdZalJQZVM| zS!6V@TSsM|&S9>co{zDKcZ9g4N&r7AIPXsm(&ZZ=&P=YVpyp3$74I{`J`u7&R;prD z+x(r$2*We!@`;dvBRz79YRdzej4=JpK_Fz+@R>~RrHI>V5A8_`Xgbm=-eiQmAjHn( zUWntb+r%7YVv`GT{59`0d}cy2QuUyI|4Wsu3q5pNRj<_?z)%2Jsgm^v_4}WX()GpT z)XCBd8XIv$O8`kxDHFg{X)kJG=fu3tP_%LEgNMrAmh-q$RwkT-9t@SrIfdbxU*kvw);1p>HL9@xT{O+6E|k*D?DPI)+^$+u?f zO{<`BDdO*r-*=QJ4d=c{)-o_WH>HbYfH3P9#RvQL{%^yHE`7CZ{T4Yt&b~YX|T4VYWR%uRl|9z zf)Eyk8&^g+Rr21fg;Q<*-dY{rWO55&7C}FAi3|EU z(^2cDtT^36@=pY2Q>tsGqXuxd5skoX%2>2<+(!X7(zCQmCL?Ua$4qVk+(ck__Z(MR zg;RPYFPM!0yfFOWHIcJ7(6JiB>v|DNDI_B1c%v3)M%d>}?k1#4)|PR|jN=8^(#2S+ zUO8A2^2GEa>cWV?>2;mywLAfDeOXiReO5?65%Dsw#reMVQJ0bSm|e;MMjfA!)G7`+2+>Lg?=N<6xVEV{AT)%C3hDgMAK;6`My^ zq&NkiyRUr&OzlT~yDEl*V5fs2W9tkd#8}u%4zqVmHxfeVK|lO3U_V&b58x(*cKu$k z+uqP~J>@fRg&OMD}PY>Ax+NtIj# zQmP??Y?+IVl4Z%)2;mv)+w2*I=UPg&lG2I0!6h#2+IGv3QJN6L`#KN7V}8&FJ!D$C zq)|$;91_-qE}MoYOlwS`J1Do#2ku0OMNAhZ?pN{wSHy4^A}S@sAf^s|SA^?N5WCEv zD}Cv@sQcXsagfs@IXn9R1kIpZb*9j_^w>)a?%oK=k+u`)-l