From b0bc0b2b8bd3fc137eb034287cedb983c58c5285 Mon Sep 17 00:00:00 2001 From: 0xPxt Date: Thu, 5 Sep 2024 08:11:34 +0200 Subject: [PATCH] add missing files to cmakelists --- CMakeLists.txt | 2 ++ app/src/common/tx.c | 7 +++++-- app/src/parser.c | 2 +- tests_zemu/tests/transactions.test.ts | 4 ---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c57b80..564db30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,8 +140,10 @@ file(GLOB_RECURSE LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/hexutils.c ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/zxmacros.c ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/zxformat.c + ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/buffering.c #### ${CMAKE_CURRENT_SOURCE_DIR}/app/src/buffering_json.c + ${CMAKE_CURRENT_SOURCE_DIR}/app/src/tx.c ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser.c ${CMAKE_CURRENT_SOURCE_DIR}/app/src/items.c ${CMAKE_CURRENT_SOURCE_DIR}/app/src/items_format.c diff --git a/app/src/common/tx.c b/app/src/common/tx.c index 07cdbda..4c2698a 100644 --- a/app/src/common/tx.c +++ b/app/src/common/tx.c @@ -25,10 +25,10 @@ #include "zxmacros.h" #define TEMPLATE_JSON_BUFFER_SIZE 1024 -#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX) +#if !defined(TARGET_NANOS) #define RAM_BUFFER_SIZE 8192 #define FLASH_BUFFER_SIZE 16384 - TEMPLATE_JSON_BUFFER_SIZE -#elif defined(TARGET_NANOS) +#else #define RAM_BUFFER_SIZE 256 #define FLASH_BUFFER_SIZE 8192 - TEMPLATE_JSON_BUFFER_SIZE #endif @@ -45,6 +45,9 @@ typedef struct { #if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX) storage_t NV_CONST N_appdata_impl __attribute__((aligned(64))); #define N_appdata (*(NV_VOLATILE storage_t *)PIC(&N_appdata_impl)) +#else +storage_t N_appdata_impl __attribute__((aligned(64))); +#define N_appdata (*(storage_t *)PIC(&N_appdata_impl)) #endif static parser_context_t ctx_parsed_tx; diff --git a/app/src/parser.c b/app/src/parser.c index a0f0b95..57fc716 100644 --- a/app/src/parser.c +++ b/app/src/parser.c @@ -68,7 +68,7 @@ parser_error_t parser_parse(parser_context_t *ctx, const uint8_t *data, size_t d parser_createJsonTemplate(ctx); ctx->json = &tx_obj_json; ctx->buffer = tx_json_get_buffer(); - ctx->bufferLen = tx_json_get_buffer_length(); + ctx->bufferLen = (uint16_t)tx_json_get_buffer_length(); CHECK_ERROR(_read_json_tx(ctx)); } diff --git a/tests_zemu/tests/transactions.test.ts b/tests_zemu/tests/transactions.test.ts index 787bc27..0d483c6 100644 --- a/tests_zemu/tests/transactions.test.ts +++ b/tests_zemu/tests/transactions.test.ts @@ -137,10 +137,6 @@ describe.each(TRANSACTIONS_TEST_CASES)('Tx transfer', function (data) { const decodedHash = decodeHash(signatureResponse.hash) - console.log('Pubkey: ', pubKey.toString('hex')) - console.log('Signature: ', signatureResponse.signature.toString('hex')) - console.log('Decoded Hash: ', decodedHash.toString('hex')) - // Now verify the signature const valid = ed25519.verify(signatureResponse.signature, decodedHash, pubKey) expect(valid).toEqual(true)