aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

tools/generate_wire.py: make bitcoin_tx a varlen structs

Browse Source 
Now it allocates naturally.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-02-08 11:55:12 +10:30
committed by Christian Decker
parent 526d3a232e
commit 674a2c7554
7 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lightningd/peer_control.c
View File

@@ -1150,8 +1150,7 @@ static void handle_onchain_broadcast_tx(struct peer *peer, const u8 *msg)
{
struct bitcoin_tx *tx;
tx = tal(msg, struct bitcoin_tx);
if (!fromwire_onchain_broadcast_tx(msg, NULL, tx)) {
if (!fromwire_onchain_broadcast_tx(msg, msg, NULL, &tx)) {
peer_internal_error(peer, "Invalid onchain_broadcast_tx");
return;
}
@@ -1581,12 +1580,12 @@ static void opening_got_hsm_funding_sig(struct funding_channel *fc,
const struct crypto_state *cs,
u64 gossip_index)
{
struct bitcoin_tx *tx = tal(fc, struct bitcoin_tx);
struct bitcoin_tx *tx;
u8 *linear;
u64 change_satoshi;
struct json_result *response = new_json_result(fc->cmd);
if (!fromwire_hsm_sign_funding_reply(resp, NULL, tx))
if (!fromwire_hsm_sign_funding_reply(fc, resp, NULL, &tx))
fatal("HSM gave bad sign_funding_reply %s",
tal_hex(fc, resp));
@@ -1788,9 +1787,9 @@ static bool better_closing_fee(struct peer *peer, const struct bitcoin_tx *tx)
static void peer_received_closing_signature(struct peer *peer, const u8 *msg)
{
secp256k1_ecdsa_signature sig;
struct bitcoin_tx *tx = tal(msg, struct bitcoin_tx);
struct bitcoin_tx *tx;
if (!fromwire_closing_received_signature(msg, NULL, &sig, tx)) {
if (!fromwire_closing_received_signature(msg, msg, NULL, &sig, &tx)) {
peer_internal_error(peer, "Bad closing_received_signature %s",
tal_hex(peer, msg));
return;
@@ -2220,14 +2219,13 @@ static void opening_funder_finished(struct subd *opening, const u8 *resp,
/* At this point, we care about peer */
fc->peer->channel_info = channel_info
= tal(fc->peer, struct channel_info);
remote_commit = tal(resp, struct bitcoin_tx);
/* This is a new channel_info->their_config so set its ID to 0 */
fc->peer->channel_info->their_config.id = 0;
if (!fromwire_opening_funder_reply(resp, NULL,
if (!fromwire_opening_funder_reply(resp, resp, NULL,
&channel_info->their_config,
remote_commit,
&remote_commit,
&remote_commit_sig,
&cs,
&gossip_index,
@@ -2340,8 +2338,6 @@ static void opening_fundee_finished(struct subd *opening,
log_debug(peer->log, "Got opening_fundee_finish_response");
assert(tal_count(fds) == 2);
remote_commit = tal(reply, struct bitcoin_tx);
/* At this point, we care about peer */
peer->channel_info = channel_info = tal(peer, struct channel_info);
/* This is a new channel_info->their_config, set its ID to 0 */
@@ -2350,7 +2346,7 @@ static void opening_fundee_finished(struct subd *opening,
peer->funding_txid = tal(peer, struct bitcoin_txid);
if (!fromwire_opening_fundee_reply(tmpctx, reply, NULL,
&channel_info->their_config,
remote_commit,
&remote_commit,
&remote_commit_sig,
&cs,
&gossip_index,