dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebrand to Blackcoin More

Browse Source
This commit is contained in:
lateminer
2018-09-30 15:28:44 +03:00
parent 7d578b9533
commit c3ee9da215
18 changed files with 124 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Makefile.am
View File

@@ -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 #

32
src/Makefile.qt.include
View File

@@ -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)

10
src/bitcoin-cli-res.rc
View File

@@ -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

10
src/bitcoin-tx-res.rc
View File

@@ -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

10
src/bitcoind-res.rc
View File

@@ -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

8
src/init.cpp
View File

@@ -475,14 +475,16 @@ std::string HelpMessage(HelpMessageMode mode)
std::string LicenseInfo()
{
const std::string URL_SOURCE_CODE = "<https://github.com/janko33bd/bitcoin>";
const std::string URL_SOURCE_CODE = "<https://gitlab.com/blackcoin/blackcoin-more>";
const std::string URL_WEBSITE = "<http://blackcoin.co/>";
// 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" +

8
src/pos.cpp
View File

@@ -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 <stdio.h>
#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

6
src/pos.h
View File

@@ -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

8
src/qt/guiconstants.h
View File

@@ -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

2
src/qt/utilitydialog.cpp
View File

@@ -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();

18
src/util.cpp
View File

@@ -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<string, string> mapArgs;
map<string, vector<string> > 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
}

3
src/wallet/wallet.cpp
View File

@@ -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"