From c524aeb461bbf848d8b03fe87d29c7b478cd2a4c Mon Sep 17 00:00:00 2001 From: BTChip github Date: Fri, 26 Oct 2018 19:06:46 +0200 Subject: [PATCH] Remove EOS Classic --- Makefile | 8 ++------ glyphs/nanos_badge_eosclassic.gif | Bin 65 -> 0 bytes nanos_app_eosclassic.gif | Bin 72 -> 0 bytes src_genericwallet/chainConfig.h | 1 - src_genericwallet/main.c | 6 ------ src_genericwallet/tokens.c | 2 -- src_genericwallet/tokens.h | 2 -- 7 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 glyphs/nanos_badge_eosclassic.gif delete mode 100644 nanos_app_eosclassic.gif diff --git a/Makefile b/Makefile index 5518dd6..b3a2e0b 100755 --- a/Makefile +++ b/Makefile @@ -113,17 +113,13 @@ else ifeq ($(CHAIN),gochain) APP_LOAD_PARAMS += --path "44'/6060'" DEFINES += CHAINID_UPCASE=\"GOCHAIN\" CHAINID_COINNAME=\"GO\" CHAIN_KIND=CHAIN_KIND_GOCHAIN CHAIN_ID=60 APPNAME = "GoChain" -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, mix) +$(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) endif endif @@ -215,4 +211,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 mix + @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma atheios callisto ethersocial ether1 gochain # musicoin ellaism ethergem mix diff --git a/glyphs/nanos_badge_eosclassic.gif b/glyphs/nanos_badge_eosclassic.gif deleted file mode 100644 index 03797f045d319b555b77d4455c670b1eee28c4fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?wbh9u|kdN{_TZJEq az2z2DxHg7bls*%?no@Od%MoQ(25SHVt{AWY diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h index 825b4c1..e87494a 100644 --- a/src_genericwallet/chainConfig.h +++ b/src_genericwallet/chainConfig.h @@ -23,7 +23,6 @@ typedef enum chain_kind_e { CHAIN_KIND_ETHERGEM, CHAIN_KIND_ATHEIOS, CHAIN_KIND_GOCHAIN, - CHAIN_KIND_EOSCLASSIC, CHAIN_KIND_MIX } chain_kind_t; diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c index 46ae81c..a64b1b8 100644 --- a/src_genericwallet/main.c +++ b/src_genericwallet/main.c @@ -1514,9 +1514,6 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_GOCHAIN: numTokens = NUM_TOKENS_GOCHAIN; break; - case CHAIN_KIND_EOSCLASSIC: - numTokens = NUM_TOKENS_EOSCLASSIC; - break; case CHAIN_KIND_MIX: numTokens = NUM_TOKENS_MIX; break; @@ -1577,9 +1574,6 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_GOCHAIN: currentToken = PIC(&TOKENS_GOCHAIN[i]); break; - case CHAIN_KIND_EOSCLASSIC: - currentToken = PIC(&TOKENS_EOSCLASSIC[i]); - break; case CHAIN_KIND_MIX: currentToken = PIC(&TOKENS_MIX[i]); break; diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c index ac9f468..e94b2fa 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -1136,6 +1136,4 @@ 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 28e07e8..2442181 100644 --- a/src_genericwallet/tokens.h +++ b/src_genericwallet/tokens.h @@ -41,7 +41,6 @@ typedef struct tokenDefinition_t { #define NUM_TOKENS_ETHERGEM 0 #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]; @@ -62,5 +61,4 @@ extern tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO]; 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];