From 79348a2d9156efb975469a89c80006d7ed9ef77b Mon Sep 17 00:00:00 2001 From: hackyminer Date: Mon, 30 Jul 2018 09:43:11 +0900 Subject: [PATCH] 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];