gilardh
/
hush
forked from hush/hush
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

initial version rebranded as hush

v1.0.9-lin
David Mercer 7 years ago
parent
e6ed157e7f
commit
f56f15b73d
8 changed files with 41 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile.am
  2. 52
      src/Makefile.am
  3. 2
      src/clientversion.cpp
  4. 6
      src/metrics.cpp
  5. 4
      src/rpcnet.cpp
  6. 2
      src/sendalert.cpp
  7. 10
      src/util.cpp
  8. 2
      zcutil/build.sh

4
Makefile.am
View File

@ -12,8 +12,8 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libzcashconsensus.pc
endif
BITCOIND_BIN=$(top_builddir)/src/zcashd$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/zcash-cli$(EXEEXT)
BITCOIND_BIN=$(top_builddir)/src/hushd$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/hush-cli$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
##OSX_APP=Bitcoin-Qt.app

52
src/Makefile.am
View File

@ -71,11 +71,11 @@ noinst_PROGRAMS =
TESTS =
if BUILD_BITCOIND
bin_PROGRAMS += zcashd
bin_PROGRAMS += hushd
endif
if BUILD_BITCOIN_UTILS
bin_PROGRAMS += zcash-cli zcash-tx
bin_PROGRAMS += hush-cli hush-tx
endif
LIBZCASH_H = \
@ -204,7 +204,7 @@ obj/build.h: FORCE
$(abs_top_srcdir)
libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
# server: zcashd
# server: hushd
libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
libbitcoin_server_a_SOURCES = \
sendalert.cpp \
@ -265,7 +265,7 @@ libbitcoin_proton_a_SOURCES = \
amqp/amqppublishnotifier.cpp
endif
# wallet: zcashd, but only linked when wallet enabled
# wallet: hushd, but only linked when wallet enabled
libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
libbitcoin_wallet_a_SOURCES = \
utiltest.cpp \
@ -315,7 +315,7 @@ crypto_libbitcoin_crypto_a_SOURCES += \
${EQUIHASH_TROMP_SOURCES}
endif
# common: shared between zcashd and non-server tools
# common: shared between hushd and non-server tools
libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)
libbitcoin_common_a_SOURCES = \
amount.cpp \
@ -383,15 +383,15 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
#
# bitcoind binary #
zcashd_SOURCES = bitcoind.cpp
zcashd_CPPFLAGS = $(BITCOIN_INCLUDES)
zcashd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
hushd_SOURCES = bitcoind.cpp
hushd_CPPFLAGS = $(BITCOIN_INCLUDES)
hushd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
if TARGET_WINDOWS
zcashd_SOURCES += bitcoind-res.rc
hushd_SOURCES += bitcoind-res.rc
endif
zcashd_LDADD = \
hushd_LDADD = \
$(LIBBITCOIN_SERVER) \
$(LIBBITCOIN_COMMON) \
$(LIBUNIVALUE) \
@ -403,14 +403,14 @@ zcashd_LDADD = \
$(LIBSECP256K1)
if ENABLE_ZMQ
zcashd_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
hushd_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
endif
if ENABLE_WALLET
zcashd_LDADD += libbitcoin_wallet.a
hushd_LDADD += libbitcoin_wallet.a
endif
zcashd_LDADD += \
hushd_LDADD += \
$(BOOST_LIBS) \
$(BDB_LIBS) \
$(SSL_LIBS) \
@ -423,19 +423,19 @@ zcashd_LDADD += \
$(LIBZCASH_LIBS)
if ENABLE_PROTON
zcashd_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS)
hushd_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS)
endif
# bitcoin-cli binary #
zcash_cli_SOURCES = bitcoin-cli.cpp
zcash_cli_CPPFLAGS = $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
zcash_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
hush_cli_SOURCES = bitcoin-cli.cpp
hush_cli_CPPFLAGS = $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
hush_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
if TARGET_WINDOWS
zcash_cli_SOURCES += bitcoin-cli-res.rc
hush_cli_SOURCES += bitcoin-cli-res.rc
endif
zcash_cli_LDADD = \
hush_cli_LDADD = \
$(LIBBITCOIN_CLI) \
$(LIBUNIVALUE) \
$(LIBBITCOIN_UTIL) \
@ -448,17 +448,17 @@ zcash_cli_LDADD = \
$(LIBZCASH_LIBS)
#
# zcash-tx binary #
zcash_tx_SOURCES = bitcoin-tx.cpp
zcash_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
zcash_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
# hush-tx binary #
hush_tx_SOURCES = bitcoin-tx.cpp
hush_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
hush_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
if TARGET_WINDOWS
zcash_tx_SOURCES += bitcoin-tx-res.rc
hush_tx_SOURCES += bitcoin-tx-res.rc
endif
# FIXME: Is libzcash needed for zcash_tx?
zcash_tx_LDADD = \
hush_tx_LDADD = \
$(LIBUNIVALUE) \
$(LIBBITCOIN_COMMON) \
$(LIBBITCOIN_UTIL) \
@ -467,7 +467,7 @@ zcash_tx_LDADD = \
$(LIBBITCOIN_CRYPTO) \
$(LIBZCASH_LIBS)
zcash_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
hush_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
#
# zcash protocol primitives #

2
src/clientversion.cpp
View File

@ -19,7 +19,7 @@
* for both bitcoind and bitcoin-core, to make it harder for attackers to
* target servers or GUI users specifically.
*/
const std::string CLIENT_NAME("MagicBean");
const std::string CLIENT_NAME("BalefulStatic");
/**
* Client version number

6
src/metrics.cpp
View File

@ -220,7 +220,7 @@ int printMiningStatus(bool mining)
lines++;
} else {
std::cout << _("You are currently not mining.") << std::endl;
std::cout << _("To enable mining, add 'gen=1' to your zdash.conf and restart.") << std::endl;
std::cout << _("To enable mining, add 'gen=1' to your hush.conf and restart.") << std::endl;
lines += 2;
}
std::cout << std::endl;
@ -387,8 +387,8 @@ void ThreadShowMetricsScreen()
std::cout << "\e[2J";
// Thank you text
std::cout << _("Thank you for running a Zdash node!") << std::endl;
std::cout << _("You're helping to strengthen the machine :D") << std::endl;
std::cout << _("Thank you for running a HUSH node!") << std::endl;
std::cout << _("You're helping to secure everyone's privacy") << std::endl;
std::cout << std::endl;
// Privacy notice text

4
src/rpcnet.cpp
View File

@ -96,7 +96,7 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
" \"pingtime\": n, (numeric) ping time\n"
" \"pingwait\": n, (numeric) ping wait\n"
" \"version\": v, (numeric) The peer version, such as 170002\n"
" \"subver\": \"/MagicBean:x.y.z[-v]/\", (string) The string version\n"
" \"subver\": \"/BalefulStatic:x.y.z[-v]/\", (string) The string version\n"
" \"inbound\": true|false, (boolean) Inbound (true) or Outbound (false)\n"
" \"startingheight\": n, (numeric) The starting height (block) of the peer\n"
" \"banscore\": n, (numeric) The ban score\n"
@ -407,7 +407,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
"\nResult:\n"
"{\n"
" \"version\": xxxxx, (numeric) the server version\n"
" \"subversion\": \"/MagicBean:x.y.z[-v]/\", (string) the server subversion string\n"
" \"subversion\": \"/BalefulStatic:x.y.z[-v]/\", (string) the server subversion string\n"
" \"protocolversion\": xxxxx, (numeric) the protocol version\n"
" \"localservices\": \"xxxxxxxxxxxxxxxx\", (string) the services we offer to the network\n"
" \"timeoffset\": xxxxx, (numeric) the time offset\n"

2
src/sendalert.cpp
View File

@ -93,7 +93,7 @@ void ThreadSendAlert()
// Set specific client version/versions here. If setSubVer is empty, no filtering on subver is done:
// alert.setSubVer.insert(std::string("/MagicBean:0.7.2/"));
const std::vector<std::string> useragents = {"MagicBean", "BeanStalk", "AppleSeed", "EleosZcash"};
const std::vector<std::string> useragents = {"MagicBean", "BalefulStatic"};
BOOST_FOREACH(const std::string& useragent, useragents) {
alert.setSubVer.insert(std::string("/"+useragent+":1.0.3/"));

10
src/util.cpp
View File

@ -450,7 +450,7 @@ boost::filesystem::path GetDefaultDataDir()
// Unix: ~/.zcash
#ifdef WIN32
// Windows
return GetSpecialFolderPath(CSIDL_APPDATA) / "Zdash";
return GetSpecialFolderPath(CSIDL_APPDATA) / "Hush";
#else
fs::path pathRet;
char* pszHome = getenv("HOME");
@ -462,10 +462,10 @@ boost::filesystem::path GetDefaultDataDir()
// Mac
pathRet /= "Library/Application Support";
TryCreateDirectory(pathRet);
return pathRet / "Zdash";
return pathRet / "Hush";
#else
// Unix
return pathRet / ".zdash";
return pathRet / ".hush";
#endif
#endif
}
@ -582,7 +582,7 @@ void ClearDatadirCache()
boost::filesystem::path GetConfigFile()
{
boost::filesystem::path pathConfigFile(GetArg("-conf", "zdash.conf"));
boost::filesystem::path pathConfigFile(GetArg("-conf", "hush.conf"));
if (!pathConfigFile.is_complete())
pathConfigFile = GetDataDir(false) / pathConfigFile;
@ -601,7 +601,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
{
// Don't overwrite existing settings so command line settings override zdash.conf
// Don't overwrite existing settings so command line settings override hush.conf
string strKey = string("-") + it->string_key;
if (mapSettingsRet.count(strKey) == 0)
{

2
zcutil/build.sh
View File

@ -108,4 +108,4 @@ HOST="$HOST" BUILD="$BUILD" NO_RUST="$RUST_ARG" NO_PROTON="$PROTON_ARG" "$MAKE"
./autogen.sh
CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$RUST_ARG" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g'
cd src
"$MAKE" "$@" V=1 zcashd zcash-cli
"$MAKE" "$@" V=1 hushd hush-cli

Write Preview
Loading…
Cancel
Save