diff --git a/Makefile b/Makefile index 2b322e8..5518dd6 100755 --- a/Makefile +++ b/Makefile @@ -117,9 +117,13 @@ else ifeq ($(CHAIN),eosclassic) APP_LOAD_PARAMS += --path "44'/2018'" DEFINES += CHAINID_UPCASE=\"EOSCLASSIC\" CHAINID_COINNAME=\"EOSC\" CHAIN_KIND=CHAIN_KIND_EOSCLASSIC CHAIN_ID=20 APPNAME = "EOSClassic" +else ifeq ($(CHAIN),mix) +APP_LOAD_PARAMS += --path "44'/76'" +DEFINES += CHAINID_UPCASE=\"MIX\" CHAINID_COINNAME=\"MIX\" CHAIN_KIND=CHAIN_KIND_MIX CHAIN_ID=76 +APPNAME = "Mix" 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, eosclassic) +$(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, eosclassic, mix) endif endif @@ -211,4 +215,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 ellaism ethergem eosclassic + @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma atheios callisto ethersocial ether1 gochain # musicoin ellaism ethergem eosclassic mix diff --git a/blue_app_mix.gif b/blue_app_mix.gif new file mode 100644 index 0000000..c3d5c4e Binary files /dev/null and b/blue_app_mix.gif differ diff --git a/glyphs/blue_badge_mix.gif b/glyphs/blue_badge_mix.gif new file mode 100644 index 0000000..5174214 Binary files /dev/null and b/glyphs/blue_badge_mix.gif differ diff --git a/glyphs/nanos_badge_mix.gif b/glyphs/nanos_badge_mix.gif new file mode 100644 index 0000000..776f645 Binary files /dev/null and b/glyphs/nanos_badge_mix.gif differ diff --git a/nanos_app_mix.gif b/nanos_app_mix.gif new file mode 100644 index 0000000..8f8fa31 Binary files /dev/null and b/nanos_app_mix.gif differ diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h index 46ea04b..825b4c1 100644 --- a/src_genericwallet/chainConfig.h +++ b/src_genericwallet/chainConfig.h @@ -23,7 +23,8 @@ typedef enum chain_kind_e { CHAIN_KIND_ETHERGEM, CHAIN_KIND_ATHEIOS, CHAIN_KIND_GOCHAIN, - CHAIN_KIND_EOSCLASSIC + CHAIN_KIND_EOSCLASSIC, + CHAIN_KIND_MIX } chain_kind_t; typedef struct chain_config_s { diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c index c2c4748..46ae81c 100644 --- a/src_genericwallet/main.c +++ b/src_genericwallet/main.c @@ -1517,6 +1517,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_EOSCLASSIC: numTokens = NUM_TOKENS_EOSCLASSIC; break; + case CHAIN_KIND_MIX: + numTokens = NUM_TOKENS_MIX; + break; } for (i=0; ikind) { @@ -1577,6 +1580,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_EOSCLASSIC: currentToken = PIC(&TOKENS_EOSCLASSIC[i]); break; + case CHAIN_KIND_MIX: + currentToken = PIC(&TOKENS_MIX[i]); + break; } if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) { return currentToken; diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c index 60bfc20..ac9f468 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -1137,3 +1137,5 @@ 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] = {}; + +const tokenDefinition_t const TOKENS_MIX[NUM_TOKENS_MIX] = {}; diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h index 53af16d..28e07e8 100644 --- a/src_genericwallet/tokens.h +++ b/src_genericwallet/tokens.h @@ -42,6 +42,7 @@ typedef struct tokenDefinition_t { #define NUM_TOKENS_ATHEIOS 0 #define NUM_TOKENS_GOCHAIN 0 #define NUM_TOKENS_EOSCLASSIC 0 +#define NUM_TOKENS_MIX 0 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA]; extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM]; @@ -62,3 +63,4 @@ 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]; +extern tokenDefinition_t const TOKENS_MIX[NUM_TOKENS_MIX];