diff --git a/Makefile b/Makefile index 1a5efba..d65af42 100755 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ APP_LOAD_PARAMS += --path "1517992542'/1101353413'" APPVERSION_M=1 APPVERSION_N=9 -APPVERSION_P=14 +APPVERSION_P=16 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P) APP_LOAD_FLAGS= --appFlags 0x240 --dep Ethereum:$(APPVERSION) @@ -234,9 +234,13 @@ else ifeq ($(CHAIN),polygon) APP_LOAD_PARAMS += --path "44'/60'" DEFINES += CHAINID_UPCASE=\"POLYGON\" CHAINID_COINNAME=\"MATIC\" CHAIN_KIND=CHAIN_KIND_POLYGON CHAIN_ID=137 APPNAME = "Polygon" +else ifeq ($(CHAIN),shyft) +APP_LOAD_PARAMS += --path "44'/60'" +DEFINES += CHAINID_UPCASE=\"SHYFT\" CHAINID_COINNAME=\"SHFT\" CHAIN_KIND=CHAIN_KIND_SHYFT CHAIN_ID=7341 +APPNAME = "Shyft" else ifeq ($(filter clean,$(MAKECMDGOALS)),) -$(error Unsupported CHAIN - use ethereum, ropsten, goerli, moonriver, 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, bsc, songbird, polygon) +$(error Unsupported CHAIN - use ethereum, ropsten, goerli, moonriver, 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, bsc, songbird, polygon, shyft) endif endif @@ -407,4 +411,4 @@ include $(BOLOS_SDK)/Makefile.rules dep/%.d: %.c Makefile listvariants: - @echo VARIANTS CHAIN ethereum ropsten goerli moonriver ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain pirl akroma atheios callisto ethersocial ether1 gochain musicoin ethergem mix ellaism reosc hpb tomochain dexon volta ewc thundercore bsc songbird polygon + @echo VARIANTS CHAIN ethereum ropsten goerli moonriver ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain pirl akroma atheios callisto ethersocial ether1 gochain musicoin ethergem mix ellaism reosc hpb tomochain dexon volta ewc thundercore bsc songbird polygon shyft diff --git a/icons/nanos_app_shyft.gif b/icons/nanos_app_shyft.gif new file mode 100644 index 0000000..3a07de0 Binary files /dev/null and b/icons/nanos_app_shyft.gif differ diff --git a/icons/nanox_app_shyft.gif b/icons/nanox_app_shyft.gif new file mode 100644 index 0000000..fd1cb06 Binary files /dev/null and b/icons/nanox_app_shyft.gif differ diff --git a/src/chainConfig.h b/src/chainConfig.h index 3a174a1..733a1a6 100644 --- a/src/chainConfig.h +++ b/src/chainConfig.h @@ -57,7 +57,8 @@ typedef enum chain_kind_e { CHAIN_KIND_FLARE, CHAIN_KIND_BSC, CHAIN_KIND_SONGBIRD, - CHAIN_KIND_POLYGON + CHAIN_KIND_POLYGON, + CHAIN_KIND_SHYFT } chain_kind_t; typedef struct chain_config_s { diff --git a/src/main.c b/src/main.c index 11358e7..999d1d9 100644 --- a/src/main.c +++ b/src/main.c @@ -266,6 +266,9 @@ tokenDefinition_t *getKnownToken(uint8_t *contractAddress) { case CHAIN_KIND_POLYGON: numTokens = NUM_TOKENS_POLYGON; break; + case CHAIN_KIND_SHYFT: + numTokens = NUM_TOKENS_SHYFT; + break; } for (i = 0; i < numTokens; i++) { switch (chainConfig->kind) { @@ -374,6 +377,9 @@ tokenDefinition_t *getKnownToken(uint8_t *contractAddress) { case CHAIN_KIND_POLYGON: currentToken = (tokenDefinition_t *) PIC(&TOKENS_POLYGON[i]); break; + case CHAIN_KIND_SHYFT: + currentToken = (tokenDefinition_t *) PIC(&TOKENS_SHYFT[i]); + break; } if (memcmp(currentToken->address, tmpContent.txContent.destination, ADDRESS_LENGTH) == 0) { return currentToken; diff --git a/src/tokens.c b/src/tokens.c index b6a9181..e1ddb5f 100644 --- a/src/tokens.c +++ b/src/tokens.c @@ -192,4 +192,6 @@ const tokenDefinition_t const TOKENS_MOONRIVER[NUM_TOKENS_MOONRIVER] = {}; const tokenDefinition_t const TOKENS_POLYGON[NUM_TOKENS_POLYGON] = {}; +const tokenDefinition_t const TOKENS_SHYFT[NUM_TOKENS_SHYFT] = {}; + #endif diff --git a/src/tokens.h b/src/tokens.h index 45c7460..4c3b2ee 100644 --- a/src/tokens.h +++ b/src/tokens.h @@ -101,6 +101,7 @@ static const uint8_t LEDGER_SIGNATURE_PUBLIC_KEY[] = { #define NUM_TOKENS_SONGBIRD 0 #define NUM_TOKENS_MOONRIVER 0 #define NUM_TOKENS_POLYGON 0 +#define NUM_TOKENS_SHYFT 0 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA]; extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM]; @@ -137,6 +138,7 @@ extern tokenDefinition_t const TOKENS_BSC[NUM_TOKENS_BSC]; extern tokenDefinition_t const TOKENS_SONGBIRD[NUM_TOKENS_SONGBIRD]; extern tokenDefinition_t const TOKENS_MOONRIVER[NUM_TOKENS_MOONRIVER]; extern tokenDefinition_t const TOKENS_POLYGON[NUM_TOKENS_POLYGON]; +extern tokenDefinition_t const TOKENS_SHYFT[NUM_TOKENS_SHYFT]; #endif /* HAVE_TOKENS_LIST */