Merge pull request #26 from EthereumCommonwealth/ether-1

Add support for Ether-1 (ETHO)

Makefile

@@ -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
@@ -100,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
 
@@ -192,4 +196,4 @@ include $(BOLOS_SDK)/Makefile.rules
 dep/%.d: %.c Makefile.genericwallet
 
 listvariants:
-	@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd #musicoin callisto ethersocial ellaism
+	@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd #musicoin callisto ethersocial ellaism pirl akroma ether1

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 {

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; i<numTokens; i++) {            
         switch(chainConfig->kind) {
@@ -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;

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

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