network: remove final references to network names

As of this commit, each process gets a 'network_id' variable which is
always set to a valid network id, and no network strings are used.

Author: jgriffiths

main/process/process_utils.h

@@ -76,16 +76,13 @@ typedef struct {
 bool jade_process_check_network(jade_process_t* process, CborValue* params, uint32_t* network_id);
 
 // Ensure the rpc "network" parameter is valid and consistent with prior use.
-// Declares 'network_id'/'network' variables and initializes them.
+// Declares 'network_id' variable and initializes it.
 // Assumes GET_MSG_PARAMS() was used previously in the same scope.
-// TODO: Remove 'network' and pass around 'network_id' instead.
 #define CHECK_NETWORK_CONSISTENT(process)                                                                              \
     uint32_t network_id;                                                                                               \
     if (!jade_process_check_network(process, &params, &network_id)) {                                                  \
         goto cleanup;                                                                                                  \
-    }                                                                                                                  \
-    const char* const network = networkIdToNetwork(network_id);                                                        \
-    (void)network;
+    }
 
 // Do we have have a keychain, and does its userdata indicate the same 'source'
 // as the current message ?

main/qrmode.c

@@ -22,6 +22,7 @@
 #include "utils/network.h"
 #include "wallet.h"
 
+#include <wally_address.h>
 #include <wally_script.h>
 
 #include <string.h>
@@ -1591,8 +1592,13 @@ static bool post_auth_msg_request(const jade_msg_source_t source, const bool sup
     cberr = cbor_encoder_create_map(&root_map_encoder, &params_encoder, 2);
     JADE_ASSERT(cberr == CborNoError);
     const network_type_t restriction = keychain_get_network_type_restriction();
-    const char* network = restriction == NETWORK_TYPE_TEST ? TAG_TESTNET : TAG_MAINNET;
-    add_string_to_map(&params_encoder, "network", network);
+    uint32_t network_id;
+    if (restriction == NETWORK_TYPE_TEST) {
+        network_id = WALLY_NETWORK_BITCOIN_TESTNET;
+    } else {
+        network_id = WALLY_NETWORK_BITCOIN_MAINNET;
+    }
+    add_string_to_map(&params_encoder, "network", networkIdToNetwork(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);

main/utils/address.c

@@ -8,6 +8,7 @@
 #include <wally_script.h>
 
 #include <stdio.h>
+#include <string.h>
 
 static const char BITCOIN_ADDRESS_URI_SCHEME[] = "bitcoin";
 

main/utils/network.c

@@ -2,9 +2,21 @@
 #include "network.h"
 #include "jade_assert.h"
 
+#include <string.h>
+
 #include <wally_address.h>
 #include <wally_bip32.h>
 
+// Main networks
+#define TAG_MAINNET "mainnet"
+#define TAG_LIQUID "liquid"
+
+// Test networks
+#define TAG_TESTNET "testnet"
+#define TAG_TESTNETLIQUID "testnet-liquid"
+#define TAG_LOCALTEST "localtest"
+#define TAG_LOCALTESTLIQUID "localtest-liquid"
+
 // Green CSV buckets allowed
 static const size_t ALLOWED_CSV_MAINNET[] = { 25920, 51840, 65535 };
 static const size_t ALLOWED_CSV_TESTNET[] = { 144, 4320, 51840 };

main/utils/network.h

@@ -2,44 +2,35 @@
 #define UTILS_NETWORK_H_
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
-#include <string.h>
 
 #include <network_type.h>
 
+// Maximum length of a network name
 #define MAX_NETWORK_NAME_LEN 20
 
-// Main networks
-#define TAG_MAINNET "mainnet"
-#define TAG_LIQUID "liquid"
+bool isLiquidNetworkId(uint32_t network_id);
 
-// Test networks
-#define TAG_TESTNET "testnet"
-#define TAG_TESTNETLIQUID "testnet-liquid"
-#define TAG_LOCALTEST "localtest"
-#define TAG_LOCALTESTLIQUID "localtest-liquid"
+bool csvBlocksExpectedForNetwork(uint32_t network_id, uint32_t csvBlocks);
+size_t networkToMinAllowedCsvBlocks(uint32_t network_id);
 
-bool isLiquidNetworkId(const uint32_t network_id);
-
-bool csvBlocksExpectedForNetwork(const uint32_t network_id, uint32_t csvBlocks);
-size_t networkToMinAllowedCsvBlocks(const uint32_t network_id);
-
-// TAG_ string to WALLY_NETWORK_ constant, or WALLY_NETWORK_NONE if unknown
+// Network name to WALLY_NETWORK_ constant, or WALLY_NETWORK_NONE if unknown
 uint32_t networkToNetworkId(const char* network);
-// WALLY_NETWORK_ constant to TAG_ string. Asserts if unknown/WALLY_NETWORK_NONE
-const char* networkIdToNetwork(const uint32_t network_id);
+// WALLY_NETWORK_ constant to network name. Asserts if unknown/WALLY_NETWORK_NONE
+const char* networkIdToNetwork(uint32_t network_id);
 
-network_type_t networkIdToType(const uint32_t network_id);
-uint32_t networkToBip32Version(const uint32_t network_id);
+network_type_t networkIdToType(uint32_t network_id);
+uint32_t networkToBip32Version(uint32_t network_id);
 
-uint8_t networkToP2PKHPrefix(const uint32_t network_id);
-uint8_t networkToP2SHPrefix(const uint32_t network_id);
-const char* networkToBech32Hrp(const uint32_t network_id);
+uint8_t networkToP2PKHPrefix(uint32_t network_id);
+uint8_t networkToP2SHPrefix(uint32_t network_id);
+const char* networkToBech32Hrp(uint32_t network_id);
 
 // Liquid-specific
-uint8_t networkToCAPrefix(const uint32_t network_id);
-const char* networkToBlech32Hrp(const uint32_t network_id);
+uint8_t networkToCAPrefix(uint32_t network_id);
+const char* networkToBlech32Hrp(uint32_t network_id);
 
-const char* networkGetPolicyAsset(const uint32_t network_id);
+const char* networkGetPolicyAsset(uint32_t network_id);
 
 #endif /* UTILS_NETWORK_H_ */