lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

bitcoin/tx: pass struct amount_sat by copy. 

This is the normal convention for this type; it makes using converters
a little easier.  See next patch.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
pull/2938/head
Rusty Russell 6 years ago
parent
2f1e116510
commit
c9817b225b
10 changed files with 33 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      bitcoin/tx.c
  2. 6
      bitcoin/tx.h
  3. 10
      channeld/commit_tx.c
  4. 6
      common/close_tx.c
  5. 4
      common/funding_tx.c
  6. 4
      common/htlc_tx.c
  7. 6
      common/initial_commit_tx.c
  8. 2
      common/utxo.c
  9. 4
      common/withdraw_tx.c
  10. 12
      onchaind/onchaind.c

12
bitcoin/tx.c
View File

@ -15,14 +15,14 @@
#define SEGREGATED_WITNESS_FLAG 0x1 #define SEGREGATED_WITNESS_FLAG 0x1
int bitcoin_tx_add_output(struct bitcoin_tx *tx, const u8 *script, int bitcoin_tx_add_output(struct bitcoin_tx *tx, const u8 *script,
struct amount_sat *amount) struct amount_sat amount)
{ {
size_t i = tx->wtx->num_outputs; size_t i = tx->wtx->num_outputs;
struct wally_tx_output *output; struct wally_tx_output *output;
assert(i < tx->wtx->outputs_allocation_len); assert(i < tx->wtx->outputs_allocation_len);
assert(tx->wtx != NULL); assert(tx->wtx != NULL);
wally_tx_output_init_alloc(amount->satoshis /* Raw: low-level helper */, wally_tx_output_init_alloc(amount.satoshis /* Raw: low-level helper */,
script, tal_bytelen(script), &output); script, tal_bytelen(script), &output);
wally_tx_add_output(tx->wtx, output); wally_tx_add_output(tx->wtx, output);
wally_tx_output_free(output); wally_tx_output_free(output);
@ -32,7 +32,7 @@ int bitcoin_tx_add_output(struct bitcoin_tx *tx, const u8 *script,
int bitcoin_tx_add_input(struct bitcoin_tx *tx, const struct bitcoin_txid *txid, int bitcoin_tx_add_input(struct bitcoin_tx *tx, const struct bitcoin_txid *txid,
u32 outnum, u32 sequence, u32 outnum, u32 sequence,
const struct amount_sat *amount, u8 *script) struct amount_sat amount, u8 *script)
{ {
size_t i = tx->wtx->num_inputs; size_t i = tx->wtx->num_inputs;
struct wally_tx_input *input; struct wally_tx_input *input;
@ -48,7 +48,7 @@ int bitcoin_tx_add_input(struct bitcoin_tx *tx, const struct bitcoin_txid *txid,
/* Now store the input amount if we know it, so we can sign later */ /* Now store the input amount if we know it, so we can sign later */
tx->input_amounts[i] = tal_free(tx->input_amounts[i]); tx->input_amounts[i] = tal_free(tx->input_amounts[i]);
tx->input_amounts[i] = tal_dup(tx, struct amount_sat, amount); tx->input_amounts[i] = tal_dup(tx, struct amount_sat, &amount);
return i; return i;
} }
@ -74,10 +74,10 @@ bool bitcoin_tx_check(const struct bitcoin_tx *tx)
} }
void bitcoin_tx_output_set_amount(struct bitcoin_tx *tx, int outnum, void bitcoin_tx_output_set_amount(struct bitcoin_tx *tx, int outnum,
struct amount_sat *amount) struct amount_sat amount)
{ {
assert(outnum < tx->wtx->num_outputs); assert(outnum < tx->wtx->num_outputs);
tx->wtx->outputs[outnum].satoshi = amount->satoshis; /* Raw: low-level helper */ tx->wtx->outputs[outnum].satoshi = amount.satoshis; /* Raw: low-level helper */
} }
const u8 *bitcoin_tx_output_get_script(const tal_t *ctx, const u8 *bitcoin_tx_output_get_script(const tal_t *ctx,

6
bitcoin/tx.h
View File

@ -76,11 +76,11 @@ struct bitcoin_tx *pull_bitcoin_tx(const tal_t *ctx,
const u8 **cursor, size_t *max); const u8 **cursor, size_t *max);
int bitcoin_tx_add_output(struct bitcoin_tx *tx, const u8 *script, int bitcoin_tx_add_output(struct bitcoin_tx *tx, const u8 *script,
struct amount_sat *amount); struct amount_sat amount);
int bitcoin_tx_add_input(struct bitcoin_tx *tx, const struct bitcoin_txid *txid, int bitcoin_tx_add_input(struct bitcoin_tx *tx, const struct bitcoin_txid *txid,
u32 outnum, u32 sequence, u32 outnum, u32 sequence,
const struct amount_sat *amount, u8 *script); struct amount_sat amount, u8 *script);
/** /**
@ -91,7 +91,7 @@ int bitcoin_tx_add_input(struct bitcoin_tx *tx, const struct bitcoin_txid *txid,
* existing output. * existing output.
*/ */
void bitcoin_tx_output_set_amount(struct bitcoin_tx *tx, int outnum, void bitcoin_tx_output_set_amount(struct bitcoin_tx *tx, int outnum,
struct amount_sat *amount); struct amount_sat amount);
/** /**
* Helper to get the script of a script's output as a tal_arr * Helper to get the script of a script's output as a tal_arr

10
channeld/commit_tx.c
View File

@ -45,7 +45,7 @@ static void add_offered_htlc_out(struct bitcoin_tx *tx, size_t n,
ripemd160(&ripemd, htlc->rhash.u.u8, sizeof(htlc->rhash.u.u8)); ripemd160(&ripemd, htlc->rhash.u.u8, sizeof(htlc->rhash.u.u8));
wscript = htlc_offered_wscript(tx, &ripemd, keyset); wscript = htlc_offered_wscript(tx, &ripemd, keyset);
p2wsh = scriptpubkey_p2wsh(tx, wscript); p2wsh = scriptpubkey_p2wsh(tx, wscript);
bitcoin_tx_add_output(tx, p2wsh, &amount); bitcoin_tx_add_output(tx, p2wsh, amount);
SUPERVERBOSE("# HTLC %" PRIu64 " offered %s wscript %s\n", htlc->id, SUPERVERBOSE("# HTLC %" PRIu64 " offered %s wscript %s\n", htlc->id,
type_to_string(tmpctx, struct amount_sat, &amount), type_to_string(tmpctx, struct amount_sat, &amount),
tal_hex(wscript, wscript)); tal_hex(wscript, wscript));
@ -65,7 +65,7 @@ static void add_received_htlc_out(struct bitcoin_tx *tx, size_t n,
p2wsh = scriptpubkey_p2wsh(tx, wscript); p2wsh = scriptpubkey_p2wsh(tx, wscript);
amount = amount_msat_to_sat_round_down(htlc->amount); amount = amount_msat_to_sat_round_down(htlc->amount);
bitcoin_tx_add_output(tx, p2wsh, &amount); bitcoin_tx_add_output(tx, p2wsh, amount);
SUPERVERBOSE("# HTLC %"PRIu64" received %s wscript %s\n", SUPERVERBOSE("# HTLC %"PRIu64" received %s wscript %s\n",
htlc->id, htlc->id,
@ -203,7 +203,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
u8 *p2wsh = scriptpubkey_p2wsh(tx, wscript); u8 *p2wsh = scriptpubkey_p2wsh(tx, wscript);
struct amount_sat amount = amount_msat_to_sat_round_down(self_pay); struct amount_sat amount = amount_msat_to_sat_round_down(self_pay);
bitcoin_tx_add_output(tx, p2wsh, &amount); bitcoin_tx_add_output(tx, p2wsh, amount);
(*htlcmap)[n] = NULL; (*htlcmap)[n] = NULL;
/* We don't assign cltvs[n]: if we use it, order doesn't matter. /* We don't assign cltvs[n]: if we use it, order doesn't matter.
* However, valgrind will warn us something wierd is happening */ * However, valgrind will warn us something wierd is happening */
@ -230,7 +230,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
* This output sends funds to the other peer and thus is a simple * This output sends funds to the other peer and thus is a simple
* P2WPKH to `remotepubkey`. * P2WPKH to `remotepubkey`.
*/ */
int pos = bitcoin_tx_add_output(tx, p2wpkh, &amount); int pos = bitcoin_tx_add_output(tx, p2wpkh, amount);
assert(pos == n); assert(pos == n);
(*htlcmap)[n] = NULL; (*htlcmap)[n] = NULL;
/* We don't assign cltvs[n]: if we use it, order doesn't matter. /* We don't assign cltvs[n]: if we use it, order doesn't matter.
@ -287,7 +287,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
* * `txin[0]` sequence: upper 8 bits are 0x80, lower 24 bits are upper 24 bits of the obscured commitment number * * `txin[0]` sequence: upper 8 bits are 0x80, lower 24 bits are upper 24 bits of the obscured commitment number
*/ */
u32 sequence = (0x80000000 | ((obscured_commitment_number>>24) & 0xFFFFFF)); u32 sequence = (0x80000000 | ((obscured_commitment_number>>24) & 0xFFFFFF));
bitcoin_tx_add_input(tx, funding_txid, funding_txout, sequence, &funding, NULL); bitcoin_tx_add_input(tx, funding_txid, funding_txout, sequence, funding, NULL);
return tx; return tx;
} }

6
common/close_tx.c
View File

@ -38,13 +38,13 @@ struct bitcoin_tx *create_close_tx(const tal_t *ctx,
/* Our input spends the anchor tx output. */ /* Our input spends the anchor tx output. */
bitcoin_tx_add_input(tx, anchor_txid, anchor_index, bitcoin_tx_add_input(tx, anchor_txid, anchor_index,
BITCOIN_TX_DEFAULT_SEQUENCE, &funding, NULL); BITCOIN_TX_DEFAULT_SEQUENCE, funding, NULL);
if (amount_sat_greater_eq(to_us, dust_limit)) { if (amount_sat_greater_eq(to_us, dust_limit)) {
script = script =
tal_dup_arr(tx, u8, our_script, tal_count(our_script), 0); tal_dup_arr(tx, u8, our_script, tal_count(our_script), 0);
/* One output is to us. */ /* One output is to us. */
bitcoin_tx_add_output(tx, script, &to_us); bitcoin_tx_add_output(tx, script, to_us);
num_outputs++; num_outputs++;
} }
@ -52,7 +52,7 @@ struct bitcoin_tx *create_close_tx(const tal_t *ctx,
script = tal_dup_arr(tx, u8, their_script, script = tal_dup_arr(tx, u8, their_script,
tal_count(their_script), 0); tal_count(their_script), 0);
/* Other output is to them. */ /* Other output is to them. */
bitcoin_tx_add_output(tx, script, &to_them); bitcoin_tx_add_output(tx, script, to_them);
num_outputs++; num_outputs++;
} }

4
common/funding_tx.c
View File

@ -32,7 +32,7 @@ struct bitcoin_tx *funding_tx(const tal_t *ctx,
wscript = bitcoin_redeem_2of2(tx, local_fundingkey, remote_fundingkey); wscript = bitcoin_redeem_2of2(tx, local_fundingkey, remote_fundingkey);
SUPERVERBOSE("# funding witness script = %s\n", SUPERVERBOSE("# funding witness script = %s\n",
tal_hex(wscript, wscript)); tal_hex(wscript, wscript));
bitcoin_tx_add_output(tx, scriptpubkey_p2wsh(tx, wscript), &funding); bitcoin_tx_add_output(tx, scriptpubkey_p2wsh(tx, wscript), funding);
tal_free(wscript); tal_free(wscript);
if (has_change) { if (has_change) {
@ -40,7 +40,7 @@ struct bitcoin_tx *funding_tx(const tal_t *ctx,
map[0] = int2ptr(0); map[0] = int2ptr(0);
map[1] = int2ptr(1); map[1] = int2ptr(1);
bitcoin_tx_add_output(tx, scriptpubkey_p2wpkh(tx, changekey), bitcoin_tx_add_output(tx, scriptpubkey_p2wpkh(tx, changekey),
&change); change);
permute_outputs(tx, NULL, map); permute_outputs(tx, NULL, map);
*outnum = (map[0] == int2ptr(0) ? 0 : 1); *outnum = (map[0] == int2ptr(0) ? 0 : 1);
} else { } else {

4
common/htlc_tx.c
View File

@ -47,7 +47,7 @@ static struct bitcoin_tx *htlc_tx(const tal_t *ctx,
* * `txin[0]` sequence: `0` * * `txin[0]` sequence: `0`
*/ */
amount = amount_msat_to_sat_round_down(msat); amount = amount_msat_to_sat_round_down(msat);
bitcoin_tx_add_input(tx, commit_txid, commit_output_number, 0, &amount, bitcoin_tx_add_input(tx, commit_txid, commit_output_number, 0, amount,
NULL); NULL);
/* BOLT #3: /* BOLT #3:
@ -62,7 +62,7 @@ static struct bitcoin_tx *htlc_tx(const tal_t *ctx,
wscript = bitcoin_wscript_htlc_tx(tx, to_self_delay, revocation_pubkey, wscript = bitcoin_wscript_htlc_tx(tx, to_self_delay, revocation_pubkey,
local_delayedkey); local_delayedkey);
bitcoin_tx_add_output(tx, scriptpubkey_p2wsh(tx, wscript), &amount); bitcoin_tx_add_output(tx, scriptpubkey_p2wsh(tx, wscript), amount);
tal_free(wscript); tal_free(wscript);
return tx; return tx;

6
common/initial_commit_tx.c
View File

@ -175,7 +175,7 @@ struct bitcoin_tx *initial_commit_tx(const tal_t *ctx,
u8 *wscript = to_self_wscript(tmpctx, to_self_delay, keyset); u8 *wscript = to_self_wscript(tmpctx, to_self_delay, keyset);
amount = amount_msat_to_sat_round_down(self_pay); amount = amount_msat_to_sat_round_down(self_pay);
int pos = bitcoin_tx_add_output( int pos = bitcoin_tx_add_output(
tx, scriptpubkey_p2wsh(tx, wscript), &amount); tx, scriptpubkey_p2wsh(tx, wscript), amount);
assert(pos == n); assert(pos == n);
n++; n++;
} }
@ -197,7 +197,7 @@ struct bitcoin_tx *initial_commit_tx(const tal_t *ctx,
amount = amount_msat_to_sat_round_down(other_pay); amount = amount_msat_to_sat_round_down(other_pay);
int pos = bitcoin_tx_add_output( int pos = bitcoin_tx_add_output(
tx, scriptpubkey_p2wpkh(tx, &keyset->other_payment_key), tx, scriptpubkey_p2wpkh(tx, &keyset->other_payment_key),
&amount); amount);
assert(pos == n); assert(pos == n);
n++; n++;
} }
@ -236,7 +236,7 @@ struct bitcoin_tx *initial_commit_tx(const tal_t *ctx,
* * `txin[0]` script bytes: 0 * * `txin[0]` script bytes: 0
*/ */
sequence = (0x80000000 | ((obscured_commitment_number>>24) & 0xFFFFFF)); sequence = (0x80000000 | ((obscured_commitment_number>>24) & 0xFFFFFF));
bitcoin_tx_add_input(tx, funding_txid, funding_txout, sequence, &funding, NULL); bitcoin_tx_add_input(tx, funding_txid, funding_txout, sequence, funding, NULL);
assert(bitcoin_tx_check(tx)); assert(bitcoin_tx_check(tx));

2
common/utxo.c
View File

@ -69,7 +69,7 @@ struct bitcoin_tx *tx_spending_utxos(const tal_t *ctx,
bitcoin_tx_add_input(tx, &utxos[i]->txid, utxos[i]->outnum, bitcoin_tx_add_input(tx, &utxos[i]->txid, utxos[i]->outnum,
BITCOIN_TX_DEFAULT_SEQUENCE, BITCOIN_TX_DEFAULT_SEQUENCE,
&utxos[i]->amount, script); utxos[i]->amount, script);
} }
return tx; return tx;

4
common/withdraw_tx.c
View File

@ -23,14 +23,14 @@ struct bitcoin_tx *withdraw_tx(const tal_t *ctx,
tx = tx_spending_utxos(ctx, chainparams, utxos, bip32_base, tx = tx_spending_utxos(ctx, chainparams, utxos, bip32_base,
!amount_sat_eq(change, AMOUNT_SAT(0))); !amount_sat_eq(change, AMOUNT_SAT(0)));
bitcoin_tx_add_output(tx, destination, &withdraw_amount); bitcoin_tx_add_output(tx, destination, withdraw_amount);
if (!amount_sat_eq(change, AMOUNT_SAT(0))) { if (!amount_sat_eq(change, AMOUNT_SAT(0))) {
const void *map[2]; const void *map[2];
map[0] = int2ptr(0); map[0] = int2ptr(0);
map[1] = int2ptr(1); map[1] = int2ptr(1);
bitcoin_tx_add_output(tx, scriptpubkey_p2wpkh(tx, changekey), bitcoin_tx_add_output(tx, scriptpubkey_p2wpkh(tx, changekey),
&change); change);
permute_outputs(tx, NULL, map); permute_outputs(tx, NULL, map);
if (change_outnum) if (change_outnum)
*change_outnum = ptr2int(map[1]); *change_outnum = ptr2int(map[1]);

12
onchaind/onchaind.c
View File

@ -143,7 +143,7 @@ static bool grind_htlc_tx_fee(struct amount_sat *fee,
if (!amount_sat_sub(&out, *tx->input_amounts[0], *fee)) if (!amount_sat_sub(&out, *tx->input_amounts[0], *fee))
break; break;
bitcoin_tx_output_set_amount(tx, 0, &out); bitcoin_tx_output_set_amount(tx, 0, out);
if (!check_tx_sig(tx, 0, NULL, wscript, if (!check_tx_sig(tx, 0, NULL, wscript,
&keyset->other_htlc_key, remotesig)) &keyset->other_htlc_key, remotesig))
continue; continue;
@ -185,7 +185,7 @@ static bool set_htlc_timeout_fee(struct bitcoin_tx *tx,
type_to_string(tmpctx, struct amount_sat, &fee), type_to_string(tmpctx, struct amount_sat, &fee),
type_to_string(tmpctx, struct bitcoin_tx, tx)); type_to_string(tmpctx, struct bitcoin_tx, tx));
bitcoin_tx_output_set_amount(tx, 0, &amount); bitcoin_tx_output_set_amount(tx, 0, amount);
return check_tx_sig(tx, 0, NULL, wscript, return check_tx_sig(tx, 0, NULL, wscript,
&keyset->other_htlc_key, remotesig); &keyset->other_htlc_key, remotesig);
} }
@ -223,7 +223,7 @@ static void set_htlc_success_fee(struct bitcoin_tx *tx,
"Cannot deduct htlc-success fee %s from tx %s", "Cannot deduct htlc-success fee %s from tx %s",
type_to_string(tmpctx, struct amount_sat, &fee), type_to_string(tmpctx, struct amount_sat, &fee),
type_to_string(tmpctx, struct bitcoin_tx, tx)); type_to_string(tmpctx, struct bitcoin_tx, tx));
bitcoin_tx_output_set_amount(tx, 0, &amt); bitcoin_tx_output_set_amount(tx, 0, amt);
if (check_tx_sig(tx, 0, NULL, wscript, if (check_tx_sig(tx, 0, NULL, wscript,
@ -317,10 +317,10 @@ static struct bitcoin_tx *tx_to_us(const tal_t *ctx,
tx = bitcoin_tx(ctx, out->chainparams, 1, 1); tx = bitcoin_tx(ctx, out->chainparams, 1, 1);
tx->wtx->locktime = locktime; tx->wtx->locktime = locktime;
bitcoin_tx_add_input(tx, &out->txid, out->outnum, to_self_delay, bitcoin_tx_add_input(tx, &out->txid, out->outnum, to_self_delay,
&out->sat, NULL); out->sat, NULL);
bitcoin_tx_add_output( bitcoin_tx_add_output(
tx, scriptpubkey_p2wpkh(tx, &our_wallet_pubkey), &out->sat); tx, scriptpubkey_p2wpkh(tx, &our_wallet_pubkey), out->sat);
/* Worst-case sig is 73 bytes */ /* Worst-case sig is 73 bytes */
weight = measure_tx_weight(tx) + 1 + 3 + 73 + 0 + tal_count(wscript); weight = measure_tx_weight(tx) + 1 + 3 + 73 + 0 + tal_count(wscript);
@ -355,7 +355,7 @@ static struct bitcoin_tx *tx_to_us(const tal_t *ctx,
type_to_string(tmpctx, struct amount_sat, type_to_string(tmpctx, struct amount_sat,
&amt)); &amt));
} }
bitcoin_tx_output_set_amount(tx, 0, &amt); bitcoin_tx_output_set_amount(tx, 0, amt);
if (!wire_sync_write(HSM_FD, take(hsm_sign_msg(NULL, tx, wscript)))) if (!wire_sync_write(HSM_FD, take(hsm_sign_msg(NULL, tx, wscript))))
status_failed(STATUS_FAIL_HSM_IO, "Writing sign request to hsm"); status_failed(STATUS_FAIL_HSM_IO, "Writing sign request to hsm");

Write Preview
Loading…
Cancel
Save