Merge branch 'esn-support' of https://github.com/EthersocialNetwork/blue-app-eth into EthersocialNetwork-esn-support

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, musicoin, callisto)
+$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto, ethersocial)
 endif
 endif
 

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 {

src_genericwallet/main.c

@@ -1534,6 +1534,9 @@ tokenDefinition_t* getKnownToken() {
         case CHAIN_KIND_CALLISTO:
             numTokens = NUM_TOKENS_CALLISTO;
             break;            
+        case CHAIN_KIND_ETHERSOCIAL:
+            numTokens = NUM_TOKENS_ETHERSOCIAL;
+            break;
     }
     for (i=0; i<numTokens; i++) {            
         switch(chainConfig->kind) {
@@ -1573,6 +1576,9 @@ tokenDefinition_t* getKnownToken() {
             case CHAIN_KIND_CALLISTO:
                 currentToken = PIC(&TOKENS_CALLISTO[i]);
                 break;
+            case CHAIN_KIND_ETHERSOCIAL:
+                currentToken = PIC(&TOKENS_ETHERSOCIAL[i]);
+                break;
         } 
         if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) {
             return currentToken;

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] = {};

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];