Bitcore port

2018-03-27 13:34:52 +02:00
parent a86845f3dc
commit 8b78a8199e
46 changed files with 4319 additions and 450 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ endif

 BITCOIND_BIN=$(top_builddir)/src/zcashd$(EXEEXT)
 BITCOIN_CLI_BIN=$(top_builddir)/src/zcash-cli$(EXEEXT)
+WALLET_UTILITY_BIN=$(top_builddir)/src/wallet-utility$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

 if TARGET_DARWIN
@@ -31,32 +32,32 @@ endif
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)

 BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
-           $(top_srcdir)/contrib/devtools/security-check.py
+	$(top_srcdir)/contrib/devtools/security-check.py

 WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
-  $(top_srcdir)/share/pixmaps/nsis-header.bmp \
-  $(top_srcdir)/share/pixmaps/nsis-wizard.bmp
+	$(top_srcdir)/share/pixmaps/nsis-header.bmp \
+	$(top_srcdir)/share/pixmaps/nsis-wizard.bmp

 if TARGET_DARWIN
 OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) $(OSX_BASE_LPROJ_DIR) \
-  $(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \
-  $(top_srcdir)/contrib/macdeploy/DS_Store \
-  $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
-  $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
+	$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \
+	$(top_srcdir)/contrib/macdeploy/DS_Store \
+	$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
+	$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
 endif

 if TARGET_DARWIN
 COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
-  leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
-  baseline_filtered.info block_test_filtered.info \
-  leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
+	leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
+	baseline_filtered.info block_test_filtered.info \
+	leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
 #  zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
 else
 COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
-  leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
-  baseline_filtered.info block_test_filtered.info \
-  leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
-  #zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
+	leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
+	baseline_filtered.info block_test_filtered.info \
+	leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
+	#zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
 endif

 dist-hook:
@@ -76,8 +77,9 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
 	$(MKDIR_P) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
+	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(WALLET_UTILITY_BIN) $(top_builddir)/release
 	@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \
-	  echo error: could not build $@
+	echo error: could not build $@
 	@echo built $@

 $(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE
@@ -110,9 +112,9 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR
 	$(INSTALL_DATA) $< $@

 OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
-  $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
-  $(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
-  
+	$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
+	$(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
+
 endif

 if BUILD_DARWIN
@@ -161,6 +163,9 @@ $(BITCOIND_BIN): FORCE
 $(BITCOIN_CLI_BIN): FORCE
 	$(MAKE) -C src $(@F)

+$(WALLET_UTILITY_BIN): FORCE
+	$(MAKE) -C src $(@F)
+
 if USE_LCOV

 baseline.info:
@@ -169,27 +174,27 @@ baseline.info:
 if BUILD_DARWIN
 baseline_filtered.info: baseline.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/*.h" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
-                      "$(abs_builddir)/src/gtest/*" \
-                      "$(abs_builddir)/src/test/*" \
-                      "$(abs_builddir)/src/wallet/gtest/*" \
-                      "$(abs_builddir)/src/wallet/test/*" \
-                      -o $@
+	"$(abs_builddir)/depends/$(BUILD)/include/*.h" \
+	"$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
+	"$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
+	"$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
+	"$(abs_builddir)/src/gtest/*" \
+	"$(abs_builddir)/src/test/*" \
+	"$(abs_builddir)/src/wallet/gtest/*" \
+	"$(abs_builddir)/src/wallet/test/*" \
+	-o $@
 else
 baseline_filtered.info: baseline.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
-                      "$(abs_builddir)/src/gtest/*" \
-                      "$(abs_builddir)/src/test/*" \
-                      "$(abs_builddir)/src/wallet/gtest/*" \
-                      "$(abs_builddir)/src/wallet/test/*" \
-                      -o $@
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
+	"$(abs_builddir)/src/gtest/*" \
+	"$(abs_builddir)/src/test/*" \
+	"$(abs_builddir)/src/wallet/gtest/*" \
+	"$(abs_builddir)/src/wallet/test/*" \
+	-o $@
 endif

 leveldb_baseline.info: baseline_filtered.info
@@ -198,27 +203,27 @@ leveldb_baseline.info: baseline_filtered.info
 if BUILD_DARWIN
 leveldb_baseline_filtered.info: leveldb_baseline.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/*.h" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
-                      "$(abs_builddir)/src/gtest/*" \
-                      "$(abs_builddir)/src/test/*" \
-                      "$(abs_builddir)/src/wallet/gtest/*" \
-                      "$(abs_builddir)/src/wallet/test/*" \
-                      -o $@
+	"$(abs_builddir)/depends/$(BUILD)/include/*.h" \
+	"$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
+	"$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
+	"$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
+	"$(abs_builddir)/src/gtest/*" \
+	"$(abs_builddir)/src/test/*" \
+	"$(abs_builddir)/src/wallet/gtest/*" \
+	"$(abs_builddir)/src/wallet/test/*" \
+	-o $@
 else
 leveldb_baseline_filtered.info: leveldb_baseline.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
-                      "$(abs_builddir)/src/gtest/*" \
-                      "$(abs_builddir)/src/test/*" \
-                      "$(abs_builddir)/src/wallet/gtest/*" \
-                      "$(abs_builddir)/src/wallet/test/*" \
-                      -o $@
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
+	"$(abs_builddir)/src/gtest/*" \
+	"$(abs_builddir)/src/test/*" \
+	"$(abs_builddir)/src/wallet/gtest/*" \
+	"$(abs_builddir)/src/wallet/test/*" \
+	-o $@
 endif

 baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
@@ -233,27 +238,27 @@ test_bitcoin.info: baseline_filtered_combined.info
 if BUILD_DARWIN
 test_bitcoin_filtered.info: test_bitcoin.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/*.h" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
-                      "$(abs_builddir)/src/gtest/*" \
-                      "$(abs_builddir)/src/test/*" \
-                      "$(abs_builddir)/src/wallet/gtest/*" \
-                      "$(abs_builddir)/src/wallet/test/*" \
-                      -o $@
+	"$(abs_builddir)/depends/$(BUILD)/include/*.h" \
+	"$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
+	"$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
+	"$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
+	"$(abs_builddir)/src/gtest/*" \
+	"$(abs_builddir)/src/test/*" \
+	"$(abs_builddir)/src/wallet/gtest/*" \
+	"$(abs_builddir)/src/wallet/test/*" \
+	-o $@
 else
 test_bitcoin_filtered.info: test_bitcoin.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
-                      "$(abs_builddir)/src/gtest/*" \
-                      "$(abs_builddir)/src/test/*" \
-                      "$(abs_builddir)/src/wallet/gtest/*" \
-                      "$(abs_builddir)/src/wallet/test/*" \
-                      -o $@
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
+	"$(abs_builddir)/src/gtest/*" \
+	"$(abs_builddir)/src/test/*" \
+	"$(abs_builddir)/src/wallet/gtest/*" \
+	"$(abs_builddir)/src/wallet/test/*" \
+	-o $@
 endif

 block_test.info: test_bitcoin_filtered.info
@@ -266,31 +271,31 @@ block_test.info: test_bitcoin_filtered.info
 if BUILD_DARWIN
 block_test_filtered.info: block_test.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/*.h" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
-                      "$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
-                      "$(abs_builddir)/src/gtest/*" \
-                      "$(abs_builddir)/src/test/*" \
-                      "$(abs_builddir)/src/wallet/gtest/*" \
-                      "$(abs_builddir)/src/wallet/test/*" \
-                      -o $@
+	"$(abs_builddir)/depends/$(BUILD)/include/*.h" \
+	"$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
+	"$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
+	"$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
+	"$(abs_builddir)/src/gtest/*" \
+	"$(abs_builddir)/src/test/*" \
+	"$(abs_builddir)/src/wallet/gtest/*" \
+	"$(abs_builddir)/src/wallet/test/*" \
+	-o $@
 else
 block_test_filtered.info: block_test.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
-                      "$(abs_builddir)/src/gtest/*" \
-                      "$(abs_builddir)/src/test/*" \
-                      "$(abs_builddir)/src/wallet/gtest/*" \
-                      "$(abs_builddir)/src/wallet/test/*" \
-                      -o $@
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
+	"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
+	"$(abs_builddir)/src/gtest/*" \
+	"$(abs_builddir)/src/test/*" \
+	"$(abs_builddir)/src/wallet/gtest/*" \
+	"$(abs_builddir)/src/wallet/test/*" \
+	-o $@
 endif

 test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
-       $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@

 if ! BUILD_DARWIN
 zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info
@@ -299,7 +304,7 @@ endif

 if BUILD_DARWIN
 total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info
-  $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 else
 total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info
 	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
@@ -307,19 +312,19 @@ endif


 test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
-       $(GENHTML) -s $< -o $(@D)
-       @touch $@
+	$(GENHTML) -s $< -o $(@D)
+	@touch $@

 if TARGET_DARWIN
 zcash-gtest.coverage/.dirstamp:  zcash-gtest_coverage.info
-  $(GENHTML) -s $< -o $(@D)
-  @touch $@
+	$(GENHTML) -s $< -o $(@D)
+	@touch $@
 cov-zcash: zcash-gtest.coverage/.dirstamp
 endif

 total.coverage/.dirstamp: total_coverage.info
-       $(GENHTML) -s $< -o $(@D)
-       @touch $@
+	$(GENHTML) -s $< -o $(@D)
+	@touch $@

 if BUILD_DARWIN
 cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp