From 843b5ff80c6ae5eea842bf2d809b44bd381c7f75 Mon Sep 17 00:00:00 2001 From: Michael Ira Krufky Date: Sun, 7 Oct 2018 10:14:12 -0400 Subject: [PATCH] Add support for Mix Blockchain homepage: https://www.mix-blockchain.org block explorer: https://blocks.mix-blockchain.org network statistics : https://stats.mix-blockchain.org slip0044 index : 76 chain ID: 76 --- Makefile | 8 ++++++-- blue_app_mix.gif | Bin 0 -> 405 bytes glyphs/blue_badge_mix.gif | Bin 0 -> 347 bytes glyphs/nanos_badge_mix.gif | Bin 0 -> 1132 bytes nanos_app_mix.gif | Bin 0 -> 1125 bytes src_genericwallet/chainConfig.h | 3 ++- src_genericwallet/main.c | 6 ++++++ src_genericwallet/tokens.c | 2 ++ src_genericwallet/tokens.h | 2 ++ 9 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 blue_app_mix.gif create mode 100644 glyphs/blue_badge_mix.gif create mode 100644 glyphs/nanos_badge_mix.gif create mode 100644 nanos_app_mix.gif diff --git a/Makefile b/Makefile index 2b322e8ef..5518dd631 100755 --- a/Makefile +++ b/Makefile @@ -117,9 +117,13 @@ else ifeq ($(CHAIN),eosclassic) APP_LOAD_PARAMS += --path "44'/2018'" DEFINES += CHAINID_UPCASE=\"EOSCLASSIC\" CHAINID_COINNAME=\"EOSC\" CHAIN_KIND=CHAIN_KIND_EOSCLASSIC CHAIN_ID=20 APPNAME = "EOSClassic" +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 ($(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, eosclassic) +$(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, eosclassic, mix) 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 ellaism ethergem eosclassic + @echo VARIANTS CHAIN ethereum ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain kusd pirl akroma atheios callisto ethersocial ether1 gochain # musicoin ellaism ethergem eosclassic mix diff --git a/blue_app_mix.gif b/blue_app_mix.gif new file mode 100644 index 0000000000000000000000000000000000000000..c3d5c4e1dc70b9a674bb9e74c88711501e93b7e2 GIT binary patch literal 405 zcmV;G0c!q7Nk%w1VKM+R0J8u9^ZELJ+~uw4?$hz~=l1sw!_t@G={?NZ0Kd;}+2c~t z-7v}50Km}s`T76<{{X$uEC2ui05SkF000F4u*pdq5kakjp8p_-6pIoFM5V3`U>spA z&)#7G>}nKr?|TJ9ZZd%Vj=jSmH{c16oa1f**9fP_ zzyzX%BcuK)qLzcE3h0?N}2 z36~4CMIQ>-vH{;73b7ALZqpvLhr|T}mD21$&JNKC0rv~_AqtHE+;foNQx{a6R$Up< z#TcbzYWj6y)aVhE5@UFI5@Vu|r9lcxKhf)g!rze;7EOZq(nckXGNoLCSTkXrOb=xy zr1Zy8muB=;w2_yx zH_%rkB;Xfv=2hgiQ3%11xI=P?p@PF{M)Igo=Ltk22%;p$gqnHN5$Jj;6I(m`ieZaF zi8{*1!H5bv#__9w!=@@hE7h|4eB9+eyhIT>_Cr6{}d=wluJ#9R0zBjq{0eKK!x@aF0`n{N~eP?Pc()( tqJ`2!I)>^s6f$y4$$5=TN;G7`#*0S!z$C*}gQ7s394XFB7ZXVV06SD}p<)04 literal 0 HcmV?d00001 diff --git a/glyphs/nanos_badge_mix.gif b/glyphs/nanos_badge_mix.gif new file mode 100644 index 0000000000000000000000000000000000000000..776f6454b3f247e94570e722dd801ddd5f5f5ced GIT binary patch literal 1132 zcmZ?wbhEHbh+i z#(Mch>H3D2mX`VkM*2oZx|Z5PFSp>IEf;+ybD@E~!PCWvMA{Mftf3V2@j6VsVR^ zk&}_JqpJzfJY(!`f#^-a?G^)^ZqWxiMjsTtNYM=w0;VAl6P|d19C-3i%>$zB`;K7M%r?(Lh`uU@`*{_N?K$B!O9xPR~No!hr=-nf44>Xplv zE?zi)?(CVz2)%Hf~tIZta@Yt5&X9zHI4| z#fug$m_KjsoY}Kx&X_)J>XgZoCQj(@>+R|8>g;H5Yi((6YHX;ltF5W7s;nq4D=jH5 zDlEv)%gxEo%FIYlOHD~mN=%54i;annii`*k3k?Yl3Jmb~^Y!ue^7L?bb9Hfca&)k_ zv$e6dva~QaGc_?bGBnWF)78<|($r8_Q&mw`QdE$ala-N{l9Uh^6BQ8_5)|O)#mZm}0O8n;egFUf literal 0 HcmV?d00001 diff --git a/nanos_app_mix.gif b/nanos_app_mix.gif new file mode 100644 index 0000000000000000000000000000000000000000..8f8fa310bac0bf66875ff867705033cf5c9331ca GIT binary patch literal 1125 zcmZ?wbhEHb6krfwXkcLY|NlP&1B2p!?g-xi1((Eh+i z#(Mch>H3D2mX`VkM*2oZx|Z5PB_f>IEf;+ybD@E~!PCWvMA{Mftf3V2@j6VsVS1 zi=~sRi7RgNpn6lVxCN@$5vN=9fsWA!MK4lx!-Rlo2*iXZULXga{8RIQX}$=UxEcTd z`}^njub)4@fBX97^QVs=-oJbM=Jl(WFP=Yp`sDGWhY#-GyL;#Mt(!NlU%Ptc@}-Lx z&YwGb=JctPCypOGdgSn-g9rBS+q-A?uAMu!Z`-%OrteG>WPn$Yr@}!9q`ulo&y1P0%+S^)NnwuIM>g#H2s;eq1%F9Yiii-*h z^7C?Yva>QX($i8?l9Lh>;^SgtqN5@s!oxyCf`bAB{QZ1=yuCa<+}&JVoShsU?CorA ztgS39%*{+qjExKp^!0Rgw6!!f)YVi~l$8_}kind) { @@ -1577,6 +1580,9 @@ tokenDefinition_t* getKnownToken() { case CHAIN_KIND_EOSCLASSIC: currentToken = PIC(&TOKENS_EOSCLASSIC[i]); break; + case CHAIN_KIND_MIX: + currentToken = PIC(&TOKENS_MIX[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 60bfc2000..ac9f468fe 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -1137,3 +1137,5 @@ const tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS] = {}; const tokenDefinition_t const TOKENS_GOCHAIN[NUM_TOKENS_GOCHAIN] = {}; const tokenDefinition_t const TOKENS_EOSCLASSIC[NUM_TOKENS_EOSCLASSIC] = {}; + +const tokenDefinition_t const TOKENS_MIX[NUM_TOKENS_MIX] = {}; diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h index 53af16d96..28e07e863 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_EOSCLASSIC 0 +#define NUM_TOKENS_MIX 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_EOSCLASSIC[NUM_TOKENS_EOSCLASSIC]; +extern tokenDefinition_t const TOKENS_MIX[NUM_TOKENS_MIX];