From 45c049fd04688f038279a3cbe27507e1155211d6 Mon Sep 17 00:00:00 2001 From: tjulien-ledger <84443769+tjulien-ledger@users.noreply.github.com> Date: Fri, 10 Mar 2023 18:41:35 +0100 Subject: [PATCH] Oasys (#413) * correcting ticker * modifying conf file * updating main.c * updating chainConfig.h * Removed last bits of EWC * correcting arbitrum * adding oasys conf file * adding oasys icons * remaining changes for oasys * removing trailing space --------- Co-authored-by: Alexandre Paillier --- icons/nanos_app_oasys.gif | Bin 0 -> 107 bytes icons/nanox_app_oasys.gif | Bin 0 -> 104 bytes makefile_conf/chain/oasys.mk | 3 +++ src/chainConfig.h | 3 ++- src/main.c | 6 ++++++ src/tokens.c | 2 ++ src/tokens.h | 2 ++ src_common/network.c | 3 ++- 8 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 icons/nanos_app_oasys.gif create mode 100644 icons/nanox_app_oasys.gif create mode 100644 makefile_conf/chain/oasys.mk diff --git a/icons/nanos_app_oasys.gif b/icons/nanos_app_oasys.gif new file mode 100644 index 0000000000000000000000000000000000000000..e43f39477a163958026a4fd073bf3981d429fd74 GIT binary patch literal 107 zcmZ?wbhEHb6krfw_`t{j1poj4SNzEWVlgQG=l0A^Oi%SqOwUZt=1Wh^%}um5&@(Xw zK?WU=5|BOyCY7H4m8ah_#B>Op6HPajEIq9`rCjxK;UuXW3w^q`J=pE}tyi9v!5RQ* CA0hPs literal 0 HcmV?d00001 diff --git a/icons/nanox_app_oasys.gif b/icons/nanox_app_oasys.gif new file mode 100644 index 0000000000000000000000000000000000000000..cfb4ea46048024d31bfddca79204121bb0a482a8 GIT binary patch literal 104 zcmZ?wbhEHbB&gM%`%*{=-HPACL z1wjTKkP?tS1}4Rx{*|j4Wabqc?zK33wf$3EW3;K)3Dbq@#!2b7Q!n^Pvocr%00&(k AiU0rr literal 0 HcmV?d00001 diff --git a/makefile_conf/chain/oasys.mk b/makefile_conf/chain/oasys.mk new file mode 100644 index 0000000..0e2dc18 --- /dev/null +++ b/makefile_conf/chain/oasys.mk @@ -0,0 +1,3 @@ +APP_LOAD_PARAMS += --path "44'/685'" --path "44'/60'" +DEFINES += CHAINID_UPCASE=\"OASYS\" CHAINID_COINNAME=\"OAS\" CHAIN_KIND=CHAIN_KIND_OASYS CHAIN_ID=248 +APPNAME = "Oasys" diff --git a/src/chainConfig.h b/src/chainConfig.h index fd09ed2..070de49 100644 --- a/src/chainConfig.h +++ b/src/chainConfig.h @@ -73,7 +73,8 @@ typedef enum chain_kind_e { CHAIN_KIND_MULTIVAC, CHAIN_KIND_TECRA, CHAIN_KIND_APOTHEMNETWORK, - CHAIN_KIND_ID4GOOD + CHAIN_KIND_ID4GOOD, + CHAIN_KIND_OASYS } chain_kind_t; typedef struct chain_config_s { diff --git a/src/main.c b/src/main.c index 56a7f6b..3ba8bd6 100644 --- a/src/main.c +++ b/src/main.c @@ -297,6 +297,9 @@ extraInfo_t *getKnownToken(uint8_t *contractAddress) { case CHAIN_KIND_ID4GOOD: numTokens = NUM_TOKENS_ID4GOOD; break; + case CHAIN_KIND_OASYS: + numTokens = NUM_TOKENS_OASYS; + break; } for (i = 0; i < numTokens; i++) { switch (chainConfig->kind) { @@ -453,6 +456,9 @@ extraInfo_t *getKnownToken(uint8_t *contractAddress) { case CHAIN_KIND_ID4GOOD: currentToken = (tokenDefinition_t *) PIC(&TOKENS_ID4GOOD[i]); break; + case CHAIN_KIND_OASYS: + currentToken = (tokenDefinition_t *) PIC(&TOKENS_OASYS[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 8916c0e..e17e482 100644 --- a/src/tokens.c +++ b/src/tokens.c @@ -222,4 +222,6 @@ const tokenDefinition_t const TOKENS_TECRA[NUM_TOKENS_TECRA] = {}; const tokenDefinition_t const TOKENS_APOTHEMNETWORK[NUM_TOKENS_APOTHEMNETWORK] = {}; +const tokenDefinition_t const TOKENS_OASYS[NUM_TOKENS_OASYS] = {}; + #endif diff --git a/src/tokens.h b/src/tokens.h index 7eecde1..1a261c3 100644 --- a/src/tokens.h +++ b/src/tokens.h @@ -125,6 +125,7 @@ static const uint8_t LEDGER_SIGNATURE_PUBLIC_KEY[] = { #define NUM_TOKENS_MULTIVAC 0 #define NUM_TOKENS_TECRA 0 #define NUM_TOKENS_APOTHEMNETWORK 0 +#define NUM_TOKENS_OASYS 0 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA]; extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM]; @@ -175,6 +176,7 @@ extern tokenDefinition_t const TOKENS_METER[NUM_TOKENS_METER]; extern tokenDefinition_t const TOKENS_MULTIVAC[NUM_TOKENS_MULTIVAC]; extern tokenDefinition_t const TOKENS_TECRA[NUM_TOKENS_TECRA]; extern tokenDefinition_t const TOKENS_APOTHEMNETWORK[NUM_TOKENS_APOTHEMNETWORK]; +extern tokenDefinition_t const TOKENS_OASYS[NUM_TOKENS_OASYS]; #endif /* HAVE_TOKENS_LIST */ diff --git a/src_common/network.c b/src_common/network.c index 84e08dd..f0dc4d1 100644 --- a/src_common/network.c +++ b/src_common/network.c @@ -61,7 +61,8 @@ static const network_info_t NETWORK_MAPPING[] = { {.chain_id = 57, .name = "Syscoin", .ticker = "SYS"}, {.chain_id = 106, .name = "Velas EVM", .ticker = "VLX"}, {.chain_id = 288, .name = "Boba Network", .ticker = "ETH"}, - {.chain_id = 39797, .name = "Energi", .ticker = "NRG"}}; + {.chain_id = 39797, .name = "Energi", .ticker = "NRG"}, + {.chain_id = 248, .name = "Oasys", .ticker = "OAS"}}; uint64_t get_chain_id(void) { uint64_t chain_id = 0;