diff --git a/Makefile.genericwallet b/Makefile.genericwallet index e20ca6d..bb2b36b 100755 --- a/Makefile.genericwallet +++ b/Makefile.genericwallet @@ -42,6 +42,10 @@ DEFINES += CHAINID_UPCASE=\"ETHEREUM\" CHAINID_COINNAME=\"ETH\" CHAIN_KIND=CHAIN APPNAME = "Ethereum" DEFINES_LIB= APP_LOAD_FLAGS=--appFlags 0x840 +else ifeq ($(CHAIN),ellaism) +APP_LOAD_PARAMS += --path "44'/163'" +DEFINES += CHAINID_UPCASE=\"ELLA\" CHAINID_COINNAME=\"ELLA\" CHAIN_KIND=CHAIN_KIND_ELLAISM CHAIN_ID=64 +APPNAME = "Ellaism" else ifeq ($(CHAIN),ethereum_classic) APP_LOAD_PARAMS += --path "44'/61'" DEFINES += CHAINID_UPCASE=\"ETC\" CHAINID_COINNAME=\"ETC\" CHAIN_KIND=CHAIN_KIND_ETHEREUM_CLASSIC CHAIN_ID=61 @@ -96,7 +100,7 @@ DEFINES += CHAINID_UPCASE=\"CALLISTO\" CHAINID_COINNAME=\"CLO\" CHAIN_KIND=CHAIN APPNAME = "Callisto" else ifeq ($(filter clean,$(MAKECMDGOALS)),) -$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto, ethersocial) +$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto, ethersocial, ellaism) endif endif diff --git a/blue_app_ellaism.gif b/blue_app_ellaism.gif new file mode 100644 index 0000000..1c3d854 Binary files /dev/null and b/blue_app_ellaism.gif differ diff --git a/glyphs/blue_badge_ellaism.gif b/glyphs/blue_badge_ellaism.gif new file mode 100644 index 0000000..d90ae1b Binary files /dev/null and b/glyphs/blue_badge_ellaism.gif differ diff --git a/glyphs/nanos_badge_ellaism.gif b/glyphs/nanos_badge_ellaism.gif new file mode 100644 index 0000000..d07bad7 Binary files /dev/null and b/glyphs/nanos_badge_ellaism.gif differ diff --git a/nanos_app_ellaism.gif b/nanos_app_ellaism.gif new file mode 100644 index 0000000..51f8692 Binary files /dev/null and b/nanos_app_ellaism.gif differ diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h index 7fd3061..88a896d 100644 --- a/src_genericwallet/chainConfig.h +++ b/src_genericwallet/chainConfig.h @@ -17,7 +17,8 @@ typedef enum chain_kind_e { CHAIN_KIND_AKROMA, CHAIN_KIND_MUSICOIN, CHAIN_KIND_CALLISTO, - CHAIN_KIND_ETHERSOCIAL + CHAIN_KIND_ETHERSOCIAL, + CHAIN_KIND_ELLAISM } chain_kind_t; typedef struct chain_config_s { diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c index 6abe1d0..07335ea 100644 --- a/src_genericwallet/main.c +++ b/src_genericwallet/main.c @@ -1537,6 +1537,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_ETHERSOCIAL: numTokens = NUM_TOKENS_ETHERSOCIAL; break; + case CHAIN_KIND_ELLAISM: + numTokens = NUM_TOKENS_ELLAISM; + break; } for (i=0; ikind) { @@ -1579,6 +1582,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_ETHERSOCIAL: currentToken = PIC(&TOKENS_ETHERSOCIAL[i]); break; + case CHAIN_KIND_ELLAISM: + currentToken = PIC(&TOKENS_ELLAISM[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 41bd7ef..f43429b 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -699,6 +699,10 @@ const tokenDefinition_t const TOKENS_ETHEREUM[NUM_TOKENS_ETHEREUM] = { {{0xe3,0x86,0xb1,0x39,0xed,0x37,0x15,0xca,0x4b,0x18,0xfd,0x52,0x67,0x1b,0xdc,0xea,0x1c,0xdf,0xe4,0xb1}, "ZST ", 8}, }; +const tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM] = { + {{0x99,0x1e,0x7f,0xe4,0xb0,0x5f,0x2b,0x3d,0xb1,0xd7,0x88,0xe7,0x05,0x96,0x3f,0x5d,0x64,0x7b,0x00,0x44}, "MINING", 18}, +}; + const tokenDefinition_t const TOKENS_ETHEREUM_CLASSIC[NUM_TOKENS_ETHEREUM_CLASSIC] = {}; const tokenDefinition_t const TOKENS_ETHERSOCIAL[NUM_TOKENS_ETHERSOCIAL] = {}; diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h index c45a6bf..f576378 100644 --- a/src_genericwallet/tokens.h +++ b/src_genericwallet/tokens.h @@ -24,6 +24,7 @@ typedef struct tokenDefinition_t { } tokenDefinition_t; #define NUM_TOKENS_AKROMA 0 +#define NUM_TOKENS_ELLAISM 1 #define NUM_TOKENS_ETHEREUM 677 #define NUM_TOKENS_ETHEREUM_CLASSIC 0 #define NUM_TOKENS_ETHERSOCIAL 0 @@ -38,6 +39,7 @@ typedef struct tokenDefinition_t { #define NUM_TOKENS_CALLISTO 0 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA]; +extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM]; 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];