Skip to content

Commit

Permalink
Merge pull request #341 from keepkey/add-top-evm-networks
Browse files Browse the repository at this point in the history 
add op, bnb, matic, xdai chain support
  • Loading branch information
@pastaghost
pastaghost authored Apr 14, 2023
2 parents 28a8669 + 7793e92 commit 06844eb
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 77 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.7.2)

project(
KeepKeyFirmware
VERSION 7.7.0
VERSION 7.8.0
LANGUAGES C CXX ASM)

set(BOOTLOADER_MAJOR_VERSION 2)
Expand Down
2 changes: 1 addition & 1 deletion deps/python-keepkey
Submodule python-keepkey updated 36 files
+6 −4 .gitmodules
+0 −5 README.rst
+0 −33 authenticator/AUTHENTICATOR.md
+0 −110 authenticator/AddAccDialog.ui
+0 −685 authenticator/AuthMain.ui
+0 −58 authenticator/GUImixin.py
+0 −719 authenticator/KeepKeyAuthenticator.py
+0 −230 authenticator/ManualAddAcc.ui
+0 −354 authenticator/PinUi.ui
+0 −384 authenticator/RemAccDialog.ui
+0 −0 authenticator/__init__.py
+0 −74 authenticator/addaccdialog.py
+ − authenticator/authResources/circle-32.png
+ − authenticator/authResources/kk-icon-gold.png
+0 −343 authenticator/authmain.py
+ − authenticator/circle-32.png
+ − authenticator/kk-icon-gold.png
+ − authenticator/kkQRtest.png
+ − authenticator/kkQRtest1.png
+ − authenticator/kkQRtest2.png
+0 −117 authenticator/manualaddacc.py
+0 −101 authenticator/passphraseDialog.ui
+0 −67 authenticator/passphrasedialog.py
+0 −161 authenticator/pindialog.py
+0 −208 authenticator/remaccdialog.py
+0 −19 authenticator/setup.py
+1 −1 device-protocol
+1 −9 keepkeyctl
+0 −4 keepkeylib/client.py
+1 −1 keepkeylib/eth/ethereum-lists
+43 −33 keepkeylib/eth/ethereum_networks.json
+1 −1 keepkeylib/eth/uniswap_tokens.json
+1 −1 setup.py
+0 −122 tests/otp.py
+0 −73 tests/test_msg_authfeature.py
+1 −2 tests/test_msg_ping.py
41 changes: 16 additions & 25 deletions lib/firmware/ethereum.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,15 +337,12 @@ void ethereumFormatAmount(const bignum256 *amnt, const TokenType *token,
case 2:
suffix = " EXP";
break; // Expanse
case 3:
suffix = " tROP";
break; // Ethereum Testnet Ropsten
case 4:
suffix = " tRIN";
break; // Ethereum Testnet Rinkeby
case 8:
suffix = " UBQ";
break; // UBIQ
case 10:
suffix = " OP";
break; // Optimism
case 20:
suffix = " EOSC";
break; // EOS Classic
Expand All @@ -354,31 +351,25 @@ void ethereumFormatAmount(const bignum256 *amnt, const TokenType *token,
break; // Ethereum Social
case 30:
suffix = " RBTC";
break; // RSK
case 31:
suffix = " tRBTC";
break; // RSK Testnet
case 42:
suffix = " tKOV";
break; // Ethereum Testnet Kovan
break; // Rootstock
case 40:
suffix = " TLOS";
break; // Telos
case 56:
suffix = " BNB";
break; // BNB Chain
case 61:
suffix = " ETC";
break; // Ethereum Classic
case 62:
suffix = " tETC";
break; // Ethereum Classic Testnet
case 64:
suffix = " ELLA";
break; // Ellaism
case 820:
suffix = " CLO";
break; // Callisto
case 1987:
suffix = " EGEM";
break; // EtherGem
default:
suffix = " UNKN";
break; // unknown chain
case 100:
suffix = " xDAI";
break; // Gnosis Chain
case 137:
suffix = " MATIC";
break; // Polygon Mainnet
}
}
}
Expand Down
149 changes: 99 additions & 50 deletions lib/firmware/fsm_msg_osmosis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void fsm_msgOsmosisSignTx(const OsmosisSignTx *msg) {
}

void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
// Confirm transaction basics
/** Confirm transaction basics */
CHECK_PARAM(osmosis_signingIsInited(), "Signing not in progress");

const CoinType *coin = fsm_getCoin(true, "Osmosis");
Expand All @@ -130,6 +130,7 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {

const OsmosisSignTx *sign_tx = osmosis_getOsmosisSignTx();

/** Confirm required transaction parameters exist */
if (msg->has_send) {
if (!msg->send.has_to_address || !msg->send.has_amount) {
osmosis_signAbort();
Expand All @@ -139,9 +140,17 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
return;
}

char amount_str[40];
sprintf(amount_str, "%.6f OSMO",
atof(msg->send.amount) / pow(10, OSMOSIS_PRECISION));
float amount = atof(msg->send.amount);
const char *denom = msg->send.denom;
if (!strcmp(msg->send.denom, "uosmo")) {
amount /= pow(10, OSMOSIS_PRECISION);
denom = "OSMO";
}

char amount_str[103];
snprintf(amount_str, sizeof(amount_str) - 1, "%.6f %s", amount, denom);

/** Confirm transaction parameters on screen */
if (!confirm_transaction_output(
ButtonRequestType_ButtonRequest_ConfirmOutput, amount_str,
msg->send.to_address)) {
Expand Down Expand Up @@ -169,6 +178,14 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
layoutHome();
return;
}

float amount = atof(msg->delegate.amount);
const char *denom = msg->delegate.denom;
if (!strcmp(msg->delegate.denom, "uosmo")) {
amount /= pow(10, OSMOSIS_PRECISION);
denom = "OSMO";
}

/** Confirm transaction parameters on-screen */
if (!confirm_osmosis_address("Confirm Delegator Address",
msg->delegate.delegator_address)) {
Expand All @@ -187,8 +204,7 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
}

if (!confirm(ButtonRequestType_ButtonRequest_Other, "Confirm Amount",
"%.6f OSMO",
atof(msg->delegate.amount) / pow(10, OSMOSIS_PRECISION))) {
"%.6f %s", amount, denom)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
Expand All @@ -214,8 +230,15 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
layoutHome();
return;
}
/** Confirm transaction parameters on-screen */

float amount = atof(msg->undelegate.amount);
const char *denom = msg->undelegate.denom;
if (!strcmp(msg->undelegate.denom, "uosmo")) {
amount /= pow(10, OSMOSIS_PRECISION);
denom = "OSMO";
}

/** Confirm transaction parameters on-screen */
if (!confirm_osmosis_address("Confirm Delegator Address",
msg->undelegate.delegator_address)) {
osmosis_signAbort();
Expand All @@ -233,8 +256,7 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
}

if (!confirm(ButtonRequestType_ButtonRequest_Other, "Confirm Amount",
"%.6f OSMO",
atof(msg->undelegate.amount) / pow(10, OSMOSIS_PRECISION))) {
"%.6f %s", amount, denom)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
Expand Down Expand Up @@ -263,7 +285,6 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
return;
}

/** Confirm transaction parameters on-screen */
char insoamt[33] = {0};
uint8_t outsoamt[34] = {0};
strlcpy(insoamt, msg->lp_add.share_out_amount,
Expand All @@ -277,24 +298,31 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
return;
}

float amount_in_max_b = atof(msg->lp_add.amount_in_max_b);
const char *denom_in_max_b = msg->lp_add.denom_in_max_b;
if (!strcmp(msg->lp_add.denom_in_max_b, "uosmo")) {
amount_in_max_b /= pow(10, OSMOSIS_PRECISION);
denom_in_max_b = "OSMO";
}

float amount_in_max_a = atof(msg->lp_add.amount_in_max_a);
const char *denom_in_max_a = msg->lp_add.denom_in_max_a;
if (!strcmp(msg->lp_add.denom_in_max_a, "uosmo")) {
amount_in_max_a /= pow(10, OSMOSIS_PRECISION);
denom_in_max_a = "OSMO";
}

/** Confirm transaction parameters on-screen */
if (!confirm(ButtonRequestType_ButtonRequest_Other, "Add Liquidity",
"Deposit %.6f %s and...",
atof(msg->lp_add.amount_in_max_b) / pow(10, OSMOSIS_PRECISION),
(!strcmp(msg->lp_add.denom_in_max_b, "uosmo"))
? "OSMO"
: msg->lp_add.denom_in_max_b)) {
"Deposit %.6f %s and...", amount_in_max_b, denom_in_max_b)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
return;
}

if (!confirm(ButtonRequestType_ButtonRequest_Other, "Add Liquidity",
"... %.6f %s?",
atof(msg->lp_add.amount_in_max_a) / pow(10, OSMOSIS_PRECISION),
(!strcmp(msg->lp_add.denom_in_max_a, "uosmo"))
? "OSMO"
: msg->lp_add.denom_in_max_a)) {
"... %.6f %s?", amount_in_max_a, denom_in_max_a)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
Expand Down Expand Up @@ -344,7 +372,6 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
return;
}

/** Confirm transaction parameters on-screen */
char insoamt[33] = {0};
uint8_t outsoamt[34] = {0};
strlcpy(insoamt, msg->lp_remove.share_in_amount,
Expand All @@ -358,26 +385,32 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
return;
}

if (!confirm(
ButtonRequestType_ButtonRequest_Other, "Remove Liquidity",
"Withdraw %.6f %s and...",
atof(msg->lp_remove.amount_out_min_b) / pow(10, OSMOSIS_PRECISION),
(!strcmp(msg->lp_remove.denom_out_min_b, "uosmo"))
? "OSMO"
: msg->lp_remove.denom_out_min_b)) {
float amount_out_min_b = atof(msg->lp_remove.amount_out_min_b);
const char *denom_out_min_b = msg->lp_remove.denom_out_min_b;
if (!strcmp(msg->lp_remove.denom_out_min_b, "uosmo")) {
amount_out_min_b /= pow(10, OSMOSIS_PRECISION);
denom_out_min_b = "OSMO";
}

float amount_out_min_a = atof(msg->lp_remove.amount_out_min_a);
const char *denom_out_min_a = msg->lp_remove.denom_out_min_a;
if (!strcmp(msg->lp_remove.denom_out_min_a, "uosmo")) {
amount_out_min_a /= pow(10, OSMOSIS_PRECISION);
denom_out_min_a = "OSMO";
}

/** Confirm transaction parameters on-screen */
if (!confirm(ButtonRequestType_ButtonRequest_Other, "Remove Liquidity",
"Withdraw %.6f %s and...", amount_out_min_b,
denom_out_min_b)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
return;
}

if (!confirm(
ButtonRequestType_ButtonRequest_Other, "Remove Liquidity",
"... %.6f %s ?",
atof(msg->lp_remove.amount_out_min_a) / pow(10, OSMOSIS_PRECISION),
(!strcmp(msg->lp_remove.denom_out_min_a, "uosmo"))
? "OSMO"
: msg->lp_remove.denom_out_min_a)) {
if (!confirm(ButtonRequestType_ButtonRequest_Other, "Remove Liquidity",
"... %.6f %s ?", amount_out_min_a, denom_out_min_a)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
Expand Down Expand Up @@ -424,11 +457,12 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
layoutHome();
return;
}
/** Confirm transaction parameters on-screen */

float amount = atof(msg->redelegate.amount) / pow(10, OSMOSIS_PRECISION);

/** Confirm transaction parameters on-screen */
if (!confirm(ButtonRequestType_ButtonRequest_Other, "Redelegate",
"Redelegate %.6f OSMO?",
atof(msg->send.amount) / pow(10, OSMOSIS_PRECISION))) {
"Redelegate %.6f OSMO?", amount)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
Expand Down Expand Up @@ -480,6 +514,7 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
return;
}

/** Confirm transaction parameters on-screen */
if (!confirm(ButtonRequestType_ButtonRequest_Other, "Claim Rewards",
"Claim all available rewards?")) {
osmosis_signAbort();
Expand Down Expand Up @@ -525,15 +560,24 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
return;
}

/** Confirm transaction parameters on-screen */
float token_in_amount = atof(msg->swap.token_in_amount);
const char *token_in_denom = msg->swap.token_in_denom;
if (!strcmp(msg->swap.token_in_denom, "uosmo")) {
token_in_amount /= pow(10, OSMOSIS_PRECISION);
token_in_denom = "OSMO";
}

float token_out_min_amount = atof(msg->swap.token_out_min_amount);
const char *token_out_denom = msg->swap.token_out_denom;
if (!strcmp(msg->swap.token_out_denom, "uosmo")) {
token_out_min_amount /= pow(10, OSMOSIS_PRECISION);
token_out_denom = "OSMO";
}

if (!confirm(
ButtonRequestType_ButtonRequest_Other, "Swap",
"Swap %.6f %s for at least %.6f %s?",
atof(msg->swap.token_in_amount) / pow(10, OSMOSIS_PRECISION),
msg->swap.token_in_denom,
atof(msg->swap.token_out_min_amount) / pow(10, OSMOSIS_PRECISION),
msg->swap.token_out_denom)) {
/** Confirm transaction parameters on-screen */
if (!confirm(ButtonRequestType_ButtonRequest_Other, "Swap",
"Swap %.6f %s for at least %.6f %s?", token_in_amount,
token_in_denom, token_out_min_amount, token_out_denom)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
Expand Down Expand Up @@ -573,12 +617,17 @@ void fsm_msgOsmosisMsgAck(const OsmosisMsgAck *msg) {
layoutHome();
return;
}
/** Confirm transaction parameters on-screen */

float amount = atof(msg->ibc_transfer.amount);
const char *denom = msg->ibc_transfer.denom;
if (!strcmp(msg->ibc_transfer.denom, "uosmo")) {
amount /= pow(10, OSMOSIS_PRECISION);
denom = "OSMO";
}

/** Confirm transaction parameters on-screen */
if (!confirm(ButtonRequestType_ButtonRequest_Other, "IBC Transfer",
"Transfer %.6f %s?",
atof(msg->ibc_transfer.amount) / pow(10, OSMOSIS_PRECISION),
msg->ibc_transfer.denom)) {
"Transfer %.6f %s?", amount, denom)) {
osmosis_signAbort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
layoutHome();
Expand Down

0 comments on commit 06844eb

Please sign in to comment.