Skip to content

Commit

Permalink
Merge pull request #35 from Zondax/updates
Browse files Browse the repository at this point in the history
some updates
  • Loading branch information
carlosala authored Jun 26, 2022
2 parents 757b29e + 8767e8d commit ab705bd
Show file tree
Hide file tree
Showing 31 changed files with 159 additions and 1,243 deletions.
7 changes: 3 additions & 4 deletions app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ all: bin/app.elf
@echo "APPNAME=\"${APPNAME}\"" >> $(OUTPUT_INSTALLER)
@echo "APPVERSION=\"${APPVERSION}\"" >> $(OUTPUT_INSTALLER)
@echo "APPPATH=\""${APPPATH}"\"" >> $(OUTPUT_INSTALLER)
@echo "LOAD_PARAMS=\"${APP_LOAD_PARAMS}\"" >> $(OUTPUT_INSTALLER)
@echo "DELETE_PARAMS=\"${APP_DELETE_PARAMS}\"" >> $(OUTPUT_INSTALLER)
@echo "LOAD_PARAMS=($$(echo "${APP_LOAD_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER)
@echo "DELETE_PARAMS=($$(echo "${COMMON_DELETE_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER)
@echo "APPHEX=\"" >> $(OUTPUT_INSTALLER)
@cat $(CURDIR)/bin/app.hex >> $(OUTPUT_INSTALLER)
@echo "\"" >> $(OUTPUT_INSTALLER)
Expand Down Expand Up @@ -95,8 +95,7 @@ endef
$(error "$(error_message)")
endif

APP_LOAD_PARAMS = --curve ed25519 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH)
APP_DELETE_PARAMS = $(COMMON_DELETE_PARAMS)
APP_LOAD_PARAMS = --curve ed25519 $(COMMON_LOAD_PARAMS) --path $(APPPATH)

ifeq ($(TARGET_NAME),TARGET_NANOS)
APP_LOAD_PARAMS += --appFlags 0x000
Expand Down
2 changes: 1 addition & 1 deletion app/Makefile.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ APPVERSION_M=1
# This is the `spec_version` field of `Runtime`
APPVERSION_N=10
# This is the patch version of this release
APPVERSION_P=0
APPVERSION_P=1
118 changes: 63 additions & 55 deletions app/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/src/common/parser_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ typedef enum {
parser_tx_nesting_not_supported,
parser_tx_nesting_limit_reached,
parser_tx_call_vec_too_large,
parser_junction_limit,
} parser_error_t;

typedef struct {
Expand Down
1 change: 1 addition & 0 deletions app/src/parser_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ parser_error_t _readCompactIndex(parser_context_t *c, pd_CompactIndex_t *v);
uint16_t _detectAddressType(const parser_context_t *c);

parser_error_t _toStringCompactInt(const compactInt_t *c, uint8_t decimalPlaces,
bool trimTrailingZeros,
char postfix[],
char prefix[],
char *outValue, uint16_t outValueLen,
Expand Down
Loading

0 comments on commit ab705bd

Please sign in to comment.