DONTMERGE: reconcile pre-segwit hashing

Author: jgriffiths

src/transaction.c

@@ -2798,6 +2798,31 @@ static int tx_get_signature_hash(const struct wally_tx *tx,
     else
         ret = wally_sha256d(buff_p, n2, bytes_out, len);
 
+    if (ret == WALLY_OK) {
+        // Reconcile
+        unsigned char tmp[SHA256_LEN];
+        struct wally_map_item value_item;
+        struct wally_map values = { &value_item, 1, 1, NULL };
+        values.items[0].key = NULL;
+        values.items[0].key_len = index;
+        if (is_elements) {
+            value_item.value = (unsigned char*)value;
+            value_item.value_len = value_len;
+        } else {
+            value_item.value = (unsigned char*)&satoshi;
+            value_item.value_len = sizeof(uint64_t);
+        }
+        ret = wally_tx_get_input_signature_hash(tx, index, NULL, NULL,
+                                                 &values, script, script_len,
+                                                 0, WALLY_NO_CODESEPARATOR,
+                                                 NULL, 0, NULL, 0,
+                                                 sighash, WALLY_SIGTYPE_PRE_SW,
+                                                 NULL, tmp, len);
+        if (ret != WALLY_OK)
+            return WALLY_ERROR;
+        if (memcmp(bytes_out, tmp, len))
+            return WALLY_ERROR;
+    }
 fail:
     if (buff_p != buff)
         clear_and_free(buff_p, n);