From 6ac7be127714f9ad125da9e72cded05af9c755a3 Mon Sep 17 00:00:00 2001 From: Neozaru Date: Wed, 6 Oct 2021 14:13:33 +0200 Subject: [PATCH] feat: goerli build (#202) * feat: goerli build * Apply clang-format-10 Co-authored-by: TamtamHero <10632523+TamtamHero@users.noreply.github.com> --- Makefile | 19 +++++++++++++++++-- icons/blue_app_goerli.gif | Bin 0 -> 405 bytes icons/goerli.png | Bin 0 -> 2117 bytes icons/nanos_app_goerli.gif | Bin 0 -> 1125 bytes icons/nanox_app_goerli.gif | Bin 0 -> 1116 bytes src/tokens.c | 18 ++++++++++++++++++ src/tokens.h | 2 +- 7 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 icons/blue_app_goerli.gif create mode 100755 icons/goerli.png create mode 100644 icons/nanos_app_goerli.gif create mode 100644 icons/nanox_app_goerli.gif diff --git a/Makefile b/Makefile index 02e600a..f4aaa4a 100755 --- a/Makefile +++ b/Makefile @@ -67,6 +67,21 @@ DEFINES += HAVE_ETH2 APPNAME = "Eth Ropsten" DEFINES_LIB= APP_LOAD_FLAGS=--appFlags 0xa40 +else ifeq ($(CHAIN),goerli) +APP_LOAD_PARAMS += --path "44'/60'" +DEFINES += CHAINID_UPCASE=\"ETHEREUM\" CHAINID_COINNAME=\"ETH\" CHAIN_KIND=CHAIN_KIND_ETHEREUM CHAIN_ID=5 +# Starkware integration +APP_LOAD_PARAMS += --path "2645'/579218131'" +DEFINES += HAVE_STARKWARE +# Keep for Starkware Goerli tests +DEFINES += HAVE_TOKENS_EXTRA_LIST +DEFINES += STARK_BIP32_PATH_0=0x80000A55 STARK_BIP32_PATH_1=0xA2862AD3 +# Allow to derive ETH 2 public keys +APP_LOAD_PARAMS += --path "12381/3600" --curve bls12381g1 +DEFINES += HAVE_ETH2 +APPNAME = "Eth Goerli" +DEFINES_LIB= +APP_LOAD_FLAGS=--appFlags 0xa40 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 @@ -213,7 +228,7 @@ DEFINES += CHAINID_UPCASE=\"SONGBIRD\" CHAINID_COINNAME=\"SGB\" CHAIN_KIND=CHAIN APPNAME = "Songbird" 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, bsc, songbird) +$(error Unsupported CHAIN - use ethereum, ropsten, goerli, 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) endif endif @@ -384,4 +399,4 @@ include $(BOLOS_SDK)/Makefile.rules dep/%.d: %.c Makefile listvariants: - @echo VARIANTS CHAIN ethereum ropsten 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 + @echo VARIANTS CHAIN ethereum ropsten goerli 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 diff --git a/icons/blue_app_goerli.gif b/icons/blue_app_goerli.gif new file mode 100644 index 0000000000000000000000000000000000000000..c3d5c4e1dc70b9a674bb9e74c88711501e93b7e2 GIT binary patch literal 405 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 literal 0 HcmV?d00001 diff --git a/src/tokens.c b/src/tokens.c index cdf7d24..c4d25d9 100644 --- a/src/tokens.c +++ b/src/tokens.c @@ -21,6 +21,7 @@ const tokenDefinition_t const TOKENS_EXTRA[NUM_TOKENS_EXTRA] = { + // Ropsten DeversiFi tokens {{0x4c, 0x5f, 0x66, 0x59, 0x61, 0x97, 0xa8, 0x6f, 0xb3, 0x0a, 0x24, 0x35, 0xe2, 0xef, 0x4d, 0xdc, 0xb3, 0x93, 0x42, 0xc9}, "tUSDT ", @@ -37,6 +38,23 @@ const tokenDefinition_t const TOKENS_EXTRA[NUM_TOKENS_EXTRA] = { 0x53, 0x3c, 0xd6, 0xa2, 0x1e, 0x3e, 0x59, 0xbe, 0x32, 0x4a}, "tBTC ", 18}, + // Goerli DeversiFi tokens + {{0xd9, 0x97, 0xa8, 0x63, 0x46, 0xe7, 0x65, 0x18, 0xe6, 0x92, + 0x25, 0x56, 0xf3, 0x4d, 0x76, 0x61, 0x30, 0xc0, 0xbb, 0xfd}, + "tUSDT ", + 6}, + {{0xc1, 0xd5, 0x79, 0xeb, 0xff, 0x7c, 0x0f, 0x6c, 0xfd, 0x9a, + 0xd5, 0xfb, 0x26, 0x7f, 0xec, 0x73, 0xbe, 0x70, 0xc8, 0xf7}, + "tBTC ", + 18}, + {{0xa8, 0xf3, 0x14, 0x4f, 0xea, 0x2c, 0x37, 0x5a, 0xd0, 0x58, + 0xec, 0x12, 0x09, 0x9a, 0x5a, 0x21, 0xa2, 0x6f, 0xe9, 0x96}, + "tDVF ", + 18}, + {{0x4c, 0xda, 0xbe, 0xc1, 0x2a, 0x39, 0x7f, 0xb6, 0xef, 0xaf, + 0x46, 0x13, 0xd5, 0xdf, 0xd7, 0x9b, 0x30, 0x9a, 0xe9, 0xfa}, + "tXDVF ", + 18}, }; diff --git a/src/tokens.h b/src/tokens.h index c3ea404..3d0d4d4 100644 --- a/src/tokens.h +++ b/src/tokens.h @@ -34,7 +34,7 @@ typedef struct tokenDefinition_t { #ifdef HAVE_TOKENS_EXTRA_LIST -#define NUM_TOKENS_EXTRA 4 +#define NUM_TOKENS_EXTRA 8 extern tokenDefinition_t const TOKENS_EXTRA[NUM_TOKENS_EXTRA];