Remove theta, flare and flare_coston

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Small refactor of `getEthDisplayableAddress` helper
 - Improve Zemu tests to get parallelization
 - Increased plugin interface to version 2
+- Remove support for Theta and Flare
+- Add support for Songbird
 
 ## [1.9.2](https://github.com/ledgerhq/app-ethereum/compare/1.9.0...1.9.2) - 2021-8-11
 

Makefile

@@ -203,17 +203,13 @@ else ifeq ($(CHAIN),flare_coston)
 APP_LOAD_PARAMS += --path "44'/554'" --path "44'/60'"
 DEFINES += CHAINID_UPCASE=\"FLARE\" CHAINID_COINNAME=\"FLR\" CHAIN_KIND=CHAIN_KIND_FLARE CHAIN_ID=16
 APPNAME = "Flare Coston"
-else ifeq ($(CHAIN),theta)
-APP_LOAD_PARAMS += --path "44'/500'"
-DEFINES += CHAINID_UPCASE=\"THETA\" CHAINID_COINNAME=\"THETA\" CHAIN_KIND=CHAIN_KIND_THETA CHAIN_ID=500
-APPNAME = "Theta"
 else ifeq ($(CHAIN),bsc)
 APP_LOAD_PARAMS += --path "44'/60'"
 DEFINES += CHAINID_UPCASE=\"BSC\" CHAINID_COINNAME=\"BNB\" CHAIN_KIND=CHAIN_KIND_BSC CHAIN_ID=56
 APPNAME = "Binance Smart Chain"
 else
 ifeq ($(filter clean,$(MAKECMDGOALS)),)
-$(error Unsupported CHAIN - use ethereum, ropsten, ethereum_classic, expanse, poa, artis_sigma1, artis_tau1, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, mix, reosc, hpb, tomochain, tobalaba, dexon, volta, ewc, webchain, thundercore, flare, flare_coston, theta)
+$(error Unsupported CHAIN - use ethereum, ropsten, ethereum_classic, expanse, poa, artis_sigma1, artis_tau1, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, mix, reosc, hpb, tomochain, tobalaba, dexon, volta, ewc, webchain, thundercore)
 endif
 endif
 

src/chainConfig.h

@@ -54,7 +54,6 @@ typedef enum chain_kind_e {
     CHAIN_KIND_WEBCHAIN,
     CHAIN_KIND_THUNDERCORE,
     CHAIN_KIND_FLARE,
-    CHAIN_KIND_THETA,
     CHAIN_KIND_BSC
 } chain_kind_t;
 

src/main.c

@@ -250,9 +250,6 @@ tokenDefinition_t *getKnownToken(uint8_t *contractAddress) {
         case CHAIN_KIND_FLARE:
             numTokens = NUM_TOKENS_FLARE;
             break;
-        case CHAIN_KIND_THETA:
-            numTokens = NUM_TOKENS_THETA;
-            break;
         case CHAIN_KIND_BSC:
             numTokens = NUM_TOKENS_BSC;
             break;
@@ -352,9 +349,6 @@ tokenDefinition_t *getKnownToken(uint8_t *contractAddress) {
             case CHAIN_KIND_FLARE:
                 currentToken = (tokenDefinition_t *) PIC(&TOKENS_FLARE[i]);
                 break;
-            case CHAIN_KIND_THETA:
-                currentToken = (tokenDefinition_t *) PIC(&TOKENS_THETA[i]);
-                break;
             case CHAIN_KIND_BSC:
                 currentToken = (tokenDefinition_t *) PIC(&TOKENS_BSC[i]);
                 break;

src/tokens.c

@@ -3853,10 +3853,6 @@ const tokenDefinition_t const TOKENS_ETHEREUM[NUM_TOKENS_ETHEREUM] = {
       0x91, 0x9a, 0xbc, 0x23, 0x5c, 0xa4, 0xfd, 0x7f, 0x72, 0xc1},
      "TGT ",
      1},
-    {{0x38, 0x83, 0xf5, 0xe1, 0x81, 0xfc, 0xca, 0xf8, 0x41, 0x0f,
-      0xa6, 0x1e, 0x12, 0xb5, 0x9b, 0xad, 0x96, 0x3f, 0xb6, 0x45},
-     "THETA ",
-     18},
     {{0x1c, 0xb3, 0x20, 0x9d, 0x45, 0xb2, 0xa6, 0x0b, 0x7f, 0xbc,
       0xa1, 0xcc, 0xdb, 0xf8, 0x7f, 0x67, 0x42, 0x37, 0xa4, 0xaa},
      "THR ",
@@ -4564,8 +4560,6 @@ const tokenDefinition_t const TOKENS_THUNDERCORE[NUM_TOKENS_THUNDERCORE] = {};
 
 const tokenDefinition_t const TOKENS_FLARE[NUM_TOKENS_FLARE] = {};
 
-const tokenDefinition_t const TOKENS_THETA[NUM_TOKENS_THETA] = {};
-
 const tokenDefinition_t const TOKENS_BSC[NUM_TOKENS_BSC] = {};
 
 #endif

src/tokens.h

@@ -95,7 +95,6 @@ static const uint8_t LEDGER_SIGNATURE_PUBLIC_KEY[] = {
 #define NUM_TOKENS_WEBCHAIN         0
 #define NUM_TOKENS_THUNDERCORE      0
 #define NUM_TOKENS_FLARE            0
-#define NUM_TOKENS_THETA            0
 #define NUM_TOKENS_BSC              0
 
 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA];
@@ -129,7 +128,6 @@ extern tokenDefinition_t const TOKENS_ARTIS_TAU1[NUM_TOKENS_ARTIS_TAU1];
 extern tokenDefinition_t const TOKENS_WEBCHAIN[NUM_TOKENS_WEBCHAIN];
 extern tokenDefinition_t const TOKENS_THUNDERCORE[NUM_TOKENS_THUNDERCORE];
 extern tokenDefinition_t const TOKENS_FLARE[NUM_TOKENS_FLARE];
-extern tokenDefinition_t const TOKENS_THETA[NUM_TOKENS_THETA];
 extern tokenDefinition_t const TOKENS_BSC[NUM_TOKENS_BSC];
 
 #endif /* HAVE_TOKENS_LIST */