From 486e4b5ed25e8f0c269c098b1df986993132b809 Mon Sep 17 00:00:00 2001 From: Michael Ira Krufky Date: Mon, 30 Jul 2018 18:12:20 -0400 Subject: [PATCH] Add support for Callisto --- Makefile.genericwallet | 4 ++++ blue_app_callisto.gif | Bin 0 -> 1379 bytes glyphs/blue_badge_callisto.gif | Bin 0 -> 1409 bytes glyphs/nanos_badge_callisto.gif | Bin 0 -> 91 bytes nanos_app_callisto.gif | Bin 0 -> 89 bytes src_genericwallet/chainConfig.h | 3 ++- src_genericwallet/main.c | 6 ++++++ src_genericwallet/tokens.c | 2 ++ src_genericwallet/tokens.h | 2 ++ 9 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 blue_app_callisto.gif create mode 100644 glyphs/blue_badge_callisto.gif create mode 100644 glyphs/nanos_badge_callisto.gif create mode 100644 nanos_app_callisto.gif diff --git a/Makefile.genericwallet b/Makefile.genericwallet index acd77b2..37a4979 100755 --- a/Makefile.genericwallet +++ b/Makefile.genericwallet @@ -86,6 +86,10 @@ else ifeq ($(CHAIN),musicoin) APP_LOAD_PARAMS += --path "44'/184'" DEFINES += CHAINID_UPCASE=\"MUSICOIN\" CHAINID_COINNAME=\"MUSIC\" CHAIN_KIND=CHAIN_KIND_MUSICOIN CHAIN_ID=7762959 APPNAME = "Musicoin" +else ifeq ($(CHAIN),callisto) +APP_LOAD_PARAMS += --path "44'/820'" +DEFINES += CHAINID_UPCASE=\"CALLISTO\" CHAINID_COINNAME=\"CLO\" CHAIN_KIND=CHAIN_KIND_CALLISTO CHAIN_ID=820 +APPNAME = "Callisto" else ifeq ($(filter clean,$(MAKECMDGOALS)),) $(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd) diff --git a/blue_app_callisto.gif b/blue_app_callisto.gif new file mode 100644 index 0000000000000000000000000000000000000000..9b5607bf9b7dcbec8db0eabee0a7be99532d15af GIT binary patch literal 1379 zcmZ?wbhEHbG-5Df_|Cx4bF8T6SaI*MlD^}m{m0AtPn1kJUN-SW`NR_y6Hio5I$1UO zWcB1zwNp;jOgU9M?R4F=)AcjYG|f8OGUr^|+;i>o&Uef^-#PDG*TVBX3odjoywJ1g zLhs^>eM>G*Sb7PFCa%0Pb>)?5tFBI8cWut*n~S#GT)g$xlI^#bZ@;}_2N2y^x$DmA z-FMgQy|-@Pz4iO=Z`gl-^O%4sytN77@rE7&VJd~{jt zrfVqH7IRXlp+O?bC-2CGO={jes=i8v37gYB*gZ__9=_bH;lggop0zV!%ge*uhU~`* zytXFx^s=rB)14sP8n#yBK+4A*n>s{<;vJO?ZhY#wtt@rP>CMBbOQW}^m6=SqE#TU| zt^96Y=0c-fcD4rQ-MLCmdd-IvMYY+K9%?^1kvFx#-&_LL%l(zn;x8(5j=C0iylAK*9| z9TD^Im6;cZg0aN9|0|jj7^WC|MuhA?|4~7$IRgAvBahz)ga|TgKzqk#J@nhXZZQIo|_XyL3N_HZ;C8NN5aZobaH@ zOy)prLY#xaeRhTu4fE?7zp77<4sQ9t%*(Sf!L{=F((U&peN2u`k9M*VpUX7wZh~xC zi($E&DBoNKnZjc`L*4kQKbD2F@kwqtDtYeVGU@!iJ4+Ru8Cx2nB)|F|Sms==d+;Eq zos6U#=QLHdo085y!lyEH+%(M)ez)}Kf%q=AYpzp^N&~KYHBQ}lxTt911?MF9oCC{T z`I=I~GWN(8TwGedNkmM-KgHwfD=$_H#j9(y_c~k%+EK?M>gN3Ql|YcxTNND!hm&7e wf_KDCnBu8%@>DdV!O511!WuhHTxZm{k+s&1P4P*?7F*E=46b64(gFWzi{Eg#fuj&UAlDn^5rX6u3Wu( z_1d*-*RNl{apT6#n>TOWx^?^Z?YnpH-n)12!Gi}6A3l8a=+ToWPo6$~`s~@W=g*(N zc=6)p%a^ZSy?Xun^_w?u-oAbN?%lih@85s;@ZsafkDoq$`uzFxmoHzwe*OCG+qduE zzyJ90O@p`3Kyvbe)00iZr?kx6{OHs?>uNt9 zsm&^W3ytc_OuD8#J~LfrrdjE#D~}H?W>(aAu^{PH*Yb${VWt@i-Y^TsEfv~g(U^2| z6RX;S8K<@>L~PGLt#o1n)62V!r5~T^o@QXVbRdbjMb)BWLyM5@f2DaprZsZ#3JL77 zJ;11OMKs)c-&unISB@P5o+Y_E4Gd3hw+NOoxG=4yk-eKYZm!SGhNi39W-1!lNvti~ zMV`6Uo{Ub4r0@qxjJ!hgv0=)Z>$R zU$`lFX|8C9>yWCtGJ{#J?b<{J2}g4QR&KM1L(Ob177rc7pSnGCWfn=l#r0eAf_yJy z)YnVpvbre^?EE1L0c@-bmdjQ1ibn^N(UDai3lM?jOFPf>HcZ~bH8pze)(^{8P23$kaf*KN>qR004AubV?Q<{y literal 0 HcmV?d00001 diff --git a/glyphs/nanos_badge_callisto.gif b/glyphs/nanos_badge_callisto.gif new file mode 100644 index 0000000000000000000000000000000000000000..25a0cddfe1bc9633fc5160ef873650a9a78eab8c GIT binary patch literal 91 zcmZ?wbhEHb#FEq$h4Rdj3G|%)7!{qbvJXa(bprp61TTU=0BJRUTUa literal 0 HcmV?d00001 diff --git a/nanos_app_callisto.gif b/nanos_app_callisto.gif new file mode 100644 index 0000000000000000000000000000000000000000..c0d449a7ecd056f5f260417d192e264aab54d1bb GIT binary patch literal 89 zcmZ?wbhEHb6krfwXkcLY|NlP&1B2o}LFb~>#FEq$h4Rdj3K^trk%h=IWx0MoG^q5uE@ literal 0 HcmV?d00001 diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h index 4332e73..f14a1bb 100644 --- a/src_genericwallet/chainConfig.h +++ b/src_genericwallet/chainConfig.h @@ -15,7 +15,8 @@ typedef enum chain_kind_e { CHAIN_KIND_KUSD, CHAIN_KIND_PIRL, CHAIN_KIND_AKROMA, - CHAIN_KIND_MUSICOIN + CHAIN_KIND_MUSICOIN, + CHAIN_KIND_CALLISTO } chain_kind_t; typedef struct chain_config_s { diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c index a0f6867..45eaefd 100644 --- a/src_genericwallet/main.c +++ b/src_genericwallet/main.c @@ -1293,6 +1293,9 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer, uint16_t dataLength case CHAIN_KIND_MUSICOIN: numTokens = NUM_TOKENS_MUSICOIN; break; + case CHAIN_KIND_CALLISTO: + numTokens = NUM_TOKENS_CALLISTO; + break; } for (i=0; iaddress, tmpContent.txContent.destination, 20) == 0) { dataPresent = false; diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c index 457e2ce..163b9df 100644 --- a/src_genericwallet/tokens.c +++ b/src_genericwallet/tokens.c @@ -723,3 +723,5 @@ const tokenDefinition_t const TOKENS_WANCHAIN[NUM_TOKENS_WANCHAIN] = {}; const tokenDefinition_t const TOKENS_KUSD[NUM_TOKENS_KUSD] = {}; const tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN] = {}; + +const tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO] = {}; diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h index 5416dcb..ac26422 100644 --- a/src_genericwallet/tokens.h +++ b/src_genericwallet/tokens.h @@ -34,6 +34,7 @@ typedef struct tokenDefinition_t { #define NUM_TOKENS_WANCHAIN 0 #define NUM_TOKENS_KUSD 0 #define NUM_TOKENS_MUSICOIN 0 +#define NUM_TOKENS_CALLISTO 0 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA]; extern tokenDefinition_t const TOKENS_ETHEREUM[NUM_TOKENS_ETHEREUM]; @@ -46,3 +47,4 @@ extern tokenDefinition_t const TOKENS_EXPANSE[NUM_TOKENS_EXPANSE]; extern tokenDefinition_t const TOKENS_WANCHAIN[NUM_TOKENS_WANCHAIN]; extern tokenDefinition_t const TOKENS_KUSD[NUM_TOKENS_KUSD]; extern tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN]; +extern tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO];