diff --git a/.gitignore b/.gitignore index 4c4eff37db99..5ad8fa1e1536 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,10 @@ src/bitcoin-cli src/bitcoin-tx src/test/test_bitcoin src/qt/test/test_bitcoin-qt +src/omnicored +src/omnicore-cli +src/test/test_omnicore +src/qt/test/test_omnicore-qt # autoreconf Makefile.in @@ -35,6 +39,9 @@ src/config/stamp-h1 share/setup.nsi share/qt/Info.plist +# Omni Core Windows installer script +src/omnicore/res/omnicore-setup-win.nsi + src/univalue/gen src/qt/*.moc @@ -76,10 +83,13 @@ src/qt/test/moc*.cpp Makefile bitcoin-qt Bitcoin-Qt.app +omnicore-qt +OmniCore-Qt.app # Unit-tests Makefile.test bitcoin-qt_test +omnicore-qt_test src/test/buildenv.py # Resources cpp diff --git a/.travis.yml b/.travis.yml index 46adea50ab4d..410a12d930e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,8 +91,8 @@ before_script: - depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh - ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) - - make distdir PACKAGE=bitcoin VERSION=$HOST - - cd bitcoin-$HOST + - make distdir PACKAGE=omnicore VERSION=$HOST + - cd omnicore-$HOST - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) script: - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false ) diff --git a/Makefile.am b/Makefile.am index aa6b0da2cd33..2e7e6814382d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,20 +4,23 @@ SUBDIRS = src GZIP_ENV="-9n" -BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT) -BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT) -BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT) +BITCOIND_BIN=$(top_builddir)/src/omnicored$(EXEEXT) +BITCOIN_QT_BIN=$(top_builddir)/src/qt/omnicore-qt$(EXEEXT) +BITCOIN_CLI_BIN=$(top_builddir)/src/omnicore-cli$(EXEEXT) BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) -OSX_APP=Bitcoin-Qt.app -OSX_DMG=Bitcoin-Qt.dmg +OSX_APP=OmniCore-Qt.app +OSX_DMG=OmniCore-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) +DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md) \ + $(wildcard src/omnicore/*.md) \ + $(wildcard src/omnicore/doc/*.md) \ + $(wildcard src/omnicore/doc/release-notes/*.md) WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \ $(top_srcdir)/share/pixmaps/nsis-header.bmp \ @@ -53,7 +56,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive 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) -V2 $(top_builddir)/share/setup.nsi || \ + @test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/src/omnicore/res/omnicore-setup-win.nsi || \ echo error: could not build $@ @echo built $@ @@ -76,13 +79,13 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN) +$(OSX_APP)/Contents/MacOS/OmniCore-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/Bitcoin-Qt + $(OSX_APP)/Contents/MacOS/OmniCore-Qt if BUILD_DARWIN $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) @@ -97,10 +100,10 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/OmniCore-Qt $(OSX_DMG): $(APP_DIST_EXTRAS) - $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist + $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "OmniCore-Qt" -no-pad -r -apple -o $@ dist $(APP_DIST_DIR)/.background/background.png: $(MKDIR_P) $(@D) @@ -108,7 +111,7 @@ $(APP_DIST_DIR)/.background/background.png: $(APP_DIST_DIR)/.DS_Store: $(INSTALL) $(top_srcdir)/contrib/macdeploy/DS_Store $@ -$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/OmniCore-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) @@ -150,7 +153,7 @@ baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtere test_bitcoin.info: baseline_filtered_combined.info $(MAKE) -C src/ check - $(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@ + $(LCOV) -c -d $(abs_builddir)/src -t test_omnicore -o $@ $(LCOV) -z -d $(abs_builddir)/src $(LCOV) -z -d $(abs_builddir)/src/leveldb diff --git a/README.md b/README.md index 9e34258ba421..832306496593 100644 --- a/README.md +++ b/README.md @@ -138,11 +138,11 @@ Related projects: * https://github.com/OmniLayer/OmniJ -* https://github.com/mastercoin-MSC/omniwallet +* https://github.com/OmniLayer/omniwallet -* https://github.com/mastercoin-MSC/spec +* https://github.com/OmniLayer/spec Support: -------- -* Open a [GitHub issue] (https://github.com/OmniLayer/omnicore/issues) to file a bug submission. +* Please open a [GitHub issue] (https://github.com/OmniLayer/omnicore/issues) to file a bug submission. diff --git a/configure.ac b/configure.ac index 579035f59a1d..d959d59a2a58 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,12 @@ define(_CLIENT_VERSION_REVISION, 2) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) -AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin]) +define(_OMNICORE_VERSION_MILESTONE, 0) +define(_OMNICORE_VERSION_MAJOR, 0) +define(_OMNICORE_VERSION_MINOR, 10) +define(_OMNICORE_VERSION_PATCH, 0) +define(_OMNICORE_VERSION_STATUS, dev) +AC_INIT([Omni Core],[_OMNICORE_VERSION_MILESTONE._OMNICORE_VERSION_MAJOR._OMNICORE_VERSION_MINOR._OMNICORE_VERSION_PATCH-_OMNICORE_VERSION_STATUS],[https://github.com/OmniLayer/omnicore/issues],[omnicore],[http://www.omnilayer.org/]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) @@ -173,7 +178,7 @@ CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_ AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build bitcoin-cli bitcoin-tx (default=yes)])], + [build omnicore-cli bitcoin-tx (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -185,7 +190,7 @@ AC_ARG_WITH([libs], AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], - [build bitcoind daemon (default=yes)])], + [build omnicore daemon (default=yes)])], [build_bitcoind=$withval], [build_bitcoind=yes]) @@ -711,11 +716,11 @@ LIBS="$LIBS_TEMP" BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) -AC_MSG_CHECKING([whether to build bitcoind]) +AC_MSG_CHECKING([whether to build omnicored]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) +AC_MSG_CHECKING([whether to build utils (omnicore-cli bitcoin-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) @@ -815,7 +820,7 @@ if test x$bitcoin_enable_qt != xno; then AC_MSG_WARN("xgettext is required to update qt translations") fi - AC_MSG_CHECKING([whether to build test_bitcoin-qt]) + AC_MSG_CHECKING([whether to build test_omnicore-qt]) if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="test" @@ -824,7 +829,7 @@ if test x$bitcoin_enable_qt != xno; then fi fi -AC_MSG_CHECKING([whether to build test_bitcoin]) +AC_MSG_CHECKING([whether to build test_omnicore]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="test" @@ -870,6 +875,17 @@ AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD) AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE) AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR) +AC_DEFINE(OMNICORE_VERSION_MILESTONE, _OMNICORE_VERSION_MILESTONE, [Omni Core milestone]) +AC_DEFINE(OMNICORE_VERSION_MAJOR, _OMNICORE_VERSION_MAJOR, [Omni Core major version]) +AC_DEFINE(OMNICORE_VERSION_MINOR, _OMNICORE_VERSION_MINOR, [Omni Core minor version]) +AC_DEFINE(OMNICORE_VERSION_PATCH, _OMNICORE_VERSION_PATCH, [Omni Core patch version]) +AC_DEFINE(OMNICORE_VERSION_STATUS, _OMNICORE_VERSION_STATUS, [Omni Core release status]) +AC_SUBST(OMNICORE_VERSION_MILESTONE, _OMNICORE_VERSION_MILESTONE) +AC_SUBST(OMNICORE_VERSION_MAJOR, _OMNICORE_VERSION_MAJOR) +AC_SUBST(OMNICORE_VERSION_MINOR, _OMNICORE_VERSION_MINOR) +AC_SUBST(OMNICORE_VERSION_PATCH, _OMNICORE_VERSION_PATCH) +AC_SUBST(OMNICORE_VERSION_STATUS, _OMNICORE_VERSION_STATUS) + AC_SUBST(RELDFLAGS) AC_SUBST(LIBTOOL_APP_LDFLAGS) AC_SUBST(USE_UPNP) @@ -883,6 +899,7 @@ AC_SUBST(BUILD_TEST_QT) AC_SUBST(MINIUPNPC_CPPFLAGS) AC_SUBST(MINIUPNPC_LIBS) AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py]) +AC_CONFIG_FILES([src/omnicore/res/omnicore-setup-win.nsi]) AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh]) AC_CONFIG_FILES([qa/pull-tester/tests-config.sh],[chmod +x qa/pull-tester/tests-config.sh]) diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 061b897d2a2c..84999241684c 100644 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -20,7 +20,7 @@ Sanity checks: Once you've got the right hardware and software: - git clone git://github.com/bitcoin/bitcoin.git + git clone git://github.com/OmniLayer/omnicore.git git clone git://github.com/devrandom/gitian-builder.git mkdir gitian-builder/inputs cd gitian-builder/inputs @@ -62,5 +62,5 @@ Here's a description of Gavin's setup on OSX 10.6: 5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above: export USE_LXC=1 - git clone git://github.com/bitcoin/bitcoin.git + git clone git://github.com/OmniLayer/omnicore.git ... etc diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 80de6770c5f7..bbc86f2992cd 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-linux-0.10" +name: "omnicore-linux-0.10" enable_cache: true suites: - "precise" @@ -17,8 +17,8 @@ packages: - "binutils-gold" reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/OmniLayer/omnicore.git" + "dir": "omnicore" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -62,7 +62,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd omnicore BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -73,13 +73,13 @@ script: | ./autogen.sh ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo omnicore-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find omnicore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index 1792f9de3f57..c3420e2174e3 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-dmg-signer" +name: "omnicore-dmg-signer" suites: - "precise" architectures: @@ -10,7 +10,7 @@ packages: reference_datetime: "2013-06-01 00:00:00" remotes: [] files: -- "bitcoin-osx-unsigned.tar.gz" +- "omnicore-osx-unsigned.tar.gz" - "signature.tar.gz" script: | WRAP_DIR=$HOME/wrapped @@ -28,10 +28,10 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=bitcoin-osx-unsigned.tar.gz - SIGNED=bitcoin-osx-signed.dmg + UNSIGNED=omnicore-osx-unsigned.tar.gz + SIGNED=omnicore-osx-signed.dmg tar -xf ${UNSIGNED} ./detached-sig-apply.sh ${UNSIGNED} signature.tar.gz - ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o uncompressed.dmg signed-app + ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "OmniCore-Qt" -no-pad -r -apple -o uncompressed.dmg signed-app ${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED} diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index c09786a56ce6..500eaf59ad3d 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-osx-0.10" +name: "omnicore-osx-0.10" enable_cache: true suites: - "precise" @@ -20,8 +20,8 @@ packages: - "libbz2-dev" reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/OmniLayer/omnicore.git" + "dir": "omnicore" files: - "MacOSX10.7.sdk.tar.gz" script: | @@ -68,7 +68,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd omnicore BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs @@ -83,14 +83,14 @@ script: | ./autogen.sh ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo omnicore-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find omnicore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" @@ -120,7 +120,7 @@ script: | popd make deploy - ${WRAP_DIR}/dmg dmg Bitcoin-Qt.dmg ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg + ${WRAP_DIR}/dmg dmg OmniCore-Qt.dmg ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg cd installed find . -name "lib*.la" -delete diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index f0459ee9461d..ee36f6754ddc 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-win-0.10" +name: "omnicore-win-0.10" enable_cache: true suites: - "precise" @@ -20,8 +20,8 @@ packages: - "zip" reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/OmniLayer/omnicore.git" + "dir": "omnicore" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -65,7 +65,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd omnicore BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -76,14 +76,14 @@ script: | ./autogen.sh ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo omnicore-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find omnicore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" @@ -100,7 +100,7 @@ script: | make ${MAKEOPTS} make deploy make install-strip - cp -f bitcoin-*setup*.exe $OUTDIR/ + cp -f omnicore-*setup*.exe $OUTDIR/ cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 0aa57b477713..27b00397e21a 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -11,5 +11,5 @@ This script should not be run manually, instead, after building as usual: During the process, the disk image window will pop up briefly where the fancy settings are applied. This is normal, please do not interfere. -When finished, it will produce `Bitcoin-Qt.dmg`. +When finished, it will produce `OmniCore-Qt.dmg`. diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index e73b9b697ef9..baba0c27607a 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Bitcoin-Qt.app + OmniCore-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 541136001fce..fb96508cb599 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -156,7 +156,7 @@ class ApplicationBundleInfo(object): def __init__(self, path): self.path = path appName = os.path.splitext(os.path.basename(path))[0] - self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) + self.binaryPath = os.path.join(path, "Contents", "MacOS", "OmniCore-Qt") if not os.path.exists(self.binaryPath): raise RuntimeError("Could not find bundle binary for " + path) self.resourcesPath = os.path.join(path, "Contents", "Resources") @@ -836,7 +836,7 @@ if config.dmg is not None: items_positions.append(itemscript.substitute(params)) params = { - "disk" : "Bitcoin-Qt", + "disk" : "OmniCore-Qt", "window_bounds" : "300,300,800,620", "icon_size" : "96", "background_commands" : "", diff --git a/doc/omnicore.md b/doc/omnicore.md new file mode 100644 index 000000000000..3ceeaf1f6cea --- /dev/null +++ b/doc/omnicore.md @@ -0,0 +1 @@ +Omni Core related documentation is available in: [src/omnicore/doc](../src/omnicore/doc) diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index 036ed29f6429..bf1daba2208e 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -10,7 +10,7 @@ touch "$DATADIR/regtest/debug.log" tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr 10000 + $$ % 55536` -"@abs_top_builddir@/src/bitcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -txindex=1 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & +"@abs_top_builddir@/src/omnicored@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -txindex=1 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & BITCOIND=$! #Install a watchdog. diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in index 10f4d33e47cf..cd812c50a29c 100755 --- a/qa/pull-tester/tests-config.sh.in +++ b/qa/pull-tester/tests-config.sh.in @@ -11,6 +11,6 @@ EXEEXT="@EXEEXT@" @BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 -REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" -REAL_BITCOINCLI="$BUILDDIR/src/bitcoin-cli${EXEEXT}" +REAL_BITCOIND="$BUILDDIR/src/omnicored${EXEEXT}" +REAL_BITCOINCLI="$BUILDDIR/src/omnicore-cli${EXEEXT}" diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index dd6edde8d285..132739293fbd 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -17,19 +17,19 @@ APPL CFBundleGetInfoString - @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers + @OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@-@OMNICORE_VERSION_STATUS@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers and the Omni Core developers CFBundleShortVersionString - @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@ + @OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@ CFBundleVersion - @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@ + @OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@ CFBundleSignature ???? CFBundleExecutable - Bitcoin-Qt + OmniCore-Qt CFBundleIdentifier org.bitcoinfoundation.Bitcoin-Qt diff --git a/src/Makefile.am b/src/Makefile.am index a43b2c0412f2..ae295e2341a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,11 +60,11 @@ bin_PROGRAMS = TESTS = if BUILD_BITCOIND - bin_PROGRAMS += bitcoind + bin_PROGRAMS += omnicored endif if BUILD_BITCOIN_UTILS - bin_PROGRAMS += bitcoin-cli bitcoin-tx + bin_PROGRAMS += omnicore-cli bitcoin-tx endif .PHONY: FORCE @@ -291,7 +291,7 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # bitcoind binary # -bitcoind_LDADD = \ +omnicored_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UNIVALUE) \ @@ -302,31 +302,31 @@ bitcoind_LDADD = \ $(LIBSECP256K1) if ENABLE_WALLET -bitcoind_LDADD += libbitcoin_wallet.a +omnicored_LDADD += libbitcoin_wallet.a endif -bitcoind_SOURCES = bitcoind.cpp +omnicored_SOURCES = bitcoind.cpp # if TARGET_WINDOWS -bitcoind_SOURCES += bitcoind-res.rc +omnicored_SOURCES += omnicore/res/omnicored-res.rc endif -bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) -bitcoind_CPPFLAGS = $(BITCOIN_INCLUDES) -bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +omnicored_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) +omnicored_CPPFLAGS = $(BITCOIN_INCLUDES) +omnicored_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) # bitcoin-cli binary # -bitcoin_cli_LDADD = \ +omnicore_cli_LDADD = \ $(LIBBITCOIN_CLI) \ $(LIBBITCOIN_UTIL) \ $(BOOST_LIBS) \ $(SSL_LIBS) \ $(CRYPTO_LIBS) -bitcoin_cli_SOURCES = \ +omnicore_cli_SOURCES = \ bitcoin-cli.cpp -bitcoin_cli_CPPFLAGS = $(BITCOIN_INCLUDES) +omnicore_cli_CPPFLAGS = $(BITCOIN_INCLUDES) # # bitcoin-tx binary # @@ -345,9 +345,9 @@ bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES) bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_cli_SOURCES += bitcoin-cli-res.rc +omnicore_cli_SOURCES += omnicore/res/omnicore-cli-res.rc endif -bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +omnicore_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if BUILD_BITCOIN_LIBS include_HEADERS = script/bitcoinconsensus.h diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index b565bd27ebfb..33e768075ea5 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -1,4 +1,4 @@ -bin_PROGRAMS += qt/bitcoin-qt +bin_PROGRAMS += qt/omnicore-qt EXTRA_LIBRARIES += qt/libbitcoinqt.a # bitcoin qt core # @@ -374,7 +374,7 @@ RES_IMAGES = \ RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png) -BITCOIN_RC = qt/res/bitcoin-qt-res.rc +BITCOIN_RC = omnicore/res/omnicore-qt-res.rc BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \ -I$(builddir)/qt/forms @@ -394,7 +394,7 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI: # Most files will depend on the forms and moc files as includes. Generate them # before anything else. $(QT_MOC): $(QT_FORMS_H) -$(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) : | $(QT_MOC) +$(qt_libbitcoinqt_a_OBJECTS) $(qt_omnicore_qt_OBJECTS) : | $(QT_MOC) #Generating these with a half-written protobuf header leads to wacky results. #This makes sure it's done. @@ -402,24 +402,24 @@ $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) # bitcoin-qt binary # -qt_bitcoin_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_omnicore_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_bitcoin_qt_SOURCES = qt/bitcoin.cpp +qt_omnicore_qt_SOURCES = qt/bitcoin.cpp if TARGET_DARWIN - qt_bitcoin_qt_SOURCES += $(BITCOIN_MM) + qt_omnicore_qt_SOURCES += $(BITCOIN_MM) endif if TARGET_WINDOWS - qt_bitcoin_qt_SOURCES += $(BITCOIN_RC) + qt_omnicore_qt_SOURCES += $(BITCOIN_RC) endif -qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) +qt_omnicore_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_omnicore_qt_LDADD += $(LIBBITCOIN_WALLET) endif -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +qt_omnicore_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) -qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_bitcoin_qt_LIBTOOLFLAGS = --tag CXX +qt_omnicore_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_omnicore_qt_LIBTOOLFLAGS = --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) @@ -449,10 +449,10 @@ CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda CLEANFILES += $(CLEAN_QT) -bitcoin_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) qt/bitcoin-qt$(EXEEXT) $(LIBBITCOINQT) +omnicore_qt_clean: FORCE + rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_omnicore_qt_OBJECTS) qt/omnicore-qt$(EXEEXT) $(LIBBITCOINQT) -bitcoin_qt : qt/bitcoin-qt$(EXEEXT) +omnicore_qt : qt/omnicore-qt$(EXEEXT) ui_%.h: %.ui @test -f $(UIC) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index c5392cf307a5..85d4c88aea62 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -1,5 +1,5 @@ -bin_PROGRAMS += qt/test/test_bitcoin-qt -TESTS += qt/test/test_bitcoin-qt +bin_PROGRAMS += qt/test/test_omnicore-qt +TESTS += qt/test/test_omnicore-qt TEST_QT_MOC_CPP = qt/test/moc_uritests.cpp @@ -12,37 +12,37 @@ TEST_QT_H = \ qt/test/paymentrequestdata.h \ qt/test/paymentservertests.h -qt_test_test_bitcoin_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_test_test_omnicore_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) -qt_test_test_bitcoin_qt_SOURCES = \ +qt_test_test_omnicore_qt_SOURCES = \ qt/test/test_main.cpp \ qt/test/uritests.cpp \ $(TEST_QT_H) if ENABLE_WALLET -qt_test_test_bitcoin_qt_SOURCES += \ +qt_test_test_omnicore_qt_SOURCES += \ qt/test/paymentservertests.cpp endif -nodist_qt_test_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP) +nodist_qt_test_test_omnicore_qt_SOURCES = $(TEST_QT_MOC_CPP) -qt_test_test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) +qt_test_test_omnicore_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_test_test_omnicore_qt_LDADD += $(LIBBITCOIN_WALLET) endif -qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ +qt_test_test_omnicore_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) -qt_test_test_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_test_test_omnicore_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno CLEANFILES += $(CLEAN_BITCOIN_QT_TEST) -test_bitcoin_qt : qt/test/test_bitcoin-qt$(EXEEXT) +test_omnicore_qt : qt/test/test_omnicore-qt$(EXEEXT) -test_bitcoin_qt_check : qt/test/test_bitcoin-qt$(EXEEXT) FORCE +test_omnicore_qt_check : qt/test/test_omnicore-qt$(EXEEXT) FORCE $(MAKE) check-TESTS TESTS=$^ -test_bitcoin_qt_clean: FORCE - rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_bitcoin_qt_OBJECTS) +test_omnicore_qt_clean: FORCE + rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_omnicore_qt_OBJECTS) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 9cc479c3056f..eb0215a59add 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -1,7 +1,7 @@ -TESTS += test/test_bitcoin test/bitcoin-util-test.py -bin_PROGRAMS += test/test_bitcoin +TESTS += test/test_omnicore test/bitcoin-util-test.py +bin_PROGRAMS += test/test_omnicore TEST_SRCDIR = test -TEST_BINARY=test/test_bitcoin$(EXEEXT) +TEST_BINARY=test/test_omnicore$(EXEEXT) EXTRA_DIST += \ @@ -80,18 +80,18 @@ BITCOIN_TESTS += \ test/rpc_wallet_tests.cpp endif -test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) -test_test_bitcoin_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) -test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +test_test_omnicore_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) +test_test_omnicore_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) +test_test_omnicore_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) if ENABLE_WALLET -test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET) +test_test_omnicore_LDADD += $(LIBBITCOIN_WALLET) endif -test_test_bitcoin_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) -test_test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static +test_test_omnicore_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) +test_test_omnicore_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static -nodist_test_test_bitcoin_SOURCES = $(GENERATED_TEST_FILES) +nodist_test_test_omnicore_SOURCES = $(GENERATED_TEST_FILES) $(BITCOIN_TESTS): $(GENERATED_TEST_FILES) @@ -99,13 +99,13 @@ CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES) CLEANFILES += $(CLEAN_BITCOIN_TEST) -bitcoin_test: $(TEST_BINARY) +omnicore_test: $(TEST_BINARY) -bitcoin_test_check: $(TEST_BINARY) FORCE +omnicore_test_check: $(TEST_BINARY) FORCE $(MAKE) check-TESTS TESTS=$^ -bitcoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) +omnicore_test_clean : FORCE + rm -f $(CLEAN_BITCOIN_TEST) $(test_test_omnicore_OBJECTS) $(TEST_BINARY) check-local: $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index ea349b197e5e..e15d94011293 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -67,12 +67,12 @@ static bool AppInitRPC(int argc, char* argv[]) // ParseParameters(argc, argv); if (argc<2 || mapArgs.count("-?") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Bitcoin Core RPC client version") + " " + FormatFullVersion() + "\n"; + std::string strUsage = _("Omni Core RPC client version") + " " + FormatFullVersion() + "\n"; if (!mapArgs.count("-version")) { strUsage += "\n" + _("Usage:") + "\n" + - " bitcoin-cli [options] [params] " + _("Send command to Bitcoin Core") + "\n" + - " bitcoin-cli [options] help " + _("List commands") + "\n" + - " bitcoin-cli [options] help " + _("Get help for a command") + "\n"; + " omnicore-cli [options] [params] " + _("Send command to Omni Core") + "\n" + + " omnicore-cli [options] help " + _("List commands") + "\n" + + " omnicore-cli [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessageCli(); } diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index be7757b0b6ce..84ce4007e206 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -69,7 +69,7 @@ bool AppInit(int argc, char* argv[]) // Process help and version before taking care about datadir if (mapArgs.count("-?") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n"; + std::string strUsage = _("Omni Core daemon") + " " + _("version") + " " + FormatFullVersion() + "\n"; if (mapArgs.count("-version")) { @@ -78,7 +78,7 @@ bool AppInit(int argc, char* argv[]) else { strUsage += "\n" + _("Usage:") + "\n" + - " bitcoind [options] " + _("Start Bitcoin Core Daemon") + "\n"; + " omnicored [options] " + _("Start Omni Core daemon") + "\n"; strUsage += "\n" + HelpMessage(HMM_BITCOIND); } @@ -115,14 +115,14 @@ bool AppInit(int argc, char* argv[]) if (fCommandLine) { - fprintf(stderr, "Error: There is no RPC client functionality in bitcoind anymore. Use the bitcoin-cli utility instead.\n"); + fprintf(stderr, "Error: There is no RPC client functionality in omnicored anymore. Use the omnicore-cli utility instead.\n"); exit(1); } #ifndef WIN32 fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { - fprintf(stdout, "Bitcoin server starting\n"); + fprintf(stdout, "Omni Core server starting\n"); // Daemonize pid_t pid = fork(); diff --git a/src/clientversion.h b/src/clientversion.h index e0bdea60e931..66a6a42ff936 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -38,7 +38,7 @@ #define DO_STRINGIZE(X) #X //! Copyright string used in Windows .rc files -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers" +#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers and Omni Core Developers" /** * bitcoind-res.rc includes this file, but it cannot cope with real c++ code. diff --git a/src/init.cpp b/src/init.cpp index 1c06213dd252..847ef80348da 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -403,7 +403,8 @@ std::string HelpMessage(HelpMessageMode mode) std::string LicenseInfo() { - return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + + return FormatParagraph(strprintf(_("Copyright (C) 2013-%i The Omni Core Developers"), COPYRIGHT_YEAR)) + "\n" + + FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + "\n" + FormatParagraph(_("This is experimental software.")) + "\n" + "\n" + @@ -760,7 +761,7 @@ bool AppInit2(boost::thread_group& threadGroup) // Sanity check if (!InitSanityCheck()) - return InitError(_("Initialization sanity check failed. Bitcoin Core is shutting down.")); + return InitError(_("Initialization sanity check failed. Omni Core is shutting down.")); std::string strDataDir = GetDataDir().string(); #ifdef ENABLE_WALLET @@ -774,7 +775,7 @@ bool AppInit2(boost::thread_group& threadGroup) if (file) fclose(file); static boost::interprocess::file_lock lock(pathLockFile.string().c_str()); if (!lock.try_lock()) - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running."), strDataDir)); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Omni Core is probably already running."), strDataDir)); #ifndef WIN32 CreatePidFile(GetPidFile(), getpid()); #endif @@ -1195,10 +1196,10 @@ bool AppInit2(boost::thread_group& threadGroup) InitWarning(msg); } else if (nLoadWalletRet == DB_TOO_NEW) - strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin Core") << "\n"; + strErrors << _("Error loading wallet.dat: Wallet requires newer version of Omni Core") << "\n"; else if (nLoadWalletRet == DB_NEED_REWRITE) { - strErrors << _("Wallet needed to be rewritten: restart Bitcoin Core to complete") << "\n"; + strErrors << _("Wallet needed to be rewritten: restart Omni Core to complete") << "\n"; LogPrintf("%s", strErrors.str()); return InitError(strErrors.str()); } diff --git a/src/main.cpp b/src/main.cpp index 429a5367e250..85c44f82ca9e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,7 @@ using namespace boost; using namespace std; #if defined(NDEBUG) -# error "Bitcoin cannot be compiled without assertions." +# error "Omni Core cannot be compiled without assertions." #endif /** diff --git a/src/net.cpp b/src/net.cpp index 47221edef6ee..71f0941957b6 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1536,7 +1536,7 @@ bool BindListenPort(const CService &addrBind, string& strError, bool fWhiteliste { int nErr = WSAGetLastError(); if (nErr == WSAEADDRINUSE) - strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core is probably already running."), addrBind.ToString()); + strError = strprintf(_("Unable to bind to %s on this computer. Omni Core is probably already running."), addrBind.ToString()); else strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr)); LogPrintf("%s\n", strError); diff --git a/src/omnicore/COPYING.md b/src/omnicore/COPYING.md new file mode 100644 index 000000000000..909c52cbb124 --- /dev/null +++ b/src/omnicore/COPYING.md @@ -0,0 +1,20 @@ +Copyright (c) 2013-2015 Omni Core Developers +Copyright (c) 2009-2015 Bitcoin Core Developers + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/omnicore/README.md b/src/omnicore/README.md new file mode 100644 index 000000000000..a3a8164a1720 --- /dev/null +++ b/src/omnicore/README.md @@ -0,0 +1,43 @@ +Omni Core (beta) integration/staging tree +========================================= + +[![Build Status](https://travis-ci.org/OmniLayer/omnicore.svg?branch=omnicore-0.0.10)](https://travis-ci.org/OmniLayer/omnicore) + +What is the Omni Layer +---------------------- +The Omni Layer is a communications protocol that uses the Bitcoin block chain to enable features such as smart contracts, user currencies and decentralized peer-to-peer exchanges. A common analogy that is used to describe the relation of the Omni Layer to Bitcoin is that of HTTP to TCP/IP: HTTP, like the Omni Layer, is the application layer to the more fundamental transport and internet layer of TCP/IP, like Bitcoin. + +http://www.omnilayer.org + +What is Omni Core +----------------- + +Omni Core is a fast, portable Omni Layer implementation that is based off the Bitcoin Core codebase (currently 0.10.2). This implementation requires no external dependencies extraneous to Bitcoin Core, and is native to the Bitcoin network just like other Bitcoin nodes. It currently supports a wallet mode and is seamlessly available on three platforms: Windows, Linux and Mac OS. Omni Layer extensions are exposed via the UI and the JSON-RPC interface. Development has been consolidated on the Omni Core product, and it is the reference client for the Omni Layer. + +Disclaimer, warning +------------------- +This software is EXPERIMENTAL software. USE ON MAINNET AT YOUR OWN RISK. + +By default this software will use your existing Bitcoin wallet, including spending bitcoins contained therein (for example for transaction fees or trading). +The protocol and transaction processing rules for the Omni Layer are still under active development and are subject to change in future. +Omni Core should be considered an alpha-level product, and you use it at your own risk. Neither the Omni Foundation nor the Omni Core developers assumes any responsibility for funds misplaced, mishandled, lost, or misallocated. + +Further, please note that this installation of Omni Core should be viewed as EXPERIMENTAL. Your wallet data, bitcoins and Omni Layer tokens may be lost, deleted, or corrupted, with or without warning due to bugs or glitches. Please take caution. + +This software is provided open-source at no cost. You are responsible for knowing the law in your country and determining if your use of this software contravenes any local laws. + +PLEASE DO NOT use wallet(s) with significant amounts of bitcoins or Omni Layer tokens while testing! + +Related projects +---------------- + +* https://github.com/OmniLayer/OmniJ + +* https://github.com/OmniLayer/omniwallet + +* https://github.com/OmniLayer/spec + +Support +------- + +* Please open a [GitHub issue](https://github.com/OmniLayer/omnicore/issues) to file a bug submission. diff --git a/src/omnicore/doc/configuration.md b/src/omnicore/doc/configuration.md new file mode 100644 index 000000000000..f7fa19f1eb7c --- /dev/null +++ b/src/omnicore/doc/configuration.md @@ -0,0 +1,30 @@ +Omni Core configuration +======================= + +Omni Core can be configured via command-line options, or by editing `bitcoin.conf`. + +##### General + + - `-startclean` (boolean, clear persistence files, disabled by default) + +##### Logging + + - `-omnilogfile=file` (string, log file, `omnicore.log` by default) + - `-omnidebug=category` (multi string, enable log categories, can be `all`, `none`) + +##### Transactions + + - `-autocommit` (boolean, create or broadcast transactions, enabled by default) + - `-omnitxcache=n` (number, max. size of input transaction cache, `500000` transactions by default) + - `-datacarrier` and `-datacarriersize` determine whether to use class B (multisig) or class C encoding + +##### Notifications + + - `-omnialertallowsender=source` (multi string, authorize alert senders, can be `any`) + - `-omnialertignoresender=source` (multi string, ignore alert senders) + - `-overrideforcedshutdown` (boolean, overwrite shutdown, triggered by an alert, disabled by default) + +##### UI + + - `-disclaimer` (boolean, explicitly show QT disclaimer on startup, disabled by default) + - `-omniuiwalletscope=n` (number, max. transactions to show in history, `500` by default) diff --git a/src/omnicore/doc/release-notes.md b/src/omnicore/doc/release-notes.md new file mode 100644 index 000000000000..126fdc13a3e3 --- /dev/null +++ b/src/omnicore/doc/release-notes.md @@ -0,0 +1 @@ +Note: this is a temporary file, and shall be updated before a release. \ No newline at end of file diff --git a/src/omnicore/doc/release-notes/release-notes-v0.0.9-rel.md b/src/omnicore/doc/release-notes/release-notes-v0.0.9-rel.md new file mode 100644 index 000000000000..90352a18a172 --- /dev/null +++ b/src/omnicore/doc/release-notes/release-notes-v0.0.9-rel.md @@ -0,0 +1,21 @@ +Master Core version 0.0.9-rel is available from: + +- https://github.com/mastercoin-MSC/mastercore/releases/tag/v0.0.9 + +General +======= + +- This release is consensus critical. You MUST update before block 342650. After block 342650 prior versions WILL provide incorrect data +- This release modifies the schema. You MUST reparse when upgrading (run once with the --startclean option) +- Integrators should regularly poll getinfo_MP for any alerts to ensure they are kept aprised of any urgent issues + +Changelog +========= + +- Mainnet Send To Owners transaction processing is live from block 342650 +- STO support added to listtransactions_MP +- STO RPC calls getsto_MP and sendtoowners_MP added +- Added --startclean option to automate reparsing (removal of MP_ state folders etc) +- Alerting system added including evaluation and shutdown in event of new protocol messages being made live that are unsupported by client +- getinfo_MP RPC call added +- Numerous bugfixes \ No newline at end of file diff --git a/src/omnicore/doc/release-notes/release-notes-v0.0.9.1-rel.md b/src/omnicore/doc/release-notes/release-notes-v0.0.9.1-rel.md new file mode 100644 index 000000000000..eade93358f50 --- /dev/null +++ b/src/omnicore/doc/release-notes/release-notes-v0.0.9.1-rel.md @@ -0,0 +1,66 @@ +Omni Core version 0.0.9.1-rel is available from: + + https://github.com/mastercoin-MSC/mastercore/releases/tag/v0.0.9.1 + +0.0.9.1 is a minor release and not consensus critical. An upgrade is only mandatory if you are using a version prior 0.0.9. + +Please report bugs using the issue tracker at GitHub: + + https://github.com/mastercoin-MSC/mastercore/issues + +IMPORTANT +========= + +- This is the first experimental release of Omni Layer support in the QT UI, please be vigilant with testing and do not risk large amounts of Bitcoin and Omni Layer tokens. +- The transaction index is no longer defaulted to enabled. You will need to ensure you have "txindex=1" (without the quotes) in your configuration file. +- If you are upgrading from a version earlier than 0.0.9-rel you must start with the --startclean parameter at least once to refresh your persistence files. +- The first time Omni Core is run the startup process may take an hour or more as existing Omni Layer transactions are parsed. This is normal and should only be required the first time Omni Core is run. + +Upgrading and downgrading +========================== + +How to Upgrade +-------------- + +If you are running an older version, shut it down. Wait until it has completely shut down (which might take a few minutes for older versions), then copy the new version of mastercored/mastercore-qt. + +If you are upgrading from any version earlier than 0.0.9, the first time you run you must start with the --startclean parameter at least once to refresh your persistence files. + +Downgrading +----------- + +Downgrading is not currently supported as older versions will not provide accurate information. + +Changelog +========= + +General +------- + +- Extra console debugging removed +- Bitcoin 0.10 blockchain detection (will refuse to start if out of order block storage is detected) +- txindex default value now matches Bitcoin Core (false) +- Update authorized alert senders +- Added support for TX70 to RPC output +- Fix missing LOCK of cs_main in selectCoins() +- Versioning code updated + + +UI +-- + +- New signal added for changes to Omni state (emitted from block handler for blocks containing Omni transactions) +- Fix double clicking a transaction in overview does not activate the Bitcoin history tab +- Splash screen updated to reflect new branding +- Fix frame alignment in overview page +- Update send page behaviour and layout per feedback +- Fix column resizing on balances tab +- Right align amounts in balances tab +- Various rebranding to Omni Core +- Rewritten Omni transaction history tab +- Add protection against long labels growing the UI size to ridiculous proportions +- Update signalling to all Omni pages to ensure up to date info +- Override display of Mastercoin metadata for rebrand (RPC unchanged) +- Acknowledgement of disclaimer will now be remembered +- Ecosystem display fixed in property lookup +- Fix intermittent startup freezes due to locks diff --git a/doc/apidocumentation.md b/src/omnicore/doc/rpc-api.md similarity index 100% rename from doc/apidocumentation.md rename to src/omnicore/doc/rpc-api.md diff --git a/src/omnicore/res/omnicore-cli-res.rc b/src/omnicore/res/omnicore-cli-res.rc new file mode 100644 index 000000000000..17ed009b9985 --- /dev/null +++ b/src/omnicore/res/omnicore-cli-res.rc @@ -0,0 +1,36 @@ +#include // needed for VERSIONINFO +#include "../version.h" // Omni Core version information +#include "../../clientversion.h" // Bitcoin Core version information + +#define VER_PRODUCTVERSION OMNICORE_VERSION_MILESTONE,OMNICORE_VERSION_MAJOR,OMNICORE_VERSION_MINOR,OMNICORE_VERSION_PATCH +#define VER_PRODUCTVERSION_STR STRINGIZE(OMNICORE_VERSION_MILESTONE) "." STRINGIZE(OMNICORE_VERSION_MAJOR) "." STRINGIZE(OMNICORE_VERSION_MINOR) "." STRINGIZE(OMNICORE_VERSION_PATCH) "-" STRINGIZE(OMNICORE_VERSION_STATUS) +#define VER_FILEVERSION VER_PRODUCTVERSION +#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // U.S. English - multilingual (hex) + BEGIN + VALUE "CompanyName", "Omni Foundation" + VALUE "FileDescription", "Omni Core CLI (OSS RPC client for Bitcoin and the Omni Layer)" + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", "omnicore-cli" + VALUE "LegalCopyright", COPYRIGHT_STR + VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." + VALUE "OriginalFilename", "omnicore-cli.exe" + VALUE "ProductName", "Omni Core CLI" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal) + END +END diff --git a/src/omnicore/res/omnicore-qt-res.rc b/src/omnicore/res/omnicore-qt-res.rc new file mode 100644 index 000000000000..e5cd4a1d5541 --- /dev/null +++ b/src/omnicore/res/omnicore-qt-res.rc @@ -0,0 +1,39 @@ +#include // needed for VERSIONINFO +#include "../version.h" // Omni Core version information +#include "../../clientversion.h" // Bitcoin Core version information + +IDI_ICON1 ICON DISCARDABLE "../../qt/res/icons/bitcoin.ico" +IDI_ICON2 ICON DISCARDABLE "../../qt/res/icons/bitcoin_testnet.ico" + +#define VER_PRODUCTVERSION OMNICORE_VERSION_MILESTONE,OMNICORE_VERSION_MAJOR,OMNICORE_VERSION_MINOR,OMNICORE_VERSION_PATCH +#define VER_PRODUCTVERSION_STR STRINGIZE(OMNICORE_VERSION_MILESTONE) "." STRINGIZE(OMNICORE_VERSION_MAJOR) "." STRINGIZE(OMNICORE_VERSION_MINOR) "." STRINGIZE(OMNICORE_VERSION_PATCH) "-" STRINGIZE(OMNICORE_VERSION_STATUS) +#define VER_FILEVERSION VER_PRODUCTVERSION +#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // U.S. English - multilingual (hex) + BEGIN + VALUE "CompanyName", "Omni Foundation" + VALUE "FileDescription", "Omni Core (OSS GUI client for Bitcoin and the Omni Layer)" + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", "omnicore-qt" + VALUE "LegalCopyright", COPYRIGHT_STR + VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." + VALUE "OriginalFilename", "omnicore-qt.exe" + VALUE "ProductName", "Omni Core" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal) + END +END diff --git a/src/omnicore/res/omnicore-setup-win.nsi.in b/src/omnicore/res/omnicore-setup-win.nsi.in new file mode 100644 index 000000000000..381c60223ef4 --- /dev/null +++ b/src/omnicore/res/omnicore-setup-win.nsi.in @@ -0,0 +1,182 @@ +Name "@PACKAGE_NAME@ (@WINDOWS_BITS@-bit)" + +RequestExecutionLevel highest +SetCompressor /SOLID lzma + +# General Symbol Definitions +!define REGKEY "SOFTWARE\$(^Name)" +!define PRODUCTVERSION @OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@ +!define VERSION @OMNICORE_VERSION_MILESTONE@.@OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@-@OMNICORE_VERSION_STATUS@ +!define COMPANY "Omni Foundation" +!define URL http://www.omnilayer.org/ + +# MUI Symbol Definitions +!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico" +!define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp" +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_RIGHT +!define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp" +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM +!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY} +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "@PACKAGE_NAME@" +!define MUI_FINISHPAGE_RUN $INSTDIR\omnicore-qt.exe +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp" +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + +# Included files +!include Sections.nsh +!include MUI2.nsh +!if "@WINDOWS_BITS@" == "64" +!include x64.nsh +!endif + +# Variables +Var StartMenuGroup + +# Installer pages +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +# Installer languages +!insertmacro MUI_LANGUAGE English + +# Installer attributes +OutFile @abs_top_srcdir@/omnicore-${VERSION}-win@WINDOWS_BITS@-setup.exe +!if "@WINDOWS_BITS@" == "64" +InstallDir "$PROGRAMFILES64\Omni Core" +!else +InstallDir "$PROGRAMFILES\Omni Core" +!endif +CRCCheck on +XPStyle on +BrandingText " " +ShowInstDetails show +VIProductVersion ${PRODUCTVERSION} +VIAddVersionKey ProductName "Omni Core" +VIAddVersionKey ProductVersion "${VERSION}" +VIAddVersionKey CompanyName "${COMPANY}" +VIAddVersionKey CompanyWebsite "${URL}" +VIAddVersionKey FileVersion "${VERSION}" +VIAddVersionKey FileDescription "" +VIAddVersionKey LegalCopyright "" +InstallDirRegKey HKCU "${REGKEY}" Path +ShowUninstDetails show + +# Installer sections +Section -Main SEC0000 + SetOutPath $INSTDIR + SetOverwrite on + File @abs_top_srcdir@/release/omnicore-qt.exe + File /oname=copying.txt @abs_top_srcdir@/src/omnicore/COPYING.md + File /oname=readme.txt @abs_top_srcdir@/src/omnicore/README.md + File /oname=release-notes.txt @abs_top_srcdir@/src/omnicore/doc/release-notes.md + SetOutPath $INSTDIR\daemon + File @abs_top_srcdir@/release/omnicored.exe + File @abs_top_srcdir@/release/omnicore-cli.exe + SetOutPath $INSTDIR\doc + File /r @abs_top_srcdir@/src/omnicore/doc\*.* + SetOutPath $INSTDIR + WriteRegStr HKCU "${REGKEY}\Components" Main 1 + + # Remove old wxwidgets-based-bitcoin executable and locales: + Delete /REBOOTOK $INSTDIR\omnicore.exe + RMDir /r /REBOOTOK $INSTDIR\locale +SectionEnd + +Section -post SEC0001 + WriteRegStr HKCU "${REGKEY}" Path $INSTDIR + SetOutPath $INSTDIR + WriteUninstaller $INSTDIR\uninstall.exe + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory $SMPROGRAMS\$StartMenuGroup + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\omnicore-qt.exe + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe + !insertmacro MUI_STARTMENU_WRITE_END + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}" + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}" + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}" + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe + WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 + WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 + WriteRegStr HKCR "bitcoin" "URL Protocol" "" + WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin" + WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\omnicore-qt.exe + WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\omnicore-qt.exe" "%1"' +SectionEnd + +# Macro for selecting uninstaller sections +!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID + Push $R0 + ReadRegStr $R0 HKCU "${REGKEY}\Components" "${SECTION_NAME}" + StrCmp $R0 1 0 next${UNSECTION_ID} + !insertmacro SelectSection "${UNSECTION_ID}" + GoTo done${UNSECTION_ID} +next${UNSECTION_ID}: + !insertmacro UnselectSection "${UNSECTION_ID}" +done${UNSECTION_ID}: + Pop $R0 +!macroend + +# Uninstaller sections +Section /o -un.Main UNSEC0000 + Delete /REBOOTOK $INSTDIR\omnicore-qt.exe + Delete /REBOOTOK $INSTDIR\copying.txt + Delete /REBOOTOK $INSTDIR\readme.txt + Delete /REBOOTOK $INSTDIR\release-notes.txt + RMDir /r /REBOOTOK $INSTDIR\daemon + RMDir /r /REBOOTOK $INSTDIR\doc + DeleteRegValue HKCU "${REGKEY}\Components" Main +SectionEnd + +Section -un.post UNSEC0001 + DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" + Delete /REBOOTOK "$SMSTARTUP\Omni Core.lnk" + Delete /REBOOTOK $INSTDIR\uninstall.exe + Delete /REBOOTOK $INSTDIR\debug.log + Delete /REBOOTOK $INSTDIR\db.log + DeleteRegValue HKCU "${REGKEY}" StartMenuGroup + DeleteRegValue HKCU "${REGKEY}" Path + DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components" + DeleteRegKey /IfEmpty HKCU "${REGKEY}" + DeleteRegKey HKCR "bitcoin" + RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup + RmDir /REBOOTOK $INSTDIR + Push $R0 + StrCpy $R0 $StartMenuGroup 1 + StrCmp $R0 ">" no_smgroup +no_smgroup: + Pop $R0 +SectionEnd + +# Installer functions +Function .onInit + InitPluginsDir +!if "@WINDOWS_BITS@" == "64" + ${If} ${RunningX64} + ; disable registry redirection (enable access to 64-bit portion of registry) + SetRegView 64 + ${Else} + MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system." + Abort + ${EndIf} +!endif +FunctionEnd + +# Uninstaller functions +Function un.onInit + ReadRegStr $INSTDIR HKCU "${REGKEY}" Path + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup + !insertmacro SELECT_UNSECTION Main ${UNSEC0000} +FunctionEnd diff --git a/src/omnicore/res/omnicored-res.rc b/src/omnicore/res/omnicored-res.rc new file mode 100644 index 000000000000..7b3aa7f21955 --- /dev/null +++ b/src/omnicore/res/omnicored-res.rc @@ -0,0 +1,36 @@ +#include // needed for VERSIONINFO +#include "../version.h" // Omni Core version information +#include "../../clientversion.h" // Bitcoin Core version information + +#define VER_PRODUCTVERSION OMNICORE_VERSION_MILESTONE,OMNICORE_VERSION_MAJOR,OMNICORE_VERSION_MINOR,OMNICORE_VERSION_PATCH +#define VER_PRODUCTVERSION_STR STRINGIZE(OMNICORE_VERSION_MILESTONE) "." STRINGIZE(OMNICORE_VERSION_MAJOR) "." STRINGIZE(OMNICORE_VERSION_MINOR) "." STRINGIZE(OMNICORE_VERSION_PATCH) "-" STRINGIZE(OMNICORE_VERSION_STATUS) +#define VER_FILEVERSION VER_PRODUCTVERSION +#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // U.S. English - multilingual (hex) + BEGIN + VALUE "CompanyName", "Omni Foundation" + VALUE "FileDescription", "Omni Core daemon (OSS daemon/client for Bitcoin and the Omni Layer)" + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", "omnicored" + VALUE "LegalCopyright", COPYRIGHT_STR + VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." + VALUE "OriginalFilename", "omnicored.exe" + VALUE "ProductName", "Omni Core daemon" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal) + END +END diff --git a/src/omnicore/version.cpp b/src/omnicore/version.cpp index b1836aa57af1..b5aa44ec40e6 100644 --- a/src/omnicore/version.cpp +++ b/src/omnicore/version.cpp @@ -27,21 +27,28 @@ # endif #endif +#ifdef OMNICORE_VERSION_STATUS +# define OMNICORE_VERSION_SUFFIX STRINGIZE(OMNICORE_VERSION_STATUS) +#else +# define OMNICORE_VERSION_SUFFIX "" +#endif + //! Returns formatted Omni Core version, e.g. "0.0.9.1-dev" const std::string OmniCoreVersion() { - // TODO: replace zeros at some point if (OMNICORE_VERSION_PATCH) { - return strprintf("0.0.%d.%d.%d%s", + return strprintf("%d.%d.%d.%d-%s", + OMNICORE_VERSION_MILESTONE, OMNICORE_VERSION_MAJOR, OMNICORE_VERSION_MINOR, OMNICORE_VERSION_PATCH, - OMNICORE_VERSION_TYPE); + OMNICORE_VERSION_SUFFIX); } else { - return strprintf("0.0.%d.%d%s", + return strprintf("%d.%d.%d-%s", + OMNICORE_VERSION_MILESTONE, OMNICORE_VERSION_MAJOR, OMNICORE_VERSION_MINOR, - OMNICORE_VERSION_TYPE); + OMNICORE_VERSION_SUFFIX); } } diff --git a/src/omnicore/version.h b/src/omnicore/version.h index 5ed8fde3b126..c4e7f6ed3b0f 100644 --- a/src/omnicore/version.h +++ b/src/omnicore/version.h @@ -1,26 +1,50 @@ #ifndef OMNICORE_VERSION_H #define OMNICORE_VERSION_H -#include +#if defined(HAVE_CONFIG_H) +#include "config/bitcoin-config.h" +#else + +// +// Omni Core version information are also to be defined in configure.ac. +// +// During the configuration, this information are used for other places. +// + +// Even greater than major versions +#define OMNICORE_VERSION_MILESTONE 0 // Increase with every consensus affecting change -#define OMNICORE_VERSION_MAJOR 10 +#define OMNICORE_VERSION_MAJOR 10 // Increase with every non-consensus affecting feature -#define OMNICORE_VERSION_MINOR 0 +#define OMNICORE_VERSION_MINOR 0 // Increase with every patch, which is not a feature or consensus affecting -#define OMNICORE_VERSION_PATCH 0 +#define OMNICORE_VERSION_PATCH 0 + +// Use "dev" for development versions, switch to "rc" for release candidates +#define OMNICORE_VERSION_STATUS dev + -// Use "-dev" for development versions, switch to "-rel" for tags -#define OMNICORE_VERSION_TYPE "-dev" +#endif // HAVE_CONFIG_H +#if !defined(WINDRES_PREPROC) + +// +// *-res.rc includes this file, but it cannot cope with real c++ code. +// WINDRES_PREPROC is defined to indicate that its pre-processor is running. +// Anything other than a define should be guarded below: +// + +#include //! Omni Core client version static const int OMNICORE_VERSION = - + 100000 * OMNICORE_VERSION_MAJOR - + 100 * OMNICORE_VERSION_MINOR - + 1 * OMNICORE_VERSION_PATCH; + + 100000000 * OMNICORE_VERSION_MILESTONE + + 100000 * OMNICORE_VERSION_MAJOR + + 100 * OMNICORE_VERSION_MINOR + + 1 * OMNICORE_VERSION_PATCH; //! Returns formatted Omni Core version, e.g. "0.0.9.1-dev" const std::string OmniCoreVersion(); @@ -35,4 +59,6 @@ const std::string BuildDate(); const std::string BuildCommit(); +#endif // WINDRES_PREPROC + #endif // OMNICORE_VERSION_H diff --git a/src/qt/Makefile b/src/qt/Makefile index b9dcf0c59922..c84b36c91b26 100644 --- a/src/qt/Makefile +++ b/src/qt/Makefile @@ -1,9 +1,9 @@ .PHONY: FORCE all: FORCE - $(MAKE) -C .. bitcoin_qt test_bitcoin_qt + $(MAKE) -C .. omnicore_qt test_omnicore_qt clean: FORCE - $(MAKE) -C .. bitcoin_qt_clean test_bitcoin_qt_clean + $(MAKE) -C .. omnicore_qt_clean test_omnicore_qt_clean check: FORCE - $(MAKE) -C .. test_bitcoin_qt_check -bitcoin-qt bitcoin-qt.exe: FORCE - $(MAKE) -C .. bitcoin_qt + $(MAKE) -C .. test_omnicore_qt_check +omnicore-qt omnicore-qt.exe: FORCE + $(MAKE) -C .. omnicore_qt diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index fa9ac6b135cb..f1f165b761dd 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -119,7 +119,7 @@ void AskPassphraseDialog::accept() { QMessageBox::warning(this, tr("Wallet encrypted"), "" + - tr("Bitcoin will close now to finish the encryption process. " + tr("Omni Core will close now to finish the encryption process. " "Remember that encrypting your wallet cannot fully protect " "your bitcoins from being stolen by malware infecting your computer.") + "

" + diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 2e3935662f39..0cec93ceb5a7 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -314,8 +314,8 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) quitAction->setStatusTip(tr("Quit application")); quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); quitAction->setMenuRole(QAction::QuitRole); - aboutAction = new QAction(networkStyle->getAppIcon(), tr("&About Bitcoin Core"), this); - aboutAction->setStatusTip(tr("Show information about Bitcoin Core")); + aboutAction = new QAction(networkStyle->getAppIcon(), tr("&About Omni Core"), this); + aboutAction->setStatusTip(tr("Show information about Omni Core")); aboutAction->setMenuRole(QAction::AboutRole); #if QT_VERSION < 0x050000 aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this); @@ -354,7 +354,7 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) openAction->setStatusTip(tr("Open a bitcoin: URI or payment request")); showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this); - showHelpMessageAction->setStatusTip(tr("Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options")); + showHelpMessageAction->setStatusTip(tr("Show the Omni Core help message to get a list with possible command-line options")); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); @@ -528,7 +528,7 @@ void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle) { #ifndef Q_OS_MAC trayIcon = new QSystemTrayIcon(this); - QString toolTip = tr("Bitcoin Core client") + " " + networkStyle->getTitleAddText(); + QString toolTip = tr("Omni Core client") + " " + networkStyle->getTitleAddText(); trayIcon->setToolTip(toolTip); trayIcon->setIcon(networkStyle->getAppIcon()); trayIcon->show(); @@ -806,7 +806,7 @@ void BitcoinGUI::setNumBlocks(int count) void BitcoinGUI::message(const QString &title, const QString &message, unsigned int style, bool *ret) { - QString strTitle = tr("Bitcoin"); // default title + QString strTitle = tr("Omni Core"); // default title // Default to information icon int nMBoxIcon = QMessageBox::Information; int nNotifyIcon = Notificator::Information; diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 902f34c69ee1..f50e591d03f1 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -586,7 +586,7 @@ TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* t #ifdef WIN32 boost::filesystem::path static StartupShortcutPath() { - return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin.lnk"; + return GetSpecialFolderPath(CSIDL_STARTUP) / "Omni Core.lnk"; } bool GetStartOnSystemStartup() @@ -668,7 +668,7 @@ boost::filesystem::path static GetAutostartDir() boost::filesystem::path static GetAutostartFilePath() { - return GetAutostartDir() / "bitcoin.desktop"; + return GetAutostartDir() / "omnicore.desktop"; } bool GetStartOnSystemStartup() @@ -709,7 +709,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) // Write a bitcoin.desktop file to the autostart directory: optionFile << "[Desktop Entry]\n"; optionFile << "Type=Application\n"; - optionFile << "Name=Bitcoin\n"; + optionFile << "Name=Omni Core\n"; optionFile << "Exec=" << pszExePath << " -min\n"; optionFile << "Terminal=false\n"; optionFile << "Hidden=false\n"; diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 7618bff69d9b..3ed9701574ba 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -181,7 +181,7 @@ void Intro::pickDataDirectory() TryCreateDirectory(GUIUtil::qstringToBoostPath(dataDir)); break; } catch(fs::filesystem_error &e) { - QMessageBox::critical(0, tr("Bitcoin Core"), + QMessageBox::critical(0, tr("Omni Core"), tr("Error: Specified data directory \"%1\" cannot be created.").arg(dataDir)); /* fall through, back to choosing screen */ } diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 2d2d448b49f4..ada8b4793cdc 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -361,7 +361,7 @@ void RPCConsole::clear() "b { color: #006060; } " ); - message(CMD_REPLY, (tr("Welcome to the Bitcoin RPC console.") + "
" + + message(CMD_REPLY, (tr("Welcome to the Omni Core RPC console.") + "
" + tr("Use up and down arrows to navigate history, and Ctrl-L to clear screen.") + "
" + tr("Type help for an overview of available commands.")), true); } diff --git a/src/qt/test/Makefile b/src/qt/test/Makefile index a02f86b62ac9..800ce6113a65 100644 --- a/src/qt/test/Makefile +++ b/src/qt/test/Makefile @@ -1,6 +1,6 @@ all: - $(MAKE) -C ../../ test_bitcoin_qt + $(MAKE) -C ../../ test_omnicore_qt clean: - $(MAKE) -C ../../ test_bitcoin_qt_clean + $(MAKE) -C ../../ test_omnicore_qt_clean check: - $(MAKE) -C ../../ test_bitcoin_qt_check + $(MAKE) -C ../../ test_omnicore_qt_check diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 58bf0406248b..3c1a93cf7507 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -28,7 +28,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : ui->setupUi(this); GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this); - QString version = tr("Bitcoin Core") + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion()); + QString version = tr("Omni Core") + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion()); /* On x86 add a bit specifier to the version so that users can distinguish between * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious. */ @@ -40,7 +40,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : if (about) { - setWindowTitle(tr("About Bitcoin Core")); + setWindowTitle(tr("About Omni Core")); /// HTML-format the license message from the core QString licenseInfo = QString::fromStdString(LicenseInfo()); @@ -60,7 +60,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : } else { setWindowTitle(tr("Command-line options")); QString header = tr("Usage:") + "\n" + - " bitcoin-qt [" + tr("command-line options") + "] " + "\n"; + " omnicore-qt [" + tr("command-line options") + "] " + "\n"; QString coreOptions = QString::fromStdString(HelpMessage(HMM_BITCOIN_QT)); @@ -112,7 +112,7 @@ ShutdownWindow::ShutdownWindow(QWidget *parent, Qt::WindowFlags f): { QVBoxLayout *layout = new QVBoxLayout(); layout->addWidget(new QLabel( - tr("Bitcoin Core is shutting down...") + "

" + + tr("Omni Core is shutting down...") + "

" + tr("Do not shut down the computer until this window disappears."))); setLayout(layout); } diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 541432c2b74d..8d67d595481e 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -430,10 +430,10 @@ Value getblocktemplate(const Array& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Omni Core is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Omni Core is downloading blocks..."); static unsigned int nTransactionsUpdatedLast; diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 71408291694b..c046c1600589 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -228,10 +228,10 @@ Value stop(const Array& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "stop\n" - "\nStop Bitcoin server."); + "\nStop Omni Core server."); // Shutdown will take long enough that the response should get back StartShutdown(); - return "Bitcoin server stopping"; + return "Omni Core server stopping"; } @@ -618,7 +618,7 @@ void StartRPCThreads() unsigned char rand_pwd[32]; GetRandBytes(rand_pwd, 32); uiInterface.ThreadSafeMessageBox(strprintf( - _("To use bitcoind, or the -server option to bitcoin-qt, you must set an rpcpassword in the configuration file:\n" + _("To use omnicored, or the -server option to omnicore-qt, you must set an rpcpassword in the configuration file:\n" "%s\n" "It is recommended you use the following random password:\n" "rpcuser=bitcoinrpc\n" diff --git a/src/test/Makefile b/src/test/Makefile index 87bf73fec98d..8aaa7aecf066 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -1,6 +1,6 @@ all: - $(MAKE) -C .. bitcoin_test + $(MAKE) -C .. omnicore_test clean: - $(MAKE) -C .. bitcoin_test_clean + $(MAKE) -C .. omnicore_test_clean check: - $(MAKE) -C .. bitcoin_test_check + $(MAKE) -C .. omnicore_test_check diff --git a/src/timedata.cpp b/src/timedata.cpp index 59f7778db172..704d96f477d7 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -97,7 +97,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nTime) if (!fMatch) { fDone = true; - string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly."); + string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Omni Core will not work properly."); strMiscWarning = strMessage; LogPrintf("*** %s\n", strMessage); uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);