mirror of
https://git.hush.is/hush/hush3.git
synced 2025-09-24 00:04:19 -04:00
hushd, hush-cli and hush-tx are real binaries now
No more bash scripts or .bat files needed as wrappers!
This commit is contained in:
Duke Leto
parent
13e16cc2ef
commit
50ee752c3f
8
.gitignore
vendored
8
.gitignore
vendored
@ -118,6 +118,14 @@ src/komodo-cli.exe
|
||||
src/komodod.exe
|
||||
src/komodo-tx.exe
|
||||
|
||||
src/hush-cli
|
||||
src/hushd
|
||||
src/hush-tx
|
||||
src/hush-test
|
||||
src/hush-cli.exe
|
||||
src/hushd.exe
|
||||
src/hush-tx.exe
|
||||
|
||||
#output during builds, symbol tables?
|
||||
*.dSYM
|
||||
|
||||
|
||||
14
configure.ac
14
configure.ac
@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
|
||||
AC_PREREQ([2.60])
|
||||
define(_CLIENT_VERSION_MAJOR, 3)
|
||||
define(_CLIENT_VERSION_MINOR, 8)
|
||||
define(_CLIENT_VERSION_REVISION, 0)
|
||||
define(_CLIENT_VERSION_REVISION, 1)
|
||||
define(_CLIENT_VERSION_BUILD, 50)
|
||||
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
|
||||
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
|
||||
@ -14,9 +14,9 @@ AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
AC_CONFIG_MACRO_DIR([build-aux/m4])
|
||||
|
||||
BITCOIN_DAEMON_NAME=komodod
|
||||
BITCOIN_CLI_NAME=komodo-cli
|
||||
BITCOIN_TX_NAME=komodo-tx
|
||||
BITCOIN_DAEMON_NAME=hushd
|
||||
BITCOIN_CLI_NAME=hush-cli
|
||||
BITCOIN_TX_NAME=hush-tx
|
||||
|
||||
dnl Unless the user specified ARFLAGS, force it to be cr
|
||||
AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])
|
||||
@ -231,7 +231,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
|
||||
|
||||
AC_ARG_WITH([utils],
|
||||
[AS_HELP_STRING([--with-utils],
|
||||
[build komodo-cli komodo-tx wallet-utility (default=yes)])],
|
||||
[build hush-cli hush-tx wallet-utility (default=yes)])],
|
||||
[build_bitcoin_utils=$withval],
|
||||
[build_bitcoin_utils=yes])
|
||||
|
||||
@ -766,11 +766,11 @@ AX_CHECK_COMPILE_FLAG([-Wno-builtin-declaration-mismatch],[CXXFLAGS="$CXXFLAGS -
|
||||
|
||||
LIBZCASH_LIBS="-lgmp -lgmpxx $BOOST_SYSTEM_LIB -lwolfssl -lsodium $RUST_LIBS"
|
||||
|
||||
AC_MSG_CHECKING([whether to build komodod])
|
||||
AC_MSG_CHECKING([whether to build hushd])
|
||||
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
|
||||
AC_MSG_RESULT($build_bitcoind)
|
||||
|
||||
AC_MSG_CHECKING([whether to build utils (komodo-cli komodo-tx wallet-utility)])
|
||||
AC_MSG_CHECKING([whether to build utils (hush-cli hush-tx wallet-utility)])
|
||||
AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
|
||||
AC_MSG_RESULT($build_bitcoin_utils)
|
||||
|
||||
|
||||
@ -98,11 +98,11 @@ noinst_PROGRAMS =
|
||||
TESTS =
|
||||
|
||||
#if BUILD_BITCOIND
|
||||
bin_PROGRAMS += komodod
|
||||
bin_PROGRAMS += hushd
|
||||
#endif
|
||||
|
||||
if BUILD_BITCOIN_UTILS
|
||||
bin_PROGRAMS += komodo-cli komodo-tx
|
||||
bin_PROGRAMS += hush-cli hush-tx
|
||||
endif
|
||||
if ENABLE_WALLET
|
||||
bin_PROGRAMS += wallet-utility
|
||||
@ -333,7 +333,7 @@ libbitcoin_zmq_a_SOURCES = \
|
||||
zmq/zmqpublishnotifier.cpp
|
||||
endif
|
||||
|
||||
# wallet: komodod, but only linked when wallet enabled
|
||||
# wallet: hushd, but only linked when wallet enabled
|
||||
libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
libbitcoin_wallet_a_SOURCES = \
|
||||
@ -481,17 +481,17 @@ libbitcoin_cli_a_SOURCES = \
|
||||
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
|
||||
#
|
||||
|
||||
# komodod binary #
|
||||
komodod_SOURCES = bitcoind.cpp
|
||||
komodod_CPPFLAGS = -fPIC $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
komodod_CXXFLAGS = -fPIC $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
komodod_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
# hushd binary #
|
||||
hushd_SOURCES = bitcoind.cpp
|
||||
hushd_CPPFLAGS = -fPIC $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
hushd_CXXFLAGS = -fPIC $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
hushd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
if TARGET_WINDOWS
|
||||
komodod_SOURCES += bitcoind-res.rc
|
||||
hushd_SOURCES += bitcoind-res.rc
|
||||
endif
|
||||
|
||||
komodod_LDADD = \
|
||||
hushd_LDADD = \
|
||||
$(LIBBITCOIN_SERVER) \
|
||||
$(LIBBITCOIN_COMMON) \
|
||||
$(LIBUNIVALUE) \
|
||||
@ -506,10 +506,10 @@ komodod_LDADD = \
|
||||
$(LIBCRYPTOCONDITIONS)
|
||||
|
||||
if ENABLE_WALLET
|
||||
komodod_LDADD += $(LIBBITCOIN_WALLET)
|
||||
hushd_LDADD += $(LIBBITCOIN_WALLET)
|
||||
endif
|
||||
|
||||
komodod_LDADD += \
|
||||
hushd_LDADD += \
|
||||
$(BOOST_LIBS) \
|
||||
$(BDB_LIBS) \
|
||||
$(SSL_LIBS) \
|
||||
@ -521,27 +521,27 @@ komodod_LDADD += \
|
||||
$(LIBZCASH_LIBS)
|
||||
|
||||
if TARGET_DARWIN
|
||||
komodod_LDADD += libcc.dylib $(LIBSECP256K1)
|
||||
hushd_LDADD += libcc.dylib $(LIBSECP256K1)
|
||||
endif
|
||||
if TARGET_WINDOWS
|
||||
komodod_LDADD += libcc.dll $(LIBSECP256K1)
|
||||
hushd_LDADD += libcc.dll $(LIBSECP256K1)
|
||||
endif
|
||||
if TARGET_LINUX
|
||||
komodod_LDADD += libcc.so $(LIBSECP256K1)
|
||||
hushd_LDADD += libcc.so $(LIBSECP256K1)
|
||||
endif
|
||||
|
||||
# [+] Decker: use static linking for libstdc++.6.dylib, libgomp.1.dylib, libgcc_s.1.dylib
|
||||
if TARGET_DARWIN
|
||||
komodod_LDFLAGS += -static-libgcc
|
||||
hushd_LDFLAGS += -static-libgcc
|
||||
endif
|
||||
|
||||
# komodo-cli binary #
|
||||
komodo_cli_SOURCES = bitcoin-cli.cpp
|
||||
komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
|
||||
komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
# hush-cli binary #
|
||||
hush_cli_SOURCES = bitcoin-cli.cpp
|
||||
hush_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
|
||||
hush_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
hush_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
if TARGET_DARWIN
|
||||
komodo_cli_LDFLAGS += -static-libgcc
|
||||
hush_cli_LDFLAGS += -static-libgcc
|
||||
endif
|
||||
|
||||
# wallet-utility binary #
|
||||
@ -553,10 +553,10 @@ wallet_utility_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
endif
|
||||
|
||||
if TARGET_WINDOWS
|
||||
komodo_cli_SOURCES += bitcoin-cli-res.rc
|
||||
hush_cli_SOURCES += bitcoin-cli-res.rc
|
||||
endif
|
||||
|
||||
komodo_cli_LDADD = \
|
||||
hush_cli_LDADD = \
|
||||
$(LIBBITCOIN_CLI) \
|
||||
$(LIBUNIVALUE) \
|
||||
$(LIBBITCOIN_UTIL) \
|
||||
@ -584,17 +584,17 @@ wallet_utility_LDADD = \
|
||||
$(LIBCRYPTOCONDITIONS)
|
||||
endif
|
||||
|
||||
# komodo-tx binary #
|
||||
komodo_tx_SOURCES = komodo-tx.cpp
|
||||
komodo_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
komodo_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
komodo_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
# hush-tx binary #
|
||||
hush_tx_SOURCES = hush-tx.cpp
|
||||
hush_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
hush_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
hush_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
if TARGET_WINDOWS
|
||||
komodo_tx_SOURCES += bitcoin-tx-res.rc
|
||||
hush_tx_SOURCES += bitcoin-tx-res.rc
|
||||
endif
|
||||
|
||||
komodo_tx_LDADD = \
|
||||
hush_tx_LDADD = \
|
||||
$(LIBUNIVALUE) \
|
||||
$(LIBBITCOIN_COMMON) \
|
||||
$(LIBBITCOIN_UTIL) \
|
||||
@ -605,7 +605,7 @@ komodo_tx_LDADD = \
|
||||
$(LIBZCASH_LIBS) \
|
||||
$(LIBCRYPTOCONDITIONS)
|
||||
|
||||
komodo_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
|
||||
hush_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
|
||||
|
||||
# Zcash Protocol Primitives
|
||||
libzcash_a_SOURCES = \
|
||||
|
||||
23
src/hush-cli
23
src/hush-cli
@ -1,23 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2016-2021 The Hush developers
|
||||
# Released under the GPLv3
|
||||
|
||||
# set working directory to the location of this script
|
||||
# readlink -f does not always exist
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
cd $DIR
|
||||
DIR="$( cd "$( dirname "$( readlink "${BASH_SOURCE[0]}" )" )" && pwd )"
|
||||
cd $DIR
|
||||
|
||||
NAME=HUSH3
|
||||
|
||||
CLI=${KOMODOCLI:-./komodo-cli}
|
||||
if [ -f $CLI ]; then
|
||||
$CLI -ac_name=$NAME "$@"
|
||||
else
|
||||
# We prefix our binary when installed
|
||||
# system wide on Debain systems, to prevent clashes,
|
||||
# because we are classy like that. Fuck jl777, The KYC Traitor.
|
||||
CLI=hush-komodo-cli
|
||||
$CLI -ac_name=$NAME "$@"
|
||||
fi
|
||||
11
src/hush-tx
11
src/hush-tx
@ -1,11 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2016-2021 The Hush developers
|
||||
# Released under the GPLv3
|
||||
|
||||
# set working directory to the location of this script
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
cd $DIR
|
||||
|
||||
NAME=HUSHT
|
||||
|
||||
./komodo-tx -ac_name=$NAME "$@"
|
||||
99
src/hushd
99
src/hushd
@ -1,99 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2016-2021 The Hush developers
|
||||
# Distributed under the GPLv3 software license, see the accompanying
|
||||
# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
|
||||
|
||||
# set working directory to the location of this script
|
||||
# readlink -f does not always exist
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
cd $DIR
|
||||
DIR="$( cd "$( dirname "$( readlink "${BASH_SOURCE[0]}" )" )" && pwd )"
|
||||
cd $DIR
|
||||
|
||||
# Chain parameters
|
||||
NAME=HUSH3
|
||||
|
||||
# this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn
|
||||
SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac
|
||||
|
||||
# Hush was and will always be:
|
||||
# The First Pure Sapling Zcash Protocol chain!
|
||||
SAPLING=1
|
||||
|
||||
# We use 3 "eras" of different supply curves
|
||||
ERAS=3
|
||||
|
||||
# These values are historical and over-ridden by internals!
|
||||
# Do not change these values, change internals.
|
||||
BLOCKTIME=150 # Hush goes to 75s blocktime at Block 340K
|
||||
REWARD=0,1125000000,562500000
|
||||
HALVING=129,340000,840000
|
||||
PERC=11111111
|
||||
END=128,340000,5422111
|
||||
|
||||
# 6250000 - (Sprout pool at block 500,000)
|
||||
SUPPLY=6178674
|
||||
FOUNDERS=1
|
||||
CLIENTNAME=GoldenSandtrout
|
||||
NODE1=node1.hush.is
|
||||
NODE2=node2.hush.is
|
||||
NODE3=node3.hush.is
|
||||
NODE4=node4.hush.is
|
||||
NODE5=node5.hush.is
|
||||
NODE6=node6.hush.is
|
||||
NODE7=node7.hush.is
|
||||
NODE8=node8.hush.is
|
||||
CCLIB=hush3
|
||||
|
||||
# CryptoConditions/Custom Consensus params
|
||||
# CCs will effectively be turned off at Block 340K
|
||||
# since transparent outputs will not be allowed, except
|
||||
# for mining and dpow. CCs can be used on Hush Smart
|
||||
# Chains that do not define ac_private=1
|
||||
FAUCET=228
|
||||
HEIR=234
|
||||
CHANNEL=235
|
||||
ORACLE=236
|
||||
GATEWAY=241
|
||||
CCENABLE=$FAUCET,$HEIR,$CHANNEL,$ORACLE,$GATEWAY
|
||||
|
||||
KMD=${KOMODOD:-./komodod}
|
||||
if [ -f $KMD ]; then
|
||||
HUSH="TheFuture"
|
||||
# echo "Found binary: $KMD"
|
||||
else
|
||||
KMD=hush-komodod
|
||||
if [ -f $KMD ]; then
|
||||
echo "Found binary: $KMD"
|
||||
else
|
||||
echo "ERROR: Could not find Komodo binary!!!"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# jl777 dishonored his village and so Duke The Elder journeys on
|
||||
# with the True Extreme Privacy Cypherpunks
|
||||
$KMD -ac_name=$NAME \
|
||||
-ac_sapling=$SAPLING \
|
||||
-ac_reward=$REWARD \
|
||||
-ac_halving=$HALVING \
|
||||
-ac_end=$END \
|
||||
-ac_eras=$ERAS \
|
||||
-ac_blocktime=$BLOCKTIME \
|
||||
-ac_cc=2 \
|
||||
-ac_ccenable=$CCENABLE \
|
||||
-ac_founders=$FOUNDERS \
|
||||
-ac_supply=$SUPPLY \
|
||||
-ac_perc=$PERC \
|
||||
-clientname=$CLIENTNAME \
|
||||
-asmap \
|
||||
-addnode=$NODE1 \
|
||||
-addnode=$NODE2 \
|
||||
-addnode=$NODE3 \
|
||||
-addnode=$NODE4 \
|
||||
-addnode=$NODE5 \
|
||||
-addnode=$NODE6 \
|
||||
-addnode=$NODE7 \
|
||||
-addnode=$NODE8 \
|
||||
-ac_cclib=$CCLIB \
|
||||
-ac_script=$SCRIPT "$@"
|
||||
Loading…
x
Reference in New Issue
Block a user