plugins/spender/fundchannel.c: Make fundchannel a thin layer around m…

…ultifundchannel. Changelog-Changed: protocol: `fundchannel` now shuffles inputs and outputs, and no longer follows BIP69.
ElementsProject · Aug 21, 2020 · e4e5415 · e4e5415
1 parent 4d4b624
commit e4e5415
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 460 deletions.
diff --git a/plugins/.gitignore b/plugins/.gitignore
@@ -1,5 +1,4 @@
 autoclean
 bcli
-fundchannel
 pay
 spenderp
diff --git a/plugins/Makefile b/plugins/Makefile
@@ -4,9 +4,6 @@ PLUGIN_PAY_OBJS := $(PLUGIN_PAY_SRC:.c=.o)
 PLUGIN_AUTOCLEAN_SRC := plugins/autoclean.c
 PLUGIN_AUTOCLEAN_OBJS := $(PLUGIN_AUTOCLEAN_SRC:.c=.o)
 
-PLUGIN_FUNDCHANNEL_SRC := plugins/fundchannel.c
-PLUGIN_FUNDCHANNEL_OBJS := $(PLUGIN_FUNDCHANNEL_SRC:.c=.o)
-
 PLUGIN_BCLI_SRC := plugins/bcli.c
 PLUGIN_BCLI_OBJS := $(PLUGIN_BCLI_SRC:.c=.o)
 
@@ -25,16 +22,17 @@ PLUGIN_MULTIFUNDCHANNEL_SRC :=
 PLUGIN_MULTIFUNDCHANNEL_OBJS := $(PLUGIN_MULTIFUNDCHANNEL_SRC:.c=.o)
 
 PLUGIN_SPENDER_SRC :=				\
+	plugins/spender/fundchannel.c		\
 	plugins/spender/main.c			\
 	plugins/spender/multifundchannel.c
 PLUGIN_SPENDER_HEADER :=			\
+	plugins/spender/fundchannel.h		\
 	plugins/spender/multifundchannel.h
 PLUGIN_SPENDER_OBJS := $(PLUGIN_SPENDER_SRC:.c=.o)
 
 PLUGIN_ALL_SRC :=				\
 	$(PLUGIN_AUTOCLEAN_SRC)			\
 	$(PLUGIN_BCLI_SRC)			\
-	$(PLUGIN_FUNDCHANNEL_SRC)		\
 	$(PLUGIN_KEYSEND_SRC)			\
 	$(PLUGIN_LIB_SRC)			\
 	$(PLUGIN_MULTIFUNDCHANNEL_SRC)		\
@@ -50,7 +48,6 @@ PLUGIN_ALL_OBJS := $(PLUGIN_ALL_SRC:.c=.o)
 PLUGINS :=					\
 	plugins/autoclean			\
 	plugins/bcli				\
-	plugins/fundchannel			\
 	plugins/keysend				\
 	plugins/pay				\
 	plugins/spenderp
@@ -99,8 +96,6 @@ $(PLUGIN_PAY_OBJS): $(PLUGIN_PAY_LIB_HEADER)
 
 plugins/autoclean: bitcoin/chainparams.o $(PLUGIN_AUTOCLEAN_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS)
 
-plugins/fundchannel: common/addr.o $(PLUGIN_FUNDCHANNEL_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS)
-
 plugins/bcli: bitcoin/chainparams.o $(PLUGIN_BCLI_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS)
 
 plugins/keysend: bitcoin/chainparams.o wire/tlvstream.o wire/gen_onion_wire.o $(PLUGIN_KEYSEND_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_PAY_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS)