Merge pull request #49 from Nicemanss/master

Add support for High Performance Blockchain
This commit is contained in:
Jean P
2019-01-03 13:48:37 +01:00
committed by GitHub
10 changed files with 19 additions and 5 deletions

View File

@@ -121,10 +121,13 @@ else ifeq ($(CHAIN),reosc)
APP_LOAD_PARAMS += --path "44'/2894'"
DEFINES += CHAINID_UPCASE=\"REOSC\" CHAINID_COINNAME=\"REOSC\" CHAIN_KIND=CHAIN_KIND_REOSC CHAIN_ID=2894
APPNAME = "REOSC"
else ifeq ($(CHAIN),hpb)
APP_LOAD_PARAMS += --path "44'/269'"
DEFINES += CHAINID_UPCASE=\"HPB\" CHAINID_COINNAME=\"HPB\" CHAIN_KIND=CHAIN_KIND_HPB CHAIN_ID=269
APPNAME = "HPB"
else
ifeq ($(filter clean,$(MAKECMDGOALS)),)
$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, mix, reosc)
endif
$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, mix, reosc, hpb)
endif
APP_LOAD_PARAMS += $(APP_LOAD_FLAGS) --path "44'/1'"
@@ -215,4 +218,4 @@ include $(BOLOS_SDK)/Makefile.rules
dep/%.d: %.c Makefile
listvariants:
@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma atheios callisto ethersocial ether1 gochain musicoin ethergem mix ellaism reosc
@echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma atheios callisto ethersocial ether1 gochain musicoin ethergem mix ellaism reosc hpb

BIN
blue_app_hpb.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 579 B

BIN
glyphs/blue_badge_hpb.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 434 B

BIN
glyphs/nanos_badge_hpb.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 B

BIN
hpb.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
nanos_app_hpb.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 B

View File

@@ -24,7 +24,8 @@ typedef enum chain_kind_e {
CHAIN_KIND_ATHEIOS,
CHAIN_KIND_GOCHAIN,
CHAIN_KIND_MIX,
CHAIN_KIND_REOSC
CHAIN_KIND_REOSC,
CHAIN_KIND_HPB
} chain_kind_t;
typedef struct chain_config_s {

View File

@@ -1520,6 +1520,9 @@ tokenDefinition_t* getKnownToken() {
case CHAIN_KIND_REOSC:
numTokens = NUM_TOKENS_REOSC;
break;
case CHAIN_KIND_HPB:
numTokens = NUM_TOKENS_HPB;
break;
}
for (i=0; i<numTokens; i++) {
switch(chainConfig->kind) {
@@ -1583,7 +1586,10 @@ tokenDefinition_t* getKnownToken() {
case CHAIN_KIND_REOSC:
currentToken = (tokenDefinition_t *)PIC(&TOKENS_REOSC[i]);
break;
}
case CHAIN_KIND_HPB:
currentToken = (tokenDefinition_t *)PIC(&TOKENS_HPB[i]);
break;
}
if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) {
return currentToken;
}

View File

@@ -1173,3 +1173,5 @@ const tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN] = {};
const tokenDefinition_t const TOKENS_MIX[NUM_TOKENS_MIX] = {};
const tokenDefinition_t const TOKENS_REOSC[NUM_TOKENS_REOSC] = {};
const tokenDefinition_t const TOKENS_HPB[NUM_TOKENS_HPB] = {};

View File

@@ -43,6 +43,7 @@ typedef struct tokenDefinition_t {
#define NUM_TOKENS_GOCHAIN 0
#define NUM_TOKENS_MIX 0
#define NUM_TOKENS_REOSC 0
#define NUM_TOKENS_HPB 0
extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA];
extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM];
@@ -64,3 +65,4 @@ extern tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS];
extern tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN];
extern tokenDefinition_t const TOKENS_MIX[NUM_TOKENS_MIX];
extern tokenDefinition_t const TOKENS_REOSC[NUM_TOKENS_REOSC];
extern tokenDefinition_t const TOKENS_HPB[NUM_TOKENS_HPB];