d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix alternate chain ticker names

Browse Source
This commit is contained in:
BTChip github
2017-10-27 05:38:29 +02:00
parent f833e315c2
commit a240145f0f
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.genericwallet
View File

@@ -23,20 +23,20 @@ include $(BOLOS_SDK)/Makefile.defines
APPVERSION_M=1 APPVERSION_M=1
APPVERSION_N=0 APPVERSION_N=0
APPVERSION_P=19 APPVERSION_P=20
APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P) APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
ifeq ($(CHAIN),ethereum) ifeq ($(CHAIN),ethereum)
APP_LOAD_PARAMS += --path "44'/60'" --path "44'/61'" APP_LOAD_PARAMS += --path "44'/60'" --path "44'/61'"
DEFINES += CHAINID_UPCASE=\"ETHEREUM\" CHAINID_NAME=\"Ethereum\" CHAINID=$(CHAIN) CHAIN_TYPE_ETHEREUM DEFINES += CHAINID_UPCASE=\"ETHEREUM\" CHAINID_COINNAME=\"ETH\" CHAINID_NAME=\"Ethereum\" CHAINID=$(CHAIN) CHAIN_TYPE_ETHEREUM
APPNAME = Ethereum APPNAME = Ethereum
else ifeq ($(CHAIN),expanse) else ifeq ($(CHAIN),expanse)
APP_LOAD_PARAMS += --path "44'/40'" APP_LOAD_PARAMS += --path "44'/40'"
DEFINES += CHAINID_UPCASE=\"EXPANSE\" CHAINID_NAME=\"Expanse\" CHAINID=$(CHAIN) CHAIN_TYPE_EXPANSE DEFINES += CHAINID_UPCASE=\"EXPANSE\" CHAINID_COINNAME=\"EXP\" CHAINID_NAME=\"Expanse\" CHAINID=$(CHAIN) CHAIN_TYPE_EXPANSE
APPNAME = Expanse APPNAME = Expanse
else ifeq ($(CHAIN),ubiq) else ifeq ($(CHAIN),ubiq)
APP_LOAD_PARAMS += --path "44'/108'" APP_LOAD_PARAMS += --path "44'/108'"
DEFINES += CHAINID_UPCASE=\"UBIQ\" CHAINID_NAME=\"Ubiq\" CHAINID=$(CHAIN) CHAIN_TYPE_UBIQ DEFINES += CHAINID_UPCASE=\"UBIQ\" CHAINID_COINNAME=\"UBQ\" CHAINID_NAME=\"Ubiq\" CHAINID=$(CHAIN) CHAIN_TYPE_UBIQ
APPNAME = Ubiq APPNAME = Ubiq
else else
ifeq ($(filter clean,$(MAKECMDGOALS)),) ifeq ($(filter clean,$(MAKECMDGOALS)),)

16
src_genericwallet/main.c
View File

@@ -81,7 +81,7 @@ uint32_t set_result_get_publicKey(void);
#define WEI_TO_ETHER 18 #define WEI_TO_ETHER 18
static const uint8_t const TOKEN_TRANSFER_ID[] = {0xa9, 0x05, 0x9c, 0xbb}; static const uint8_t const TOKEN_TRANSFER_ID[] = {0xa9, 0x05, 0x9c, 0xbb};
static const uint8_t const TICKER_ETH[] = "ETH "; static const uint8_t const TICKER_ETH[] = CHAINID_COINNAME " ";
typedef struct tokenContext_t { typedef struct tokenContext_t {
uint8_t data[4 + 32 + 32]; uint8_t data[4 + 32 + 32];
uint32_t dataFieldPos; uint32_t dataFieldPos;
@@ -2350,15 +2350,17 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer,
adjustDecimals((char *)(G_io_apdu_buffer + 100), i, adjustDecimals((char *)(G_io_apdu_buffer + 100), i,
(char *)G_io_apdu_buffer, 100, WEI_TO_ETHER); (char *)G_io_apdu_buffer, 100, WEI_TO_ETHER);
i = 0; i = 0;
maxFee[0] = 'E'; tickerOffset = 0;
maxFee[1] = 'T'; while (ticker[tickerOffset]) {
maxFee[2] = 'H'; maxFee[tickerOffset] = ticker[tickerOffset];
maxFee[3] = ' '; tickerOffset++;
}
tickerOffset++;
while (G_io_apdu_buffer[i]) { while (G_io_apdu_buffer[i]) {
maxFee[4 + i] = G_io_apdu_buffer[i]; maxFee[tickerOffset + i] = G_io_apdu_buffer[i];
i++; i++;
} }
maxFee[4 + i] = '\0'; maxFee[tickerOffset + i] = '\0';
#if defined(TARGET_BLUE) #if defined(TARGET_BLUE)
ui_approval_transaction_blue_init(); ui_approval_transaction_blue_init();