network: use network_t for network ids, remove network_type.h

Fix warnings about missed switch cases, remove now-uneeded wally
includes.

Author: jgriffiths

main/assets.c

@@ -8,7 +8,6 @@
 
 #include <assets_snapshot.h>
 #include <cbor.h>
-#include <wally_address.h>
 #include <wally_elements.h>
 #include <wally_transaction.h>
 
@@ -190,7 +189,7 @@ bool assets_get_allocate(const char* field, const CborValue* value, asset_info_t
 // Lookup asset-info for the passed asset-id.
 // 1. Looks in any explicitly passed asset-info
 // 2. Looks in any h/coded asset snapshot data (eg. policy assets)
-bool assets_get_info(const uint32_t network_id, const asset_info_t* assets, const size_t num_assets,
+bool assets_get_info(const network_t network_id, const asset_info_t* assets, const size_t num_assets,
     const char* asset_id, asset_info_t* asset_info_out)
 {
     JADE_ASSERT(network_is_liquid(network_id));

main/assets.h

@@ -2,6 +2,7 @@
 #define JADE_ASSETS_H_
 
 #include "utils/cbor_rpc.h"
+#include "utils/network.h"
 
 // NOTE: strings here may not be nul-terminated as may directly reference message fields
 typedef struct {
@@ -16,7 +17,7 @@ typedef struct {
 
 bool assets_get_allocate(const char* field, const CborValue* value, asset_info_t** data, size_t* written);
 
-bool assets_get_info(uint32_t network_id, const asset_info_t* assets, size_t num_assets, const char* asset_id,
+bool assets_get_info(network_t network_id, const asset_info_t* assets, size_t num_assets, const char* asset_id,
     asset_info_t* asset_info_out);
 
 #endif /* JADE_ASSETS_H_ */

main/bcur.c

@@ -2,11 +2,11 @@
 #include "bcur.h"
 #include "jade_assert.h"
 #include "keychain.h"
-#include "network_type.h"
 #include "qrcode.h"
 #include "qrscan.h"
 #include "ui.h"
 #include "utils/malloc_ext.h"
+#include "utils/network.h"
 #include "utils/util.h"
 
 #include <cbor.h>

main/descriptor.c

@@ -8,7 +8,6 @@
 #include "utils/temporary_stack.h"
 #include "wallet.h"
 
-#include <wally_address.h>
 #include <wally_descriptor.h>
 #include <wally_script.h>
 
@@ -167,7 +166,7 @@ static void string_values_to_map(const string_value_t* datavalues, const size_t
     }
 }
 
-static bool parse_descriptor(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+static bool parse_descriptor(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     descriptor_type_t* deduced_type, struct wally_descriptor** output, uint32_t* depth, const char** errmsg)
 {
     JADE_ASSERT(name);
@@ -276,7 +275,7 @@ static bool parse_descriptor(const char* name, const descriptor_data_t* descript
 
 // NOTE: signers should either be sufficient to hold details for all signers, or NULL if
 // the only value of interest is the number of signers in the descriptor.
-bool descriptor_get_signers(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+bool descriptor_get_signers(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     descriptor_type_t* deduced_type, signer_t* signers, const size_t signers_len, size_t* written, const char** errmsg)
 {
     JADE_ASSERT(name);
@@ -389,7 +388,7 @@ bool descriptor_get_signers(const char* name, const descriptor_data_t* descripto
 }
 
 // On success output must be freed with wally_free_string()
-bool descriptor_to_address(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+bool descriptor_to_address(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     const uint32_t multi_index, const uint32_t child_num, descriptor_type_t* deduced_type, char** output,
     const char** errmsg)
 {
@@ -430,7 +429,7 @@ bool descriptor_to_address(const char* name, const descriptor_data_t* descriptor
 // On success output must be freed
 // NOTE: For miniscript expressions, the script generated is untyped bitcoin script.
 //       For descriptors, a scriptPubKey is generated.
-bool descriptor_to_script(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+bool descriptor_to_script(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     const uint32_t multi_index, const uint32_t child_num, descriptor_type_t* deduced_type, uint8_t** output,
     size_t* output_len, const char** errmsg)
 {
@@ -470,7 +469,7 @@ bool descriptor_to_script(const char* name, const descriptor_data_t* descriptor,
     return true;
 }
 
-bool descriptor_search_for_script(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+bool descriptor_search_for_script(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     const uint32_t multi_index, uint32_t* child_num, const size_t search_depth, const uint8_t* script,
     const size_t script_len)
 {

main/descriptor.h

@@ -2,6 +2,7 @@
 #define DESCRIPTOR_H_
 
 #include "signer.h"
+#include "utils/network.h"
 
 struct wally_map;
 
@@ -49,24 +50,24 @@ typedef struct _descriptor_data {
 size_t string_values_len(const string_value_t* datavalues, size_t num_values);
 
 // Parse the descriptor and get signer information
-bool descriptor_get_signers(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+bool descriptor_get_signers(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     descriptor_type_t* type, signer_t* signers, size_t signers_len, size_t* written, const char** errmsg);
 
 // Generate an address using a descriptor/miniscript expression
 // On success output must be freed with wally_free_string()
-bool descriptor_to_address(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+bool descriptor_to_address(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     uint32_t multi_index, uint32_t child_num, descriptor_type_t* type, char** output, const char** errmsg);
 
 // Generate a script using a descriptor/miniscript expression
 // On success output must be freed
 // NOTE: For miniscript expressions, the script generated is untyped bitcoin script.
 //       For descriptors, a scriptPubKey is generated.
-bool descriptor_to_script(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+bool descriptor_to_script(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     uint32_t multi_index, uint32_t child_num, descriptor_type_t* type, uint8_t** output, size_t* output_len,
     const char** errmsg);
 
 // Iterate over a number of leaf child indexes testing the generated script for a match against the passed script
-bool descriptor_search_for_script(const char* name, const descriptor_data_t* descriptor, const uint32_t network_id,
+bool descriptor_search_for_script(const char* name, const descriptor_data_t* descriptor, const network_t network_id,
     uint32_t multi_index, uint32_t* child_num, size_t search_depth, const uint8_t* script, size_t script_len);
 
 // Storage related functions

main/keychain.c

@@ -239,7 +239,7 @@ bool keychain_is_network_type_consistent(const network_type_t network_type)
     return network_type_restriction == NETWORK_TYPE_NONE || network_type == network_type_restriction;
 }
 
-bool keychain_is_network_id_consistent(const uint32_t network_id)
+bool keychain_is_network_id_consistent(const network_t network_id)
 {
     const network_type_t network_type = network_to_type(network_id);
     return keychain_is_network_type_consistent(network_type);

main/keychain.h

@@ -1,7 +1,7 @@
 #ifndef KEYCHAIN_H_
 #define KEYCHAIN_H_
 
-#include <network_type.h>
+#include "utils/network.h"
 
 #include <stdbool.h>
 #include <wally_bip32.h>
@@ -53,7 +53,7 @@ void keychain_cache_mnemonic_entropy(const char* mnemonic);
 void keychain_clear_network_type_restriction(void);
 void keychain_set_network_type_restriction(const network_type_t network_type);
 network_type_t keychain_get_network_type_restriction(void);
-bool keychain_is_network_id_consistent(const uint32_t network_id);
+bool keychain_is_network_id_consistent(const network_t network_id);
 bool keychain_is_network_type_consistent(const network_type_t network_type);
 
 // mnemonic returned should be freed by caller with wally_free_string

main/network_type.h

@@ -51,8 +51,6 @@ static inline bool awaiting_attestation_data(void) { return false; }
 #include <sodium/utils.h>
 #include <time.h>
 
-#include <wally_address.h>
-
 // Whether during initialisation we select USB, BLE QR etc.
 static jade_msg_source_t initialisation_source = SOURCE_NONE;
 static jade_msg_source_t internal_relogin_source = SOURCE_NONE;

main/process/dashboard.c

@@ -12,15 +12,14 @@
 #include "process_utils.h"
 
 #include <sys/time.h>
-#include <wally_address.h>
 #include <wally_anti_exfil.h>
 #include <wally_script.h>
 
 #include "process_utils.h"
 
 static const char KEY_TYPE_RSA[] = { 'R', 'S', 'A' };
 
-bool jade_process_check_network(jade_process_t* process, CborValue* params, uint32_t* network_id)
+bool jade_process_check_network(jade_process_t* process, CborValue* params, network_t* network_id)
 {
     JADE_ASSERT(process);
     JADE_ASSERT(params);