diff --git a/Makefile b/Makefile index 3c1890b..874589e 100755 --- a/Makefile +++ b/Makefile @@ -117,9 +117,13 @@ else ifeq ($(CHAIN),mix) APP_LOAD_PARAMS += --path "44'/76'" DEFINES += CHAINID_UPCASE=\"MIX\" CHAINID_COINNAME=\"MIX\" CHAIN_KIND=CHAIN_KIND_MIX CHAIN_ID=76 APPNAME = "Mix" +else ifeq ($(CHAIN),reosc) +APP_LOAD_PARAMS += --path "44'/2894'" +DEFINES += CHAINID_UPCASE=\"REOSC\" CHAINID_COINNAME=\"REOSC\" CHAIN_KIND=CHAIN_KIND_REOSC CHAIN_ID=2894 +APPNAME = "REOSC" else ifeq ($(filter clean,$(MAKECMDGOALS)),) -$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, mix) +$(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, mix, reosc) endif endif @@ -211,4 +215,4 @@ include $(BOLOS_SDK)/Makefile.rules dep/%.d: %.c Makefile listvariants: - @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma atheios callisto ethersocial ether1 gochain musicoin ethergem mix ellaism + @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma atheios callisto ethersocial ether1 gochain musicoin ethergem mix ellaism reosc diff --git a/blue_app_reosc.gif b/blue_app_reosc.gif new file mode 100644 index 0000000..c3d5c4e Binary files /dev/null and b/blue_app_reosc.gif differ diff --git a/glyphs/blue_badge_reosc.gif b/glyphs/blue_badge_reosc.gif new file mode 100644 index 0000000..5174214 Binary files /dev/null and b/glyphs/blue_badge_reosc.gif differ diff --git a/glyphs/nanos_badge_reosc.gif b/glyphs/nanos_badge_reosc.gif new file mode 100644 index 0000000..776f645 Binary files /dev/null and b/glyphs/nanos_badge_reosc.gif differ diff --git a/nanos_app_reosc.gif b/nanos_app_reosc.gif new file mode 100644 index 0000000..8f8fa31 Binary files /dev/null and b/nanos_app_reosc.gif differ diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h index e87494a..3e16948 100644 --- a/src_genericwallet/chainConfig.h +++ b/src_genericwallet/chainConfig.h @@ -23,7 +23,8 @@ typedef enum chain_kind_e { CHAIN_KIND_ETHERGEM, CHAIN_KIND_ATHEIOS, CHAIN_KIND_GOCHAIN, - CHAIN_KIND_MIX + CHAIN_KIND_MIX, + CHAIN_KIND_REOSC } chain_kind_t; typedef struct chain_config_s { diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c index a64b1b8..763ffd2 100644 --- a/src_genericwallet/main.c +++ b/src_genericwallet/main.c @@ -1517,6 +1517,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_MIX: numTokens = NUM_TOKENS_MIX; break; + case CHAIN_KIND_REOSC: + numTokens = NUM_TOKENS_REOSC; + break; } for (i=0; ikind) { @@ -1577,6 +1580,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_MIX: currentToken = PIC(&TOKENS_MIX[i]); break; + case CHAIN_KIND_REOSC: + currentToken = PIC(&TOKENS_REOSC[i]); + break; } if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) { return currentToken; diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c index 0e09a20..0f700fa 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -1171,3 +1171,5 @@ const tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS] = {}; const tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN] = {}; const tokenDefinition_t const TOKENS_MIX[NUM_TOKENS_MIX] = {}; + +const tokenDefinition_t const TOKENS_REOSC[NUM_TOKENS_REOSC] = {}; diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h index 2442181..129fded 100644 --- a/src_genericwallet/tokens.h +++ b/src_genericwallet/tokens.h @@ -42,6 +42,7 @@ typedef struct tokenDefinition_t { #define NUM_TOKENS_ATHEIOS 0 #define NUM_TOKENS_GOCHAIN 0 #define NUM_TOKENS_MIX 0 +#define NUM_TOKENS_REOSC 0 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA]; extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM]; @@ -62,3 +63,4 @@ extern tokenDefinition_t const TOKENS_ETHERGEM[NUM_TOKENS_ETHERGEM]; extern tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS]; extern tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN]; extern tokenDefinition_t const TOKENS_MIX[NUM_TOKENS_MIX]; +extern tokenDefinition_t const TOKENS_REOSC[NUM_TOKENS_REOSC];