network: make network function names/parameters consistent

Author: jgriffiths

main/assets.c

@@ -193,7 +193,7 @@ bool assets_get_allocate(const char* field, const CborValue* value, asset_info_t
 bool assets_get_info(const uint32_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(isLiquidNetworkId(network_id));
+    JADE_ASSERT(network_is_liquid(network_id));
     JADE_ASSERT(assets || !num_assets);
     JADE_ASSERT(asset_id);
 

main/keychain.c

@@ -241,7 +241,7 @@ bool keychain_is_network_type_consistent(const network_type_t network_type)
 
 bool keychain_is_network_id_consistent(const uint32_t network_id)
 {
-    const network_type_t network_type = networkIdToType(network_id);
+    const network_type_t network_type = network_to_type(network_id);
     return keychain_is_network_type_consistent(network_type);
 }
 

main/process/auth_user.c

@@ -442,7 +442,7 @@ void auth_user_process(void* process_ptr)
 #ifndef CONFIG_DEBUG_MODE
         // If not a debug build, we restrict the hw to this network type
         // (In case it wasn't set at wallet creation/recovery time [older fw])
-        keychain_set_network_type_restriction(networkIdToType(network_id));
+        keychain_set_network_type_restriction(network_to_type(network_id));
 #endif
         JADE_LOGI("Success");
     }

main/process/get_receive_address.c

@@ -31,7 +31,7 @@ void get_receive_address_process(void* process_ptr)
     ASSERT_KEYCHAIN_UNLOCKED_BY_MESSAGE_SOURCE(process);
     GET_MSG_PARAMS(process);
     CHECK_NETWORK_CONSISTENT(process);
-    const bool isLiquid = isLiquidNetworkId(network_id);
+    const bool isLiquid = network_is_liquid(network_id);
 
     // Handle single-sig and generic multisig script variants
     // (Green-multisig is the default for backwards compatibility)
@@ -155,17 +155,17 @@ void get_receive_address_process(void* process_ptr)
             rpc_get_string("recovery_xpub", sizeof(xpubrecovery), &params, xpubrecovery, &written);
 
             // Optional 'blocks' for csv outputs
-            size_t csvBlocks = 0;
-            rpc_get_sizet("csv_blocks", &params, &csvBlocks);
+            size_t csv_blocks = 0;
+            rpc_get_sizet("csv_blocks", &params, &csv_blocks);
 
-            if (csvBlocks && !csvBlocksExpectedForNetwork(network_id, csvBlocks)) {
+            if (csv_blocks && !network_is_known_csv_blocks(network_id, csv_blocks)) {
                 const int ret
-                    = snprintf(warning_msg, sizeof(warning_msg), "\nWarning:\nNon-standard csv:\n%u", csvBlocks);
+                    = snprintf(warning_msg, sizeof(warning_msg), "\nWarning:\nNon-standard csv:\n%u", csv_blocks);
                 JADE_ASSERT(ret > 0 && ret < sizeof(warning_msg));
             }
 
             // Build a script pubkey for the passed parameters
-            if (!wallet_build_ga_script(network_id, written ? xpubrecovery : NULL, csvBlocks, path, path_len, script,
+            if (!wallet_build_ga_script(network_id, written ? xpubrecovery : NULL, csv_blocks, path, path_len, script,
                     sizeof(script), &script_len)) {
                 jade_process_reject_message(
                     process, CBOR_RPC_BAD_PARAMETERS, "Failed to generate valid green address script", NULL);

main/process/process_utils.c

@@ -29,7 +29,7 @@ bool jade_process_check_network(jade_process_t* process, CborValue* params, uint
     char network[MAX_NETWORK_NAME_LEN];
     size_t network_len;
     rpc_get_string("network", sizeof(network), params, network, &network_len);
-    *network_id = networkToNetworkId(network_len ? network : NULL);
+    *network_id = network_from_name(network_len ? network : NULL);
 
     if (*network_id == WALLY_NETWORK_NONE) {
         jade_process_reject_message(

main/process/register_descriptor.c

@@ -35,7 +35,7 @@ static int register_descriptor(
     JADE_ASSERT(descriptor->num_values < MAX_ALLOWED_SIGNERS);
 
     // Not valid for liquid wallets atm
-    if (isLiquidNetworkId(network_id)) {
+    if (network_is_liquid(network_id)) {
         *errmsg = "Descriptor wallets not supported on liquid network";
         return CBOR_RPC_BAD_PARAMETERS;
     }

main/process/sign_liquid_tx.c

@@ -549,7 +549,7 @@ void sign_liquid_tx_process(void* process_ptr)
     GET_MSG_PARAMS(process);
     CHECK_NETWORK_CONSISTENT(process);
 
-    if (!isLiquidNetworkId(network_id)) {
+    if (!network_is_liquid(network_id)) {
         jade_process_reject_message(
             process, CBOR_RPC_BAD_PARAMETERS, "sign_liquid_tx call only appropriate for liquid network", NULL);
         goto cleanup;
@@ -700,7 +700,7 @@ void sign_liquid_tx_process(void* process_ptr)
     // Can be null for unblinded outputs as we will skip them.
     // Populate an `output_index` -> (blinding_key, asset, value) map
     uint8_t policy_asset[ASSET_TAG_LEN];
-    const char* policy_asset_hex = networkGetPolicyAsset(network_id);
+    const char* policy_asset_hex = network_to_policy_asset_hex(network_id);
     JADE_WALLY_VERIFY(wally_hex_to_bytes(policy_asset_hex, policy_asset, sizeof(policy_asset), &written));
     JADE_ASSERT(written == sizeof(policy_asset));
 

main/process/sign_psbt.c

@@ -155,7 +155,7 @@ static bool verify_ga_script_matches(const uint32_t network_id, const struct ext
     if (recovery_key) {
         // 2of2: fetch the number of csv blocks if this is a csv script
         int ret = wally_scriptpubkey_csv_blocks_from_csv_2of2_then_1(target_script, target_script_len, &csv_blocks);
-        if (ret == WALLY_OK && !csvBlocksExpectedForNetwork(network_id, csv_blocks)) {
+        if (ret == WALLY_OK && !network_is_known_csv_blocks(network_id, csv_blocks)) {
             return false; // csv script with an invalid csv_blocks
         }
     }
@@ -945,7 +945,7 @@ void sign_psbt_process(void* process_ptr)
     GET_MSG_PARAMS(process);
     CHECK_NETWORK_CONSISTENT(process);
 
-    if (isLiquidNetworkId(network_id)) {
+    if (network_is_liquid(network_id)) {
         jade_process_reject_message(
             process, CBOR_RPC_BAD_PARAMETERS, "sign_psbt call not appropriate for liquid network", NULL);
         goto cleanup;

main/process/sign_tx.c

@@ -69,7 +69,7 @@ bool validate_wallet_outputs(jade_process_t* process, const uint32_t network_id,
             bool is_change = true;
             rpc_get_boolean("is_change", &arrayItem, &is_change);
 
-            size_t csvBlocks = 0;
+            size_t csv_blocks = 0;
             size_t script_len = 0;
             uint8_t script[WALLY_SCRIPTPUBKEY_P2WSH_LEN]; // Sufficient
             size_t written = 0;
@@ -105,7 +105,7 @@ bool validate_wallet_outputs(jade_process_t* process, const uint32_t network_id,
                 }
             } else if (rpc_has_field_data("descriptor_name", &arrayItem)) {
                 // Not valid for liquid wallets atm
-                if (isLiquidNetworkId(network_id)) {
+                if (network_is_liquid(network_id)) {
                     *errmsg = "Descriptor wallets not supported on liquid network";
                     goto cleanup;
                 }
@@ -164,21 +164,21 @@ bool validate_wallet_outputs(jade_process_t* process, const uint32_t network_id,
                     rpc_get_string("recovery_xpub", sizeof(xpubrecovery), &arrayItem, xpubrecovery, &written);
 
                     // Optional 'blocks' for csv outputs
-                    rpc_get_sizet("csv_blocks", &arrayItem, &csvBlocks);
+                    rpc_get_sizet("csv_blocks", &arrayItem, &csv_blocks);
 
                     // If number of csv blocks unexpected show a warning message and ask the user to confirm
-                    if (csvBlocks && !csvBlocksExpectedForNetwork(network_id, csvBlocks)) {
-                        JADE_LOGW("Unexpected number of csv blocks in path for output: %u", csvBlocks);
+                    if (csv_blocks && !network_is_known_csv_blocks(network_id, csv_blocks)) {
+                        JADE_LOGW("Unexpected number of csv blocks in path for output: %u", csv_blocks);
                         const int ret = snprintf(output_info[i].message, sizeof(output_info[i].message),
                             "This wallet output has a non-standard csv value (%u), so it may be difficult to find.  "
                             "Proceed at your own risk.",
-                            csvBlocks);
+                            csv_blocks);
                         JADE_ASSERT(
                             ret > 0 && ret < sizeof(output_info[i].message)); // Keep message within size handled by gui
                     }
 
                     // Build a script pubkey for the passed parameters
-                    if (!wallet_build_ga_script(network_id, written ? xpubrecovery : NULL, csvBlocks, path, path_len,
+                    if (!wallet_build_ga_script(network_id, written ? xpubrecovery : NULL, csv_blocks, path, path_len,
                             script, sizeof(script), &script_len)) {
                         JADE_LOGE("Output %u path/script failed to construct", i);
                         *errmsg = "Receive script cannot be constructed";
@@ -409,7 +409,7 @@ void sign_tx_process(void* process_ptr)
     ASSERT_KEYCHAIN_UNLOCKED_BY_MESSAGE_SOURCE(process);
     GET_MSG_PARAMS(process);
     CHECK_NETWORK_CONSISTENT(process);
-    if (isLiquidNetworkId(network_id)) {
+    if (network_is_liquid(network_id)) {
         jade_process_reject_message(
             process, CBOR_RPC_BAD_PARAMETERS, "sign_tx call not appropriate for liquid network", NULL);
         goto cleanup;

main/qrmode.c

@@ -1598,7 +1598,7 @@ static bool post_auth_msg_request(const jade_msg_source_t source, const bool sup
     } else {
         network_id = WALLY_NETWORK_BITCOIN_MAINNET;
     }
-    add_string_to_map(&params_encoder, "network", networkIdToNetwork(network_id));
+    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);
     cberr = cbor_encoder_close_container(&root_map_encoder, &params_encoder);
     JADE_ASSERT(cberr == CborNoError);