From 612d713470a75f0ef7c33da1d1650388f714dadc Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 12 Jun 2015 11:53:27 +0930 Subject: [PATCH] Move bitcoin stuff into bitcoin subdir. It's not very interesting if you're looking for LN code. Signed-off-by: Rusty Russell --- Makefile | 8 +++++--- anchor.c | 6 +++--- bitcoin/README | 6 ++++++ bitcoin_address.c => bitcoin/address.c | 2 +- bitcoin_address.h => bitcoin/address.h | 0 base58.c => bitcoin/base58.c | 2 +- base58.h => bitcoin/base58.h | 6 +++--- pubkey.c => bitcoin/pubkey.c | 0 pubkey.h => bitcoin/pubkey.h | 6 +++--- bitcoin_script.c => bitcoin/script.c | 5 ++--- bitcoin_script.h => bitcoin/script.h | 0 shadouble.c => bitcoin/shadouble.c | 0 shadouble.h => bitcoin/shadouble.h | 6 +++--- signature.c => bitcoin/signature.c | 4 ++-- signature.h => bitcoin/signature.h | 8 ++++---- bitcoin_tx.c => bitcoin/tx.c | 2 +- bitcoin_tx.h => bitcoin/tx.h | 0 check-anchor-scriptsigs.c | 8 ++++---- check-commit-sig.c | 8 ++++---- close-channel.c | 8 ++++---- close_tx.c | 8 ++++---- commit_tx.c | 8 ++++---- create-close-tx.c | 8 ++++---- create-commit-spend-tx.c | 10 +++++----- create-commit-tx.c | 8 ++++---- create-steal-tx.c | 8 ++++---- find_p2sh_out.c | 4 ++-- get-anchor-depth.c | 8 ++++---- open-anchor-scriptsigs.c | 12 ++++++------ open-channel.c | 12 ++++++------ open-commit-sig.c | 8 ++++---- permute_tx.h | 2 +- pkt.c | 8 ++++---- update-channel-accept.c | 8 ++++---- update-channel-complete.c | 8 ++++---- update-channel-signature.c | 8 ++++---- update-channel.c | 8 ++++---- 37 files changed, 114 insertions(+), 107 deletions(-) create mode 100644 bitcoin/README rename bitcoin_address.c => bitcoin/address.c (89%) rename bitcoin_address.h => bitcoin/address.h (100%) rename base58.c => bitcoin/base58.c (99%) rename base58.h => bitcoin/base58.h (93%) rename pubkey.c => bitcoin/pubkey.c (100%) rename pubkey.h => bitcoin/pubkey.h (84%) rename bitcoin_script.c => bitcoin/script.c (99%) rename bitcoin_script.h => bitcoin/script.h (100%) rename shadouble.c => bitcoin/shadouble.c (100%) rename shadouble.h => bitcoin/shadouble.h (74%) rename signature.c => bitcoin/signature.c (99%) rename signature.h => bitcoin/signature.h (90%) rename bitcoin_tx.c => bitcoin/tx.c (99%) rename bitcoin_tx.h => bitcoin/tx.h (100%) diff --git a/Makefile b/Makefile index b3f0f4285..236eed4a6 100644 --- a/Makefile +++ b/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,7 +26,7 @@ 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 @@ -32,7 +34,7 @@ distclean: clean 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 $@ $< diff --git a/anchor.c b/anchor.c index c81c6509b..65703a2c4 100644 --- a/anchor.c +++ b/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 struct bitcoin_tx *anchor_tx_create(const tal_t *ctx, diff --git a/bitcoin/README b/bitcoin/README new file mode 100644 index 000000000..1fd9d03f1 --- /dev/null +++ b/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. + diff --git a/bitcoin_address.c b/bitcoin/address.c similarity index 89% rename from bitcoin_address.c rename to bitcoin/address.c index edd3c4f53..ee4c8e2ca 100644 --- a/bitcoin_address.c +++ b/bitcoin/address.c @@ -1,4 +1,4 @@ -#include "bitcoin_address.h" +#include "address.h" #include "pubkey.h" #include diff --git a/bitcoin_address.h b/bitcoin/address.h similarity index 100% rename from bitcoin_address.h rename to bitcoin/address.h diff --git a/base58.c b/bitcoin/base58.c similarity index 99% rename from base58.c rename to bitcoin/base58.c index 42065edeb..bf9de7351 100644 --- a/base58.c +++ b/bitcoin/base58.c @@ -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 #include diff --git a/base58.h b/bitcoin/base58.h similarity index 93% rename from base58.h rename to bitcoin/base58.h index 879db16e2..ec528a32d 100644 --- a/base58.h +++ b/bitcoin/base58.h @@ -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 #include @@ -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 */ diff --git a/pubkey.c b/bitcoin/pubkey.c similarity index 100% rename from pubkey.c rename to bitcoin/pubkey.c diff --git a/pubkey.h b/bitcoin/pubkey.h similarity index 84% rename from pubkey.h rename to bitcoin/pubkey.h index 33cc8bc8b..93288f973 100644 --- a/pubkey.h +++ b/bitcoin/pubkey.h @@ -1,8 +1,8 @@ -#ifndef LIGHTNING_PUBKEY_H -#define LIGHTNING_PUBKEY_H +#ifndef LIGHTNING_BITCOIN_PUBKEY_H +#define LIGHTNING_BITCOIN_PUBKEY_H #include #include -#include "lightning.pb-c.h" +#include "../lightning.pb-c.h" struct pubkey { u8 key[65]; diff --git a/bitcoin_script.c b/bitcoin/script.c similarity index 99% rename from bitcoin_script.c rename to bitcoin/script.c index 51282531c..1e6a49028 100644 --- a/bitcoin_script.c +++ b/bitcoin/script.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 diff --git a/bitcoin_script.h b/bitcoin/script.h similarity index 100% rename from bitcoin_script.h rename to bitcoin/script.h diff --git a/shadouble.c b/bitcoin/shadouble.c similarity index 100% rename from shadouble.c rename to bitcoin/shadouble.c diff --git a/shadouble.h b/bitcoin/shadouble.h similarity index 74% rename from shadouble.h rename to bitcoin/shadouble.h index f19dbea8b..f447df7f1 100644 --- a/shadouble.h +++ b/bitcoin/shadouble.h @@ -1,5 +1,5 @@ -#ifndef LIGHTNING_SHADOUBLE_H -#define LIGHTNING_SHADOUBLE_H +#ifndef LIGHTNING_BITCOIN_SHADOUBLE_H +#define LIGHTNING_BITCOIN_SHADOUBLE_H #include "config.h" #include @@ -11,4 +11,4 @@ struct sha256_double { void sha256_double(struct sha256_double *shadouble, const void *p, size_t len); void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res); -#endif /* PETTYCOIN_SHADOUBLE_H */ +#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */ diff --git a/signature.c b/bitcoin/signature.c similarity index 99% rename from signature.c rename to bitcoin/signature.c index f98bd2436..d22e59e11 100644 --- a/signature.c +++ b/bitcoin/signature.c @@ -1,8 +1,8 @@ #include "signature.h" #include "shadouble.h" -#include "bitcoin_tx.h" +#include "tx.h" #include "pubkey.h" -#include "bitcoin_script.h" +#include "script.h" #include #include #include diff --git a/signature.h b/bitcoin/signature.h similarity index 90% rename from signature.h rename to bitcoin/signature.h index 4e0e8184e..6e98e18f1 100644 --- a/signature.h +++ b/bitcoin/signature.h @@ -1,9 +1,9 @@ -#ifndef LIGHTNING_SIGNATURE_H -#define LIGHTNING_SIGNATURE_H +#ifndef LIGHTNING_BITCOIN_SIGNATURE_H +#define LIGHTNING_BITCOIN_SIGNATURE_H #include #include #include -#include "lightning.pb-c.h" +#include "../lightning.pb-c.h" enum sighash_type { SIGHASH_ALL = 1, @@ -51,4 +51,4 @@ bool check_2of2_sig(struct bitcoin_tx *tx, size_t input_num, Signature *signature_to_proto(const tal_t *ctx, const struct signature *sig); bool proto_to_signature(const Signature *pb, struct signature *sig); -#endif /* LIGHTNING_SIGNATURE_H */ +#endif /* LIGHTNING_BITCOIN_SIGNATURE_H */ diff --git a/bitcoin_tx.c b/bitcoin/tx.c similarity index 99% rename from bitcoin_tx.c rename to bitcoin/tx.c index 01dac5357..32814f2d9 100644 --- a/bitcoin_tx.c +++ b/bitcoin/tx.c @@ -1,4 +1,4 @@ -#include "bitcoin_tx.h" +#include "tx.h" #include #include #include diff --git a/bitcoin_tx.h b/bitcoin/tx.h similarity index 100% rename from bitcoin_tx.h rename to bitcoin/tx.h diff --git a/check-anchor-scriptsigs.c b/check-anchor-scriptsigs.c index 49765055a..7c9c3b2ad 100644 --- a/check-anchor-scriptsigs.c +++ b/check-anchor-scriptsigs.c @@ -12,13 +12,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include #include diff --git a/check-commit-sig.c b/check-commit-sig.c index 2bf9bae13..0e16c998d 100644 --- a/check-commit-sig.c +++ b/check-commit-sig.c @@ -11,13 +11,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include #include diff --git a/close-channel.c b/close-channel.c index 8f69d1701..c0261d00a 100644 --- a/close-channel.c +++ b/close-channel.c @@ -11,12 +11,12 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" -#include "pubkey.h" +#include "bitcoin/signature.h" +#include "bitcoin/pubkey.h" #include "close_tx.h" #include "find_p2sh_out.h" #include diff --git a/close_tx.c b/close_tx.c index eb18fa691..a7ed30cee 100644 --- a/close_tx.c +++ b/close_tx.c @@ -1,9 +1,9 @@ #include "close_tx.h" -#include "shadouble.h" -#include "bitcoin_tx.h" -#include "bitcoin_script.h" +#include "bitcoin/shadouble.h" +#include "bitcoin/tx.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include "pkt.h" struct bitcoin_tx *create_close_tx(const tal_t *ctx, diff --git a/commit_tx.c b/commit_tx.c index 0f1854240..b439a9e05 100644 --- a/commit_tx.c +++ b/commit_tx.c @@ -1,9 +1,9 @@ #include "commit_tx.h" -#include "shadouble.h" -#include "bitcoin_tx.h" -#include "bitcoin_script.h" +#include "bitcoin/shadouble.h" +#include "bitcoin/tx.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include "pkt.h" struct bitcoin_tx *create_commit_tx(const tal_t *ctx, diff --git a/create-close-tx.c b/create-close-tx.c index bbf16c93b..ea0cb0167 100644 --- a/create-close-tx.c +++ b/create-close-tx.c @@ -10,12 +10,12 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" -#include "pubkey.h" +#include "bitcoin/signature.h" +#include "bitcoin/pubkey.h" #include "close_tx.h" #include "find_p2sh_out.h" #include diff --git a/create-commit-spend-tx.c b/create-commit-spend-tx.c index c9c643104..d0eb3247c 100644 --- a/create-commit-spend-tx.c +++ b/create-commit-spend-tx.c @@ -11,14 +11,14 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" -#include "bitcoin_address.h" +#include "bitcoin/pubkey.h" +#include "bitcoin/address.h" #include "opt_bits.h" #include "find_p2sh_out.h" #include diff --git a/create-commit-tx.c b/create-commit-tx.c index a68d8f612..4bcb88e56 100644 --- a/create-commit-tx.c +++ b/create-commit-tx.c @@ -11,13 +11,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include "find_p2sh_out.h" #include #include diff --git a/create-steal-tx.c b/create-steal-tx.c index fb9a1b62e..db26f8d35 100644 --- a/create-steal-tx.c +++ b/create-steal-tx.c @@ -11,13 +11,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include #include diff --git a/find_p2sh_out.c b/find_p2sh_out.c index 41aa40be6..ccc5f6e66 100644 --- a/find_p2sh_out.c +++ b/find_p2sh_out.c @@ -1,6 +1,6 @@ #include "find_p2sh_out.h" -#include "bitcoin_tx.h" -#include "bitcoin_script.h" +#include "bitcoin/tx.h" +#include "bitcoin/script.h" #include #include #include diff --git a/get-anchor-depth.c b/get-anchor-depth.c index 4173eafc3..c4545667e 100644 --- a/get-anchor-depth.c +++ b/get-anchor-depth.c @@ -11,13 +11,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include #include diff --git a/open-anchor-scriptsigs.c b/open-anchor-scriptsigs.c index 1e72c489a..d5677e376 100644 --- a/open-anchor-scriptsigs.c +++ b/open-anchor-scriptsigs.c @@ -5,15 +5,15 @@ #include #include #include -#include "bitcoin_tx.h" -#include "signature.h" +#include "bitcoin/tx.h" +#include "bitcoin/signature.h" #include "lightning.pb-c.h" #include "pkt.h" -#include "bitcoin_script.h" -#include "bitcoin_address.h" -#include "base58.h" +#include "bitcoin/script.h" +#include "bitcoin/address.h" +#include "bitcoin/base58.h" #include "anchor.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include #include diff --git a/open-channel.c b/open-channel.c index 5d47fb1a4..5fa07bc1b 100644 --- a/open-channel.c +++ b/open-channel.c @@ -10,13 +10,13 @@ #include #include #include "lightning.pb-c.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" -#include "bitcoin_address.h" -#include "bitcoin_tx.h" -#include "pubkey.h" -#include "shadouble.h" +#include "bitcoin/script.h" +#include "bitcoin/address.h" +#include "bitcoin/tx.h" +#include "bitcoin/pubkey.h" +#include "bitcoin/shadouble.h" #include #include #include "opt_bits.h" diff --git a/open-commit-sig.c b/open-commit-sig.c index 623cfff89..31067a64a 100644 --- a/open-commit-sig.c +++ b/open-commit-sig.c @@ -11,13 +11,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include #include diff --git a/permute_tx.h b/permute_tx.h index 3683205fe..1b56469c9 100644 --- a/permute_tx.h +++ b/permute_tx.h @@ -1,6 +1,6 @@ #ifndef LIGHTNING_PERMUTE_TX_H #define LIGHTNING_PERMUTE_TX_H -#include "bitcoin_tx.h" +#include "bitcoin/tx.h" /* Given the two seeds, permute the transaction inputs. * map[0] is set to the new index of input 0, etc. diff --git a/pkt.c b/pkt.c index 96a5fb6f0..b5007a0e7 100644 --- a/pkt.c +++ b/pkt.c @@ -2,10 +2,10 @@ #include #include #include "pkt.h" -#include "bitcoin_tx.h" -#include "bitcoin_address.h" -#include "pubkey.h" -#include "signature.h" +#include "bitcoin/tx.h" +#include "bitcoin/address.h" +#include "bitcoin/pubkey.h" +#include "bitcoin/signature.h" #include static struct pkt *to_pkt(const tal_t *ctx, Pkt__PktCase type, void *msg) diff --git a/update-channel-accept.c b/update-channel-accept.c index 366d94ce2..6c70cffb8 100644 --- a/update-channel-accept.c +++ b/update-channel-accept.c @@ -10,13 +10,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include "find_p2sh_out.h" #include #include diff --git a/update-channel-complete.c b/update-channel-complete.c index a1663cfe8..c57b63046 100644 --- a/update-channel-complete.c +++ b/update-channel-complete.c @@ -11,13 +11,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include "find_p2sh_out.h" #include #include diff --git a/update-channel-signature.c b/update-channel-signature.c index cd38100a1..b71a31e9b 100644 --- a/update-channel-signature.c +++ b/update-channel-signature.c @@ -7,13 +7,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include "find_p2sh_out.h" #include #include diff --git a/update-channel.c b/update-channel.c index a8347b80a..62eeb829e 100644 --- a/update-channel.c +++ b/update-channel.c @@ -10,13 +10,13 @@ #include #include "lightning.pb-c.h" #include "anchor.h" -#include "base58.h" +#include "bitcoin/base58.h" #include "pkt.h" -#include "bitcoin_script.h" +#include "bitcoin/script.h" #include "permute_tx.h" -#include "signature.h" +#include "bitcoin/signature.h" #include "commit_tx.h" -#include "pubkey.h" +#include "bitcoin/pubkey.h" #include "find_p2sh_out.h" #include #include