mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

dual-fund: remove all references to PODLEs

Browse Source 
We're punting on PODLE's for v1 of dual-funded channels
This commit is contained in:
niftynei 2021-02-23 12:37:44 -06:00 committed by Rusty Russell
parent 65bf347ad3
commit 71164799f9
8 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
channeld/channeld.c
View File

@ -1875,7 +1875,6 @@ static void peer_in(struct peer *peer, const u8 *msg)
return;
case WIRE_INIT_RBF:
case WIRE_ACK_RBF:
case WIRE_BLACKLIST_PODLE:
#endif
break;

1
gossipd/gossipd.c
View File

@ -768,7 +768,6 @@ static struct io_plan *peer_msg_in(struct io_conn *conn,
case WIRE_ACCEPT_CHANNEL2:
case WIRE_INIT_RBF:
case WIRE_ACK_RBF:
case WIRE_BLACKLIST_PODLE:
#endif
status_broken("peer %s: relayed unexpected msg of type %s",
type_to_string(tmpctx, struct node_id, &peer->id),

2
lightningd/dual_open_control.c
View File

@ -243,7 +243,6 @@ struct openchannel2_payload {
u8 channel_flags;
u32 locktime;
u8 *shutdown_scriptpubkey;
/* FIXME: include the podle? */
struct amount_sat accepter_funding;
u32 funding_feerate_per_kw;
@ -286,7 +285,6 @@ openchannel2_hook_serialize(struct openchannel2_payload *payload,
if (tal_bytelen(payload->shutdown_scriptpubkey) != 0)
json_add_hex_talarr(stream, "shutdown_scriptpubkey",
payload->shutdown_scriptpubkey);
/* FIXME: include the podle? */
json_object_end(stream);
}

19
openingd/dualopend.c
View File

@ -153,7 +153,6 @@ struct state {
struct channel_id channel_id;
u8 channel_flags;
struct sha256 opening_podle_h2;
enum tx_role our_role;
u32 feerate_per_kw_funding;
@ -220,8 +219,7 @@ static u8 *psbt_changeset_get_next(const tal_t *ctx,
msg = towire_tx_add_input(ctx, cid, serial_id,
prevtx, in->tx_input.index,
in->tx_input.sequence,
script,
NULL);
script);
tal_arr_remove(&set->added_ins, 0);
return msg;
@ -1205,7 +1203,6 @@ static u8 *opening_negotiate_msg(const tal_t *ctx, struct state *state)
case WIRE_TX_REMOVE_OUTPUT:
case WIRE_TX_COMPLETE:
case WIRE_ACK_RBF:
case WIRE_BLACKLIST_PODLE:
case WIRE_CHANNEL_ANNOUNCEMENT:
case WIRE_CHANNEL_UPDATE:
case WIRE_NODE_ANNOUNCEMENT:
@ -1255,8 +1252,6 @@ static bool run_tx_interactive(struct state *state,
struct bitcoin_tx *tx;
struct bitcoin_txid txid;
struct amount_sat amt;
struct tlv_tx_add_input_tlvs *add_tlvs =
tlv_tx_add_input_tlvs_new(tmpctx);
if (!fromwire_tx_add_input(tmpctx, msg, &cid,
&serial_id,
@ -1264,8 +1259,7 @@ static bool run_tx_interactive(struct state *state,
&tx_bytes),
&outnum, &sequence,
cast_const2(u8 **,
&redeemscript),
add_tlvs))
&redeemscript)))
open_err_fatal(state,
"Parsing tx_add_input %s",
tal_hex(tmpctx, msg));
@ -1389,7 +1383,6 @@ static bool run_tx_interactive(struct state *state,
psbt_input_set_serial_id(psbt, in, serial_id);
/* FIXME: what's in the tlv? */
break;
}
case WIRE_TX_REMOVE_INPUT: {
@ -1551,7 +1544,6 @@ static bool run_tx_interactive(struct state *state,
case WIRE_ACCEPT_CHANNEL2:
case WIRE_INIT_RBF:
case WIRE_ACK_RBF:
case WIRE_BLACKLIST_PODLE:
case WIRE_CHANNEL_ANNOUNCEMENT:
case WIRE_CHANNEL_UPDATE:
case WIRE_NODE_ANNOUNCEMENT:
@ -1858,7 +1850,6 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
if (!fromwire_open_channel2(oc2_msg, &chain_hash,
&state->channel_id,
&state->opening_podle_h2,
&feerate_max,
&feerate_min,
&feerate_best,
@ -1924,7 +1915,6 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
&state->our_points.revocation,
&state->their_points.revocation);
/* FIXME: pass the podle back also */
msg = towire_dualopend_got_offer(NULL,
&cid,
tx_state->opener_funding,
@ -2336,7 +2326,6 @@ static void opener_start(struct state *state, u8 *msg)
struct channel_id cid;
char *err_reason;
struct amount_sat total;
struct sha256 podle;
u32 feerate_min, feerate_max, feerate_best;
struct tx_state *tx_state = state->tx_state;
@ -2395,12 +2384,9 @@ static void opener_start(struct state *state, u8 *msg)
state->upfront_shutdown_script[LOCAL];
}
/* FIXME: actually set the podle */
memset(&podle, 0, sizeof(podle));
msg = towire_open_channel2(NULL,
&chainparams->genesis_blockhash,
&state->channel_id,
&podle, /* FIXME: podle H2! */
feerate_max,
feerate_min,
feerate_best,
@ -3360,7 +3346,6 @@ static u8 *handle_peer_in(struct state *state)
case WIRE_TX_REMOVE_OUTPUT:
case WIRE_TX_COMPLETE:
case WIRE_ACK_RBF:
case WIRE_BLACKLIST_PODLE:
case WIRE_CHANNEL_ANNOUNCEMENT:
case WIRE_CHANNEL_UPDATE:
case WIRE_NODE_ANNOUNCEMENT:

23
wire/extracted_peer_exp_dual_fund.patch
View File

@ -1,6 +1,6 @@
--- wire/extracted_peer_wire_csv 2020-07-28 12:36:12.063168014 -0500
+++ - 2020-08-31 21:00:40.856646471 -0500
@@ -31,6 +31,46 @@
@@ -31,6 +31,40 @@
tlvdata,n2,tlv1,amount_msat,tu64,
tlvtype,n2,tlv2,11
tlvdata,n2,tlv2,cltv_expiry,tu32,
@ -13,12 +13,6 @@
+msgdata,tx_add_input,sequence,u32,
+msgdata,tx_add_input,redeemscript_len,u16,
+msgdata,tx_add_input,script,byte,redeemscript_len
+msgdata,tx_add_input,tlvs,tx_add_input_tlvs,
+tlvtype,tx_add_input_tlvs,podle_proof,2
+tlvdata,tx_add_input_tlvs,podle_proof,p,point,
+tlvdata,tx_add_input_tlvs,podle_proof,p2,point,
+tlvdata,tx_add_input_tlvs,podle_proof,e,sha256,
+tlvdata,tx_add_input_tlvs,podle_proof,sig,byte,32
+msgtype,tx_add_output,67
+msgdata,tx_add_output,channel_id,channel_id,
+msgdata,tx_add_output,serial_id,u16,
@ -47,13 +41,12 @@
msgtype,open_channel,32
msgdata,open_channel,chain_hash,chain_hash,
msgdata,open_channel,temporary_channel_id,byte,32
@@ -82,6 +122,54 @@
@@ -82,6 +122,53 @@
msgtype,funding_locked,36
msgdata,funding_locked,channel_id,channel_id,
msgdata,funding_locked,next_per_commitment_point,point,
+msgtype,open_channel2,64
+msgdata,open_channel2,chain_hash,chain_hash,
+msgdata,open_channel2,podle_h2,sha256,
+msgdata,open_channel2,feerate_per_kw_funding,u32,
+msgdata,open_channel2,funding_satoshis,u64,
+msgdata,open_channel2,dust_limit_satoshis,u64,
@ -102,15 +95,3 @@
msgtype,shutdown,38
msgdata,shutdown,channel_id,channel_id,
msgdata,shutdown,len,u16,
@@ -169,6 +257,11 @@
msgdata,channel_update,fee_base_msat,u32,
msgdata,channel_update,fee_proportional_millionths,u32,
msgdata,channel_update,htlc_maximum_msat,u64,,option_channel_htlc_max
+msgtype,blacklist_podle,260
+msgdata,blacklist_podle,signature,signature,
+msgdata,blacklist_podle,node_id,point,
+msgdata,blacklist_podle,podle_h2,byte,32
+msgdata,blacklist_podle,timestamp,u32,
msgtype,query_short_channel_ids,261,gossip_queries
msgdata,query_short_channel_ids,chain_hash,chain_hash,
msgdata,query_short_channel_ids,len,u16,

4
wire/extracted_peer_exp_dual_fund_more.patch
View File

@ -10,7 +10,7 @@
msgdata,tx_add_input,prevtx,byte,prevtx_len
msgdata,tx_add_input,prevtx_vout,u32,
@@ -48,16 +48,16 @@
tlvdata,tx_add_input_tlvs,podle_proof,sig,byte,32
msgdata,tx_add_input,script,byte,redeemscript_len
msgtype,tx_add_output,67
msgdata,tx_add_output,channel_id,channel_id,
-msgdata,tx_add_output,serial_id,u16,
@ -30,9 +30,9 @@
msgdata,tx_complete,channel_id,channel_id,
msgtype,tx_signatures,71
@@ -125,7 +125,9 @@
msgdata,funding_locked,next_per_commitment_point,point,
msgtype,open_channel2,64
msgdata,open_channel2,chain_hash,chain_hash,
msgdata,open_channel2,podle_h2,sha256,
-msgdata,open_channel2,feerate_per_kw_funding,u32,
+msgdata,open_channel2,feerate_funding_max,u32,
+msgdata,open_channel2,feerate_funding_min,u32,

2
wire/extracted_peer_exp_tmp_chan_id.patch
View File

@ -5,6 +5,6 @@
msgtype,open_channel2,64
msgdata,open_channel2,chain_hash,chain_hash,
+msgdata,open_channel2,temporary_channel_id,byte,32
msgdata,open_channel2,podle_h2,sha256,
msgdata,open_channel2,feerate_funding_max,u32,
msgdata,open_channel2,feerate_funding_min,u32,
msgdata,open_channel2,feerate_funding_best,u32,

2
wire/peer_wire.c
View File

@ -45,7 +45,6 @@ static bool unknown_type(enum peer_wire t)
case WIRE_ACCEPT_CHANNEL2:
case WIRE_INIT_RBF:
case WIRE_ACK_RBF:
case WIRE_BLACKLIST_PODLE:
#endif
return false;
}
@ -97,7 +96,6 @@ bool is_msg_for_gossipd(const u8 *cursor)
case WIRE_ACCEPT_CHANNEL2:
case WIRE_INIT_RBF:
case WIRE_ACK_RBF:
case WIRE_BLACKLIST_PODLE:
#endif
break;
}