0.4.9 onto master (#71)

* mergine latest changes

* removing circle ci batch

* adding travis ci integration

* adding badge

* small change to kickoff build

* Update .travis.yml

* fexit fix

* some more price changes

* updating miner.cpp

* updateing build status to match branch

* mining on testnet

.gitignore

@@ -1,8 +1,16 @@
+configure
+config.log
+config.status
+libtool
 src/*.exe
 src/yacoin
 src/yacoind
 src/test_yacoin
 src/build.h
+src/miniupnpc
+utils/sw
+utils/stage
+utils/downloads
 .*.swp
 *.*~*
 *.bak
@@ -23,3 +31,27 @@ qrc_*.cpp
 .DS_Store
 build
 README.md
+.genjane
+.genleveldb
+yacoind-*
+autom4te.cache
+.deps
+.dirstamp
+Makefile.in
+src/config/bitcoin-config.h
+src/config/bitcoin-config.h.in
+src/config/stamp-h1
+src/qt/forms/ui*.h
+src/yacoin_test
+src/log.0000000*1
+log.000*1
+src/qt/*moc
+.vscode/*
+src/libyacoin_common.a
+src/qt/libbitcoinqt.a
+src/qt/moc_*
+release/yacoin-qt.exe
+Makefile.Debug
+Makefile.release
+object_script.yacoin-qt.Debug
+object_script.yacoin-qt.Release

.gitlab-ci.yml

@@ -0,0 +1,8 @@
+stages:
+  - build
+
+buildwindows:
+  stage: build
+  script:
+    - cd utils
+    - c:\git\bin\bash.exe --login -i -- build.sh > buildlog.log 2>&1

.travis.yml

@@ -0,0 +1,36 @@
+sudo: required
+dist: trusty
+os: linux
+language: minimal
+cache:
+  directories:
+  - depends/built
+  - depends/sdk-sources
+  - $HOME/.ccache
+
+git:
+  depth: false
+
+install:
+  - travis_retry sudo apt-get update
+  - travis_retry sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils python3 -y
+  - travis_retry sudo apt-get install libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev -y
+  - travis_retry sudo apt-get install software-properties-common -y
+  - travis_retry sudo add-apt-repository ppa:bitcoin/bitcoin -y
+  - travis_retry sudo apt-get update
+  - travis_retry sudo apt-get install libdb4.8-dev libdb4.8++-dev -y
+  - travis_retry sudo apt-get install libminiupnpc-dev -y
+  - travis_retry sudo apt-get install libzmq3-dev -y
+  - travis_retry sudo apt-get install libqt4-dev libprotobuf-dev protobuf-compiler -y
+  - travis_retry sudo apt-get install libqrencode-dev -y
+  - travis_retry sudo apt-get install git -y
+  - travis_retry sudo apt-get install ca-certificates -y
+  - echo "Done"
+
+script: 
+  - ./autogen.sh
+  - ./configure --enable-tests 
+  - make           
+  - cd src
+  - mkdir unittestresults
+  - ./yacoin_test > ./unittestresults/unittestresults.txt

Makefile.am

@@ -0,0 +1,206 @@
+ACLOCAL_AMFLAGS = -I build-aux/m4
+SUBDIRS = src
+.PHONY: deploy FORCE
+
+# GZIP_ENV="-9n"
+
+BITCOIND_BIN=$(top_builddir)/src/yacoind$(EXEEXT)
+BITCOIN_QT_BIN=$(top_builddir)/src/qt/yacoin-qt$(EXEEXT)
+BITCOIN_TEST_BIN=$(top_builddir)/src/test/yacoin_test$(EXEEXT)
+# BITCOIN_CLI_BIN=$(top_builddir)/src/yacoin-cli$(EXEEXT)
+# BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
+
+# OSX_APP=yacoin-Qt.app
+# OSX_DMG=yacoin-Qt.dmg
+# OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
+# OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
+# OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
+# OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
+# OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
+
+DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
+
+# WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
+#   $(top_srcdir)/share/pixmaps/nsis-header.bmp \
+#   $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
+#   $(top_srcdir)/doc/README_windows.txt
+
+# OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
+#   $(top_srcdir)/contrib/macdeploy/background.png \
+#   $(top_srcdir)/contrib/macdeploy/DS_Store \
+#   $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
+#   $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
+
+# 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
+
+dist-hook:
+	-$(MAKE) -C $(top_distdir)/src/leveldb clean
+# -$(MAKE) -C $(top_distdir)/src/secp256k1 distclean
+# -$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
+
+distcheck-hook:
+	$(MKDIR_P) $(top_distdir)/_build/src/leveldb
+	cp -rf $(top_srcdir)/src/leveldb/* $(top_distdir)/_build/src/leveldb/
+	-$(MAKE) -C $(top_distdir)/_build/src/leveldb clean
+
+# distcleancheck:
+# 	@:
+
+# $(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_QT_BIN) $(top_builddir)/release
+# 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
+# 	@test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
+# 	  echo error: could not build $@
+
+$(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE
+	$(MAKE) -C src $(patsubst src/%,%,$@)
+
+# $(OSX_APP)/Contents/PkgInfo:
+# 	$(MKDIR_P) $(@D)
+# 	@echo "APPL????" > $@
+
+# $(OSX_APP)/Contents/Resources/empty.lproj:
+# 	$(MKDIR_P) $(@D)
+# 	@touch $@
+
+# $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
+# 	$(MKDIR_P) $(@D)
+# 	$(INSTALL_DATA) $< $@
+
+# $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
+# 	$(MKDIR_P) $(@D)
+# 	$(INSTALL_DATA) $< $@
+
+# $(OSX_APP)/Contents/MacOS/yacoin-Qt: $(BITCOIN_QT_BIN)
+# 	$(MKDIR_P) $(@D)
+# 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $< $@
+
+# 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/yacoin-Qt
+
+if BUILD_DARWIN
+# $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
+# 	$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
+
+# deploydir: $(OSX_DMG)
+else
+APP_DIST_DIR=$(top_builddir)/dist
+# APP_DIST_EXTRAS=$(APP_DIST_DIR)/.background/background.png $(APP_DIST_DIR)/.DS_Store $(APP_DIST_DIR)/Applications
+
+$(APP_DIST_DIR)/Applications:
+	@rm -f $@
+	@cd $(@D); $(LN_S) /Applications $(@F)
+
+# $(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/yacoin-Qt
+
+# $(OSX_DMG): $(APP_DIST_EXTRAS)
+# 	$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "yacoin-Qt" -no-pad -r -apple -o $@ dist
+
+# $(APP_DIST_DIR)/.background/background.png:
+# 	$(MKDIR_P) $(@D)
+# 	$(INSTALL) $(top_srcdir)/contrib/macdeploy/background.png $@
+# $(APP_DIST_DIR)/.DS_Store:
+#   $(INSTALL) $(top_srcdir)/contrib/macdeploy/DS_Store $@
+
+# $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/yacoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
+#	 INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
+
+deploydir: $(APP_DIST_EXTRAS)
+endif
+
+# if TARGET_DARWIN
+# appbundle: $(OSX_APP_BUILT)
+# deploy: $(OSX_DMG)
+# endif
+# if TARGET_WINDOWS
+# deploy: $(BITCOIN_WIN_INSTALLER)
+# endif
+
+$(BITCOIN_QT_BIN): FORCE
+	$(MAKE) -C src qt/$(@F)
+
+$(BITCOIND_BIN): FORCE
+	$(MAKE) -C src $(@F)
+
+$(BITCOIN_TEST_BIN): FORCE
+	$(MAKE) -C src $(@F)
+
+# $(BITCOIN_CLI_BIN): FORCE
+# 	$(MAKE) -C src $(@F)
+
+# if USE_LCOV
+
+# baseline.info:
+# 	$(LCOV) -c -i -d $(abs_builddir)/src -o $@
+
+# baseline_filtered.info: baseline.info
+# 	$(LCOV) -r $< "/usr/include/*" -o $@
+
+# leveldb_baseline.info: baseline_filtered.info
+# 	$(LCOV) -c -i -d $(abs_builddir)/src/leveldb -b $(abs_builddir)/src/leveldb -o $@
+
+# leveldb_baseline_filtered.info: leveldb_baseline.info
+# 	$(LCOV) -r $< "/usr/include/*" -o $@
+
+# baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
+# 	$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@
+
+# test_bitcoin.info: baseline_filtered_combined.info
+# 	$(MAKE) -C src/ check
+# 	$(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@
+# 	$(LCOV) -z -d $(abs_builddir)/src
+# 	$(LCOV) -z -d $(abs_builddir)/src/leveldb
+
+# test_bitcoin_filtered.info: test_bitcoin.info
+# 	$(LCOV) -r $< "/usr/include/*" -o $@
+
+# block_test.info: test_bitcoin_filtered.info
+# 	$(MKDIR_P) qa/tmp
+# 	-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
+# 	$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
+# 	$(LCOV) -z -d $(abs_builddir)/src
+# 	$(LCOV) -z -d $(abs_builddir)/src/leveldb
+
+# block_test_filtered.info: block_test.info
+# 	$(LCOV) -r $< "/usr/include/*" -o $@
+
+# 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 $@
+
+# total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info
+# 	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
+
+# test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
+# 	$(GENHTML) -s $< -o $(@D)
+# 	@touch $@
+
+# total.coverage/.dirstamp: total_coverage.info
+# 	$(GENHTML) -s $< -o $(@D)
+# 	@touch $@
+
+# cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
+
+# endif
+
+# if USE_COMPARISON_TOOL
+# check-local:
+# 	$(MKDIR_P) qa/tmp
+# 	@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
+# endif
+
+dist_noinst_SCRIPTS = autogen.sh
+
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
+
+# CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
+
+.INTERMEDIATE: $(COVERAGE_INFO)
+
+clean-local:
+	rm -rf test_bitcoin.coverage/ total.coverage/ $(OSX_APP)

README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/yacoin/yacoin.svg?branch=0.4.9)](https://travis-ci.org/yacoin/yacoin)
 YACoin Official Development Tree.
 
 Many thanks to WindMaster for initially setting up this repository to continue development and promotion of YACoin after the original developer, GitHub user pocopoco, went paka paka. Due to community feedback and the need for an updated and stable client, this is now the official YACoin Development Tree.