From abcde461df4641c5b4f0d399e8be08a0cf890f8b Mon Sep 17 00:00:00 2001 From: lisa neigut Date: Wed, 31 Jul 2019 18:55:53 -0500 Subject: [PATCH] devtools: print witnesses along with signatures for mkfunding we need the witnesses for dual-funding transactions --- devtools/mkfunding.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/devtools/mkfunding.c b/devtools/mkfunding.c index 09e9b999c..6a7064cab 100644 --- a/devtools/mkfunding.c +++ b/devtools/mkfunding.c @@ -47,6 +47,7 @@ int main(int argc, char *argv[]) struct bitcoin_signature sig; struct bitcoin_txid txid; const struct chainparams *chainparams = chainparams_for_network("bitcoin"); + u8 **witnesses; setup_locale(); @@ -116,8 +117,14 @@ int main(int argc, char *argv[]) sign_tx_input(tx, 0, NULL, p2wpkh_scriptcode(NULL, &inputkey), &input_privkey, &inputkey, SIGHASH_ALL, &sig); + witnesses = bitcoin_witness_p2wpkh(NULL, &sig, &inputkey); + bitcoin_tx_input_set_witness(tx, 0, witnesses); printf("# funding sig: %s\n", sig_as_hex(&sig)); + printf("# funding witnesses: [\n"); + for (size_t i = 0; i < tal_count(witnesses); i++) + printf("\t%s\n", tal_hex(NULL, witnesses[i])); + printf("# ]\n"); printf("# funding amount: %s\n", type_to_string(NULL, struct amount_sat, &funding_amount)); @@ -125,9 +132,6 @@ int main(int argc, char *argv[]) printf("# funding txid: %s\n", type_to_string(NULL, struct bitcoin_txid, &txid)); - bitcoin_tx_input_set_witness( - tx, 0, bitcoin_witness_p2wpkh(NULL, &sig, &inputkey)); - printf("tx: %s\n", tal_hex(NULL, linearize_tx(NULL, tx))); return 0;