diff --git a/Makefile b/Makefile index c8811fa..a7805a0 100755 --- a/Makefile +++ b/Makefile @@ -102,9 +102,13 @@ else ifeq ($(CHAIN),callisto) APP_LOAD_PARAMS += --path "44'/820'" DEFINES += CHAINID_UPCASE=\"CALLISTO\" CHAINID_COINNAME=\"CLO\" CHAIN_KIND=CHAIN_KIND_CALLISTO CHAIN_ID=820 APPNAME = "Callisto" +else ifeq ($(CHAIN),ethergem) +APP_LOAD_PARAMS += --path "44'/1987'" +DEFINES += CHAINID_UPCASE=\"ETHERGEM\" CHAINID_COINNAME=\"EGEM\" CHAIN_KIND=CHAIN_KIND_ETHERGEM CHAIN_ID=1987 +APPNAME = "EtherGem" else ifeq ($(filter clean,$(MAKECMDGOALS)),) -$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto, ethersocial, ellaism, pirl, akroma, ether1) +$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto, ethersocial, ellaism, pirl, akroma, ether1, ethergem) endif endif @@ -196,4 +200,4 @@ include $(BOLOS_SDK)/Makefile.rules dep/%.d: %.c Makefile.genericwallet listvariants: - @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd #musicoin callisto ethersocial ellaism pirl akroma ether1 + @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd #musicoin callisto ethersocial ellaism pirl akroma ether1 ethergem diff --git a/blue_app_ethergem.gif b/blue_app_ethergem.gif new file mode 100644 index 0000000..fc6d01b Binary files /dev/null and b/blue_app_ethergem.gif differ diff --git a/ethergem.png b/ethergem.png new file mode 100644 index 0000000..d441d9b Binary files /dev/null and b/ethergem.png differ diff --git a/glyphs/blue_badge_ethergem.gif b/glyphs/blue_badge_ethergem.gif new file mode 100644 index 0000000..85a95a2 Binary files /dev/null and b/glyphs/blue_badge_ethergem.gif differ diff --git a/glyphs/nanos_badge_ethergem.gif b/glyphs/nanos_badge_ethergem.gif new file mode 100644 index 0000000..19b7621 Binary files /dev/null and b/glyphs/nanos_badge_ethergem.gif differ diff --git a/nanos_app_ethergem.gif b/nanos_app_ethergem.gif new file mode 100644 index 0000000..b4daf58 Binary files /dev/null and b/nanos_app_ethergem.gif differ diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h index de49fcc..f0c717b 100644 --- a/src_genericwallet/chainConfig.h +++ b/src_genericwallet/chainConfig.h @@ -19,7 +19,8 @@ typedef enum chain_kind_e { CHAIN_KIND_CALLISTO, CHAIN_KIND_ETHERSOCIAL, CHAIN_KIND_ELLAISM, - CHAIN_KIND_ETHER1 + CHAIN_KIND_ETHER1, + CHAIN_KIND_ETHERGEM } chain_kind_t; typedef struct chain_config_s { diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c index 90b6ef3..cbf82ac 100644 --- a/src_genericwallet/main.c +++ b/src_genericwallet/main.c @@ -1555,6 +1555,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_ETHER1: numTokens = NUM_TOKENS_ETHER1; break; + case CHAIN_KIND_ETHERGEM: + numTokens = NUM_TOKENS_ETHERGEM; + break; } for (i=0; ikind) { @@ -1603,6 +1606,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_ETHER1: currentToken = PIC(&TOKENS_ETHER1[i]); break; + case CHAIN_KIND_ETHERGEM: + currentToken = PIC(&TOKENS_ETHERGEM[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 9c105c1..bc838c0 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -733,3 +733,5 @@ const tokenDefinition_t const TOKENS_KUSD[NUM_TOKENS_KUSD] = {}; const tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN] = {}; const tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO] = {}; + +const tokenDefinition_t const TOKENS_ETHERGEM[NUM_TOKENS_ETHERGEM] = {}; diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h index 443c4f7..9f59dbc 100644 --- a/src_genericwallet/tokens.h +++ b/src_genericwallet/tokens.h @@ -38,6 +38,7 @@ typedef struct tokenDefinition_t { #define NUM_TOKENS_KUSD 0 #define NUM_TOKENS_MUSICOIN 0 #define NUM_TOKENS_CALLISTO 0 +#define NUM_TOKENS_ETHERGEM 0 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA]; extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM]; @@ -54,3 +55,4 @@ extern tokenDefinition_t const TOKENS_WANCHAIN[NUM_TOKENS_WANCHAIN]; extern tokenDefinition_t const TOKENS_KUSD[NUM_TOKENS_KUSD]; 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];