wire-gen: move in-house wire delcarations to new format

tidying things up!
This commit is contained in:
lisa neigut
2019-07-23 17:51:11 -05:00
committed by Rusty Russell
parent 236d26308f
commit 32eaae0cb9
23 changed files with 703 additions and 698 deletions

View File

@@ -3,136 +3,136 @@
#include <common/derive_basepoints.h>
#include <common/per_peer_state.h>
opening_init,6000
msgtype,opening_init,6000
# Which network are we configured for?
opening_init,,chain_hash,struct bitcoin_blkid
msgdata,opening_init,chain_hash,bitcoin_blkid,
# Base configuration we'll offer (channel reserve will vary with amount)
opening_init,,our_config,struct channel_config
msgdata,opening_init,our_config,channel_config,
# Minimum/maximum configuration values we'll accept
opening_init,,max_to_self_delay,u32
opening_init,,min_effective_htlc_capacity_msat,struct amount_msat
opening_init,,pps,struct per_peer_state
opening_init,,our_basepoints,struct basepoints
opening_init,,our_funding_pubkey,struct pubkey
msgdata,opening_init,max_to_self_delay,u32,
msgdata,opening_init,min_effective_htlc_capacity_msat,amount_msat,
msgdata,opening_init,pps,per_peer_state,
msgdata,opening_init,our_basepoints,basepoints,
msgdata,opening_init,our_funding_pubkey,pubkey,
# Constraints in case the other end tries to open a channel.
opening_init,,minimum_depth,u32
opening_init,,min_feerate,u32
opening_init,,max_feerate,u32
opening_init,,lfeatures_len,u16
opening_init,,lfeatures,lfeatures_len*u8
msgdata,opening_init,minimum_depth,u32,
msgdata,opening_init,min_feerate,u32,
msgdata,opening_init,max_feerate,u32,
msgdata,opening_init,lfeatures_len,u16,
msgdata,opening_init,lfeatures,u8,lfeatures_len
# Optional msg to send.
opening_init,,len,u16
opening_init,,msg,len*u8
msgdata,opening_init,len,u16,
msgdata,opening_init,msg,u8,len
# Openingd->master: they offered channel, should we continue?
opening_got_offer,6005
opening_got_offer,,funding_satoshis,struct amount_sat
opening_got_offer,,push_msat,struct amount_msat
opening_got_offer,,dust_limit_satoshis,struct amount_sat
opening_got_offer,,max_htlc_value_in_flight_msat,struct amount_msat
opening_got_offer,,channel_reserve_satoshis,struct amount_sat
opening_got_offer,,htlc_minimum_msat,struct amount_msat
opening_got_offer,,feerate_per_kw,u32
opening_got_offer,,to_self_delay,u16
opening_got_offer,,max_accepted_htlcs,u16
opening_got_offer,,channel_flags,u8
opening_got_offer,,shutdown_len,u16
opening_got_offer,,shutdown_scriptpubkey,shutdown_len*u8
msgtype,opening_got_offer,6005
msgdata,opening_got_offer,funding_satoshis,amount_sat,
msgdata,opening_got_offer,push_msat,amount_msat,
msgdata,opening_got_offer,dust_limit_satoshis,amount_sat,
msgdata,opening_got_offer,max_htlc_value_in_flight_msat,amount_msat,
msgdata,opening_got_offer,channel_reserve_satoshis,amount_sat,
msgdata,opening_got_offer,htlc_minimum_msat,amount_msat,
msgdata,opening_got_offer,feerate_per_kw,u32,
msgdata,opening_got_offer,to_self_delay,u16,
msgdata,opening_got_offer,max_accepted_htlcs,u16,
msgdata,opening_got_offer,channel_flags,u8,
msgdata,opening_got_offer,shutdown_len,u16,
msgdata,opening_got_offer,shutdown_scriptpubkey,u8,shutdown_len
# master->openingd: optional rejection message
opening_got_offer_reply,6105
opening_got_offer_reply,,rejection,?wirestring
msgtype,opening_got_offer_reply,6105
msgdata,opening_got_offer_reply,rejection,?wirestring,
#include <common/bip32.h>
#include <common/htlc_wire.h>
# Master->openingd: please fund a channel.
opening_funder,6001
opening_funder,,funding_satoshis,struct amount_sat
opening_funder,,push_msat,struct amount_msat
opening_funder,,feerate_per_kw,u32
opening_funder,,change_satoshis,struct amount_sat
opening_funder,,change_keyindex,u32
opening_funder,,channel_flags,u8
msgtype,opening_funder,6001
msgdata,opening_funder,funding_satoshis,amount_sat,
msgdata,opening_funder,push_msat,amount_msat,
msgdata,opening_funder,feerate_per_kw,u32,
msgdata,opening_funder,change_satoshis,amount_sat,
msgdata,opening_funder,change_keyindex,u32,
msgdata,opening_funder,channel_flags,u8,
#include <common/utxo.h>
opening_funder,,num_inputs,u16
opening_funder,,inputs,num_inputs*struct utxo
opening_funder,,bip32,struct ext_key
msgdata,opening_funder,num_inputs,u16,
msgdata,opening_funder,inputs,utxo,num_inputs
msgdata,opening_funder,bip32,ext_key,
# Openingd->master: we've successfully offered channel.
# This gives their sig, means we can broadcast tx: we're done.
opening_funder_reply,6101
opening_funder_reply,,their_config,struct channel_config
opening_funder_reply,,first_commit,struct bitcoin_tx
opening_funder_reply,,first_commit_sig,struct bitcoin_signature
opening_funder_reply,,pps,struct per_peer_state
opening_funder_reply,,revocation_basepoint,struct pubkey
opening_funder_reply,,payment_basepoint,struct pubkey
opening_funder_reply,,htlc_basepoint,struct pubkey
opening_funder_reply,,delayed_payment_basepoint,struct pubkey
opening_funder_reply,,their_per_commit_point,struct pubkey
opening_funder_reply,,minimum_depth,u32
opening_funder_reply,,remote_fundingkey,struct pubkey
opening_funder_reply,,funding_txid,struct bitcoin_txid
opening_funder_reply,,funding_txout,u16
opening_funder_reply,,feerate_per_kw,u32
opening_funder_reply,,our_channel_reserve_satoshis,struct amount_sat
opening_funder_reply,,shutdown_len,u16
opening_funder_reply,,shutdown_scriptpubkey,shutdown_len*u8
msgtype,opening_funder_reply,6101
msgdata,opening_funder_reply,their_config,channel_config,
msgdata,opening_funder_reply,first_commit,bitcoin_tx,
msgdata,opening_funder_reply,first_commit_sig,bitcoin_signature,
msgdata,opening_funder_reply,pps,per_peer_state,
msgdata,opening_funder_reply,revocation_basepoint,pubkey,
msgdata,opening_funder_reply,payment_basepoint,pubkey,
msgdata,opening_funder_reply,htlc_basepoint,pubkey,
msgdata,opening_funder_reply,delayed_payment_basepoint,pubkey,
msgdata,opening_funder_reply,their_per_commit_point,pubkey,
msgdata,opening_funder_reply,minimum_depth,u32,
msgdata,opening_funder_reply,remote_fundingkey,pubkey,
msgdata,opening_funder_reply,funding_txid,bitcoin_txid,
msgdata,opening_funder_reply,funding_txout,u16,
msgdata,opening_funder_reply,feerate_per_kw,u32,
msgdata,opening_funder_reply,our_channel_reserve_satoshis,amount_sat,
msgdata,opening_funder_reply,shutdown_len,u16,
msgdata,opening_funder_reply,shutdown_scriptpubkey,u8,shutdown_len
# master->openingd: start channel establishment for a funding
# tx that will be paid for by an external wallet
opening_funder_start,6002
opening_funder_start,,funding_satoshis,struct amount_sat
opening_funder_start,,push_msat,struct amount_msat
opening_funder_start,,feerate_per_kw,u32
opening_funder_start,,channel_flags,u8
msgtype,opening_funder_start,6002
msgdata,opening_funder_start,funding_satoshis,amount_sat,
msgdata,opening_funder_start,push_msat,amount_msat,
msgdata,opening_funder_start,feerate_per_kw,u32,
msgdata,opening_funder_start,channel_flags,u8,
# openingd->master: send back output script for 2-of-2 funding output
opening_funder_start_reply,6102
opening_funder_start_reply,,script_len,u8
opening_funder_start_reply,,scriptpubkey,script_len*u8
msgtype,opening_funder_start_reply,6102
msgdata,opening_funder_start_reply,script_len,u8,
msgdata,opening_funder_start_reply,scriptpubkey,u8,script_len
# master->openingd: complete channel establishment for a funding
# tx that will be paid for by an external wallet
# response to this is a normal `opening_funder_reply` ??
opening_funder_complete,6012
opening_funder_complete,,funding_txid,struct bitcoin_txid
opening_funder_complete,,funding_txout,u16
msgtype,opening_funder_complete,6012
msgdata,opening_funder_complete,funding_txid,bitcoin_txid,
msgdata,opening_funder_complete,funding_txout,u16,
#master->openingd: cancel channel establishment for a funding
opening_funder_cancel,6013
msgtype,opening_funder_cancel,6013
# Openingd->master: we failed to negotiation channel
opening_funder_failed,6004
opening_funder_failed,,reason,wirestring
msgtype,opening_funder_failed,6004
msgdata,opening_funder_failed,reason,wirestring,
# Openingd->master: they offered channel.
# This gives their txid and info, means we can send funding_signed: we're done.
opening_fundee,6003
opening_fundee,,their_config,struct channel_config
opening_fundee,,first_commit,struct bitcoin_tx
opening_fundee,,first_commit_sig,struct bitcoin_signature
opening_fundee,,pps,struct per_peer_state
opening_fundee,,revocation_basepoint,struct pubkey
opening_fundee,,payment_basepoint,struct pubkey
opening_fundee,,htlc_basepoint,struct pubkey
opening_fundee,,delayed_payment_basepoint,struct pubkey
opening_fundee,,their_per_commit_point,struct pubkey
opening_fundee,,remote_fundingkey,struct pubkey
opening_fundee,,funding_txid,struct bitcoin_txid
opening_fundee,,funding_txout,u16
opening_fundee,,funding_satoshis,struct amount_sat
opening_fundee,,push_msat,struct amount_msat
opening_fundee,,channel_flags,u8
opening_fundee,,feerate_per_kw,u32
msgtype,opening_fundee,6003
msgdata,opening_fundee,their_config,channel_config,
msgdata,opening_fundee,first_commit,bitcoin_tx,
msgdata,opening_fundee,first_commit_sig,bitcoin_signature,
msgdata,opening_fundee,pps,per_peer_state,
msgdata,opening_fundee,revocation_basepoint,pubkey,
msgdata,opening_fundee,payment_basepoint,pubkey,
msgdata,opening_fundee,htlc_basepoint,pubkey,
msgdata,opening_fundee,delayed_payment_basepoint,pubkey,
msgdata,opening_fundee,their_per_commit_point,pubkey,
msgdata,opening_fundee,remote_fundingkey,pubkey,
msgdata,opening_fundee,funding_txid,bitcoin_txid,
msgdata,opening_fundee,funding_txout,u16,
msgdata,opening_fundee,funding_satoshis,amount_sat,
msgdata,opening_fundee,push_msat,amount_msat,
msgdata,opening_fundee,channel_flags,u8,
msgdata,opening_fundee,feerate_per_kw,u32,
# The funding signed message: send this and we're committed.
opening_fundee,,msglen,u16
opening_fundee,,funding_signed_msg,msglen*u8
opening_fundee,,our_channel_reserve_satoshis,struct amount_sat
opening_fundee,,shutdown_len,u16
opening_fundee,,shutdown_scriptpubkey,shutdown_len*u8
msgdata,opening_fundee,msglen,u16,
msgdata,opening_fundee,funding_signed_msg,u8,msglen
msgdata,opening_fundee,our_channel_reserve_satoshis,amount_sat,
msgdata,opening_fundee,shutdown_len,u16,
msgdata,opening_fundee,shutdown_scriptpubkey,u8,shutdown_len
# master -> openingd: do you have a memleak?
opening_dev_memleak,6033
msgtype,opening_dev_memleak,6033
opening_dev_memleak_reply,6133
opening_dev_memleak_reply,,leak,bool
msgtype,opening_dev_memleak_reply,6133
msgdata,opening_dev_memleak_reply,leak,bool,
1 #include <common/cryptomsg.h>
3 #include <common/derive_basepoints.h>
4 #include <common/per_peer_state.h>
5 opening_init,6000 msgtype,opening_init,6000
6 # Which network are we configured for?
7 opening_init,,chain_hash,struct bitcoin_blkid msgdata,opening_init,chain_hash,bitcoin_blkid,
8 # Base configuration we'll offer (channel reserve will vary with amount)
9 opening_init,,our_config,struct channel_config msgdata,opening_init,our_config,channel_config,
10 # Minimum/maximum configuration values we'll accept
11 opening_init,,max_to_self_delay,u32 msgdata,opening_init,max_to_self_delay,u32,
12 opening_init,,min_effective_htlc_capacity_msat,struct amount_msat msgdata,opening_init,min_effective_htlc_capacity_msat,amount_msat,
13 opening_init,,pps,struct per_peer_state msgdata,opening_init,pps,per_peer_state,
14 opening_init,,our_basepoints,struct basepoints msgdata,opening_init,our_basepoints,basepoints,
15 opening_init,,our_funding_pubkey,struct pubkey msgdata,opening_init,our_funding_pubkey,pubkey,
16 # Constraints in case the other end tries to open a channel.
17 opening_init,,minimum_depth,u32 msgdata,opening_init,minimum_depth,u32,
18 opening_init,,min_feerate,u32 msgdata,opening_init,min_feerate,u32,
19 opening_init,,max_feerate,u32 msgdata,opening_init,max_feerate,u32,
20 opening_init,,lfeatures_len,u16 msgdata,opening_init,lfeatures_len,u16,
21 opening_init,,lfeatures,lfeatures_len*u8 msgdata,opening_init,lfeatures,u8,lfeatures_len
22 # Optional msg to send.
23 opening_init,,len,u16 msgdata,opening_init,len,u16,
24 opening_init,,msg,len*u8 msgdata,opening_init,msg,u8,len
25 # Openingd->master: they offered channel, should we continue?
26 opening_got_offer,6005 msgtype,opening_got_offer,6005
27 opening_got_offer,,funding_satoshis,struct amount_sat msgdata,opening_got_offer,funding_satoshis,amount_sat,
28 opening_got_offer,,push_msat,struct amount_msat msgdata,opening_got_offer,push_msat,amount_msat,
29 opening_got_offer,,dust_limit_satoshis,struct amount_sat msgdata,opening_got_offer,dust_limit_satoshis,amount_sat,
30 opening_got_offer,,max_htlc_value_in_flight_msat,struct amount_msat msgdata,opening_got_offer,max_htlc_value_in_flight_msat,amount_msat,
31 opening_got_offer,,channel_reserve_satoshis,struct amount_sat msgdata,opening_got_offer,channel_reserve_satoshis,amount_sat,
32 opening_got_offer,,htlc_minimum_msat,struct amount_msat msgdata,opening_got_offer,htlc_minimum_msat,amount_msat,
33 opening_got_offer,,feerate_per_kw,u32 msgdata,opening_got_offer,feerate_per_kw,u32,
34 opening_got_offer,,to_self_delay,u16 msgdata,opening_got_offer,to_self_delay,u16,
35 opening_got_offer,,max_accepted_htlcs,u16 msgdata,opening_got_offer,max_accepted_htlcs,u16,
36 opening_got_offer,,channel_flags,u8 msgdata,opening_got_offer,channel_flags,u8,
37 opening_got_offer,,shutdown_len,u16 msgdata,opening_got_offer,shutdown_len,u16,
38 opening_got_offer,,shutdown_scriptpubkey,shutdown_len*u8 msgdata,opening_got_offer,shutdown_scriptpubkey,u8,shutdown_len
39 # master->openingd: optional rejection message
40 opening_got_offer_reply,6105 msgtype,opening_got_offer_reply,6105
41 opening_got_offer_reply,,rejection,?wirestring msgdata,opening_got_offer_reply,rejection,?wirestring,
42 #include <common/bip32.h>
43 #include <common/htlc_wire.h>
44 # Master->openingd: please fund a channel.
45 opening_funder,6001 msgtype,opening_funder,6001
46 opening_funder,,funding_satoshis,struct amount_sat msgdata,opening_funder,funding_satoshis,amount_sat,
47 opening_funder,,push_msat,struct amount_msat msgdata,opening_funder,push_msat,amount_msat,
48 opening_funder,,feerate_per_kw,u32 msgdata,opening_funder,feerate_per_kw,u32,
49 opening_funder,,change_satoshis,struct amount_sat msgdata,opening_funder,change_satoshis,amount_sat,
50 opening_funder,,change_keyindex,u32 msgdata,opening_funder,change_keyindex,u32,
51 opening_funder,,channel_flags,u8 msgdata,opening_funder,channel_flags,u8,
52 #include <common/utxo.h>
53 opening_funder,,num_inputs,u16 msgdata,opening_funder,num_inputs,u16,
54 opening_funder,,inputs,num_inputs*struct utxo msgdata,opening_funder,inputs,utxo,num_inputs
55 opening_funder,,bip32,struct ext_key msgdata,opening_funder,bip32,ext_key,
56 # Openingd->master: we've successfully offered channel.
57 # This gives their sig, means we can broadcast tx: we're done.
58 opening_funder_reply,6101 msgtype,opening_funder_reply,6101
59 opening_funder_reply,,their_config,struct channel_config msgdata,opening_funder_reply,their_config,channel_config,
60 opening_funder_reply,,first_commit,struct bitcoin_tx msgdata,opening_funder_reply,first_commit,bitcoin_tx,
61 opening_funder_reply,,first_commit_sig,struct bitcoin_signature msgdata,opening_funder_reply,first_commit_sig,bitcoin_signature,
62 opening_funder_reply,,pps,struct per_peer_state msgdata,opening_funder_reply,pps,per_peer_state,
63 opening_funder_reply,,revocation_basepoint,struct pubkey msgdata,opening_funder_reply,revocation_basepoint,pubkey,
64 opening_funder_reply,,payment_basepoint,struct pubkey msgdata,opening_funder_reply,payment_basepoint,pubkey,
65 opening_funder_reply,,htlc_basepoint,struct pubkey msgdata,opening_funder_reply,htlc_basepoint,pubkey,
66 opening_funder_reply,,delayed_payment_basepoint,struct pubkey msgdata,opening_funder_reply,delayed_payment_basepoint,pubkey,
67 opening_funder_reply,,their_per_commit_point,struct pubkey msgdata,opening_funder_reply,their_per_commit_point,pubkey,
68 opening_funder_reply,,minimum_depth,u32 msgdata,opening_funder_reply,minimum_depth,u32,
69 opening_funder_reply,,remote_fundingkey,struct pubkey msgdata,opening_funder_reply,remote_fundingkey,pubkey,
70 opening_funder_reply,,funding_txid,struct bitcoin_txid msgdata,opening_funder_reply,funding_txid,bitcoin_txid,
71 opening_funder_reply,,funding_txout,u16 msgdata,opening_funder_reply,funding_txout,u16,
72 opening_funder_reply,,feerate_per_kw,u32 msgdata,opening_funder_reply,feerate_per_kw,u32,
73 opening_funder_reply,,our_channel_reserve_satoshis,struct amount_sat msgdata,opening_funder_reply,our_channel_reserve_satoshis,amount_sat,
74 opening_funder_reply,,shutdown_len,u16 msgdata,opening_funder_reply,shutdown_len,u16,
75 opening_funder_reply,,shutdown_scriptpubkey,shutdown_len*u8 msgdata,opening_funder_reply,shutdown_scriptpubkey,u8,shutdown_len
76 # master->openingd: start channel establishment for a funding
77 # tx that will be paid for by an external wallet
78 opening_funder_start,6002 msgtype,opening_funder_start,6002
79 opening_funder_start,,funding_satoshis,struct amount_sat msgdata,opening_funder_start,funding_satoshis,amount_sat,
80 opening_funder_start,,push_msat,struct amount_msat msgdata,opening_funder_start,push_msat,amount_msat,
81 opening_funder_start,,feerate_per_kw,u32 msgdata,opening_funder_start,feerate_per_kw,u32,
82 opening_funder_start,,channel_flags,u8 msgdata,opening_funder_start,channel_flags,u8,
83 # openingd->master: send back output script for 2-of-2 funding output
84 opening_funder_start_reply,6102 msgtype,opening_funder_start_reply,6102
85 opening_funder_start_reply,,script_len,u8 msgdata,opening_funder_start_reply,script_len,u8,
86 opening_funder_start_reply,,scriptpubkey,script_len*u8 msgdata,opening_funder_start_reply,scriptpubkey,u8,script_len
87 # master->openingd: complete channel establishment for a funding
88 # tx that will be paid for by an external wallet
89 # response to this is a normal `opening_funder_reply` ??
90 opening_funder_complete,6012 msgtype,opening_funder_complete,6012
91 opening_funder_complete,,funding_txid,struct bitcoin_txid msgdata,opening_funder_complete,funding_txid,bitcoin_txid,
92 opening_funder_complete,,funding_txout,u16 msgdata,opening_funder_complete,funding_txout,u16,
93 #master->openingd: cancel channel establishment for a funding
94 opening_funder_cancel,6013 msgtype,opening_funder_cancel,6013
95 # Openingd->master: we failed to negotiation channel
96 opening_funder_failed,6004 msgtype,opening_funder_failed,6004
97 opening_funder_failed,,reason,wirestring msgdata,opening_funder_failed,reason,wirestring,
98 # Openingd->master: they offered channel.
99 # This gives their txid and info, means we can send funding_signed: we're done.
100 opening_fundee,6003 msgtype,opening_fundee,6003
101 opening_fundee,,their_config,struct channel_config msgdata,opening_fundee,their_config,channel_config,
102 opening_fundee,,first_commit,struct bitcoin_tx msgdata,opening_fundee,first_commit,bitcoin_tx,
103 opening_fundee,,first_commit_sig,struct bitcoin_signature msgdata,opening_fundee,first_commit_sig,bitcoin_signature,
104 opening_fundee,,pps,struct per_peer_state msgdata,opening_fundee,pps,per_peer_state,
105 opening_fundee,,revocation_basepoint,struct pubkey msgdata,opening_fundee,revocation_basepoint,pubkey,
106 opening_fundee,,payment_basepoint,struct pubkey msgdata,opening_fundee,payment_basepoint,pubkey,
107 opening_fundee,,htlc_basepoint,struct pubkey msgdata,opening_fundee,htlc_basepoint,pubkey,
108 opening_fundee,,delayed_payment_basepoint,struct pubkey msgdata,opening_fundee,delayed_payment_basepoint,pubkey,
109 opening_fundee,,their_per_commit_point,struct pubkey msgdata,opening_fundee,their_per_commit_point,pubkey,
110 opening_fundee,,remote_fundingkey,struct pubkey msgdata,opening_fundee,remote_fundingkey,pubkey,
111 opening_fundee,,funding_txid,struct bitcoin_txid msgdata,opening_fundee,funding_txid,bitcoin_txid,
112 opening_fundee,,funding_txout,u16 msgdata,opening_fundee,funding_txout,u16,
113 opening_fundee,,funding_satoshis,struct amount_sat msgdata,opening_fundee,funding_satoshis,amount_sat,
114 opening_fundee,,push_msat,struct amount_msat msgdata,opening_fundee,push_msat,amount_msat,
115 opening_fundee,,channel_flags,u8 msgdata,opening_fundee,channel_flags,u8,
116 opening_fundee,,feerate_per_kw,u32 msgdata,opening_fundee,feerate_per_kw,u32,
117 # The funding signed message: send this and we're committed.
118 opening_fundee,,msglen,u16 msgdata,opening_fundee,msglen,u16,
119 opening_fundee,,funding_signed_msg,msglen*u8 msgdata,opening_fundee,funding_signed_msg,u8,msglen
120 opening_fundee,,our_channel_reserve_satoshis,struct amount_sat msgdata,opening_fundee,our_channel_reserve_satoshis,amount_sat,
121 opening_fundee,,shutdown_len,u16 msgdata,opening_fundee,shutdown_len,u16,
122 opening_fundee,,shutdown_scriptpubkey,shutdown_len*u8 msgdata,opening_fundee,shutdown_scriptpubkey,u8,shutdown_len
123 # master -> openingd: do you have a memleak?
124 opening_dev_memleak,6033 msgtype,opening_dev_memleak,6033
125 opening_dev_memleak_reply,6133 msgtype,opening_dev_memleak_reply,6133
126 opening_dev_memleak_reply,,leak,bool msgdata,opening_dev_memleak_reply,leak,bool,
127
128
129
130
131
132
133
134
135
136
137
138