aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-05 07:14:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

common: use bitcoin_outpoint.

Browse Source 
I started pulling this thread, and the entire codebase got unravelled.

Oh well, it's done now!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-10-13 14:15:36 +10:30
committed by Christian Decker
parent e7a8a0d291
commit c503232cde
75 changed files with 1061 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
devtools/mkclose.c
View File

@@ -50,8 +50,7 @@ int main(int argc, char *argv[])
struct pubkey funding_pubkey[NUM_SIDES], outkey[NUM_SIDES];
struct privkey funding_privkey[NUM_SIDES];
struct amount_sat funding_amount;
struct bitcoin_txid funding_txid;
unsigned int funding_outnum;
struct bitcoin_outpoint funding;
u32 feerate_per_kw;
struct amount_sat fee;
struct bitcoin_signature local_sig, remote_sig;
@@ -81,10 +80,10 @@ int main(int argc, char *argv[])
argnum = 1;
if (!bitcoin_txid_from_hex(argv[argnum],
strlen(argv[argnum]), &funding_txid))
strlen(argv[argnum]), &funding.txid))
errx(1, "Bad funding-txid");
argnum++;
funding_outnum = atoi(argv[argnum++]);
funding.n = atoi(argv[argnum++]);
if (!parse_amount_sat(&funding_amount, argv[argnum], strlen(argv[argnum])))
errx(1, "Bad funding-amount");
argnum++;
@@ -165,7 +164,7 @@ int main(int argc, char *argv[])
tal_hex(NULL, funding_wscript));
/* Our input spends the anchor tx output. */
bitcoin_tx_add_input(tx, &funding_txid, funding_outnum,
bitcoin_tx_add_input(tx, &funding,
BITCOIN_TX_DEFAULT_SEQUENCE, NULL,
funding_amount, NULL, funding_wscript);

11
devtools/mkcommit.c
View File

@@ -248,8 +248,7 @@ int main(int argc, char *argv[])
u64 commitnum;
struct amount_sat funding_amount;
struct channel_id cid;
struct bitcoin_txid funding_txid;
unsigned int funding_outnum;
struct bitcoin_outpoint funding;
u32 feerate_per_kw;
struct pubkey local_per_commit_point, remote_per_commit_point;
struct bitcoin_signature local_sig, remote_sig;
@@ -313,10 +312,10 @@ int main(int argc, char *argv[])
argnum = 1;
commitnum = atol(argv[argnum++]);
if (!bitcoin_txid_from_hex(argv[argnum],
strlen(argv[argnum]), &funding_txid))
strlen(argv[argnum]), &funding.txid))
errx(1, "Bad funding-txid");
argnum++;
funding_outnum = atoi(argv[argnum++]);
funding.n = atoi(argv[argnum++]);
if (!parse_amount_sat(&funding_amount, argv[argnum], strlen(argv[argnum])))
errx(1, "Bad funding-amount");
argnum++;
@@ -387,7 +386,7 @@ int main(int argc, char *argv[])
&remotebase, &funding_remotekey, commitnum);
/* FIXME: option for v2? */
derive_channel_id(&cid, &funding_txid, funding_outnum);
derive_channel_id(&cid, &funding);
if (option_anchor_outputs)
channel_type = channel_type_anchor_outputs(NULL);
@@ -398,7 +397,7 @@ int main(int argc, char *argv[])
channel = new_full_channel(NULL,
&cid,
&funding_txid, funding_outnum, 1,
&funding, 1,
take(new_height_states(NULL, fee_payer,
&blockheight)),
0, /* Defaults to no lease */

6
devtools/mkfunding.c
View File

@@ -42,7 +42,7 @@ static struct bitcoin_tx *tx_spending_utxo(const tal_t *ctx,
nlocktime);
assert(!utxo->is_p2sh);
bitcoin_tx_add_input(tx, &utxo->txid, utxo->outnum,
bitcoin_tx_add_input(tx, &utxo->outpoint,
nsequence, NULL, utxo->amount,
utxo->scriptPubkey, NULL);
@@ -99,10 +99,10 @@ int main(int argc, char *argv[])
argnum = 1;
if (!bitcoin_txid_from_hex(argv[argnum],
strlen(argv[argnum]), &input.txid))
strlen(argv[argnum]), &input.outpoint.txid))
errx(1, "Bad input-txid");
argnum++;
input.outnum = atoi(argv[argnum++]);
input.outpoint.n = atoi(argv[argnum++]);
if (!parse_amount_sat(&input.amount, argv[argnum], strlen(argv[argnum])))
errx(1, "Bad input-amount");
argnum++;