From 79348a2d9156efb975469a89c80006d7ed9ef77b Mon Sep 17 00:00:00 2001 From: hackyminer Date: Mon, 30 Jul 2018 09:43:11 +0900 Subject: [PATCH 1/2] ESN(Ethersocial Network) support added --- Makefile.genericwallet | 6 +++++- blue_app_ethersocial.gif | Bin 0 -> 1493 bytes glyphs/blue_badge_ethersocial.gif | Bin 0 -> 1593 bytes glyphs/nanos_badge_ethersocial.gif | Bin 0 -> 856 bytes nanos_app_ethersocial.gif | Bin 0 -> 852 bytes src_genericwallet/chainConfig.h | 3 ++- src_genericwallet/main.c | 6 ++++++ src_genericwallet/tokens.c | 2 ++ src_genericwallet/tokens.h | 2 ++ 9 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 blue_app_ethersocial.gif create mode 100644 glyphs/blue_badge_ethersocial.gif create mode 100644 glyphs/nanos_badge_ethersocial.gif create mode 100644 nanos_app_ethersocial.gif diff --git a/Makefile.genericwallet b/Makefile.genericwallet index 37a4979..291128c 100755 --- a/Makefile.genericwallet +++ b/Makefile.genericwallet @@ -46,6 +46,10 @@ else ifeq ($(CHAIN),ethereum_classic) APP_LOAD_PARAMS += --path "44'/61'" DEFINES += CHAINID_UPCASE=\"ETC\" CHAINID_COINNAME=\"ETC\" CHAIN_KIND=CHAIN_KIND_ETHEREUM_CLASSIC CHAIN_ID=61 APPNAME = "ETC" +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),expanse) APP_LOAD_PARAMS += --path "44'/40'" DEFINES += CHAINID_UPCASE=\"EXPANSE\" CHAINID_COINNAME=\"EXP\" CHAIN_KIND=CHAIN_KIND_EXPANSE CHAIN_ID=2 @@ -92,7 +96,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) +$(error Unsupported CHAIN - use ethereum, ethereum_classic, ethersocial, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd) endif endif diff --git a/blue_app_ethersocial.gif b/blue_app_ethersocial.gif new file mode 100644 index 0000000000000000000000000000000000000000..c16bbe0e4e6d748ba36d3554088eec5057c436c0 GIT binary patch literal 1493 zcmeIx{WF^f00;0#NhC38QnYcxqT|j^w3$Y$)3b+!7Ik98#ndf^YtQu;J>BVD*9#(< zpJ&P zJz{z@Vp5Kp=EqE{FU$*KlS*PgE@w${XpEQ2QZ%!FLV(=QBMlr zozYD!_1K(gi$D{T?r=lrIzRE;RW1AUrZ>b#tzMdjgUiapT9dyE%Mkc>X0&0!JE28O zPni$z71{@;RJaq^zA%!By?{ylwvW=Usrvp2s_u-sp%7CQ9LWlqiZ75VxuCZ~*ce*v z6%zN&RevSH>%Ir*r}1T!TacEc=J zmdZQx3#GZEhfi}m^%WHvUr~B8xFzR&$@8|-CL|6a>}?F?`fdk~WgR?pm3!ilxKq|E zjnd~xy}W~S<7NW#4}MUre7}7?oJ$f_s^zzW3f^!4Tpp$JrmJ>b!Uh$Lac`o6gkUF8 zwTxpicX<-lWCurrA;FA5cCB6rmRICLOgGC#xwJG}u*~v1D-Yvfc!i4`pCFL#hVNWi zW*ztE0vZ~YdY)c~t%T^ck<=`%=Q$LghDeEp{7?GGSz<5z=W$X@Cc9r&m%S?xvv3NY z2a-(EGTgjtC~O=7q{yx_h3b!s!?gk~&y5V`q3H!+zVFwm>|8|VfPV+gFS<-}uQsl= zsauZ7i_d?MP!dr5DB05J={`N7y+yt|qGq_uqP9G+jA5!W6(JVq=4VE?jvv3Ey1~JB zX5-y+!iVU}G%pxh!7}ZPK5SP6|9ugj&{KAz7OkaWzswW|)+c6{{0M|!U8kcqnsHpw zXZt1T8E7p?Lx;3LvZ2d))FuSVm!nPhuNvG;OS?S?r89F)P+E@n=A!&8Gpb%n;HxNc z3Abxh3`8Z_KuaplT$l=NXrE6GoTO&N1r=XvO1d`Nr;I~KP~WBaFiX-C&mla3n12E3 C=m~lN literal 0 HcmV?d00001 diff --git a/glyphs/blue_badge_ethersocial.gif b/glyphs/blue_badge_ethersocial.gif new file mode 100644 index 0000000000000000000000000000000000000000..5f4f242d9559ed836404e9b47efeb626dd8d2e7c GIT binary patch literal 1593 zcmeH`>rYd606>4YkK0>P%580F(SilGwl11n+(ZPnv{*_3HLW6afTI{j98OXlS;{8M zt#lc6>VWBr&@H+-<|bh!VggQ<7L`CoSW_s^0v9Myo-MByJ}hkh75n1(3rFn?C9~c;Lxm<&TgF{0@!^6WPBO{}uqhn)ZZnt}Ue0*YJVsdhl zAc(1{sp;wInVA`n$1^)SJ2y8sKR@sFdKVTJ78e(nmX?;6mseI+R##VjKA+$3Ut3#S zUtizY*x20M+}hd-1OmZeaC>`uXJ-ez=5>MpyTHL$0 z0{##FJ+0JWq%cDm65*BA%qOIOue>6W{=;d7QkDuu%Gtq@|qFHNB{>v#oe zi3h~$57=0h9YQq(Acd+38?CuUXNTH5_%%6Jby+8EZxJpdQ!(!tplPb3Ld3WYKvAmO ztW?p}pdD`v{Y7dfl_S^8{F7xQI7}&aASjVNSAt~W5Hi_PUemy93b)rw>KqV-wynTP zs1gSy9Dlo7VfkKbxEl*hDfGyE{}7q}1_seW4`x8wSeKr-VP?|oR1SYPM?&XTWf-VD zEW!3;1zW!VivCG`9uzLI;!O(}10Cx`yQbnFCr|;*6?V z_>vBPOjUv@5Ng!D3HRN)0NQ#?dA{G+Cc>*@6!D@djH`aA=8v~<8Nz)KB5f;ZUocSQ ziEST}QI1sh>(E)0)WL`q&B#T1TLZ)u5P%X|WNx-_OuS3Qf|_dkPuv8dos#@n^?42U zXtSj@MlOWl2$jy>_x3*@6P-sZR4H_$)AhLcOv9b<<00Y;TYm+9aG~{iVXbFf@DXmn znOiV!brmNa$;wtXR=87>sHuBKj4wUT@pG9`v)`VI>1lONUaWk1R4H^-#7|Z6z6i+Z MtXpg~1c9V~0na|21poj5 literal 0 HcmV?d00001 diff --git a/glyphs/nanos_badge_ethersocial.gif b/glyphs/nanos_badge_ethersocial.gif new file mode 100644 index 0000000000000000000000000000000000000000..21262eba8080c1001efe79e9ca6734fbb14ab7ff GIT binary patch literal 856 zcmZ?wbhEHbLTo)0vr>7_0$49vaU8 literal 0 HcmV?d00001 diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h index f14a1bb..7fd3061 100644 --- a/src_genericwallet/chainConfig.h +++ b/src_genericwallet/chainConfig.h @@ -16,7 +16,8 @@ typedef enum chain_kind_e { CHAIN_KIND_PIRL, CHAIN_KIND_AKROMA, CHAIN_KIND_MUSICOIN, - CHAIN_KIND_CALLISTO + CHAIN_KIND_CALLISTO, + CHAIN_KIND_ETHERSOCIAL } chain_kind_t; typedef struct chain_config_s { diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c index 45eaefd..6198d13 100644 --- a/src_genericwallet/main.c +++ b/src_genericwallet/main.c @@ -1269,6 +1269,9 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer, uint16_t dataLength case CHAIN_KIND_ETHEREUM_CLASSIC: numTokens = NUM_TOKENS_ETHEREUM_CLASSIC; break; + case CHAIN_KIND_ETHERSOCIAL: + numTokens = NUM_TOKENS_ETHERSOCIAL; + break; case CHAIN_KIND_PIRL: numTokens = NUM_TOKENS_PIRL; break; @@ -1309,6 +1312,9 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer, uint16_t dataLength case CHAIN_KIND_ETHEREUM_CLASSIC: currentToken = PIC(&TOKENS_ETHEREUM_CLASSIC[i]); break; + case CHAIN_KIND_ETHERSOCIAL: + currentToken = PIC(&TOKENS_ETHERSOCIAL[i]); + break; case CHAIN_KIND_PIRL: currentToken = PIC(&TOKENS_PIRL[i]); break; diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c index 163b9df..41bd7ef 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -701,6 +701,8 @@ const tokenDefinition_t const TOKENS_ETHEREUM[NUM_TOKENS_ETHEREUM] = { const tokenDefinition_t const TOKENS_ETHEREUM_CLASSIC[NUM_TOKENS_ETHEREUM_CLASSIC] = {}; +const tokenDefinition_t const TOKENS_ETHERSOCIAL[NUM_TOKENS_ETHERSOCIAL] = {}; + 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 ac26422..c45a6bf 100644 --- a/src_genericwallet/tokens.h +++ b/src_genericwallet/tokens.h @@ -26,6 +26,7 @@ typedef struct tokenDefinition_t { #define NUM_TOKENS_AKROMA 0 #define NUM_TOKENS_ETHEREUM 677 #define NUM_TOKENS_ETHEREUM_CLASSIC 0 +#define NUM_TOKENS_ETHERSOCIAL 0 #define NUM_TOKENS_PIRL 0 #define NUM_TOKENS_POA 0 #define NUM_TOKENS_RSK 0 @@ -39,6 +40,7 @@ typedef struct tokenDefinition_t { extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA]; 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_PIRL[NUM_TOKENS_PIRL]; extern tokenDefinition_t const TOKENS_POA[NUM_TOKENS_POA]; extern tokenDefinition_t const TOKENS_RSK[NUM_TOKENS_RSK]; From 4d0f9faac0f63b418eb32c6dfe0ed15d70e6184b Mon Sep 17 00:00:00 2001 From: Rain Date: Tue, 31 Jul 2018 20:26:08 +0900 Subject: [PATCH 2/2] update ESN images --- blue_app_ethersocial.gif | Bin 1493 -> 1366 bytes glyphs/blue_badge_ethersocial.gif | Bin 1593 -> 1520 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/blue_app_ethersocial.gif b/blue_app_ethersocial.gif index c16bbe0e4e6d748ba36d3554088eec5057c436c0..b852e8eb720107734a426ad9df7b7fd866a26b5f 100644 GIT binary patch delta 936 zcmV;Z16Taj3)TvMM@dFFIbkvYG644g00000f^)NibhCqXw1joEgm$!rcD09iwupJQ zhfYMx-`wor-0b1q?cv_-;@|G%;O^(-@aN?5 z=;iU~=JDy~^6TjH?CJCE>h$jG_3rHT@b32W@%Z-j`u+U=vmpV$0e>O+1OWg5{{Soi z0000o05Sjo2>$^82^>gJV2=?I3Itflu%SbS1tN^-QLv&#f)gHU+^BKF#gG3Wa2!c; zAq0>FWt3b=QU*#8EMsyE@e!uXn-6JLREe`^Lze}83T0SOOBO%h+2Jb3tE2^bPL z6_%ucBESSFTRM#Fpd|{0sSG=)(NYG60ERW9=y2;01{olnpLU3HLP5hBRXz|I)8Zk5 zB2gfZewc*C!VFZbXn5Gg>C)K_U1*WOaD|v63>rpJ{M5pk8h-;ioAGhr?G7{07cPek z!HJiy4HXRkA@hP^cP}CWY=<1c0~aX17hafxMe9QMPZCdM&|sl}8D{)YT|+34WmW+H zp~2j5Y0R~d0z#1I5L{;5Kvw_?EHG6ESS;~H2@F*rMHUM#)E5{avNs!Jjxl6H7)l%% zS!0iF7~4Xg1%HviLImJo1`ZFwa0Ui8Hgo_GWW;b;01i+=!$a#WH9;2-QGl2S3!%US zlqDVoMG*)*G=djRsBi@g4IxlMluH?aq-72fK*JK{G31#RYIM1jmHKhi!4@s1P$Nl# z#e|n$d@=C_U@}FN)>>`76_I{^1`O_!>IDZsPn|B^2Mt2#;o(l zuJg^H^vSUE$guRvvh>Te^vt#N%(nE+xAo4r^v}BW(7N@1(Y*E2zV+I@_S3-i)WP=E z!uHn0_SePt*T(kP#`f9B_Swnz+RFFb&G+5T_utX@;>-Bp()i-l_~F#~p``s?EQ>*D+D!c{P*$u z^zi)l^8EK5^!)hs{Q36%`uP3&`2PF){rvm={QUg<{Qdv`|Fcm6yaAJ70XBau00000 zG5|6F00{p8uLvAS@JbUK8zK-G03d+FhY%qG7(gJx1{+NZYTS553JL-dLy8>fkN^rP z95dOIBowoTY}3&r{aoTY()m!haNt}{+!_}gdnno;KXtsWYB;B5MeNd zZ2gVJ!C*khP{j=#$RGt^Ni^tC0y}($!C1$gfWZnN^iUmOjq$KRf`eV~RRQ-o#KL%4 zpx9UyFT^N-3WjCXfD?ZnKtur%pV`=04;h32;zJHJHbjpOh44g;GBj3%2QvtVLj_Ad z@EH~p#8|)!5jsJ_3RGaR!;e|)pukuV$c6+4EFkDm0S$~WU=SEUFvDk6u;3qYE9jtv zh5;-DD@@@;2;-Izgt9UIbWu|Y=s-gWB$)8Swnt$! zl?4bCfap;fiM37SPfvBV@KIG=_3%$y4dm6tFI6>=!Wf6tFhNCijMPvCg)H(zNpV!u n$t97T(n=l2G*dwyaXghtT+OV}K?yB1-AfZybWuh#1q1*)61oxz diff --git a/glyphs/blue_badge_ethersocial.gif b/glyphs/blue_badge_ethersocial.gif index 5f4f242d9559ed836404e9b47efeb626dd8d2e7c..8a264fff07e9c65fae9de46cc534cc63065effa6 100644 GIT binary patch delta 876 zcmV-y1C#u@4DbtoM@dFFIbkvYG644g0J*ujy1Kf%ySu!+yuH1>zrVl0z`()5!NS7A z!^6YG#KgtL#m2_Q$H&LW$jHgb$;!&g%gf8m%*@Tr&Cbrw&(F`$(9qG*(bCe=)6>(` z)YR40)z;S5*VotD+S=RO+uYpT-QC^Z-rnEe-{9cj;o;!};^N}5MvDTI4Fe5-c?cXx zu;4%#FhYcoz_6i07zQIsoLEp{!;2UlQrsvpVaAUiLqO!naUsTsBLyO~c#`Bq7$;M1 z^mtLGOCBZ}ioAI+r-TqZan=l45T-_#Ie`+5n3SYR3@w&UEOB&V&KgoF#;9u0=+CSh zbJ`rpmEsK!1`KexfwUo0w;XqWj4<#aM~)8$MC>40*6Ub2?HHY50sHYc0nB-43Myz znaAdc13XZmQSd{83VHV$oI$|>j)-1)M2|=yB8~&64KH9J(E|pFn~geu|1MbFU=0Pz zdAx8SVTM5+1tglJIi6s7gA+157r4U&f)4u)6o7m>%_orp7Z6s^4jv>o5N@FnG$3?3 z{T9&9Cvp@61P@GR zkbfO)$lqK5Oq63p7+^JjPzniXpddjImXIC}8yJbvL;xHBLV7!ZU_b~$5(F6oK5mrJ zUpx?Sg9Zq&IFJn)B#=TxGuB9vR|ZliPz(<|AQKD_NYL4WBpl#Dm_-%Xn?d*SkOBf4 z1jxe)rP(%64jUXm;7{U7)F=-+;1xo8xIG}zjf^pbP-+DkklsLlH(=GEfC>aL5Mx28 zlBKF|yBdUn2b4u{Sq=tBDjK~^iC%q>~uywM}1I2N~1(nKma?x C;(MV0 delta 892 zcmV-?1B3kV3%LwNM@dFFIbkvYG644g0L;wH($dn?)6>+{)YaA1*4Eb7*VowC*xA|H z+S=ON+uPjS+}+*X-rnBd-{0Wi;Njun;^N}tKn@%j zFaW@?p+XJ@BTAfDP+`N17#&jFC^2Eij~^L8NPnDgS=Q@VgC{~*NFYJNg$N8Vj38;3ph=|^OJG<)fWZR>6C5Zg z&;Ub;k~#@CygTs31_lNO7@%N4frJDO3JfS9a_&pD0uM(#F&IRH&;tfcctBu*gaHr| zHb)$Rzya>u2|k#}5Mjaq1QAr{CV*gr>#l0ON`L(JISRe=p2w3o3Zk!1P08RA~Gy(zU5fFg_12B+*YbJ1j0R`_B zc$i6?nSgbnUJ@{f!2u9h-~a**P~gA^u90xT z0lB>xkyo%$bbrDJ8f1V$0|hYX+W-exkRA#rfWQC&9#E7KMJ9ar!GNX>r$Cnic?g1+ z7)^8n1`kLl&1;Q$SUa3u!Lj%Wb5$%$L45}9 zI=E#65PuXvL8;eO5CXjnBPQcSCV0S`0TmqJ00a$Wm#&-?i5G2V9FdU0qZK$H!2~>d zkYZRctMsvwB19ko1{qLr!Ok=NY~aE-eNaLPgwoZsW>cG$7DEarX!XnXp4AYVTMx8V z)dn>c_R?Bk-LTbWJ2g~RNTz+~ S;fNQ0_CW~|juKG;0RTH?YiBb6