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 0000000..c16bbe0 Binary files /dev/null and b/blue_app_ethersocial.gif differ diff --git a/glyphs/blue_badge_ethersocial.gif b/glyphs/blue_badge_ethersocial.gif new file mode 100644 index 0000000..5f4f242 Binary files /dev/null and b/glyphs/blue_badge_ethersocial.gif differ diff --git a/glyphs/nanos_badge_ethersocial.gif b/glyphs/nanos_badge_ethersocial.gif new file mode 100644 index 0000000..21262eb Binary files /dev/null and b/glyphs/nanos_badge_ethersocial.gif differ diff --git a/nanos_app_ethersocial.gif b/nanos_app_ethersocial.gif new file mode 100644 index 0000000..3eb3841 Binary files /dev/null and b/nanos_app_ethersocial.gif differ 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];