Skip to content

Commit

Permalink
chore: fix after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
manu0466 committed Oct 24, 2023
1 parent efb7921 commit bcf0aa8
Show file tree
Hide file tree
Showing 125 changed files with 15 additions and 15 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ cmake-build-fuzz/
\deps/*
!\deps/nanos-secure-sdk
!\deps/nanox-secure-sdk
!\deps/nanosplus-secure-sdk
!\deps/ledger-zxlib
!\deps/tinycbor
!\deps/tinycbor-ledger
Expand Down
2 changes: 1 addition & 1 deletion app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dep/%.d: %.c Makefile

.PHONY: listvariants
listvariants:
@echo VARIANTS COIN DSM
@echo VARIANTS COIN DMS

.PHONY: version
version:
Expand Down
3 changes: 1 addition & 2 deletions app/src/apdu_handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ static bool process_chunk(volatile uint32_t *tx, uint32_t rx) {
tx_initialize();
tx_reset();
extractHDPath_HRP(rx, OFFSET_DATA);

return false;
case P1_ADD:
added = tx_append(&(G_io_apdu_buffer[OFFSET_DATA]), rx - OFFSET_DATA);
Expand Down Expand Up @@ -211,7 +210,7 @@ __Z_INLINE void handleSign(volatile uint32_t *flags, volatile uint32_t *tx, uint
THROW(APDU_CODE_DATA_INVALID);
}

parser_tx_obj.own_addr = (const char *) (G_io_apdu_buffer + VIEW_ADDRESS_OFFSET_SECP256K1);
parser_tx_obj.tx_json.own_addr = (const char *) (G_io_apdu_buffer + VIEW_ADDRESS_OFFSET_SECP256K1);
const char *error_msg = tx_parse(sign_type);

if (error_msg != NULL) {
Expand Down
8 changes: 4 additions & 4 deletions app/src/coin.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
extern "C" {
#endif

#define CLA 0x55
#define CLA 0x55u

#define HDPATH_LEN_DEFAULT 5

Expand Down Expand Up @@ -57,11 +57,11 @@ typedef enum {

#define COIN_DEFAULT_CHAINID "desmos-mainnet"

// In non-expert mode, the app will convert from udesmos to DESMOS
// In non-expert mode, the app will convert from udsm to DSM
#define COIN_DEFAULT_DENOM_BASE "udsm"
#define COIN_DEFAULT_DENOM_REPR "DSM"
#define COIN_DEFAULT_DENOM_FACTOR 6
#define COIN_DEFAULT_DENOM_TRIMMING 6
#define COIN_DEFAULT_DENOM_FACTOR 6u
#define COIN_DEFAULT_DENOM_TRIMMING 6u

// Coin denoms may be up to 128 characters long
// https://github.com/cosmos/cosmos-sdk/blob/master/types/coin.go#L780
Expand Down
Empty file removed app/src/common/app_main.c
Empty file.
2 changes: 1 addition & 1 deletion app/src/crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,4 @@ zxerr_t crypto_fillAddress(uint8_t *buffer, uint16_t buffer_len, uint16_t *addrR
*addrResponseLen = PK_LEN_SECP256K1 + strnlen(addr, (buffer_len - PK_LEN_SECP256K1));

return zxerr_ok;
}
}
2 changes: 1 addition & 1 deletion app/src/json/json_parser.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* (c) 2018, 2019 Zondax GmbH
* (c) 2018 - 2023 Zondax AG
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
1 change: 1 addition & 0 deletions app/src/tx_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,7 @@ parser_error_t tx_display_translation(char *dst, uint16_t dstLen, char *src, uin
*dst = 0;
return parser_ok;
}

#ifdef __cplusplus
#pragma clang diagnostic pop
#endif
2 changes: 1 addition & 1 deletion deps/nanosplus-secure-sdk
2 changes: 1 addition & 1 deletion deps/nanox-secure-sdk
Submodule nanox-secure-sdk updated 309 files
1 change: 1 addition & 0 deletions tests/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "bech32.h"
#include "hexutils.h"
#include "gmock/gmock.h"
#include "coin.h"

std::vector<std::string> dumpUI(parser_context_t *ctx,
uint16_t maxKeyLen,
Expand Down
2 changes: 1 addition & 1 deletion tests_zemu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@
"ts-node": "^10.9.1",
"typescript": "^5.0.4"
}
}
}
Binary file modified tests_zemu/snapshots/s-ibc_denoms/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-ibc_denoms/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-sign_basic/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-sign_basic/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-sign_basic/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-sign_basic/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-sign_basic_extra_fields/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-sign_basic_extra_fields/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-sign_basic_extra_fields/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-sign_basic_extra_fields/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-ibc_denoms/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-ibc_denoms/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-sign_basic/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-sign_basic/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-sign_basic_extra_fields/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-sign_basic_extra_fields/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests_zemu/snapshots/st-govDeposit/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests_zemu/snapshots/st-govDeposit/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests_zemu/snapshots/st-govDeposit/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/st-ibc_denoms/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/st-ibc_denoms/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests_zemu/snapshots/st-msgMultiSend/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests_zemu/snapshots/st-msgMultiSend/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests_zemu/snapshots/st-msgMultiSend/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests_zemu/snapshots/st-msgMultiSend/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests_zemu/snapshots/st-msgMultiSend/00005.png
Binary file added tests_zemu/snapshots/st-msgMultiSend/00006.png
Binary file modified tests_zemu/snapshots/st-show_eth_address/00002.png
Binary file modified tests_zemu/snapshots/st-sign_basic/00001.png
Binary file modified tests_zemu/snapshots/st-sign_basic_eth_warning/00000.png
Binary file modified tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png
Binary file modified tests_zemu/snapshots/x-govDeposit/00003.png
Binary file modified tests_zemu/snapshots/x-govDeposit/00006.png
Binary file modified tests_zemu/snapshots/x-govDeposit/00008.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00003.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00005.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00006.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00007.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00008.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00009.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00010.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00011.png
Binary file modified tests_zemu/snapshots/x-msgMultiSend/00012.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress-eth/00003.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress-eth/00004.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress-eth/00005.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress-eth/00006.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress-eth/00008.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress-eth/00009.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress/00003.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress/00004.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress/00005.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress/00006.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress/00008.png
Binary file modified tests_zemu/snapshots/x-setWithdrawAddress/00009.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic/00002.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic/00003.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic/00004.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic/00006.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic/00008.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00002.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00003.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00005.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00006.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00007.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00008.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00009.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00011.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00013.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00018.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00019.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth/00020.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00000.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00002.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00003.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00005.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00006.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00007.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00008.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00009.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00011.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00013.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00018.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00019.png
Binary file modified tests_zemu/snapshots/x-textual-sign_basic_expert/00020.png
File renamed without changes.

0 comments on commit bcf0aa8

Please sign in to comment.