mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-01-06 05:49:30 +01:00
8f38a46584
openingd calculates our reserve based on the channel amount (even if we're funding, to keep the calculation in one place), but it wasn't reporting it back to the master daemon. We initialized it to 0 so that valgrind wouldn't get upset, as it's part of a structure we send over the wire. Have openingd report back, and also initialize it to an impossible value as extra assurance. And remove a stray (harmless but weird) semicolon. Reported-by: Gálli Zoltán Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
3.2 KiB
3.2 KiB
1 | #include <common/cryptomsg.h> |
---|---|
2 | #include <common/channel_config.h> |
3 | #include <common/derive_basepoints.h> |
4 | opening_init,6000 |
5 | # Which network are we configured for (as index into the chainparams)? |
6 | opening_init,,network_index,u32 |
7 | # Base configuration we'll offer (channel reserve will vary with amount) |
8 | opening_init,,our_config,struct channel_config |
9 | # Minimum/maximum configuration values we'll accept |
10 | opening_init,,max_to_self_delay,u32 |
11 | opening_init,,min_effective_htlc_capacity_msat,u64 |
12 | opening_init,,crypto_state,struct crypto_state |
13 | opening_init,,our_basepoints,struct basepoints |
14 | opening_init,,our_funding_pubkey,struct pubkey |
15 | #include <common/bip32.h> |
16 | #include <common/htlc_wire.h> |
17 | # This means we offer the open. |
18 | opening_funder,6001 |
19 | opening_funder,,funding_satoshis,u64 |
20 | opening_funder,,push_msat,u64 |
21 | opening_funder,,feerate_per_kw,u32 |
22 | opening_funder,,change_satoshis,u64 |
23 | opening_funder,,change_keyindex,u32 |
24 | opening_funder,,channel_flags,u8 |
25 | #include <common/utxo.h> |
26 | opening_funder,,num_inputs,u16 |
27 | opening_funder,,inputs,num_inputs*struct utxo |
28 | opening_funder,,bip32,struct ext_key |
29 | # This gives their sig, means we can broadcast tx: we're done. |
30 | opening_funder_reply,6101 |
31 | opening_funder_reply,,their_config,struct channel_config |
32 | opening_funder_reply,,first_commit,struct bitcoin_tx |
33 | opening_funder_reply,,first_commit_sig,secp256k1_ecdsa_signature |
34 | opening_funder_reply,,crypto_state,struct crypto_state |
35 | opening_funder_reply,,revocation_basepoint,struct pubkey |
36 | opening_funder_reply,,payment_basepoint,struct pubkey |
37 | opening_funder_reply,,htlc_basepoint,struct pubkey |
38 | opening_funder_reply,,delayed_payment_basepoint,struct pubkey |
39 | opening_funder_reply,,their_per_commit_point,struct pubkey |
40 | opening_funder_reply,,minimum_depth,u32 |
41 | opening_funder_reply,,remote_fundingkey,struct pubkey |
42 | opening_funder_reply,,funding_txid,struct bitcoin_txid |
43 | opening_funder_reply,,feerate_per_kw,u32 |
44 | opening_funder_reply,,our_channel_reserve_satoshis,u64 |
45 | # This means they offer the open (contains their offer packet) |
46 | opening_fundee,6003 |
47 | opening_fundee,,minimum_depth,u32 |
48 | opening_fundee,,min_feerate,u32 |
49 | opening_fundee,,max_feerate,u32 |
50 | opening_fundee,,len,u16 |
51 | opening_fundee,,msg,len*u8 |
52 | # This gives their txid and info, means we can send funding_signed: we're done. |
53 | opening_fundee_reply,6103 |
54 | opening_fundee_reply,,their_config,struct channel_config |
55 | opening_fundee_reply,,first_commit,struct bitcoin_tx |
56 | opening_fundee_reply,,first_commit_sig,secp256k1_ecdsa_signature |
57 | opening_fundee_reply,,crypto_state,struct crypto_state |
58 | opening_fundee_reply,,revocation_basepoint,struct pubkey |
59 | opening_fundee_reply,,payment_basepoint,struct pubkey |
60 | opening_fundee_reply,,htlc_basepoint,struct pubkey |
61 | opening_fundee_reply,,delayed_payment_basepoint,struct pubkey |
62 | opening_fundee_reply,,their_per_commit_point,struct pubkey |
63 | opening_fundee_reply,,remote_fundingkey,struct pubkey |
64 | opening_fundee_reply,,funding_txid,struct bitcoin_txid |
65 | opening_fundee_reply,,funding_txout,u16 |
66 | opening_fundee_reply,,funding_satoshis,u64 |
67 | opening_fundee_reply,,push_msat,u64 |
68 | opening_fundee_reply,,channel_flags,u8 |
69 | opening_fundee_reply,,feerate_per_kw,u32 |
70 | # The (encrypted) funding signed message: send this and we're committed. |
71 | opening_fundee_reply,,msglen,u16 |
72 | opening_fundee_reply,,funding_signed_msg,msglen*u8 |
73 | opening_fundee_reply,,our_channel_reserve_satoshis,u64 |