network: add network_t enum to encapsulate network ids

jgriffiths · Jamie C. Driver · commit 6630377af2f9 · 2025-05-30T16:32:51.000+01:00
diff --git a/main/assets.c b/main/assets.c
@@ -209,9 +209,9 @@ bool assets_get_info(const uint32_t network_id, const asset_info_t* assets, cons
     }
 
     // 3. Search the h/coded assets snapshot
-    // FIXME: WALLY_NETWORK_LIQUID_REGTEST appears to use mainnet assets?
-    const bool use_testnet_registry = network_id == WALLY_NETWORK_LIQUID_TESTNET /* ||
-        network_id == WALLY_NETWORK_LIQUID_REGTEST */
+    // FIXME: NETWORK_LIQUID_REGTEST appears to use mainnet assets?
+    const bool use_testnet_registry = network_id == NETWORK_LIQUID_TESTNET /* ||
+        network_id == NETWORK_LIQUID_REGTEST */
         ;
     const snapshot_asset_info_t* snapshot_asset = assets_snapshot_get_info(asset_id, use_testnet_registry);
     if (snapshot_asset) {
diff --git a/main/descriptor.c b/main/descriptor.c
@@ -395,7 +395,7 @@ bool descriptor_to_address(const char* name, const descriptor_data_t* descriptor
 {
     JADE_ASSERT(name);
     JADE_ASSERT(descriptor);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(!deduced_type || *deduced_type == DESCRIPTOR_TYPE_UNKNOWN);
     JADE_INIT_OUT_PPTR(output);
     JADE_INIT_OUT_PPTR(errmsg);
@@ -436,7 +436,7 @@ bool descriptor_to_script(const char* name, const descriptor_data_t* descriptor,
 {
     JADE_ASSERT(name);
     JADE_ASSERT(descriptor);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(!deduced_type || *deduced_type == DESCRIPTOR_TYPE_UNKNOWN);
     JADE_INIT_OUT_PPTR(output);
     JADE_INIT_OUT_SIZE(output_len);
@@ -476,7 +476,7 @@ bool descriptor_search_for_script(const char* name, const descriptor_data_t* des
 {
     JADE_ASSERT(name);
     JADE_ASSERT(descriptor);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(child_num);
     JADE_ASSERT(search_depth);
     JADE_ASSERT(script);
diff --git a/main/process/dashboard.c b/main/process/dashboard.c
@@ -1223,7 +1223,7 @@ static void handle_registered_wallets(void)
 
                 // Get signer info from descriptor
                 size_t num_signer_details = 0;
-                if (!descriptor_get_signers(wallet_name, &descriptor, WALLY_NETWORK_NONE, NULL, signer_details,
+                if (!descriptor_get_signers(wallet_name, &descriptor, NETWORK_NONE, NULL, signer_details,
                         MAX_ALLOWED_SIGNERS, &num_signer_details, &errmsg)) {
                     JADE_LOGE("Failed to load signer information from descriptor data");
                     const char* message[] = { "Unable to load", "signer details" };
diff --git a/main/process/process_utils.c b/main/process/process_utils.c
@@ -31,7 +31,7 @@ bool jade_process_check_network(jade_process_t* process, CborValue* params, uint
     rpc_get_string("network", sizeof(network), params, network, &network_len);
     *network_id = network_from_name(network_len ? network : NULL);
 
-    if (*network_id == WALLY_NETWORK_NONE) {
+    if (*network_id == NETWORK_NONE) {
         jade_process_reject_message(
             process, CBOR_RPC_BAD_PARAMETERS, "Failed to extract valid network from parameters", NULL);
         return false;
diff --git a/main/process/register_descriptor.c b/main/process/register_descriptor.c
@@ -27,7 +27,7 @@ static int register_descriptor(
     const char* descriptor_name, const uint32_t network_id, descriptor_data_t* descriptor, const char** errmsg)
 {
     JADE_ASSERT(descriptor_name);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(descriptor);
     JADE_INIT_OUT_PPTR(errmsg);
 
diff --git a/main/process/register_multisig.c b/main/process/register_multisig.c
@@ -242,10 +242,10 @@ int register_multisig_file(const char* multisig_file, const size_t multisig_file
     uint32_t network_id;
     uint8_t xpub_version[4];
     if (keychain_get_network_type_restriction() == NETWORK_TYPE_TEST) {
-        network_id = WALLY_NETWORK_BITCOIN_TESTNET;
+        network_id = NETWORK_BITCOIN_TESTNET;
         uint32_to_be(BIP32_VER_TEST_PUBLIC, xpub_version);
     } else {
-        network_id = WALLY_NETWORK_BITCOIN_MAINNET;
+        network_id = NETWORK_BITCOIN;
         uint32_to_be(BIP32_VER_MAIN_PUBLIC, xpub_version);
     }
 
diff --git a/main/process/sign_liquid_tx.c b/main/process/sign_liquid_tx.c
@@ -517,7 +517,7 @@ bool show_elements_fee_confirmation_activity(const uint32_t network_id, const st
     const output_info_t* outinfo, const script_flavour_t aggregate_inputs_scripts_flavour, const uint64_t fees,
     const TxType_t txtype, const bool tx_is_partial)
 {
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(tx);
     JADE_ASSERT(outinfo);
 
diff --git a/main/process/sign_psbt.c b/main/process/sign_psbt.c
@@ -49,7 +49,7 @@ static const uint8_t PSBT_MAGIC_PREFIX[5] = { 0x70, 0x73, 0x62, 0x74, 0xFF }; //
 
 static bool is_green_multisig_signers(const uint32_t network_id, const key_iter* iter, struct ext_key* recovery_hdkey)
 {
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(iter && iter->is_valid);
 
     const size_t num_keys = key_iter_get_num_keys(iter);
@@ -145,7 +145,7 @@ static bool verify_ga_script_matches(const uint32_t network_id, const struct ext
     const struct ext_key* recovery_key, const uint32_t* path, const size_t path_len, const uint8_t* target_script,
     const size_t target_script_len)
 {
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(path);
     JADE_ASSERT(target_script);
     JADE_ASSERT(target_script_len);
@@ -292,7 +292,7 @@ static bool verify_descriptor_script_matches_impl(const char* descriptor_name, c
 {
     JADE_ASSERT(descriptor_name);
     JADE_ASSERT(descriptor);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(target_script);
     JADE_ASSERT(target_script_len);
 
@@ -324,7 +324,7 @@ static bool verify_descriptor_script_matches(const char* descriptor_name, const
 {
     JADE_ASSERT(descriptor_name);
     JADE_ASSERT(descriptor);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(path);
     JADE_ASSERT(path_len);
     JADE_ASSERT(iter && iter->is_valid);
@@ -411,7 +411,7 @@ static bool get_suitable_descriptor_record(const key_iter* iter, const uint32_t*
     JADE_ASSERT(iter && iter->is_valid);
     JADE_ASSERT(target_script);
     JADE_ASSERT(target_script_len);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(wallet_name);
     JADE_ASSERT(wallet_name_len);
     JADE_ASSERT(descriptor);
@@ -456,7 +456,7 @@ static void validate_any_change_outputs(const uint32_t network_id, struct wally_
     const char* wallet_name, const multisig_data_t* multisig_data, const descriptor_data_t* descriptor,
     output_info_t* output_info)
 {
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(psbt);
     JADE_ASSERT(signing_flags);
     // wallet_name, multisig_data and descriptor optional
@@ -622,7 +622,7 @@ int sign_psbt(const uint32_t network_id, struct wally_psbt* psbt, const char** e
 {
     JADE_ASSERT(psbt);
     JADE_INIT_OUT_PPTR(errmsg);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
 
     // Elements/PSET not supported
     size_t is_elements = 0;
diff --git a/main/process/sign_tx.c b/main/process/sign_tx.c
@@ -34,7 +34,7 @@ bool validate_wallet_outputs(jade_process_t* process, const uint32_t network_id,
     CborValue* wallet_outputs, output_info_t* output_info, const char** errmsg)
 {
     JADE_ASSERT(process);
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(tx);
     JADE_ASSERT(wallet_outputs);
     JADE_ASSERT(output_info);
diff --git a/main/qrmode.c b/main/qrmode.c
@@ -624,7 +624,7 @@ static bool handle_address_options(const bool show_account, uint16_t* account_in
 static bool verify_address(const address_data_t* const addr_data)
 {
     JADE_ASSERT(addr_data);
-    JADE_ASSERT(addr_data->network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(addr_data->network_id != NETWORK_NONE);
     JADE_ASSERT(addr_data->script_len);
 
     const bool default_selection = true;
@@ -1135,9 +1135,9 @@ static bool parse_sign_display_bcur_psbt_qr(const uint8_t* cbor, const size_t cb
     const char* errmsg = NULL;
     uint32_t network_id;
     if (keychain_get_network_type_restriction() == NETWORK_TYPE_TEST) {
-        network_id = WALLY_NETWORK_BITCOIN_TESTNET;
+        network_id = NETWORK_BITCOIN_TESTNET;
     } else {
-        network_id = WALLY_NETWORK_BITCOIN_MAINNET;
+        network_id = NETWORK_BITCOIN;
     }
     const int errcode = sign_psbt(network_id, psbt, &errmsg);
     if (errcode) {
@@ -1594,9 +1594,9 @@ static bool post_auth_msg_request(const jade_msg_source_t source, const bool sup
     const network_type_t restriction = keychain_get_network_type_restriction();
     uint32_t network_id;
     if (restriction == NETWORK_TYPE_TEST) {
-        network_id = WALLY_NETWORK_BITCOIN_TESTNET;
+        network_id = NETWORK_BITCOIN_TESTNET;
     } else {
-        network_id = WALLY_NETWORK_BITCOIN_MAINNET;
+        network_id = NETWORK_BITCOIN;
     }
     add_string_to_map(&params_encoder, "network", network_to_name(network_id));
     add_boolean_to_map(&params_encoder, "suppress_pin_change_confirmation", suppress_pin_change_confirmation);
diff --git a/main/selfcheck.c b/main/selfcheck.c
@@ -924,8 +924,8 @@ static bool test_miniscript_descriptors(void)
     descriptor_data_t desc = {};
     bool ret;
 
-    const uint32_t MAINNET = WALLY_NETWORK_BITCOIN_MAINNET;
-    const uint32_t TESTNET = WALLY_NETWORK_BITCOIN_TESTNET;
+    const uint32_t MAINNET = NETWORK_BITCOIN;
+    const uint32_t TESTNET = NETWORK_BITCOIN_TESTNET;
     uint8_t buf[BIP32_KEY_FINGERPRINT_LEN];
     size_t num_signers = 0;
     signer_t signers[3];
diff --git a/main/ui/sign_tx.c b/main/ui/sign_tx.c
@@ -418,7 +418,7 @@ static bool show_input_output_activity(const char* title, const bool is_wallet_o
 bool show_btc_transaction_outputs_activity(
     const uint32_t network_id, const struct wally_tx* tx, const output_info_t* output_info)
 {
-    JADE_ASSERT(network_id != WALLY_NETWORK_NONE);
+    JADE_ASSERT(network_id != NETWORK_NONE);
     JADE_ASSERT(tx);
     // Note: output_info is optional and can be null
 
diff --git a/main/usbhmsc/usbmode.c b/main/usbhmsc/usbmode.c
@@ -829,9 +829,9 @@ static bool sign_usb_psbt(const usbstorage_action_context_t* ctx)
     const char* errmsg = NULL;
     uint32_t network_id;
     if (keychain_get_network_type_restriction() == NETWORK_TYPE_TEST) {
-        network_id = WALLY_NETWORK_BITCOIN_TESTNET;
+        network_id = NETWORK_BITCOIN_TESTNET;
     } else {
-        network_id = WALLY_NETWORK_BITCOIN_MAINNET;
+        network_id = NETWORK_BITCOIN;
     }
     const int errcode = sign_psbt(network_id, psbt, &errmsg);
     if (errcode) {
diff --git a/main/utils/address.c b/main/utils/address.c
@@ -242,7 +242,7 @@ static bool try_parse_address(const uint32_t network_id, address_data_t* addr_da
 
     // 1. Try non- (or wrapped-) segwit.
     // Don't bother trying Bitcoin regtest since it shares a prefix with testnet
-    if (network_id != WALLY_NETWORK_BITCOIN_REGTEST) {
+    if (network_id != NETWORK_BITCOIN_REGTEST) {
         wret = wally_address_to_scriptpubkey(
             addr_data->address, network_id, addr_data->script, sizeof(addr_data->script), &addr_data->script_len);
     }
@@ -274,7 +274,7 @@ bool parse_address(const char* address, address_data_t* addr_data)
     JADE_ASSERT(addr_data);
 
     addr_data->address[0] = '\0';
-    addr_data->network_id = WALLY_NETWORK_NONE;
+    addr_data->network_id = NETWORK_NONE;
     addr_data->script_len = 0;
 
     // Convert potential uri form into raw base58 address string
@@ -284,13 +284,12 @@ bool parse_address(const char* address, address_data_t* addr_data)
     }
 
     // Try to parse the passed address for mainnet, testnet and localtest/regtest
-    if (try_parse_address(WALLY_NETWORK_BITCOIN_MAINNET, addr_data)
-        || try_parse_address(WALLY_NETWORK_BITCOIN_TESTNET, addr_data)
-        || try_parse_address(WALLY_NETWORK_BITCOIN_REGTEST, addr_data)) {
+    if (try_parse_address(NETWORK_BITCOIN, addr_data) || try_parse_address(NETWORK_BITCOIN_TESTNET, addr_data)
+        || try_parse_address(NETWORK_BITCOIN_REGTEST, addr_data)) {
         // Script parsed
         const size_t len = strnlen(addr_data->address, sizeof(addr_data->address));
         JADE_ASSERT(len > 0 && len < sizeof(addr_data->address));
-        JADE_ASSERT(addr_data->network_id != WALLY_NETWORK_NONE);
+        JADE_ASSERT(addr_data->network_id != NETWORK_NONE);
         JADE_ASSERT(addr_data->script_len);
         return true;
     }
diff --git a/main/utils/network.c b/main/utils/network.c
diff --git a/main/utils/network.h b/main/utils/network.h
diff --git a/main/wallet.c b/main/wallet.c

Original file line number	Diff line number	Diff line change
`@@ -209,9 +209,9 @@ bool assets_get_info(const uint32_t network_id, const asset_info_t* assets, cons`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`// 3. Search the h/coded assets snapshot`
`212`		`- // FIXME: WALLY_NETWORK_LIQUID_REGTEST appears to use mainnet assets?`
`213`		`- const bool use_testnet_registry = network_id == WALLY_NETWORK_LIQUID_TESTNET /* \|\|`
`214`		`- network_id == WALLY_NETWORK_LIQUID_REGTEST */`
	`212`	`+ // FIXME: NETWORK_LIQUID_REGTEST appears to use mainnet assets?`
	`213`	`+ const bool use_testnet_registry = network_id == NETWORK_LIQUID_TESTNET /* \|\|`
	`214`	`+ network_id == NETWORK_LIQUID_REGTEST */`
`215`	`215`	`;`
`216`	`216`	`const snapshot_asset_info_t* snapshot_asset = assets_snapshot_get_info(asset_id, use_testnet_registry);`
`217`	`217`	`if (snapshot_asset) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ static int register_descriptor(`
`27`	`27`	`const char* descriptor_name, const uint32_t network_id, descriptor_data_t* descriptor, const char** errmsg)`
`28`	`28`	`{`
`29`	`29`	`JADE_ASSERT(descriptor_name);`
`30`		`- JADE_ASSERT(network_id != WALLY_NETWORK_NONE);`
	`30`	`+ JADE_ASSERT(network_id != NETWORK_NONE);`
`31`	`31`	`JADE_ASSERT(descriptor);`
`32`	`32`	`JADE_INIT_OUT_PPTR(errmsg);`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ bool show_elements_fee_confirmation_activity(const uint32_t network_id, const st`
`517`	`517`	`const output_info_t* outinfo, const script_flavour_t aggregate_inputs_scripts_flavour, const uint64_t fees,`
`518`	`518`	`const TxType_t txtype, const bool tx_is_partial)`
`519`	`519`	`{`
`520`		`- JADE_ASSERT(network_id != WALLY_NETWORK_NONE);`
	`520`	`+ JADE_ASSERT(network_id != NETWORK_NONE);`
`521`	`521`	`JADE_ASSERT(tx);`
`522`	`522`	`JADE_ASSERT(outinfo);`
`523`	`523`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ bool validate_wallet_outputs(jade_process_t* process, const uint32_t network_id,`
`34`	`34`	`CborValue* wallet_outputs, output_info_t* output_info, const char** errmsg)`
`35`	`35`	`{`
`36`	`36`	`JADE_ASSERT(process);`
`37`		`- JADE_ASSERT(network_id != WALLY_NETWORK_NONE);`
	`37`	`+ JADE_ASSERT(network_id != NETWORK_NONE);`
`38`	`38`	`JADE_ASSERT(tx);`
`39`	`39`	`JADE_ASSERT(wallet_outputs);`
`40`	`40`	`JADE_ASSERT(output_info);`