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

Merge branch 'master' into eosc

Browse Source
This commit is contained in:
Michael Ira Krufky
2018-09-08 11:40:14 -04:00
committed by GitHub
parent c632e70214 a0ab013c09
commit ac504a3ddb
10 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src_genericwallet/chainConfig.h
View File

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

6
src_genericwallet/main.c
View File

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

2
src_genericwallet/tokens.c
View File

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

2
src_genericwallet/tokens.h
View File

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