Commit c0850f00 authored by Pavel Vasin's avatar Pavel Vasin

rebrand to blackcoin

parent 6fd05268
src/*.exe
src/bitcoin
src/bitcoind
src/test_bitcoin
src/blackcoin
src/blackcoind
src/test_blackcoin
src/build.h
.*.swp
*.*~*
......@@ -10,11 +10,11 @@ src/build.h
*.orig
*.o
*.patch
.bitcoin
.blackcoin
#compilation and Qt preprocessor part
*.qm
Makefile
bitcoin-qt
blackcoin-qt
#resources cpp
qrc_*.cpp
#qt creator
......
Building Bitcoin
Building BlackCoin
See doc/readme-qt.rst for instructions on building Bitcoin QT,
See doc/readme-qt.rst for instructions on building BlackCoin QT,
the intended-for-end-users, nice-graphical-interface, reference
implementation of Bitcoin.
implementation of BlackCoin.
See doc/build-*.txt for instructions on building bitcoind,
See doc/build-*.txt for instructions on building blackcoind,
the intended-for-services, no-graphical-interface, reference
implementation of Bitcoin.
implementation of BlackCoin.
NovaCoin official development tree
BlackCoin official development tree
NovaCoin - a hybrid scrypt PoW + PoS based cryptocurrency.
* 10 minutes stake spacing
* 30 minutes PoW spacing
* Balanced PoW blocks and stakes weighting
* The PoW subsidy halves every x64 multiply of PoW difficulty
* The PoS interest halves every x64 multiply of PoS difficulty
* Maximum PoW reward is 100 coins
* Maximum PoS reward is 10 coins
* ~ 2 billion total coins
BlackCoin is a PoS-based cryptocurrency.
Development process
===========================
......@@ -25,7 +16,7 @@ or are controversial.
The master branch is regularly built and tested, but is not guaranteed
to be completely stable. Tags are regularly created to indicate new
official, stable release versions of NovaCoin.
official, stable release versions of BlackCoin.
Feature branches are created when there are major new features being
worked on by several people.
......
TEMPLATE = app
TARGET = novacoin-qt
TARGET = blackcoin-qt
VERSION = 0.7.5
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
......@@ -417,7 +417,7 @@ macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/bitcoin.icns
macx:TARGET = "NovaCoin-Qt"
macx:TARGET = "BlackCoin-Qt"
macx:QMAKE_CFLAGS_THREAD += -pthread
macx:QMAKE_LFLAGS_THREAD += -pthread
macx:QMAKE_CXXFLAGS_THREAD += -pthread
......
NovaCoin 0.4.4 BETA
BlackCoin 0.4.4 BETA
Copyright (c) 2013 NovaCoin Developers
Copyright (c) 2011-2012 PPCoin Developers
......@@ -11,8 +11,8 @@ cryptographic software written by Eric Young (eay@cryptsoft.com).
Intro
-----
NovaCoin is a free open source project derived from Bitcoin, with
BlackCoin is a free open source project derived from Bitcoin, with
the goal of providing a long-term energy-efficient scrypt-based crypto-currency.
Built on the foundation of Bitcoin and PPCoin, innovations such as proof-of-stake
Built on the foundation of Bitcoin, PPCoin and NovaCoin, innovations such as proof-of-stake
help further advance the field of crypto-currency.
NovaCoin 0.4.4 BETA
BlackCoin 0.4.4 BETA
Copyright (c) 2013 NovaCoin Developers
Copyright (c) 2011-2013 PPCoin Developers
......@@ -11,8 +11,8 @@ cryptographic software written by Eric Young (eay@cryptsoft.com).
Intro
-----
NovaCoin is a free open source project derived from Bitcoin, with
BlackCoin is a free open source project derived from Bitcoin, with
the goal of providing a long-term energy-efficient scrypt-based crypto-currency.
Built on the foundation of Bitcoin and PPCoin, innovations such as proof-of-stake and scrypt
Built on the foundation of Bitcoin, PPCoin and NovaCoin, innovations such as proof-of-stake and scrypt
help further advance the field of crypto-currency.
......@@ -7,7 +7,7 @@ cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP
software written by Thomas Bernard.
See readme-qt.rst for instructions on building Bitcoin QT, the
See readme-qt.rst for instructions on building BlackCoin QT, the
graphical user interface.
WINDOWS BUILD NOTES
......@@ -76,9 +76,9 @@ make -f Makefile.mingw
mkdir miniupnpc
cp *.h miniupnpc/
Bitcoin
BlackCoin
-------
DOS prompt:
cd \bitcoin\src
cd \blackcoin\src
mingw32-make -f makefile.mingw
strip bitcoind.exe
strip blackcoind.exe
......@@ -7,12 +7,12 @@ software written by Eric Young (eay@cryptsoft.com) and UPnP software written by
Thomas Bernard.
Mac OS X bitcoind build instructions
Mac OS X blackcoind build instructions
Laszlo Hanyecz <solar@heliacal.net>
Douglas Huff <dhuff@jrbobdobbs.org>
See readme-qt.rst for instructions on building Bitcoin QT, the
See readme-qt.rst for instructions on building BlackCoin QT, the
graphical user interface.
Tested on 10.5 and 10.6 intel. PPC is not supported because it's big-endian.
......@@ -27,7 +27,7 @@ but you can get the current version from http://developer.apple.com
1. Clone the github tree to get the source code:
git clone git@github.com:bitcoin/bitcoin.git bitcoin
git clone git@github.com:rat4/blackcoin.git blackcoin
2. Download and install MacPorts from http://www.macports.org/
......@@ -41,14 +41,14 @@ sudo port install boost db48 openssl miniupnpc
Optionally install qrencode (and set USE_QRCODE=1):
sudo port install qrencode
4. Now you should be able to build bitcoind:
4. Now you should be able to build blackcoind:
cd bitcoin/src
cd blackcoin/src
make -f makefile.osx
Run:
./bitcoind --help # for a list of command-line options.
./blackcoind --help # for a list of command-line options.
Run
./bitcoind -daemon # to start the bitcoin daemon.
./blackcoind -daemon # to start the blackcoin daemon.
Run
./bitcoind help # When the daemon is running, to get a list of RPC commands
./blackcoind help # When the daemon is running, to get a list of RPC commands
......@@ -14,10 +14,10 @@ To Build
--------
cd src/
make -f makefile.unix # Headless bitcoin
make -f makefile.unix # Headless blackcoin
See readme-qt.rst for instructions on building Bitcoin QT,
the graphical bitcoin.
See readme-qt.rst for instructions on building BlackCoin QT,
the graphical blackcoin.
Dependencies
------------
......@@ -75,21 +75,21 @@ If using Boost 1.37, append -mt to the boost libraries in the makefile.
Dependency Build Instructions: Gentoo
-------------------------------------
Note: If you just want to install bitcoind on Gentoo, you can add the Bitcoin
Note: If you just want to install blackcoind on Gentoo, you can add the BlackCoin
overlay and use your package manager:
layman -a bitcoin && emerge bitcoind
layman -a blackcoin && emerge blackcoind
emerge -av1 --noreplace boost glib openssl sys-libs/db:4.8
Take the following steps to build (no UPnP support):
cd ${BITCOIN_DIR}/src
cd ${BLACKCOIN_DIR}/src
make -f makefile.unix USE_UPNP= BDB_INCLUDE_PATH='/usr/include/db4.8'
strip bitcoind
strip blackcoind
Notes
-----
The release is built with GCC and then "strip bitcoind" to strip the debug
The release is built with GCC and then "strip blackcoind" to strip the debug
symbols, which reduces the executable size by about 90%.
......@@ -119,7 +119,7 @@ sudo su
Security
--------
To help make your bitcoin installation more secure by making certain attacks impossible to
To help make your blackcoin installation more secure by making certain attacks impossible to
exploit even if a vulnerability is found, you can take the following measures:
* Position Independent Executable
......@@ -136,7 +136,7 @@ exploit even if a vulnerability is found, you can take the following measures:
make -f makefile.unix ... -e PIE=1
To test that you have built PIE executable, install scanelf, part of paxutils, and use:
scanelf -e ./bitcoin
scanelf -e ./blackcoin
The output should contain:
TYPE
......@@ -144,13 +144,13 @@ exploit even if a vulnerability is found, you can take the following measures:
* Non-executable Stack
If the stack is executable then trivial stack based buffer overflow exploits are possible if
vulnerable buffers are found. By default, bitcoin should be built with a non-executable stack
vulnerable buffers are found. By default, blackcoin should be built with a non-executable stack
but if one of the libraries it uses asks for an executable stack or someone makes a mistake
and uses a compiler extension which requires an executable stack, it will silently build an
executable without the non-executable stack protection.
To verify that the stack is non-executable after compiling use:
scanelf -e ./bitcoin
scanelf -e ./blackcoin
the output should contain:
STK/REL/PTL
......
Bitcoin-qt: Qt4 GUI for Bitcoin
BlackCoin-qt: Qt4 GUI for BlackCoin
===============================
Build instructions
......@@ -23,9 +23,9 @@ then execute the following:
qmake
make
Alternatively, install Qt Creator and open the `bitcoin-qt.pro` file.
Alternatively, install Qt Creator and open the `blackcoin-qt.pro` file.
An executable named `bitcoin-qt` will be built.
An executable named `blackcoin-qt` will be built.
Windows
......@@ -42,8 +42,8 @@ Windows build instructions:
- Open the .pro file in QT creator and build as normal (ctrl-B)
.. _`QT Windows SDK`: http://qt.nokia.com/downloads/sdk-windows-cpp
.. _`dependencies archive`: https://download.visucore.com/bitcoin/qtgui_deps_1.zip
.. [#] PGP signature: https://download.visucore.com/bitcoin/qtgui_deps_1.zip.sig (signed with RSA key ID `610945D0`_)
.. _`dependencies archive`: https://download.visucore.com/blackcoin/qtgui_deps_1.zip
.. [#] PGP signature: https://download.visucore.com/blackcoin/qtgui_deps_1.zip.sig (signed with RSA key ID `610945D0`_)
.. _`610945D0`: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x610945D0
......@@ -73,7 +73,7 @@ Build configuration options
UPNnP port forwarding
---------------------
To use UPnP for port forwarding behind a NAT router (recommended, as more connections overall allow for a faster and more stable bitcoin experience), pass the following argument to qmake:
To use UPnP for port forwarding behind a NAT router (recommended, as more connections overall allow for a faster and more stable blackcoin experience), pass the following argument to qmake:
::
......@@ -121,9 +121,9 @@ flag to qmake to control this:
Berkely DB version warning
==========================
A warning for people using the *static binary* version of Bitcoin on a Linux/UNIX-ish system (tl;dr: **Berkely DB databases are not forward compatible**).
A warning for people using the *static binary* version of BlackCoin on a Linux/UNIX-ish system (tl;dr: **Berkely DB databases are not forward compatible**).
The static binary version of Bitcoin is linked against libdb4.8 (see also `this Debian issue`_).
The static binary version of BlackCoin is linked against libdb4.8 (see also `this Debian issue`_).
Now the nasty thing is that databases from 5.X are not compatible with 4.X.
......@@ -138,7 +138,7 @@ Ubuntu 11.10 warning
====================
Ubuntu 11.10 has a package called 'qt-at-spi' installed by default. At the time of writing, having that package
installed causes bitcoin-qt to crash intermittently. The issue has been reported as `launchpad bug 857790`_, but
installed causes blackcoin-qt to crash intermittently. The issue has been reported as `launchpad bug 857790`_, but
isn't yet fixed.
Until the bug is fixed, you can remove the qt-at-spi package to work around the problem, though this will presumably
......
......@@ -219,12 +219,12 @@ Value stop(const Array& params, bool fHelp)
throw runtime_error(
"stop <detach>\n"
"<detach> is true or false to detach the database or not for this stop only\n"
"Stop NovaCoin server (and possibly override the detachdb config value).");
"Stop BlackCoin server (and possibly override the detachdb config value).");
// Shutdown will take long enough that the response should get back
if (params.size() > 0)
bitdb.SetDetach(params[0].get_bool());
StartShutdown();
return "NovaCoin server stopping";
return "BlackCoin server stopping";
}
......@@ -339,7 +339,7 @@ string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeader
{
ostringstream s;
s << "POST / HTTP/1.1\r\n"
<< "User-Agent: novacoin-json-rpc/" << FormatFullVersion() << "\r\n"
<< "User-Agent: blackcoin-json-rpc/" << FormatFullVersion() << "\r\n"
<< "Host: 127.0.0.1\r\n"
<< "Content-Type: application/json\r\n"
<< "Content-Length: " << strMsg.size() << "\r\n"
......@@ -370,7 +370,7 @@ static string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
if (nStatus == HTTP_UNAUTHORIZED)
return strprintf("HTTP/1.0 401 Authorization Required\r\n"
"Date: %s\r\n"
"Server: novacoin-json-rpc/%s\r\n"
"Server: blackcoin-json-rpc/%s\r\n"
"WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
"Content-Type: text/html\r\n"
"Content-Length: 296\r\n"
......@@ -397,7 +397,7 @@ static string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
"Connection: %s\r\n"
"Content-Length: %"PRIszu"\r\n"
"Content-Type: application/json\r\n"
"Server: novacoin-json-rpc/%s\r\n"
"Server: blackcoin-json-rpc/%s\r\n"
"\r\n"
"%s",
nStatus,
......@@ -668,7 +668,7 @@ private:
void ThreadRPCServer(void* parg)
{
// Make this thread recognisable as the RPC listener
RenameThread("bitcoin-rpclist");
RenameThread("blackcoin-rpclist");
try
{
......@@ -771,7 +771,7 @@ void ThreadRPCServer2(void* parg)
{
unsigned char rand_pwd[32];
RAND_bytes(rand_pwd, 32);
string strWhatAmI = "To use novacoind";
string strWhatAmI = "To use blackcoind";
if (mapArgs.count("-server"))
strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
else if (mapArgs.count("-daemon"))
......@@ -968,7 +968,7 @@ static CCriticalSection cs_THREAD_RPCHANDLER;
void ThreadRPCServer3(void* parg)
{
// Make this thread recognisable as the RPC handler
RenameThread("bitcoin-rpchand");
RenameThread("blackcoin-rpchand");
{
LOCK(cs_THREAD_RPCHANDLER);
......
......@@ -67,7 +67,7 @@ void Shutdown(void* parg)
static bool fTaken;
// Make this thread recognisable as the shutdown thread
RenameThread("bitcoin-shutoff");
RenameThread("blackcoin-shutoff");
bool fFirstThread = false;
{
......@@ -92,7 +92,7 @@ void Shutdown(void* parg)
delete pwalletMain;
NewThread(ExitTimeout, NULL);
Sleep(50);
printf("NovaCoin exited\n\n");
printf("BlackCoin exited\n\n");
fExit = true;
#ifndef QT_GUI
// ensure non-UI client gets exited here, but let Bitcoin-Qt reach 'return 0;' in bitcoin.cpp
......@@ -147,12 +147,12 @@ bool AppInit(int argc, char* argv[])
if (mapArgs.count("-?") || mapArgs.count("--help"))
{
// First part of help message is specific to bitcoind / RPC client
std::string strUsage = _("NovaCoin version") + " " + FormatFullVersion() + "\n\n" +
std::string strUsage = _("BlackCoin version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\n" +
" novacoind [options] " + "\n" +
" novacoind [options] <command> [params] " + _("Send command to -server or novacoind") + "\n" +
" novacoind [options] help " + _("List commands") + "\n" +
" novacoind [options] help <command> " + _("Get help for a command") + "\n";
" blackcoind [options] " + "\n" +
" blackcoind [options] <command> [params] " + _("Send command to -server or blackcoind") + "\n" +
" blackcoind [options] help " + _("List commands") + "\n" +
" blackcoind [options] help <command> " + _("Get help for a command") + "\n";
strUsage += "\n" + HelpMessage();
......@@ -162,7 +162,7 @@ bool AppInit(int argc, char* argv[])
// Command-line RPC
for (int i = 1; i < argc; i++)
if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "novacoin:"))
if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "blackcoin:"))
fCommandLine = true;
if (fCommandLine)
......@@ -202,13 +202,13 @@ int main(int argc, char* argv[])
bool static InitError(const std::string &str)
{
uiInterface.ThreadSafeMessageBox(str, _("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::MODAL);
uiInterface.ThreadSafeMessageBox(str, _("BlackCoin"), CClientUIInterface::OK | CClientUIInterface::MODAL);
return false;
}
bool static InitWarning(const std::string &str)
{
uiInterface.ThreadSafeMessageBox(str, _("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
uiInterface.ThreadSafeMessageBox(str, _("BlackCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
return true;
}
......@@ -230,8 +230,8 @@ std::string HelpMessage()
{
string strUsage = _("Options:") + "\n" +
" -? " + _("This help message") + "\n" +
" -conf=<file> " + _("Specify configuration file (default: novacoin.conf)") + "\n" +
" -pid=<file> " + _("Specify pid file (default: novacoind.pid)") + "\n" +
" -conf=<file> " + _("Specify configuration file (default: blackcoin.conf)") + "\n" +
" -pid=<file> " + _("Specify pid file (default: blackcoind.pid)") + "\n" +
" -datadir=<dir> " + _("Specify data directory") + "\n" +
" -wallet=<dir> " + _("Specify wallet file (within data directory)") + "\n" +
" -dbcache=<n> " + _("Set database cache size in megabytes (default: 25)") + "\n" +
......@@ -496,7 +496,7 @@ bool AppInit2()
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. NovaCoin is probably already running."), strDataDir.c_str()));
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. BlackCoin is probably already running."), strDataDir.c_str()));
#if !defined(WIN32) && !defined(QT_GUI)
if (fDaemon)
......@@ -523,7 +523,7 @@ bool AppInit2()
if (GetBoolArg("-shrinkdebugfile", !fDebug))
ShrinkDebugFile();
printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
printf("NovaCoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
printf("BlackCoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
printf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
if (!fLogTimestamps)
printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
......@@ -532,7 +532,7 @@ bool AppInit2()
std::ostringstream strErrors;
if (fDaemon)
fprintf(stdout, "NovaCoin server starting\n");
fprintf(stdout, "BlackCoin server starting\n");
int64 nStart;
......@@ -564,7 +564,7 @@ bool AppInit2()
" Original wallet.dat saved as wallet.{timestamp}.bak in %s; if"
" your balance or transactions are incorrect you should"
" restore from a backup."), strDataDir.c_str());
uiInterface.ThreadSafeMessageBox(msg, _("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
uiInterface.ThreadSafeMessageBox(msg, _("BlackCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
}
if (r == CDBEnv::RECOVER_FAIL)
return InitError(_("wallet.dat corrupt, salvage failed"));
......@@ -782,13 +782,13 @@ bool AppInit2()
{
string msg(_("Warning: error reading wallet.dat! All keys read correctly, but transaction data"
" or address book entries might be missing or incorrect."));
uiInterface.ThreadSafeMessageBox(msg, _("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
uiInterface.ThreadSafeMessageBox(msg, _("BlackCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
}
else if (nLoadWalletRet == DB_TOO_NEW)
strErrors << _("Error loading wallet.dat: Wallet requires newer version of NovaCoin") << "\n";
strErrors << _("Error loading wallet.dat: Wallet requires newer version of BlackCoin") << "\n";
else if (nLoadWalletRet == DB_NEED_REWRITE)
{
strErrors << _("Wallet needed to be rewritten: restart NovaCoin to complete") << "\n";
strErrors << _("Wallet needed to be rewritten: restart BlackCoin to complete") << "\n";
printf("%s", strErrors.str().c_str());
return InitError(strErrors.str());
}
......
......@@ -189,7 +189,7 @@ bool GetIPFromIRC(SOCKET hSocket, string strMyName, CNetAddr& ipRet)
void ThreadIRCSeed(void* parg)
{
// Make this thread recognisable as the IRC seeding thread
RenameThread("bitcoin-ircseed");
RenameThread("blackcoin-ircseed");
try
{
......@@ -302,16 +302,16 @@ void ThreadIRCSeed2(void* parg)
}
if (fTestNet) {
Send(hSocket, "JOIN #novacoinTEST2\r");
Send(hSocket, "WHO #novacoinTEST2\r");
Send(hSocket, "JOIN #blackcoinTEST\r");
Send(hSocket, "WHO #blackcoinTEST\r");
} else {
// randomly join #novacoin00-#novacoin05
// randomly join #blackcoin00-#blackcoin05
// int channel_number = GetRandInt(5);
// Channel number is always 0 for initial release
int channel_number = 0;
Send(hSocket, strprintf("JOIN #novacoin%02d\r", channel_number).c_str());
Send(hSocket, strprintf("WHO #novacoin%02d\r", channel_number).c_str());
Send(hSocket, strprintf("JOIN #blackcoin%02d\r", channel_number).c_str());
Send(hSocket, strprintf("WHO #blackcoin%02d\r", channel_number).c_str());
}
int64 nStart = GetTime();
......
......@@ -69,7 +69,7 @@ map<uint256, set<uint256> > mapOrphanTransactionsByPrev;
// Constant stuff for coinbase transactions we create:
CScript COINBASE_FLAGS;
const string strMessageMagic = "NovaCoin Signed Message:\n";
const string strMessageMagic = "BlackCoin Signed Message:\n";
// Settings
int64 nTransactionFee = MIN_TX_FEE;
......@@ -2394,7 +2394,7 @@ bool CheckDiskSpace(uint64 nAdditionalBytes)
string strMessage = _("Warning: Disk space is low!");
strMiscWarning = strMessage;
printf("*** %s\n", strMessage.c_str());
uiInterface.ThreadSafeMessageBox(strMessage, "NovaCoin", CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
uiInterface.ThreadSafeMessageBox(strMessage, "BlackCoin", CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
StartShutdown();
return false;
}
......
......@@ -143,7 +143,7 @@ OBJS= \
obj/zerocoin/SpendMetaData.o \
obj/zerocoin/ZeroTest.o
all: novacoind
all: blackcoind
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
......@@ -184,11 +184,11 @@ obj/zerocoin/%.o: zerocoin/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
novacoind: $(OBJS:obj/%=obj/%)
blackcoind: $(OBJS:obj/%=obj/%)
$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
clean:
-rm -f novacoind
-rm -f blackcoind
-rm -f obj/*.o
-rm -f obj/zerocoin/*.o
-rm -f obj/*.P
......
......@@ -105,7 +105,7 @@ OBJS= \
obj/zerocoin/SpendMetaData.o \
obj/zerocoin/ZeroTest.o
all: novacoind.exe
all: blackcoind.exe
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += -I"$(CURDIR)/leveldb/include"
......@@ -126,9 +126,9 @@ obj/%.o: %.cpp $(HEADERS)
obj/zerocoin/%.o: zerocoin/%.cpp $(HEADERS)
$(CXX) -c $(CFLAGS) -o $@ $<
novacoind.exe: $(OBJS:obj/%=obj/%)
blackcoind.exe: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lshlwapi
$(STRIP) novacoind.exe
$(STRIP) blackcoind.exe
obj/scrypt-x86.o: scrypt-x86.S
$(CXX) -c $(CFLAGS) -MMD -o $@ $<
......@@ -139,7 +139,7 @@ obj/scrypt-x86_64.o: scrypt-x86_64.S
clean:
-rm -f obj/*.o
-rm -f obj/zerocoin/*.o
-rm -f novacoind.exe
-rm -f blackcoind.exe
-rm -f obj/build.h
cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) clean && cd ..
......
......@@ -96,7 +96,7 @@ OBJS= \
obj/zerocoin/SpendMetaData.o \
obj/zerocoin/ZeroTest.o
all: novacoind.exe
all: blackcoind.exe
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
......@@ -118,11 +118,11 @@ obj/scrypt-x86.o: scrypt-x86.S
obj/scrypt-x86_64.o: scrypt-x86_64.S
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
novacoind.exe: $(OBJS:obj/%=obj/%)
blackcoind.exe: $(OBJS:obj/%=obj/%)
g++ $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
clean:
-del /Q novacoind
-del /Q blackcoind
-del /Q obj\*
-del /Q obj\zerocoin\*
......
......@@ -3,7 +3,7 @@
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
# Mac OS X makefile for bitcoin
# Mac OS X makefile for blackcoin
# Originally by Laszlo Hanyecz (solar@heliacal.net)
CXX=llvm-g++
......@@ -25,7 +25,7 @@ USE_IPV6:=1
LIBS= -dead_strip
ifdef STATIC
# Build STATIC if you are redistributing the bitcoind binary
# Build STATIC if you are redistributing the blackcoind binary
LIBS += \
$(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
$(DEPSDIR)/lib/libboost_system-mt.a \
......@@ -123,7 +123,7 @@ ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6)
endif
all: novacoind
all: blackcoind
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
......@@ -161,11 +161,11 @@ obj/scrypt-x86.o: scrypt-x86.S
obj/scrypt-x86_64.o: scrypt-x86_64.S
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
novacoind: $(OBJS:obj/%=obj/%)
blackcoind: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
clean:
-rm -f novacoind
-rm -f blackcoind
-rm -f obj/*.o
-rm -f obj/zerocoin/*.o
-rm -f obj/*.P
......
......@@ -149,7 +149,7 @@ OBJS= \
obj/zerocoin/SpendMetaData.o \
obj/zerocoin/ZeroTest.o
all: novacoind
all: blackcoind
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
......@@ -190,11 +190,11 @@ obj/zerocoin/%.o: zerocoin/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
novacoind: $(OBJS:obj/%=obj/%)
blackcoind: $(OBJS:obj/%=obj/%)
$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
clean:
-rm -f novacoind
-rm -f blackcoind
-rm -f obj/*.o
-rm -f obj/zerocoin/*.o
-rm -f obj/*.P
......
......@@ -519,7 +519,7 @@ void StakeMiner(CWallet *pwallet)
SetThreadPriority(THREAD_PRIORITY_LOWEST);
// Make this thread recognisable as the mining thread
RenameThread("novacoin-miner");
RenameThread("blackcoin-miner");
// Each thread has its own counter
unsigned int nExtraNonce = 0;
......
......@@ -373,7 +373,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)
pszGet = "GET / HTTP/1.1\r\n"
"Host: checkip.dyndns.org\r\n"
"User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)\r\n"
"User-Agent: BlackCoin\r\n"
"Connection: close\r\n"
"\r\n";
......@@ -392,7 +392,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)
pszGet = "GET /simple/ HTTP/1.1\r\n"
"Host: www.showmyip.com\r\n"
"User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)\r\n"
"User-Agent: BlackCoin\r\n"
"Connection: close\r\n"
"\r\n";
......@@ -409,7 +409,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)
void ThreadGetMyExternalIP(void* parg)
{
// Make this thread recognisable as the external IP detection thread
RenameThread("bitcoin-ext-ip");
RenameThread("blackcoin-ext-ip");
CNetAddr addrLocalHost;
if (GetMyExternalIP(addrLocalHost))
......@@ -641,7 +641,7 @@ void CNode::copyStats(CNodeStats &stats)
void ThreadSocketHandler(void* parg)
{
// Make this thread recognisable as the networking thread
RenameThread("bitcoin-net");
RenameThread("blackcoin-net");
try
{
......@@ -1000,7 +1000,7 @@ void ThreadSocketHandler2(void* parg)
void ThreadMapPort(void* parg)
{
// Make this thread recognisable as the UPnP thread
RenameThread("bitcoin-UPnP");
RenameThread("blackcoin-UPnP");
try
{
......@@ -1061,7 +1061,7 @@ void ThreadMapPort2(void* parg)