d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
BTChip github
2018-08-02 10:11:56 +02:00
parent 006e661bc6 2fe57f1811
commit f6518894e4
13 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src_genericwallet/chainConfig.h
View File

@@ -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 {

12
src_genericwallet/main.c
View File

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

4
src_genericwallet/tokens.c
View File

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

4
src_genericwallet/tokens.h
View File

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