Move bitcoin stuff into bitcoin subdir.

It's not very interesting if you're looking for LN code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

Makefile

@@ -5,7 +5,9 @@ PROTOCC:=protoc-c
 
 PROGRAMS := open-channel open-anchor-scriptsigs leak-anchor-sigs open-commit-sig check-commit-sig check-anchor-scriptsigs get-anchor-depth create-steal-tx create-commit-spend-tx close-channel create-close-tx update-channel update-channel-accept update-channel-signature update-channel-complete create-commit-tx
 
-HELPER_OBJS := base58.o lightning.pb-c.o shadouble.o pkt.o bitcoin_script.o permute_tx.o signature.o bitcoin_tx.o bitcoin_address.o anchor.o commit_tx.o pubkey.o opt_bits.o close_tx.o find_p2sh_out.o
+BITCOIN_OBJS := bitcoin/address.o bitcoin/base58.o bitcoin/pubkey.o bitcoin/script.o bitcoin/shadouble.o bitcoin/signature.o bitcoin/tx.o
+
+HELPER_OBJS := lightning.pb-c.o pkt.o permute_tx.o anchor.o commit_tx.o opt_bits.o close_tx.o find_p2sh_out.o
 
 CCAN_OBJS := ccan-crypto-sha256.o ccan-crypto-shachain.o ccan-err.o ccan-tal.o ccan-tal-str.o ccan-take.o ccan-list.o ccan-str.o ccan-opt-helpers.o ccan-opt.o ccan-opt-parse.o ccan-opt-usage.o ccan-read_write_all.o ccan-str-hex.o ccan-tal-grab_file.o ccan-noerr.o
 
@@ -24,15 +26,15 @@ FORCE::
 lightning.pb-c.c lightning.pb-c.h: lightning.proto
 	$(PROTOCC) lightning.proto --c_out=.
 
-$(PROGRAMS): % : %.o $(HELPER_OBJS) $(CCAN_OBJS)
+$(PROGRAMS): % : %.o $(HELPER_OBJS) $(BITCOIN_OBJS) $(CCAN_OBJS)
 $(PROGRAMS:=.o) $(HELPER_OBJS): $(HEADERS)
 
 distclean: clean
 	$(RM) lightning.pb-c.c lightning.pb-c.h
 
 clean:
 	$(RM) $(PROGRAMS)
-	$(RM) *.o $(CCAN_OBJS)
+	$(RM) bitcoin/*.o *.o $(CCAN_OBJS)
 
 ccan-tal.o: $(CCANDIR)/ccan/tal/tal.c
 	$(CC) $(CFLAGS) -c -o $@ $<

anchor.c

@@ -1,10 +1,10 @@
 #include "anchor.h"
-#include "bitcoin_tx.h"
+#include "bitcoin/tx.h"
 #include "overflows.h"
 #include "pkt.h"
 #include "permute_tx.h"
-#include "bitcoin_script.h"
-#include "pubkey.h"
+#include "bitcoin/script.h"
+#include "bitcoin/pubkey.h"
 #include <ccan/err/err.h>
 
 struct bitcoin_tx *anchor_tx_create(const tal_t *ctx,

bitcoin/README

@@ -0,0 +1,6 @@
+These are standard bitcoin manipulation routines which should be
+provided by any normal bitcoin library in whatever language you choose.
+
+The ones here are standalone ones taken from bitcoin core and soe I
+wrote, many taken from bitcoin-iterate and pasted in here.
+

bitcoin_address.c renamed to bitcoin/address.c

@@ -1,4 +1,4 @@
-#include "bitcoin_address.h"
+#include "address.h"
 #include "pubkey.h"
 #include <ccan/crypto/sha256/sha256.h>
 

bitcoin_address.h renamed to bitcoin/address.h

@@ -5,7 +5,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include "base58.h"
 #include "shadouble.h"
-#include "bitcoin_address.h"
+#include "address.h"
 #include "pubkey.h"
 #include <assert.h>
 #include <ccan/build_assert/build_assert.h>

base58.c renamed to bitcoin/base58.c

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_BASE58_H
-#define LIGHTNING_BASE58_H
+#ifndef LIGHTNING_BITCOIN_BASE58_H
+#define LIGHTNING_BITCOIN_BASE58_H
 /* FIXME: Use libsecpk1 */
 #include <ccan/tal/tal.h>
 #include <ccan/short_types/short_types.h>
@@ -44,4 +44,4 @@ bool raw_decode_base_n(BIGNUM *bn, const char *src, size_t len, int base);
 bool raw_decode_base58(BIGNUM *bn, const char *src, size_t len);
 void base58_get_checksum(u8 csum[4], const u8 buf[], size_t buflen);
 
-#endif /* PETTYCOIN_BASE58_H */
+#endif /* PETTYCOIN_BITCOIN_BASE58_H */

base58.h renamed to bitcoin/base58.h

@@ -1,8 +1,8 @@
-#ifndef LIGHTNING_PUBKEY_H
-#define LIGHTNING_PUBKEY_H
+#ifndef LIGHTNING_BITCOIN_PUBKEY_H
+#define LIGHTNING_BITCOIN_PUBKEY_H
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
-#include "lightning.pb-c.h"
+#include "../lightning.pb-c.h"
 
 struct pubkey {
 	u8 key[65];

pubkey.c renamed to bitcoin/pubkey.c

@@ -1,6 +1,5 @@
-#include "bitcoin_script.h"
-#include "bitcoin_address.h"
-#include "pkt.h"
+#include "script.h"
+#include "address.h"
 #include "signature.h"
 #include "pubkey.h"
 #include <openssl/ripemd.h>