diff --git a/COPYING b/COPYING
index 7de8c997a..fa8e93004 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,10 @@
The MIT License (MIT)
-Copyright (c) 2009-2018 The Blackcoin Lore developers
+Copyright (c) 2018 The Blackcoin More developers
+Copyright (c) 2014-2018 The BlackCoin Developers
+Copyright (c) 2013-2014 The NovaCoin Developers
+Copyright (c) 2011-2013 The PPCoin Developers
+Copyright (c) 2009-2016 The 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
diff --git a/Makefile.am b/Makefile.am
index 6362cf51e..c64349c48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,9 @@ BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
WALLET_UTILITY_BIN=$(top_builddir)/src/wallet-utility$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
-OSX_APP=Lore-Qt.app
-OSX_VOLNAME =Blackcoin-Lore.dmg
-OSX_DMG=Blackcoin-Lore.dmg
+OSX_APP=Blackmore-Qt.app
+OSX_VOLNAME=Blackcoin-More.dmg
+OSX_DMG=Blackcoin-More.dmg
OSX_BACKGROUND_IMAGE=background.tiff
OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
@@ -80,7 +80,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@
-$(OSX_APP)/Contents/MacOS/Lore-Qt: $(BITCOIN_QT_BIN)
+$(OSX_APP)/Contents/MacOS/Blackmore-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
@@ -90,7 +90,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR
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/Lore-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
+ $(OSX_APP)/Contents/MacOS/Blackmore-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
if BUILD_DARWIN
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
@@ -105,10 +105,10 @@ $(APP_DIST_DIR)/Applications:
@rm -f $@
@cd $(@D); $(LN_S) /Applications $(@F)
-$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Lore-Qt
+$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Blackmore-Qt
$(OSX_DMG): $(APP_DIST_EXTRAS)
- $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Blackcoin-Lore" -no-pad -r -dir-mode 0755 -apple -o $@ dist
+ $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Blackcoin-More" -no-pad -r -dir-mode 0755 -apple -o $@ dist
$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_IMAGE)
$(MKDIR_P) $(@D)
@@ -116,7 +116,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BAC
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
$(INSTALL) $< $@
-$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Lore-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
+$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Blackmore-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
deploydir: $(APP_DIST_EXTRAS)
diff --git a/README.md b/README.md
index cba1c79e9..b4400a472 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +1,35 @@
-Blackcoin Lore
+Blackcoin More
=====================================
https://blackcoin.org
-What is Blackcoin Lore?
+What is Blackcoin?
----------------
-Blackcoin is a decentralised digital currency with near-instant transaction speeds and
-negligible transaction fees built upon Proof of Stake 3.0 as introduced by the Blackcoin development team.
+Blackcoin is a decentralised digital currency with near-instant transaction speeds and negligible transaction fees built upon Proof of Stake 3.0 as
+introduced by the Blackcoin development team.
-Lore takes Blackcoin to the next level by building upon Bitcoin Core 0.12 to offer performance enhancements,
-wider compatibility with third party services and a more advanced base.
+Blackcoin More is the name of open source software which enables the use of this currency. It takes Blackcoin to the next level by building upon
+Bitcoin Core 0.12.1 with some patches from newer Bitcoin Core versions to offer performance enhancements, wider compatibility with third party services and a more advanced base.
-For downloads vist: https://github.com/janko33bd/bitcoin/releases
+For more information, as well as an immediately useable, binary version of the Blackcoin More software, see https://blackcoin.org.
License
-------
-Blackcoin Lore is released under the terms of the MIT license. See [COPYING](COPYING) for more
+Blackcoin More is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see https://opensource.org/licenses/MIT.
Development Process
-------------------
-The `Blackcoin-Lore` branch is regularly built and tested, but is not guaranteed to be
-completely stable. [Tags](https://github.com/janko33bd/bitcoin/tags) are created
-regularly to indicate new official, stable release versions of Blackcoin Lore.
+The `master` branch is regularly built and tested, but is not guaranteed to be
+completely stable. [Tags](https://gitlab.com/blackcoin/blackcoin-more/tags) are created
+regularly to indicate new official, stable release versions of Blackcoin More.
The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
-The best place to get started is to join the Development channel on Gitter: https://gitter.im/Blackcoin\_Hub/Development
+The best place to get started is to join the Development channel on Gitter: https://gitter.im/Blackcoin_Hub/Development
Testing
-------
diff --git a/configure.ac b/configure.ac
index 5eae4a2ca..773d09dce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,16 +6,16 @@ define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
-AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin])
+AC_INIT([Blackcoin More],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://gitlab.com/blackcoin/blackcoin-more],[blackcoin-more])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])
-BITCOIN_DAEMON_NAME=lored
-BITCOIN_GUI_NAME=lore-qt
-BITCOIN_CLI_NAME=lore-cli
-BITCOIN_TX_NAME=lore-tx
+BITCOIN_DAEMON_NAME=blackmored
+BITCOIN_GUI_NAME=blackmore-qt
+BITCOIN_CLI_NAME=blackmore-cli
+BITCOIN_TX_NAME=blackmore-tx
AC_CANONICAL_HOST
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 5d225b302..5e05838a0 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -28,13 +28,13 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = Bitcoin
+PROJECT_NAME = Blackcoin More
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.12.1
+PROJECT_NUMBER = 2.12.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
index a389332a5..003361082 100644
--- a/share/qt/Info.plist.in
+++ b/share/qt/Info.plist.in
@@ -29,16 +29,16 @@
????
CFBundleExecutable
- Bitcoin-Qt
+ Blackmore-Qt
CFBundleName
- Bitcoin-Qt
+ Blackmore-Qt
LSHasLocalizedDisplayName
CFBundleIdentifier
- org.bitcoinfoundation.Bitcoin-Qt
+ org.blackcoin.Blackmore-Qt
CFBundleURLTypes
diff --git a/src/Makefile.am b/src/Makefile.am
index 1fa5b4480..ed7cbe59e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,11 +61,11 @@ TESTS =
BENCHMARKS =
if BUILD_BITCOIND
- bin_PROGRAMS += lored
+ bin_PROGRAMS += blackmored
endif
if BUILD_BITCOIN_UTILS
- bin_PROGRAMS += lore-cli lore-tx
+ bin_PROGRAMS += blackmore-cli blackmore-tx
if ENABLE_WALLET
bin_PROGRAMS += wallet-utility
endif
@@ -378,17 +378,17 @@ libbitcoin_cli_a_SOURCES = \
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
#
-# lored binary #
-lored_SOURCES = bitcoind.cpp
-lored_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
-lored_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
-lored_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+# blackmored binary #
+blackmored_SOURCES = bitcoind.cpp
+blackmored_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+blackmored_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+blackmored_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
if TARGET_WINDOWS
-lored_SOURCES += bitcoind-res.rc
+blackmored_SOURCES += bitcoind-res.rc
endif
-lored_LDADD = \
+blackmored_LDADD = \
$(LIBBITCOIN_SERVER) \
$(LIBBITCOIN_COMMON) \
$(LIBUNIVALUE) \
@@ -401,13 +401,13 @@ lored_LDADD = \
$(LIBMEMENV) \
$(LIBSECP256K1)
-lored_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
+blackmored_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
-# lore-cli binary #
-lore_cli_SOURCES = bitcoin-cli.cpp
-lore_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
-lore_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
-lore_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+# blackmore-cli binary #
+blackmore_cli_SOURCES = bitcoin-cli.cpp
+blackmore_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
+blackmore_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+blackmore_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
# wallet-utility binary #
if ENABLE_WALLET
@@ -418,40 +418,40 @@ wallet_utility_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
endif
if TARGET_WINDOWS
-lore_cli_SOURCES += bitcoin-cli-res.rc
+blackmore_cli_SOURCES += bitcoin-cli-res.rc
endif
-lore_cli_LDADD = \
+blackmore_cli_LDADD = \
$(LIBBITCOIN_CLI) \
$(LIBUNIVALUE) \
$(LIBBITCOIN_UTIL) \
$(LIBBITCOIN_CRYPTO)
-lore_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
+blackmore_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
if ENABLE_WALLET
wallet_utility_LDADD = libbitcoin_wallet.a $(LIBBITCOIN_COMMON) $(LIBBITCOIN_CRYPTO) $(LIBSECP256K1) $(LIBBITCOIN_UTIL) $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS)
endif
#
-# lore-tx binary #
-lore_tx_SOURCES = bitcoin-tx.cpp
-lore_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
-lore_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
-lore_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+# blackmore-tx binary #
+blackmore_tx_SOURCES = bitcoin-tx.cpp
+blackmore_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+blackmore_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+blackmore_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
if TARGET_WINDOWS
-lore_tx_SOURCES += bitcoin-tx-res.rc
+blackmore_tx_SOURCES += bitcoin-tx-res.rc
endif
-lore_tx_LDADD = \
+blackmore_tx_LDADD = \
$(LIBUNIVALUE) \
$(LIBBITCOIN_COMMON) \
$(LIBBITCOIN_UTIL) \
$(LIBBITCOIN_CRYPTO) \
$(LIBSECP256K1)
-lore_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
+blackmore_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
#
# bitcoinconsensus library #
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index c04adb184..4e9aab784 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -1,4 +1,4 @@
-bin_PROGRAMS += qt/lore-qt
+bin_PROGRAMS += qt/blackmore-qt
EXTRA_LIBRARIES += qt/libbitcoinqt.a
# bitcoin qt core #
@@ -364,37 +364,37 @@ 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_lore_qt_OBJECTS) : | $(QT_MOC)
+$(qt_libbitcoinqt_a_OBJECTS) $(qt_blackmore_qt_OBJECTS) : | $(QT_MOC)
#Generating these with a half-written protobuf header leads to wacky results.
#This makes sure it's done.
$(QT_MOC): $(PROTOBUF_H)
$(QT_MOC_CPP): $(PROTOBUF_H)
-# lore-qt binary #
-qt_lore_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
+# blackmore-qt binary #
+qt_blackmore_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
$(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
-qt_lore_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
+qt_blackmore_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
-qt_lore_qt_SOURCES = qt/bitcoin.cpp
+qt_blackmore_qt_SOURCES = qt/bitcoin.cpp
if TARGET_DARWIN
- qt_lore_qt_SOURCES += $(BITCOIN_MM)
+ qt_blackmore_qt_SOURCES += $(BITCOIN_MM)
endif
if TARGET_WINDOWS
- qt_lore_qt_SOURCES += $(BITCOIN_RC)
+ qt_blackmore_qt_SOURCES += $(BITCOIN_RC)
endif
-qt_lore_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
+qt_blackmore_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
if ENABLE_WALLET
-qt_lore_qt_LDADD += $(LIBBITCOIN_WALLET)
+qt_blackmore_qt_LDADD += $(LIBBITCOIN_WALLET)
endif
if ENABLE_ZMQ
-qt_lore_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
+qt_blackmore_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
endif
-qt_lore_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
+qt_blackmore_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
-qt_lore_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
-qt_lore_qt_LIBTOOLFLAGS = --tag CXX
+qt_blackmore_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+qt_blackmore_qt_LIBTOOLFLAGS = --tag CXX
#locale/foo.ts -> locale/foo.qm
QT_QM=$(QT_TS:.ts=.qm)
@@ -426,9 +426,9 @@ 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_lore_qt_OBJECTS) qt/lore-qt$(EXEEXT) $(LIBBITCOINQT)
+ rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_blackmore_qt_OBJECTS) qt/blackmore-qt$(EXEEXT) $(LIBBITCOINQT)
-bitcoin_qt : qt/lore-qt$(EXEEXT)
+bitcoin_qt : qt/blackmore-qt$(EXEEXT)
ui_%.h: %.ui
@test -f $(UIC)
diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc
index 1e4aa609b..66cf938cd 100644
--- a/src/bitcoin-cli-res.rc
+++ b/src/bitcoin-cli-res.rc
@@ -16,14 +16,14 @@ BEGIN
BEGIN
BLOCK "040904E4" // U.S. English - multilingual (hex)
BEGIN
- VALUE "CompanyName", "Bitcoin"
- VALUE "FileDescription", "bitcoin-cli (JSON-RPC client for Bitcoin Core)"
+ VALUE "CompanyName", "Blackcoin"
+ VALUE "FileDescription", "blackmore-cli (JSON-RPC client for Blackcoin More)"
VALUE "FileVersion", VER_FILEVERSION_STR
- VALUE "InternalName", "bitcoin-cli"
+ VALUE "InternalName", "blackmore-cli"
VALUE "LegalCopyright", COPYRIGHT_STR
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
- VALUE "OriginalFilename", "bitcoin-cli.exe"
- VALUE "ProductName", "bitcoin-cli"
+ VALUE "OriginalFilename", "blackmore-cli.exe"
+ VALUE "ProductName", "blackmore-cli"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
diff --git a/src/bitcoin-tx-res.rc b/src/bitcoin-tx-res.rc
index 3e49b820b..c5b19c8eb 100644
--- a/src/bitcoin-tx-res.rc
+++ b/src/bitcoin-tx-res.rc
@@ -16,14 +16,14 @@ BEGIN
BEGIN
BLOCK "040904E4" // U.S. English - multilingual (hex)
BEGIN
- VALUE "CompanyName", "Bitcoin"
- VALUE "FileDescription", "bitcoin-tx (CLI Bitcoin transaction editor utility)"
+ VALUE "CompanyName", "Blackcoin"
+ VALUE "FileDescription", "blackmore-tx (CLI Blackcoin transaction editor utility)"
VALUE "FileVersion", VER_FILEVERSION_STR
- VALUE "InternalName", "bitcoin-tx"
+ VALUE "InternalName", "blackmore-tx"
VALUE "LegalCopyright", COPYRIGHT_STR
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
- VALUE "OriginalFilename", "bitcoin-tx.exe"
- VALUE "ProductName", "bitcoin-tx"
+ VALUE "OriginalFilename", "blackmore-tx.exe"
+ VALUE "ProductName", "blackmore-tx"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc
index 3a64acd5d..a38c21a52 100644
--- a/src/bitcoind-res.rc
+++ b/src/bitcoind-res.rc
@@ -16,14 +16,14 @@ BEGIN
BEGIN
BLOCK "040904E4" // U.S. English - multilingual (hex)
BEGIN
- VALUE "CompanyName", "Bitcoin"
- VALUE "FileDescription", "bitcoind (Bitcoin node with a JSON-RPC server)"
+ VALUE "CompanyName", "Blackcoin"
+ VALUE "FileDescription", "blackmored (Blackcoin node with a JSON-RPC server)"
VALUE "FileVersion", VER_FILEVERSION_STR
- VALUE "InternalName", "bitcoind"
+ VALUE "InternalName", "blackmored"
VALUE "LegalCopyright", COPYRIGHT_STR
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
- VALUE "OriginalFilename", "bitcoind.exe"
- VALUE "ProductName", "bitcoind"
+ VALUE "OriginalFilename", "blackmored.exe"
+ VALUE "ProductName", "blackmored"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
diff --git a/src/init.cpp b/src/init.cpp
index bef4e436b..54207cbd9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -475,14 +475,16 @@ std::string HelpMessage(HelpMessageMode mode)
std::string LicenseInfo()
{
- const std::string URL_SOURCE_CODE = "";
+ const std::string URL_SOURCE_CODE = "";
const std::string URL_WEBSITE = "";
// todo: remove urls from translations on next change
return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +
"\n" +
- FormatParagraph(strprintf(_("Copyright (C) 2014-%i The Blackcoin Lore Developers"), COPYRIGHT_YEAR)) + "\n" +
+ FormatParagraph(strprintf(_("Copyright (C) 2014-2018 The Blackcoin Developers"), COPYRIGHT_YEAR)) + "\n" +
"\n" +
- FormatParagraph(strprintf(_("Please contribute if you find Blackcoin Lore useful. "
+ FormatParagraph(strprintf(_("Copyright (C) 2018-%i The Blackcoin More Developers"), COPYRIGHT_YEAR)) + "\n" +
+ "\n" +
+ FormatParagraph(strprintf(_("Please contribute if you find Blackcoin More useful. "
"Visit %s for further information about the software."),
URL_WEBSITE)) +
"\n" +
diff --git a/src/pos.cpp b/src/pos.cpp
index 4c9a4fb70..641c30197 100644
--- a/src/pos.cpp
+++ b/src/pos.cpp
@@ -1,8 +1,11 @@
-// Copyright (c) 2014-2016 The BlackCoin Core developers
-// Copyright (c) 2012-2013 The PPCoin developers
+// Copyright (c) 2014-2018 The BlackCoin Developers
+// Copyright (c) 2011-2013 The PPCoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Stake cache by Qtum
+// Copyright (c) 2016-2018 The Qtum developers
+
#include "pos.h"
#include "chain.h"
@@ -16,7 +19,6 @@
#include
#include "util.h"
-
// Stake Modifier (hash modifier of proof-of-stake):
// The purpose of stake modifier is to prevent a txout (coin) owner from
// computing future proof-of-stake generated by this txout at the time
diff --git a/src/pos.h b/src/pos.h
index 85a1c0034..454857776 100644
--- a/src/pos.h
+++ b/src/pos.h
@@ -1,7 +1,11 @@
-// Copyright (c) 2015-2016 The BlackCoin Core developers
+// Copyright (c) 2014-2018 The BlackCoin Developers
+// Copyright (c) 2011-2013 The PPCoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Stake cache by Qtum
+// Copyright (c) 2016-2018 The Qtum developers
+
#ifndef BLACKCOIN_POS_H
#define BLACKCOIN_POS_H
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index 483df1d99..4a1e810b8 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -52,9 +52,9 @@ static const int MAX_URI_LENGTH = 255;
/* Number of frames in spinner animation */
#define SPINNER_FRAMES 36
-#define QAPP_ORG_NAME "Lore"
-#define QAPP_ORG_DOMAIN "Blackcoin.co"
-#define QAPP_APP_NAME_DEFAULT "Lore-Qt"
-#define QAPP_APP_NAME_TESTNET "Lore-Qt-testnet"
+#define QAPP_ORG_NAME "Blackcoin More"
+#define QAPP_ORG_DOMAIN "blackcoin.org"
+#define QAPP_APP_NAME_DEFAULT "Blackmore-Qt"
+#define QAPP_APP_NAME_TESTNET "Blackmore-Qt-testnet"
#endif // BITCOIN_QT_GUICONSTANTS_H
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 7f31b00b8..09dd409d7 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -66,7 +66,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
} else {
setWindowTitle(tr("Command-line options"));
QString header = tr("Usage:") + "\n" +
- " Lore-qt [" + tr("command-line options") + "] " + "\n";
+ " blackmore-qt [" + tr("command-line options") + "] " + "\n";
QTextCursor cursor(ui->helpMessage->document());
cursor.insertText(version);
cursor.insertBlock();
diff --git a/src/util.cpp b/src/util.cpp
index b85d52b28..95d392a2c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -99,8 +99,8 @@ namespace boost {
using namespace std;
-const char * const BITCOIN_CONF_FILENAME = "lore.conf";
-const char * const BITCOIN_PID_FILENAME = "lored.pid";
+const char * const BITCOIN_CONF_FILENAME = "blackmore.conf";
+const char * const BITCOIN_PID_FILENAME = "blackmored.pid";
map mapArgs;
map > mapMultiArgs;
@@ -455,13 +455,13 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
boost::filesystem::path GetDefaultDataDir()
{
namespace fs = boost::filesystem;
- // Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
- // Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
- // Mac: ~/Library/Application Support/Bitcoin
- // Unix: ~/.bitcoin
+ // Windows < Vista: C:\Documents and Settings\Username\Application Data\Blackmore
+ // Windows >= Vista: C:\Users\Username\AppData\Roaming\Blackmore
+ // Mac: ~/Library/Application Support/Blackmore
+ // Unix: ~/.blackmore
#ifdef WIN32
// Windows
- return GetSpecialFolderPath(CSIDL_APPDATA) / "Lore";
+ return GetSpecialFolderPath(CSIDL_APPDATA) / "Blackmore";
#else
fs::path pathRet;
char* pszHome = getenv("HOME");
@@ -473,10 +473,10 @@ boost::filesystem::path GetDefaultDataDir()
// Mac
pathRet /= "Library/Application Support";
TryCreateDirectory(pathRet);
- return pathRet / "Lore";
+ return pathRet / "Blackmore";
#else
// Unix
- return pathRet / ".lore";
+ return pathRet / ".blackmore";
#endif
#endif
}
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index d72ee491e..1e307a9fe 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3,6 +3,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Stake cache by Qtum
+// Copyright (c) 2016-2018 The Qtum developers
+
#include "wallet/wallet.h"
#include "chain.h"