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,107 +3,107 @@
#include <common/wallet.h>
# Begin! Here's the onchain tx which spends funding tx, followed by all HTLCs.
onchain_init,5001
onchain_init,,shachain,struct shachain
onchain_init,,funding_amount_satoshi,struct amount_sat
msgtype,onchain_init,5001
msgdata,onchain_init,shachain,shachain,
msgdata,onchain_init,funding_amount_satoshi,amount_sat,
# Remote per commit point for committed tx.
onchain_init,,old_remote_per_commitment_point,struct pubkey
msgdata,onchain_init,old_remote_per_commitment_point,pubkey,
# Remote per commit point for current tx (needed if we haven't got revoke_and_ack yet).
onchain_init,,remote_per_commitment_point,struct pubkey
onchain_init,,local_to_self_delay,u32
onchain_init,,remote_to_self_delay,u32
onchain_init,,feerate_per_kw,u32
onchain_init,,local_dust_limit_satoshi,struct amount_sat
msgdata,onchain_init,remote_per_commitment_point,pubkey,
msgdata,onchain_init,local_to_self_delay,u32,
msgdata,onchain_init,remote_to_self_delay,u32,
msgdata,onchain_init,feerate_per_kw,u32,
msgdata,onchain_init,local_dust_limit_satoshi,amount_sat,
# Gives an easy way to tell if it's our unilateral close or theirs...
onchain_init,,our_broadcast_txid,struct bitcoin_txid
onchain_init,,local_scriptpubkey_len,u16
onchain_init,,local_scriptpubkey,local_scriptpubkey_len*u8
onchain_init,,remote_scriptpubkey_len,u16
onchain_init,,remote_scriptpubkey,remote_scriptpubkey_len*u8
onchain_init,,ourwallet_pubkey,struct pubkey
msgdata,onchain_init,our_broadcast_txid,bitcoin_txid,
msgdata,onchain_init,local_scriptpubkey_len,u16,
msgdata,onchain_init,local_scriptpubkey,u8,local_scriptpubkey_len
msgdata,onchain_init,remote_scriptpubkey_len,u16,
msgdata,onchain_init,remote_scriptpubkey,u8,remote_scriptpubkey_len
msgdata,onchain_init,ourwallet_pubkey,pubkey,
# We need these two for commit number obscurer
onchain_init,,funder,enum side
onchain_init,,local_basepoints,struct basepoints
onchain_init,,remote_basepoints,struct basepoints
onchain_init,,tx,struct bitcoin_tx
onchain_init,,tx_blockheight,u32
onchain_init,,reasonable_depth,u32
onchain_init,,num_htlc_sigs,u16
onchain_init,,htlc_signature,num_htlc_sigs*secp256k1_ecdsa_signature
onchain_init,,num_htlcs,u64
onchain_init,,min_possible_feerate,u32
onchain_init,,max_possible_feerate,u32
onchain_init,,possible_remote_per_commit_point,?struct pubkey
msgdata,onchain_init,funder,e:side,
msgdata,onchain_init,local_basepoints,basepoints,
msgdata,onchain_init,remote_basepoints,basepoints,
msgdata,onchain_init,tx,bitcoin_tx,
msgdata,onchain_init,tx_blockheight,u32,
msgdata,onchain_init,reasonable_depth,u32,
msgdata,onchain_init,num_htlc_sigs,u16,
msgdata,onchain_init,htlc_signature,secp256k1_ecdsa_signature,num_htlc_sigs
msgdata,onchain_init,num_htlcs,u64,
msgdata,onchain_init,min_possible_feerate,u32,
msgdata,onchain_init,max_possible_feerate,u32,
msgdata,onchain_init,possible_remote_per_commit_point,?pubkey,
#include <onchaind/onchain_wire.h>
# This is all the HTLCs: one per message
onchain_htlc,5002
onchain_htlc,,htlc,struct htlc_stub
msgtype,onchain_htlc,5002
msgdata,onchain_htlc,htlc,htlc_stub,
# If it's not in the commitment tx, tell us (immediately or htlc_missing_depth)
onchain_htlc,,tell_if_missing,bool
onchain_htlc,,tell_immediately,bool
msgdata,onchain_htlc,tell_if_missing,bool,
msgdata,onchain_htlc,tell_immediately,bool,
# This says we're ready; give us preimages.
onchain_init_reply,5101
msgtype,onchain_init_reply,5101
# onchaind->master: Send out a tx.
onchain_broadcast_tx,5003
onchain_broadcast_tx,,tx,struct bitcoin_tx
onchain_broadcast_tx,,type,enum wallet_tx_type
msgtype,onchain_broadcast_tx,5003
msgdata,onchain_broadcast_tx,tx,bitcoin_tx,
msgdata,onchain_broadcast_tx,type,e:wallet_tx_type,
# master->onchaind: Notifier that an output has been spent by input_num of tx.
onchain_spent,5004
onchain_spent,,tx,struct bitcoin_tx
onchain_spent,,input_num,u32
onchain_spent,,blockheight,u32
msgtype,onchain_spent,5004
msgdata,onchain_spent,tx,bitcoin_tx,
msgdata,onchain_spent,input_num,u32,
msgdata,onchain_spent,blockheight,u32,
# master->onchaind: We will receive more than one of these, as depth changes.
onchain_depth,5005
onchain_depth,,txid,struct bitcoin_txid
onchain_depth,,depth,u32
msgtype,onchain_depth,5005
msgdata,onchain_depth,txid,bitcoin_txid,
msgdata,onchain_depth,depth,u32,
# onchaind->master: We don't want to watch this tx, or its outputs
onchain_unwatch_tx,5006
onchain_unwatch_tx,,txid,struct bitcoin_txid
msgtype,onchain_unwatch_tx,5006
msgdata,onchain_unwatch_tx,txid,bitcoin_txid,
# master->onchaind: We know HTLC preimage
onchain_known_preimage,5007
onchain_known_preimage,,preimage,struct preimage
msgtype,onchain_known_preimage,5007
msgdata,onchain_known_preimage,preimage,preimage,
# onchaind->master: We discovered HTLC preimage
onchain_extracted_preimage,5008
onchain_extracted_preimage,,preimage,struct preimage
msgtype,onchain_extracted_preimage,5008
msgdata,onchain_extracted_preimage,preimage,preimage,
# onchaind->master: this HTLC was missing from commit tx.
onchain_missing_htlc_output,5009
onchain_missing_htlc_output,,htlc,struct htlc_stub
msgtype,onchain_missing_htlc_output,5009
msgdata,onchain_missing_htlc_output,htlc,htlc_stub,
# onchaind->master: this HTLC has timed out (after reasonable_depth)
onchain_htlc_timeout,5010
onchain_htlc_timeout,,htlc,struct htlc_stub
msgtype,onchain_htlc_timeout,5010
msgdata,onchain_htlc_timeout,htlc,htlc_stub,
# onchaind->master: this peer can be forgotten
onchain_all_irrevocably_resolved,5011
msgtype,onchain_all_irrevocably_resolved,5011
# onchaind->master: hey, I identified an UTXO you'll want to track
onchain_add_utxo,5012
onchain_add_utxo,,prev_out_tx,struct bitcoin_txid
onchain_add_utxo,,prev_out_index,u32
onchain_add_utxo,,per_commit_point,struct pubkey
onchain_add_utxo,,value,struct amount_sat
onchain_add_utxo,,blockheight,u32
onchain_add_utxo,,len,u16
onchain_add_utxo,,scriptpubkey,len*u8
msgtype,onchain_add_utxo,5012
msgdata,onchain_add_utxo,prev_out_tx,bitcoin_txid,
msgdata,onchain_add_utxo,prev_out_index,u32,
msgdata,onchain_add_utxo,per_commit_point,pubkey,
msgdata,onchain_add_utxo,value,amount_sat,
msgdata,onchain_add_utxo,blockheight,u32,
msgdata,onchain_add_utxo,len,u16,
msgdata,onchain_add_utxo,scriptpubkey,u8,len
# master -> onchaind: do you have a memleak?
onchain_dev_memleak,5033
msgtype,onchain_dev_memleak,5033
onchain_dev_memleak_reply,5133
onchain_dev_memleak_reply,,leak,bool
msgtype,onchain_dev_memleak_reply,5133
msgdata,onchain_dev_memleak_reply,leak,bool,
# Tell the main daemon what we've been watching, mainly used for transactions
# that we tracked automatically but only onchaind knows how to classify their
# transactions.
onchain_transaction_annotate,5034
onchain_transaction_annotate,,txid,struct bitcoin_txid
onchain_transaction_annotate,,type,enum wallet_tx_type
msgtype,onchain_transaction_annotate,5034
msgdata,onchain_transaction_annotate,txid,bitcoin_txid,
msgdata,onchain_transaction_annotate,type,e:wallet_tx_type,
1 #include <common/derive_basepoints.h>
3 #include <common/wallet.h>
4 # Begin! Here's the onchain tx which spends funding tx, followed by all HTLCs.
5 onchain_init,5001 msgtype,onchain_init,5001
6 onchain_init,,shachain,struct shachain msgdata,onchain_init,shachain,shachain,
7 onchain_init,,funding_amount_satoshi,struct amount_sat msgdata,onchain_init,funding_amount_satoshi,amount_sat,
8 # Remote per commit point for committed tx.
9 onchain_init,,old_remote_per_commitment_point,struct pubkey msgdata,onchain_init,old_remote_per_commitment_point,pubkey,
10 # Remote per commit point for current tx (needed if we haven't got revoke_and_ack yet).
11 onchain_init,,remote_per_commitment_point,struct pubkey msgdata,onchain_init,remote_per_commitment_point,pubkey,
12 onchain_init,,local_to_self_delay,u32 msgdata,onchain_init,local_to_self_delay,u32,
13 onchain_init,,remote_to_self_delay,u32 msgdata,onchain_init,remote_to_self_delay,u32,
14 onchain_init,,feerate_per_kw,u32 msgdata,onchain_init,feerate_per_kw,u32,
15 onchain_init,,local_dust_limit_satoshi,struct amount_sat msgdata,onchain_init,local_dust_limit_satoshi,amount_sat,
16 # Gives an easy way to tell if it's our unilateral close or theirs...
17 onchain_init,,our_broadcast_txid,struct bitcoin_txid msgdata,onchain_init,our_broadcast_txid,bitcoin_txid,
18 onchain_init,,local_scriptpubkey_len,u16 msgdata,onchain_init,local_scriptpubkey_len,u16,
19 onchain_init,,local_scriptpubkey,local_scriptpubkey_len*u8 msgdata,onchain_init,local_scriptpubkey,u8,local_scriptpubkey_len
20 onchain_init,,remote_scriptpubkey_len,u16 msgdata,onchain_init,remote_scriptpubkey_len,u16,
21 onchain_init,,remote_scriptpubkey,remote_scriptpubkey_len*u8 msgdata,onchain_init,remote_scriptpubkey,u8,remote_scriptpubkey_len
22 onchain_init,,ourwallet_pubkey,struct pubkey msgdata,onchain_init,ourwallet_pubkey,pubkey,
23 # We need these two for commit number obscurer
24 onchain_init,,funder,enum side msgdata,onchain_init,funder,e:side,
25 onchain_init,,local_basepoints,struct basepoints msgdata,onchain_init,local_basepoints,basepoints,
26 onchain_init,,remote_basepoints,struct basepoints msgdata,onchain_init,remote_basepoints,basepoints,
27 onchain_init,,tx,struct bitcoin_tx msgdata,onchain_init,tx,bitcoin_tx,
28 onchain_init,,tx_blockheight,u32 msgdata,onchain_init,tx_blockheight,u32,
29 onchain_init,,reasonable_depth,u32 msgdata,onchain_init,reasonable_depth,u32,
30 onchain_init,,num_htlc_sigs,u16 msgdata,onchain_init,num_htlc_sigs,u16,
31 onchain_init,,htlc_signature,num_htlc_sigs*secp256k1_ecdsa_signature msgdata,onchain_init,htlc_signature,secp256k1_ecdsa_signature,num_htlc_sigs
32 onchain_init,,num_htlcs,u64 msgdata,onchain_init,num_htlcs,u64,
33 onchain_init,,min_possible_feerate,u32 msgdata,onchain_init,min_possible_feerate,u32,
34 onchain_init,,max_possible_feerate,u32 msgdata,onchain_init,max_possible_feerate,u32,
35 onchain_init,,possible_remote_per_commit_point,?struct pubkey msgdata,onchain_init,possible_remote_per_commit_point,?pubkey,
36 #include <onchaind/onchain_wire.h>
37 # This is all the HTLCs: one per message
38 onchain_htlc,5002 msgtype,onchain_htlc,5002
39 onchain_htlc,,htlc,struct htlc_stub msgdata,onchain_htlc,htlc,htlc_stub,
40 # If it's not in the commitment tx, tell us (immediately or htlc_missing_depth)
41 onchain_htlc,,tell_if_missing,bool msgdata,onchain_htlc,tell_if_missing,bool,
42 onchain_htlc,,tell_immediately,bool msgdata,onchain_htlc,tell_immediately,bool,
43 # This says we're ready; give us preimages.
44 onchain_init_reply,5101 msgtype,onchain_init_reply,5101
45 # onchaind->master: Send out a tx.
46 onchain_broadcast_tx,5003 msgtype,onchain_broadcast_tx,5003
47 onchain_broadcast_tx,,tx,struct bitcoin_tx msgdata,onchain_broadcast_tx,tx,bitcoin_tx,
48 onchain_broadcast_tx,,type,enum wallet_tx_type msgdata,onchain_broadcast_tx,type,e:wallet_tx_type,
49 # master->onchaind: Notifier that an output has been spent by input_num of tx.
50 onchain_spent,5004 msgtype,onchain_spent,5004
51 onchain_spent,,tx,struct bitcoin_tx msgdata,onchain_spent,tx,bitcoin_tx,
52 onchain_spent,,input_num,u32 msgdata,onchain_spent,input_num,u32,
53 onchain_spent,,blockheight,u32 msgdata,onchain_spent,blockheight,u32,
54 # master->onchaind: We will receive more than one of these, as depth changes.
55 onchain_depth,5005 msgtype,onchain_depth,5005
56 onchain_depth,,txid,struct bitcoin_txid msgdata,onchain_depth,txid,bitcoin_txid,
57 onchain_depth,,depth,u32 msgdata,onchain_depth,depth,u32,
58 # onchaind->master: We don't want to watch this tx, or its outputs
59 onchain_unwatch_tx,5006 msgtype,onchain_unwatch_tx,5006
60 onchain_unwatch_tx,,txid,struct bitcoin_txid msgdata,onchain_unwatch_tx,txid,bitcoin_txid,
61 # master->onchaind: We know HTLC preimage
62 onchain_known_preimage,5007 msgtype,onchain_known_preimage,5007
63 onchain_known_preimage,,preimage,struct preimage msgdata,onchain_known_preimage,preimage,preimage,
64 # onchaind->master: We discovered HTLC preimage
65 onchain_extracted_preimage,5008 msgtype,onchain_extracted_preimage,5008
66 onchain_extracted_preimage,,preimage,struct preimage msgdata,onchain_extracted_preimage,preimage,preimage,
67 # onchaind->master: this HTLC was missing from commit tx.
68 onchain_missing_htlc_output,5009 msgtype,onchain_missing_htlc_output,5009
69 onchain_missing_htlc_output,,htlc,struct htlc_stub msgdata,onchain_missing_htlc_output,htlc,htlc_stub,
70 # onchaind->master: this HTLC has timed out (after reasonable_depth)
71 onchain_htlc_timeout,5010 msgtype,onchain_htlc_timeout,5010
72 onchain_htlc_timeout,,htlc,struct htlc_stub msgdata,onchain_htlc_timeout,htlc,htlc_stub,
73 # onchaind->master: this peer can be forgotten
74 onchain_all_irrevocably_resolved,5011 msgtype,onchain_all_irrevocably_resolved,5011
75 # onchaind->master: hey, I identified an UTXO you'll want to track
76 onchain_add_utxo,5012 msgtype,onchain_add_utxo,5012
77 onchain_add_utxo,,prev_out_tx,struct bitcoin_txid msgdata,onchain_add_utxo,prev_out_tx,bitcoin_txid,
78 onchain_add_utxo,,prev_out_index,u32 msgdata,onchain_add_utxo,prev_out_index,u32,
79 onchain_add_utxo,,per_commit_point,struct pubkey msgdata,onchain_add_utxo,per_commit_point,pubkey,
80 onchain_add_utxo,,value,struct amount_sat msgdata,onchain_add_utxo,value,amount_sat,
81 onchain_add_utxo,,blockheight,u32 msgdata,onchain_add_utxo,blockheight,u32,
82 onchain_add_utxo,,len,u16 msgdata,onchain_add_utxo,len,u16,
83 onchain_add_utxo,,scriptpubkey,len*u8 msgdata,onchain_add_utxo,scriptpubkey,u8,len
84 # master -> onchaind: do you have a memleak?
85 onchain_dev_memleak,5033 msgtype,onchain_dev_memleak,5033
86 onchain_dev_memleak_reply,5133 msgtype,onchain_dev_memleak_reply,5133
87 onchain_dev_memleak_reply,,leak,bool msgdata,onchain_dev_memleak_reply,leak,bool,
88 # Tell the main daemon what we've been watching, mainly used for transactions
89 # that we tracked automatically but only onchaind knows how to classify their
90 # transactions.
91 onchain_transaction_annotate,5034 msgtype,onchain_transaction_annotate,5034
92 onchain_transaction_annotate,,txid,struct bitcoin_txid msgdata,onchain_transaction_annotate,txid,bitcoin_txid,
93 onchain_transaction_annotate,,type,enum wallet_tx_type msgdata,onchain_transaction_annotate,type,e:wallet_tx_type,
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109