psbt: allow pset signing from usb/qrcodes

Author: jgriffiths

main/process/sign_psbt.c

@@ -650,6 +650,18 @@ static bool psbt_update_outputs(const network_t network_id, struct wally_psbt* p
     return true;
 }
 
+// Deduce the network to try to sign with given a psbt/pset.
+network_t network_from_psbt_type(struct wally_psbt* psbt)
+{
+    JADE_ASSERT(psbt);
+    size_t is_elements = 0;
+    JADE_WALLY_VERIFY(wally_psbt_is_elements(psbt, &is_elements));
+    if (keychain_get_network_type_restriction() == NETWORK_TYPE_TEST) {
+        return is_elements ? NETWORK_LIQUID_TESTNET : NETWORK_BITCOIN_TESTNET;
+    }
+    return is_elements ? NETWORK_LIQUID : NETWORK_BITCOIN;
+}
+
 // Sign a psbt/pset - the passed wally psbt struct is updated with any signatures.
 // Returns 0 if no errors occurred - does not necessarily indicate that signatures were added.
 // Returns an rpc/message error code on error, and the error string should be populated.

main/qrmode.c

@@ -89,6 +89,7 @@ bool select_registered_wallet(const char multisig_names[][NVS_KEY_NAME_MAX_SIZE]
 
 // PSBT struct and functions
 struct wally_psbt;
+network_t network_from_psbt_type(struct wally_psbt* psbt);
 int sign_psbt(
     jade_process_t* process, CborValue* params, network_t network_id, struct wally_psbt* psbt, const char** errmsg);
 int wally_psbt_free(struct wally_psbt* psbt);
@@ -1092,12 +1093,8 @@ static bool parse_sign_display_bcur_psbt_qr(const uint8_t* cbor, const size_t cb
     // Try to sign extracted PSBT
     bool ret = false;
     const char* errmsg = NULL;
-    network_t network_id;
-    if (keychain_get_network_type_restriction() == NETWORK_TYPE_TEST) {
-        network_id = NETWORK_BITCOIN_TESTNET;
-    } else {
-        network_id = NETWORK_BITCOIN;
-    }
+    const network_t network_id = network_from_psbt_type(psbt);
+
     // Note we pass NULL process/params as we don't have any additional info
     const int errcode = sign_psbt(NULL, NULL, network_id, psbt, &errmsg);
     if (errcode) {

main/usbhmsc/usbmode.c

@@ -29,6 +29,7 @@ void await_qr_help_activity(const char* url);
 // PSBT serialisation functions
 bool deserialise_psbt(const uint8_t* bytes, size_t bytes_len, struct wally_psbt** psbt_out);
 bool serialise_psbt(const struct wally_psbt* psbt, uint8_t** output, size_t* output_len);
+network_t network_from_psbt_type(struct wally_psbt* psbt);
 int sign_psbt(
     jade_process_t* process, CborValue* params, network_t network_id, struct wally_psbt* psbt, const char** errmsg);
 
@@ -828,12 +829,8 @@ static bool sign_usb_psbt(const usbstorage_action_context_t* ctx)
 
     // Sign PSBT
     const char* errmsg = NULL;
-    network_t network_id;
-    if (keychain_get_network_type_restriction() == NETWORK_TYPE_TEST) {
-        network_id = NETWORK_BITCOIN_TESTNET;
-    } else {
-        network_id = NETWORK_BITCOIN;
-    }
+    const network_t network_id = network_from_psbt_type(psbt);
+
     // Note we pass NULL process/params as we don't have any additional info
     const int errcode = sign_psbt(NULL, NULL, network_id, psbt, &errmsg);
     if (errcode) {