Merge branch 'master' into eosc

Makefile

@@ -110,13 +110,17 @@ else ifeq ($(CHAIN),atheios)
 APP_LOAD_PARAMS += --path "44'/1620'"
 DEFINES += CHAINID_UPCASE=\"ATHEIOS\" CHAINID_COINNAME=\"ATH\" CHAIN_KIND=CHAIN_KIND_ATHEIOS CHAIN_ID=1620
 APPNAME = "Atheios"
+else ifeq ($(CHAIN),gochain)
+APP_LOAD_PARAMS += --path "44'/6060'"
+DEFINES += CHAINID_UPCASE=\"GOCHAIN\" CHAINID_COINNAME=\"GO\" CHAIN_KIND=CHAIN_KIND_GOCHAIN CHAIN_ID=60
+APPNAME = "GoChain"
 else ifeq ($(CHAIN),eosclassic)
 APP_LOAD_PARAMS += --path "44'/2018'"
 DEFINES += CHAINID_UPCASE=\"EOSCLASSIC\" CHAINID_COINNAME=\"EOSC\" CHAIN_KIND=CHAIN_KIND_EOSCLASSIC CHAIN_ID=20
 APPNAME = "EOSClassic"
 else
 ifeq ($(filter clean,$(MAKECMDGOALS)),)
-$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, eosclassic)
+$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, eosclassic)
 endif
 endif
 
@@ -208,4 +212,4 @@ include $(BOLOS_SDK)/Makefile.rules
 dep/%.d: %.c Makefile
 
 listvariants:
-	@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma # musicoin atheios callisto ethersocial ellaism   ether1 ethergem eosclassic
+	@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma # musicoin atheios callisto ethersocial ellaism   ether1 ethergem gochain eosclassic

src_genericwallet/chainConfig.h

@@ -22,6 +22,7 @@ typedef enum chain_kind_e {
 	CHAIN_KIND_ETHER1,
 	CHAIN_KIND_ETHERGEM,
 	CHAIN_KIND_ATHEIOS,
+	CHAIN_KIND_GOCHAIN,
 	CHAIN_KIND_EOSCLASSIC
 } chain_kind_t;
 

src_genericwallet/main.c

@@ -1511,6 +1511,9 @@ tokenDefinition_t* getKnownToken() {
         case CHAIN_KIND_ATHEIOS:
             numTokens = NUM_TOKENS_ATHEIOS;
             break;
+        case CHAIN_KIND_GOCHAIN:
+            numTokens = NUM_TOKENS_GOCHAIN;
+            break;
         case CHAIN_KIND_EOSCLASSIC:
             numTokens = NUM_TOKENS_EOSCLASSIC;
             break;
@@ -1568,6 +1571,9 @@ tokenDefinition_t* getKnownToken() {
             case CHAIN_KIND_ATHEIOS:
                 currentToken = PIC(&TOKENS_ATHEIOS[i]);
                 break;
+            case CHAIN_KIND_GOCHAIN:
+                currentToken = PIC(&TOKENS_GOCHAIN[i]);
+                break;
             case CHAIN_KIND_EOSCLASSIC:
                 currentToken = PIC(&TOKENS_EOSCLASSIC[i]);
                 break;

src_genericwallet/tokens.c

@@ -783,4 +783,6 @@ const tokenDefinition_t const TOKENS_ETHERGEM[NUM_TOKENS_ETHERGEM] = {};
 
 const tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS] = {};
 
+const tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN] = {};
+
 const tokenDefinition_t const TOKENS_EOSCLASSIC[NUM_TOKENS_EOSCLASSIC] = {};

src_genericwallet/tokens.h

@@ -40,6 +40,7 @@ typedef struct tokenDefinition_t {
 #define NUM_TOKENS_CALLISTO 0
 #define NUM_TOKENS_ETHERGEM 0
 #define NUM_TOKENS_ATHEIOS 0
+#define NUM_TOKENS_GOCHAIN 0
 #define NUM_TOKENS_EOSCLASSIC 0
 
 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA];
@@ -59,4 +60,5 @@ extern tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN];
 extern tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO];
 extern tokenDefinition_t const TOKENS_ETHERGEM[NUM_TOKENS_ETHERGEM];
 extern tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS];
+extern tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN];
 extern tokenDefinition_t const TOKENS_EOSCLASSIC[NUM_TOKENS_EOSCLASSIC];