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

Merge branch 'esn-support' of https://github.com/EthersocialNetwork/blue-app-eth into EthersocialNetwork-esn-support

Browse Source
This commit is contained in:
BTChip github
2018-08-02 10:19:36 +02:00
parent f6518894e4 4d0f9faac0
commit 7466481cc6
9 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src_genericwallet/chainConfig.h
View File

@@ -16,7 +16,8 @@ typedef enum chain_kind_e {
CHAIN_KIND_PIRL,
CHAIN_KIND_AKROMA,
CHAIN_KIND_MUSICOIN,
CHAIN_KIND_CALLISTO
CHAIN_KIND_CALLISTO,
CHAIN_KIND_ETHERSOCIAL
} chain_kind_t;
typedef struct chain_config_s {

6
src_genericwallet/main.c
View File

@@ -1534,6 +1534,9 @@ tokenDefinition_t* getKnownToken() {
case CHAIN_KIND_CALLISTO:
numTokens = NUM_TOKENS_CALLISTO;
break;
case CHAIN_KIND_ETHERSOCIAL:
numTokens = NUM_TOKENS_ETHERSOCIAL;
break;
}
for (i=0; i<numTokens; i++) {
switch(chainConfig->kind) {
@@ -1573,6 +1576,9 @@ tokenDefinition_t* getKnownToken() {
case CHAIN_KIND_CALLISTO:
currentToken = PIC(&TOKENS_CALLISTO[i]);
break;
case CHAIN_KIND_ETHERSOCIAL:
currentToken = PIC(&TOKENS_ETHERSOCIAL[i]);
break;
}
if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) {
return currentToken;

2
src_genericwallet/tokens.c
View File

@@ -701,6 +701,8 @@ const tokenDefinition_t const TOKENS_ETHEREUM[NUM_TOKENS_ETHEREUM] = {
const tokenDefinition_t const TOKENS_ETHEREUM_CLASSIC[NUM_TOKENS_ETHEREUM_CLASSIC] = {};
const tokenDefinition_t const TOKENS_ETHERSOCIAL[NUM_TOKENS_ETHERSOCIAL] = {};
const tokenDefinition_t const TOKENS_PIRL[NUM_TOKENS_PIRL] = {};
const tokenDefinition_t const TOKENS_POA[NUM_TOKENS_POA] = {};

2
src_genericwallet/tokens.h
View File

@@ -26,6 +26,7 @@ typedef struct tokenDefinition_t {
#define NUM_TOKENS_AKROMA 0
#define NUM_TOKENS_ETHEREUM 677
#define NUM_TOKENS_ETHEREUM_CLASSIC 0
#define NUM_TOKENS_ETHERSOCIAL 0
#define NUM_TOKENS_PIRL 0
#define NUM_TOKENS_POA 0
#define NUM_TOKENS_RSK 0
@@ -39,6 +40,7 @@ typedef struct tokenDefinition_t {
extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA];
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_PIRL[NUM_TOKENS_PIRL];
extern tokenDefinition_t const TOKENS_POA[NUM_TOKENS_POA];
extern tokenDefinition_t const TOKENS_RSK[NUM_TOKENS_RSK];