From 49d97a2fd6d52bec6a3ae8cf502a42db0d6eb7db Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sat, 1 Apr 2017 21:31:13 +1030 Subject: [PATCH] Update wire from spec ed107e4ef019f33a88aa5567adca7fbb944e93af This version correctly extracts fields with _ in them, meaning we get more fields. Also adds Makefile dependency which I noticed broke the build. Signed-off-by: Rusty Russell --- wire/Makefile | 2 +- wire/gen_onion_wire_csv | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wire/Makefile b/wire/Makefile index 7c29bf528..009d573bd 100644 --- a/wire/Makefile +++ b/wire/Makefile @@ -19,7 +19,7 @@ WIRE_SRC := wire/wire_sync.c \ WIRE_OBJS := $(WIRE_SRC:.c=.o) $(WIRE_GEN_SRC:.c=.o) WIRE_ONION_OBJS := $(WIRE_GEN_ONION_SRC:.c=.o) -$(WIRE_OBJS): $(CCAN_HEADERS) +$(WIRE_OBJS): $(CCAN_HEADERS) $(WIRE_HEADERS) $(WIRE_GEN_HEADERS) # They may not have the bolts. BOLT_EXTRACT=$(BOLTDIR)/tools/extract-formats.py diff --git a/wire/gen_onion_wire_csv b/wire/gen_onion_wire_csv index 7758ffceb..463df2041 100644 --- a/wire/gen_onion_wire_csv +++ b/wire/gen_onion_wire_csv @@ -16,14 +16,18 @@ unknown_next_peer,PERM|10 amount_below_minimum,UPDATE|11 amount_below_minimum,0,htlc-msat,4 amount_below_minimum,4,len,2 +amount_below_minimum,6,channel_update,len fee_insufficient,UPDATE|12 fee_insufficient,0,htlc-msat,4 fee_insufficient,4,len,2 +fee_insufficient,6,channel_update,len incorrect_cltv_expiry,UPDATE|13 incorrect_cltv_expiry,0,cltv-expiry,4 incorrect_cltv_expiry,4,len,2 +incorrect_cltv_expiry,6,channel_update,len expiry_too_soon,UPDATE|14 expiry_too_soon,0,len,2 +expiry_too_soon,2,channel_update,len unknown_payment_hash,PERM|15 incorrect_payment_amount,PERM|16 final_expiry_too_soon,17