M2

CMakeLists.txt

@@ -124,13 +124,16 @@ add_definitions(
 )
 
 
-##############################################################
-##{TODO}
 ##############################################################
 # Static Libraries
-file(GLOB_RECURSE LIB_SRC
+
+file(GLOB_RECURSE BLAKE_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/BLAKE2/ref/blake2b-ref.c
+        )
+
+file(GLOB_RECURSE LIB_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/app_mode.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/base64.c
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/base58.c
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/bech32.c
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/bignum.c
@@ -139,20 +142,32 @@ file(GLOB_RECURSE LIB_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/zxformat.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
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/crypto_helper.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/json/json_parser.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/jsmn/jsmn.c
         )
 
-add_library(app_lib STATIC ${LIB_SRC})
+add_library(app_lib STATIC
+        ${LIB_SRC}
+        ${JSMN_SRC}
+        ${BLAKE_SRC}
+        )
 
 target_include_directories(app_lib PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/BLAKE2/ref
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/include
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/lib
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/common
+        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/json
+        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/jsmn
+        ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/app/common
         )
 
+target_link_libraries(app_lib PUBLIC)
+
 ##############################################################
 #  Fuzz Targets
 if(ENABLE_FUZZING)
@@ -177,6 +192,8 @@ else()
             ${gmock_SOURCE_DIR}/include
             ${CMAKE_CURRENT_SOURCE_DIR}/app/src
             ${CMAKE_CURRENT_SOURCE_DIR}/app/src/lib
+            ${CMAKE_CURRENT_SOURCE_DIR}/app/src/json
+            ${CMAKE_CURRENT_SOURCE_DIR}/app/src/jsmn
             )
 
     target_link_libraries(unittests PRIVATE
@@ -188,4 +205,4 @@ else()
     add_compile_definitions(TESTVECTORS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/")
     add_test(NAME unittests COMMAND unittests)
     set_tests_properties(unittests PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests)
-endif()
+endif()

app/Makefile

@@ -52,14 +52,14 @@ DEFINES += PRODUCTION_BUILD=$(PRODUCTION_BUILD)
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.app_testing
 
 ifndef COIN
-COIN=KDA
+COIN=kadena
 endif
 
 include $(CURDIR)/Makefile.version
 
 $(info COIN  = [$(COIN)])
 
-ifeq ($(COIN),KDA)
+ifeq ($(COIN),kadena)
 # Main app configuration
 APPNAME = "Kadena"
 APPPATH = "44'/626'"
@@ -99,12 +99,10 @@ endif
 
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform
 CFLAGS += -Wvla
-# #{TODO} --> Need Rust?
 # LDFLAGS += -z muldefs
 # LDLIBS += -Lrust/target/thumbv6m-none-eabi/release -lrslib
 # APP_SOURCE_PATH += $(CURDIR)/rust/include
 
-# #{TODO} --> Need Rust?
 .PHONY: rust
 rust:
 	@echo "No rust code"
@@ -141,7 +139,7 @@ dep/%.d: %.c Makefile
 
 .PHONY: listvariants
 listvariants:
-	@echo VARIANTS COIN KDA
+	@echo VARIANTS COIN kadena
 
 .PHONY: version
 version:

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=0
 # This is the minor version
 APPVERSION_N=0
 # This is the patch version
-APPVERSION_P=1
+APPVERSION_P=2

app/src/apdu_handler.c

@@ -41,7 +41,6 @@ void extractHDPath(uint32_t rx, uint32_t offset) {
 
     memcpy(hdPath, G_io_apdu_buffer + offset, sizeof(uint32_t) * HDPATH_LEN_DEFAULT);
 
-    // #{TODO} --> testnet necessary?
     const bool mainnet = hdPath[0] == HDPATH_0_DEFAULT && hdPath[1] == HDPATH_1_DEFAULT;
 
     if (!mainnet) {

app/src/common/parser.h

@@ -26,7 +26,7 @@ const char *parser_getErrorDescription(parser_error_t err);
 const char *parser_getMsgPackTypeDescription(uint8_t type);
 
 //// parses a tx buffer
-parser_error_t parser_parse(parser_context_t *ctx, const uint8_t *data, size_t dataLen, parser_tx_t *tx_obj);
+parser_error_t parser_parse(parser_context_t *ctx, const uint8_t *data, size_t dataLen, tx_json_t *tx_obj);
 
 //// verifies tx fields
 parser_error_t parser_validate(parser_context_t *ctx);

app/src/common/parser_common.h

@@ -22,8 +22,6 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 
-#include "parser_txdef.h"
-
 #define CHECK_ERROR(__CALL)                   \
     {                                         \
         parser_error_t __err = __CALL;        \
@@ -56,15 +54,20 @@ typedef enum {
     parser_missing_field,
     paser_unknown_transaction,
     parser_tx_obj_empty,
-} parser_error_t;
 
-typedef struct {
-    const uint8_t *buffer;
-    uint16_t bufferLen;
-    uint16_t offset;
-    parser_tx_t *tx_obj;
-} parser_context_t;
+    // Coin Specific
+    parser_json_zero_tokens,
+    parser_json_too_many_tokens,  // "NOMEM: JSON string contains too many tokens"
+    parser_json_incomplete_json,  // "JSON string is not complete";
+    parser_json_not_a_transfer,
+    parser_invalid_meta_field,
+    parser_json_unexpected_error,
+    parser_name_tx_transfer,
+    parser_name_tx_transfer_xchain,
+    parser_name_rotate,
+    parser_name_gas,
+} parser_error_t;
 
 #ifdef __cplusplus
 }
-#endif
+#endif

app/src/common/tx.c

@@ -44,7 +44,7 @@ storage_t NV_CONST N_appdata_impl __attribute__((aligned(64)));
 #define N_appdata (*(NV_VOLATILE storage_t *)PIC(&N_appdata_impl))
 #endif
 
-static parser_tx_t tx_obj;
+static tx_json_t tx_obj;
 static parser_context_t ctx_parsed_tx;
 
 void tx_initialize() {