Merge branch 'master' of github.com:LedgerHQ/blue-app-eth

Makefile.genericwallet

@@ -82,9 +82,17 @@ else ifeq ($(CHAIN),kusd)
 APP_LOAD_PARAMS += --path "44'/91927009'"
 DEFINES += CHAINID_UPCASE=\"KUSD\" CHAINID_COINNAME=\"KUSD\" CHAIN_KIND=CHAIN_KIND_KUSD CHAIN_ID=2
 APPNAME = "KUSD"
+else ifeq ($(CHAIN),musicoin)
+APP_LOAD_PARAMS += --path "44'/184'"
+DEFINES += CHAINID_UPCASE=\"MUSICOIN\" CHAINID_COINNAME=\"MUSIC\" CHAIN_KIND=CHAIN_KIND_MUSICOIN CHAIN_ID=7762959
+APPNAME = "Musicoin"
+else ifeq ($(CHAIN),callisto)
+APP_LOAD_PARAMS += --path "44'/820'"
+DEFINES += CHAINID_UPCASE=\"CALLISTO\" CHAINID_COINNAME=\"CLO\" CHAIN_KIND=CHAIN_KIND_CALLISTO CHAIN_ID=820
+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, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto)
 endif
 endif
 

src_genericwallet/chainConfig.h

@@ -14,7 +14,9 @@ typedef enum chain_kind_e {
 	CHAIN_KIND_WANCHAIN,
 	CHAIN_KIND_KUSD,
 	CHAIN_KIND_PIRL,
-	CHAIN_KIND_AKROMA
+	CHAIN_KIND_AKROMA,
+	CHAIN_KIND_MUSICOIN,
+	CHAIN_KIND_CALLISTO
 } chain_kind_t;
 
 typedef struct chain_config_s {

src_genericwallet/main.c

@@ -1528,6 +1528,12 @@ tokenDefinition_t* getKnownToken() {
         case CHAIN_KIND_KUSD:
             numTokens = NUM_TOKENS_KUSD;
             break;    
+        case CHAIN_KIND_MUSICOIN:
+            numTokens = NUM_TOKENS_MUSICOIN;
+            break;
+        case CHAIN_KIND_CALLISTO:
+            numTokens = NUM_TOKENS_CALLISTO;
+            break;            
     }
     for (i=0; i<numTokens; i++) {            
         switch(chainConfig->kind) {
@@ -1561,6 +1567,12 @@ tokenDefinition_t* getKnownToken() {
             case CHAIN_KIND_KUSD:
                 currentToken = PIC(&TOKENS_KUSD[i]);
                 break;
+            case CHAIN_KIND_MUSICOIN:
+                currentToken = PIC(&TOKENS_MUSICOIN[i]);
+                break;
+            case CHAIN_KIND_CALLISTO:
+                currentToken = PIC(&TOKENS_CALLISTO[i]);
+                break;
         } 
         if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) {
             return currentToken;

src_genericwallet/tokens.c

@@ -721,3 +721,7 @@ const tokenDefinition_t const TOKENS_EXPANSE[NUM_TOKENS_EXPANSE] = {};
 const tokenDefinition_t const TOKENS_WANCHAIN[NUM_TOKENS_WANCHAIN] = {};
 
 const tokenDefinition_t const TOKENS_KUSD[NUM_TOKENS_KUSD] = {};
+
+const tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN] = {};
+
+const tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO] = {};

src_genericwallet/tokens.h

@@ -33,6 +33,8 @@ typedef struct tokenDefinition_t {
 #define NUM_TOKENS_EXPANSE 0
 #define NUM_TOKENS_WANCHAIN 0
 #define NUM_TOKENS_KUSD 0
+#define NUM_TOKENS_MUSICOIN 0
+#define NUM_TOKENS_CALLISTO 0
 
 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA];
 extern tokenDefinition_t const TOKENS_ETHEREUM[NUM_TOKENS_ETHEREUM];
@@ -44,3 +46,5 @@ extern tokenDefinition_t const TOKENS_UBIQ[NUM_TOKENS_UBIQ];
 extern tokenDefinition_t const TOKENS_EXPANSE[NUM_TOKENS_EXPANSE];
 extern tokenDefinition_t const TOKENS_WANCHAIN[NUM_TOKENS_WANCHAIN];
 extern tokenDefinition_t const TOKENS_KUSD[NUM_TOKENS_KUSD];
+extern tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN];
+extern tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO];