Struan Clark 1 год назад
Родитель
Сommit
6ed9cd591f
5 измененных файлов с 30 добавлено и 14 удалено
  1. 1 1
      flipbip.h
  2. 1 1
      flipbip_coins.c
  3. 1 1
      flipbip_coins.h
  4. 1 2
      scenes/flipbip_scene_menu.c
  5. 26 9
      views/flipbip_scene_1.c

+ 1 - 1
flipbip.h

@@ -17,7 +17,7 @@
 
 #include "flipbip_coins.h"
 
-#define FLIPBIP_VERSION "v1.18"
+#define FLIPBIP_VERSION  "v1.18"
 #define TEXT_BUFFER_SIZE 256
 
 typedef struct {

+ 1 - 1
flipbip_coins.c

@@ -13,4 +13,4 @@ const char* COIN_TEXT_ARRAY[NUM_COINS][COIN_TEXT_SIZE] = {
     {"BTC", "m/44'/0'/0'/0", "bitcoin:"},
     {"ETH", "m/44'/60'/0'/0", "ethereum:"},
     {"DOGE", "m/44'/3'/0'/0", "dogecoin:"},
-    {"ZEC", "m/44'/133'/0'/0", "zcash:"}};
+    {"ZEC", "m/44'/133'/0'/0", "zcash:"}};

+ 1 - 1
flipbip_coins.h

@@ -27,4 +27,4 @@ typedef enum {
 extern const uint32_t COIN_INFO_ARRAY[NUM_COINS][COIN_INFO_SIZE];
 
 // coin_name, derivation_path
-extern const char* COIN_TEXT_ARRAY[NUM_COINS][COIN_TEXT_SIZE];
+extern const char* COIN_TEXT_ARRAY[NUM_COINS][COIN_TEXT_SIZE];

+ 1 - 2
scenes/flipbip_scene_menu.c

@@ -22,7 +22,6 @@ void flipbip_scene_menu_on_enter(void* context) {
 
     if(flipbip_has_file(FlipBipFileKey, NULL, false) &&
        flipbip_has_file(FlipBipFileDat, NULL, false)) {
-
         for(size_t coin_type = 0; coin_type < NUM_COINS; coin_type++) {
             char wallet_menu_item[17] = "View      wallet";
             strcpy(wallet_menu_item + 5, COIN_TEXT_ARRAY[coin_type][COIN_TEXT_LABEL]);
@@ -33,7 +32,7 @@ void flipbip_scene_menu_on_enter(void* context) {
                 flipbip_scene_menu_submenu_callback,
                 app);
         }
-        
+
         submenu_add_item(
             app->submenu,
             "Regenerate wallet",

+ 26 - 9
views/flipbip_scene_1.c

@@ -120,10 +120,16 @@ static void flipbip_scene_1_init_address(
     hdnode_private_ckd(s_addr_node, addr_index);
     hdnode_fill_public_key(s_addr_node);
 
-    if(COIN_INFO_ARRAY[coin_type][COIN_INFO_ADDR_FMT] == FlipBipCoinBTC0) { // BTC / DOGE style address
+    if(COIN_INFO_ARRAY[coin_type][COIN_INFO_ADDR_FMT] ==
+       FlipBipCoinBTC0) { // BTC / DOGE style address
         // BTC / DOGE style address
         ecdsa_get_address(
-            s_addr_node->public_key, COIN_INFO_ARRAY[coin_type][COIN_INFO_ADDR_VERS], HASHER_SHA2_RIPEMD, HASHER_SHA2D, buf, buflen);
+            s_addr_node->public_key,
+            COIN_INFO_ARRAY[coin_type][COIN_INFO_ADDR_VERS],
+            HASHER_SHA2_RIPEMD,
+            HASHER_SHA2D,
+            buf,
+            buflen);
         strcpy(addr_text, buf);
         //ecdsa_get_wif(addr_node->private_key, WIF_VERSION, HASHER_SHA2D, buf, buflen);
 
@@ -137,7 +143,12 @@ static void flipbip_scene_1_init_address(
 
     } else if(COIN_INFO_ARRAY[coin_type][COIN_INFO_ADDR_FMT] == FlipBipCoinZEC133) { // ZEC
         ecdsa_get_address(
-            s_addr_node->public_key, COIN_INFO_ARRAY[coin_type][COIN_INFO_ADDR_VERS], HASHER_SHA2_RIPEMD, HASHER_SHA2D, buf, buflen);
+            s_addr_node->public_key,
+            COIN_INFO_ARRAY[coin_type][COIN_INFO_ADDR_VERS],
+            HASHER_SHA2_RIPEMD,
+            HASHER_SHA2D,
+            buf,
+            buflen);
         addr_text[0] = 't';
         strcpy(addr_text, buf);
     }
@@ -415,7 +426,8 @@ static int flipbip_scene_1_model_init(
 
     // root
     uint32_t fingerprint = 0;
-    hdnode_serialize_private(root, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPRV_VERS], buf, buflen);
+    hdnode_serialize_private(
+        root, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPRV_VERS], buf, buflen);
     char* xprv_root = malloc(buflen + 1);
     strncpy(xprv_root, buf, buflen);
     model->xprv_root = xprv_root;
@@ -434,12 +446,14 @@ static int flipbip_scene_1_model_init(
     fingerprint = hdnode_fingerprint(node);
     hdnode_private_ckd_prime(node, DERIV_ACCOUNT); // account
 
-    hdnode_serialize_private(node, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPRV_VERS], buf, buflen);
+    hdnode_serialize_private(
+        node, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPRV_VERS], buf, buflen);
     char* xprv_acc = malloc(buflen + 1);
     strncpy(xprv_acc, buf, buflen);
     model->xprv_account = xprv_acc;
 
-    hdnode_serialize_public(node, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPUB_VERS], buf, buflen);
+    hdnode_serialize_public(
+        node, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPUB_VERS], buf, buflen);
     char* xpub_acc = malloc(buflen + 1);
     strncpy(xpub_acc, buf, buflen);
     model->xpub_account = xpub_acc;
@@ -448,12 +462,14 @@ static int flipbip_scene_1_model_init(
     fingerprint = hdnode_fingerprint(node);
     hdnode_private_ckd(node, DERIV_CHANGE); // external/internal (change)
 
-    hdnode_serialize_private(node, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPRV_VERS], buf, buflen);
+    hdnode_serialize_private(
+        node, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPRV_VERS], buf, buflen);
     char* xprv_ext = malloc(buflen + 1);
     strncpy(xprv_ext, buf, buflen);
     model->xprv_extended = xprv_ext;
 
-    hdnode_serialize_public(node, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPUB_VERS], buf, buflen);
+    hdnode_serialize_public(
+        node, fingerprint, COIN_INFO_ARRAY[coin_type][COIN_INFO_XPUB_VERS], buf, buflen);
     char* xpub_ext = malloc(buflen + 1);
     strncpy(xpub_ext, buf, buflen);
     model->xpub_extended = xpub_ext;
@@ -472,7 +488,8 @@ static int flipbip_scene_1_model_init(
         const unsigned char addr_num[1] = {a};
         flipbip_btox(addr_num, 1, buf + strlen(buf));
         strcpy(buf + strlen(buf), TEXT_QRFILE_EXT);
-        flipbip_save_qrfile(COIN_TEXT_ARRAY[coin_type][COIN_TEXT_NAME], model->recv_addresses[a], buf);
+        flipbip_save_qrfile(
+            COIN_TEXT_ARRAY[coin_type][COIN_TEXT_NAME], model->recv_addresses[a], buf);
         memzero(buf, buflen);
     }