Merge branch 'master' into externalize-erc20

This commit is contained in:
Nicolas Bacca
2019-03-17 10:52:15 +01:00
committed by GitHub
12 changed files with 22 additions and 6 deletions

View File

@@ -1483,6 +1483,9 @@ tokenDefinition_t* getKnownToken() {
case CHAIN_KIND_HPB:
numTokens = NUM_TOKENS_HPB;
break;
case CHAIN_KIND_TOMOCHAIN:
numTokens = NUM_TOKENS_TOMOCHAIN;
break;
}
for (i=0; i<numTokens; i++) {
switch(chainConfig->kind) {
@@ -1549,6 +1552,9 @@ tokenDefinition_t* getKnownToken() {
case CHAIN_KIND_HPB:
currentToken = (tokenDefinition_t *)PIC(&TOKENS_HPB[i]);
break;
case CHAIN_KIND_TOMOCHAIN:
currentToken = (tokenDefinition_t *)PIC(&TOKENS_TOMOCHAIN[i]);
break;
}
if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) {
return currentToken;