diff --git a/.gitignore b/.gitignore index f12b354908568..e00a0588c50ae 100644 --- a/.gitignore +++ b/.gitignore @@ -136,7 +136,7 @@ test/.mypy_cache/ /doc/doxygen/ -libbitcoinconsensus.pc +libnavcoinconsensus.pc contrib/devtools/split-debug.sh # Output from running db4 installation diff --git a/Makefile.am b/Makefile.am index 7a4cae68d3bdf..b7530e92fb7c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,7 @@ endif if BUILD_BITCOIN_LIBS pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libbitcoinconsensus.pc +pkgconfig_DATA = libnavcoinconsensus.pc endif BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT) diff --git a/build_msvc/bench_bench_navcoin/bench_bench_navcoin.vcxproj b/build_msvc/bench_bench_navcoin/bench_bench_navcoin.vcxproj index f81f98db6e6e9..98655a12e83ad 100644 --- a/build_msvc/bench_bench_navcoin/bench_bench_navcoin.vcxproj +++ b/build_msvc/bench_bench_navcoin/bench_bench_navcoin.vcxproj @@ -116,7 +116,7 @@ - + {2b384fa8-9ee1-4544-93cb-0d733c25e8ce} diff --git a/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj b/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj index 8cb95714d3dcf..6b0c1ab894b0c 100644 --- a/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj +++ b/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj @@ -21,7 +21,7 @@ - + diff --git a/build_msvc/navcoind/navcoind.vcxproj b/build_msvc/navcoind/navcoind.vcxproj index 6e6196a0b7099..207dc6d8339f8 100644 --- a/build_msvc/navcoind/navcoind.vcxproj +++ b/build_msvc/navcoind/navcoind.vcxproj @@ -9,9 +9,9 @@ $(SolutionDir)$(Platform)\$(Configuration)\ - - - $(IntDir)init_bitcoind.obj + + + $(IntDir)init_navcoind.obj diff --git a/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh b/ci/test/00_setup_env_native_nowallet_libnavcoinkernel.sh similarity index 92% rename from ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh rename to ci/test/00_setup_env_native_nowallet_libnavcoinkernel.sh index 6f0b9cc285072..beee83a6f9f4b 100755 --- a/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh +++ b/ci/test/00_setup_env_native_nowallet_libnavcoinkernel.sh @@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8 -export CONTAINER_NAME=ci_native_nowallet_libbitcoinkernel +export CONTAINER_NAME=ci_native_nowallet_libnavcoinkernel export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04" # Use minimum supported python3.9 (or best-effort 3.10) and clang-14, see doc/dependencies.md export PACKAGES="python3-zmq clang-14 llvm-14 libc++abi-14-dev libc++-14-dev" diff --git a/configure.ac b/configure.ac index 95b70a2c41e76..d0214a20daa36 100644 --- a/configure.ac +++ b/configure.ac @@ -643,15 +643,15 @@ AC_ARG_WITH([libs], AC_ARG_WITH([experimental-kernel-lib], [AS_HELP_STRING([--with-experimental-kernel-lib], - [build experimental bitcoinkernel library (default is to build if we're building libraries and the experimental build-chainstate executable)])], + [build experimental navcoinkernel library (default is to build if we're building libraries and the experimental build-chainstate executable)])], [build_experimental_kernel_lib=$withval], [build_experimental_kernel_lib=auto]) AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], [build navcoind daemon (default=yes)])], - [build_bitcoind=$withval], - [build_bitcoind=yes]) + [build_navcoind=$withval], + [build_navcoind=yes]) case $host in *mingw*) @@ -1280,7 +1280,7 @@ if test "$enable_fuzz" = "yes"; then build_bitcoin_util=no build_bitcoin_chainstate=no build_bitcoin_wallet=no - build_bitcoind=no + build_navcoind=no build_bitcoin_libs=no use_bench=no use_tests=no @@ -1301,7 +1301,7 @@ if test "$enable_build_libblsct_only" = "yes"; then build_bitcoin_util=no build_bitcoin_chainstate=no build_bitcoin_wallet=no - build_bitcoind=no + build_navcoind=no build_bitcoin_libs=no use_bench=no use_tests=no @@ -1383,7 +1383,7 @@ if test "$use_usdt" != "no"; then fi AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"]) -if test "$build_bitcoind$use_bench$use_tests" = "nonono"; then +if test "$build_navcoind$use_bench$use_tests" = "nonono"; then use_upnp=no use_natpmp=no use_zmq=no @@ -1433,7 +1433,7 @@ if test "$use_natpmp" != "no"; then CPPFLAGS="$TEMP_CPPFLAGS" fi -if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$use_tests$use_bench$enable_fuzz_binary" = "nononononononono"; then +if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_navcoind$use_tests$use_bench$enable_fuzz_binary" = "nononononononono"; then use_boost=no else use_boost=yes @@ -1444,7 +1444,7 @@ if test "$use_boost" = "yes"; then dnl Check for Boost headers AX_BOOST_BASE([1.73.0],[],[AC_MSG_ERROR([Boost is not available!])]) if test "$want_boost" = "no"; then - AC_MSG_ERROR([only libbitcoinconsensus can be built without Boost]) + AC_MSG_ERROR([only libnavcoinconsensus can be built without Boost]) fi dnl we don't use multi_index serialization @@ -1532,7 +1532,7 @@ fi dnl libevent check use_libevent=no -if test "$build_bitcoin_cli$build_bitcoind$enable_fuzz_binary$use_tests$use_bench" != "nonononono"; then +if test "$build_bitcoin_cli$build_navcoind$enable_fuzz_binary$use_tests$use_bench" != "nonononono"; then PKG_CHECK_MODULES([EVENT], [libevent >= 2.1.8], [use_libevent=yes], [AC_MSG_ERROR([libevent version 2.1.8 or greater not found.])]) if test "$TARGET_OS" != "windows"; then PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads >= 2.1.8], [], [AC_MSG_ERROR([libevent_pthreads version 2.1.8 or greater not found.])]) @@ -1622,9 +1622,9 @@ if test "$build_multiprocess" != "no"; then AC_SUBST(MPGEN_PREFIX) fi -AC_MSG_CHECKING([whether to build bitcoind]) -AM_CONDITIONAL([BUILD_BITCOIND], [test $build_bitcoind = "yes"]) -AC_MSG_RESULT($build_bitcoind) +AC_MSG_CHECKING([whether to build navcoind]) +AM_CONDITIONAL([BUILD_BITCOIND], [test $build_navcoind = "yes"]) +AC_MSG_RESULT($build_navcoind) AC_MSG_CHECKING([whether to build bitcoin-cli]) AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test $build_bitcoin_cli = "yes"]) @@ -1645,7 +1645,7 @@ AC_MSG_RESULT($build_bitcoin_util) AC_MSG_CHECKING([whether to build experimental bitcoin-chainstate]) if test "$build_bitcoin_chainstate" = "yes"; then if test "$build_experimental_kernel_lib" = "no"; then - AC_MSG_ERROR([experimental bitcoin-chainstate cannot be built without the experimental bitcoinkernel library. Use --with-experimental-kernel-lib]); + AC_MSG_ERROR([experimental bitcoin-chainstate cannot be built without the experimental navcoinkernel library. Use --with-experimental-kernel-lib]); fi fi AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"]) @@ -1656,7 +1656,7 @@ AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test $build_bitcoin_libs = "yes"]) if test "$build_bitcoin_libs" = "yes"; then AC_DEFINE([HAVE_CONSENSUS_LIB], [1], [Define this symbol if the consensus lib has been built]) - AC_CONFIG_FILES([libbitcoinconsensus.pc:libbitcoinconsensus.pc.in]) + AC_CONFIG_FILES([libnavcoinconsensus.pc:libnavcoinconsensus.pc.in]) fi AM_CONDITIONAL([BUILD_BITCOIN_KERNEL_LIB], [test "$build_experimental_kernel_lib" != "no" && ( test "$build_experimental_kernel_lib" = "yes" || test "$build_bitcoin_chainstate" = "yes" )]) @@ -1758,7 +1758,7 @@ else AC_MSG_RESULT([no]) fi -if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoin_libs$build_bitcoind$enable_fuzz_binary$use_bench$use_tests" = "nonononononononono"; then +if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoin_libs$build_navcoind$enable_fuzz_binary$use_bench$use_tests" = "nonononononononono"; then AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --enable-fuzz(-binary) --enable-bench or --enable-tests]) fi diff --git a/contrib/README.md b/contrib/README.md index f375993ac4b76..1de8a867ad020 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain. ### [Qos](/contrib/qos) ### -A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. +A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on navcoind instance running, and another local navcoind/bitcoin-qt instance which connects to this node and receives blocks from it. ### [Seeds](/contrib/seeds) ### Utility to generate the pnSeed[] array that is compiled into the client. diff --git a/contrib/completions/bash/bitcoind.bash b/contrib/completions/bash/navcoind.bash similarity index 81% rename from contrib/completions/bash/bitcoind.bash rename to contrib/completions/bash/navcoind.bash index c11d99ef3169c..81cd5b2b5ea6e 100644 --- a/contrib/completions/bash/bitcoind.bash +++ b/contrib/completions/bash/navcoind.bash @@ -1,15 +1,15 @@ -# bash programmable completion for bitcoind(1) and bitcoin-qt(1) +# bash programmable completion for navcoind(1) and bitcoin-qt(1) # Copyright (c) 2012-2022 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -_bitcoind() { +_navcoind() { local cur prev words=() cword - local bitcoind + local navcoind - # save and use original argument to invoke bitcoind for -help + # save and use original argument to invoke navcoind for -help # it might not be in $PATH - bitcoind="$1" + navcoind="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -33,7 +33,7 @@ _bitcoind() { # only parse -help if sensible if [[ -z "$cur" || "$cur" =~ ^- ]]; then local helpopts - helpopts=$($bitcoind -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($navcoind -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) ) fi @@ -45,7 +45,7 @@ _bitcoind() { ;; esac } && -complete -F _bitcoind bitcoind bitcoin-qt +complete -F _navcoind navcoind bitcoin-qt # Local variables: # mode: shell-script diff --git a/contrib/completions/fish/bitcoind.fish b/contrib/completions/fish/navcoind.fish similarity index 77% rename from contrib/completions/fish/bitcoind.fish rename to contrib/completions/fish/navcoind.fish index fa245ae17f470..8cfa52f19a516 100644 --- a/contrib/completions/fish/bitcoind.fish +++ b/contrib/completions/fish/navcoind.fish @@ -1,8 +1,8 @@ # Disable files from being included in completions by default -complete --command bitcoind --no-files +complete --command navcoind --no-files # Extract options -function __fish_bitcoind_get_options +function __fish_navcoind_get_options argparse 'nofiles' -- $argv set --local cmd (commandline -opc)[1] set --local options @@ -21,15 +21,15 @@ end # Add options with file completion complete \ - --command bitcoind \ - --arguments "(__fish_bitcoind_get_options)" + --command navcoind \ + --arguments "(__fish_navcoind_get_options)" # Enable file completions only if the commandline now contains a `*.=` style option -complete --command bitcoind \ +complete --command navcoind \ --condition 'string match --regex -- ".*=" (commandline -pt)' \ --force-files # Add options without file completion complete \ - --command bitcoind \ - --arguments "(__fish_bitcoind_get_options --nofiles)" + --command navcoind \ + --arguments "(__fish_navcoind_get_options --nofiles)" diff --git a/contrib/devtools/gen-bitcoin-conf.sh b/contrib/devtools/gen-bitcoin-conf.sh index 6923e823b12c2..ed5196edbf181 100755 --- a/contrib/devtools/gen-bitcoin-conf.sh +++ b/contrib/devtools/gen-bitcoin-conf.sh @@ -7,7 +7,7 @@ export LC_ALL=C TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} BUILDDIR=${BUILDDIR:-$TOPDIR} BINDIR=${BINDIR:-$BUILDDIR/src} -BITCOIND=${BITCOIND:-$BINDIR/bitcoind} +BITCOIND=${BITCOIND:-$BINDIR/navcoind} SHARE_EXAMPLES_DIR=${SHARE_EXAMPLES_DIR:-$TOPDIR/share/examples} EXAMPLE_CONF_FILE=${EXAMPLE_CONF_FILE:-$SHARE_EXAMPLES_DIR/bitcoin.conf} @@ -46,7 +46,7 @@ cat > "${EXAMPLE_CONF_FILE}" << 'EOF' ### Options EOF -# parse the output from bitcoind --help +# parse the output from navcoind --help # adding newlines is a bit funky to ensure portability for BSD # see here for more details: https://stackoverflow.com/a/24575385 ${BITCOIND} --help \ diff --git a/contrib/devtools/gen-manpages.py b/contrib/devtools/gen-manpages.py index 2860e7db99441..658cec988636f 100755 --- a/contrib/devtools/gen-manpages.py +++ b/contrib/devtools/gen-manpages.py @@ -8,7 +8,7 @@ import tempfile BINARIES = [ -'src/bitcoind', +'src/navcoind', 'src/bitcoin-cli', 'src/bitcoin-tx', 'src/bitcoin-wallet', diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index b3e73bb2b9170..5c941c4a05006 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -92,7 +92,7 @@ # Allowed NEEDED libraries ELF_ALLOWED_LIBRARIES = { -# bitcoind and bitcoin-qt +# navcoind and bitcoin-qt 'libgcc_s.so.1', # GCC base support 'libc.so.6', # C library 'libpthread.so.0', # threading @@ -127,7 +127,7 @@ } MACHO_ALLOWED_LIBRARIES = { -# bitcoind and bitcoin-qt +# navcoind and bitcoin-qt 'libc++.1.dylib', # C++ Standard Library 'libSystem.B.dylib', # libc, libm, libpthread, libinfo # bitcoin-qt only diff --git a/contrib/devtools/test_utxo_snapshots.sh b/contrib/devtools/test_utxo_snapshots.sh index 93a4cd1683e1a..208f8d08b1c49 100755 --- a/contrib/devtools/test_utxo_snapshots.sh +++ b/contrib/devtools/test_utxo_snapshots.sh @@ -12,7 +12,7 @@ # completes. # # The shellcheck rule SC2086 (quoted variables) disablements are necessary -# since this rule needs to be violated in order to get bitcoind to pick up on +# since this rule needs to be violated in order to get navcoind to pick up on # $EARLY_IBD_FLAGS for the script to work. export LC_ALL=C @@ -26,7 +26,7 @@ SERVER_DATADIR="$(pwd)/utxodemo-data-server-$BASE_HEIGHT" CLIENT_DATADIR="$(pwd)/utxodemo-data-client-$BASE_HEIGHT" UTXO_DAT_FILE="$(pwd)/utxo.$BASE_HEIGHT.dat" -# Chosen to try to not interfere with any running bitcoind processes. +# Chosen to try to not interfere with any running navcoind processes. SERVER_PORT=8633 SERVER_RPC_PORT=8632 @@ -111,14 +111,14 @@ read -p "Press [enter] to continue" _ echo echo "-- IBDing the blocks (height=$BASE_HEIGHT) required to the server node..." # shellcheck disable=SC2086 -./src/bitcoind -logthreadnames=1 $SERVER_PORTS \ +./src/navcoind -logthreadnames=1 $SERVER_PORTS \ -datadir="$SERVER_DATADIR" $EARLY_IBD_FLAGS -stopatheight="$BASE_HEIGHT" >/dev/null echo echo "-- Creating snapshot at ~ height $BASE_HEIGHT ($UTXO_DAT_FILE)..." server_sleep_til_shutdown # wait for stopatheight to be hit # shellcheck disable=SC2086 -./src/bitcoind -logthreadnames=1 $SERVER_PORTS \ +./src/navcoind -logthreadnames=1 $SERVER_PORTS \ -datadir="$SERVER_DATADIR" $EARLY_IBD_FLAGS -connect=0 -listen=0 >/dev/null & SERVER_PID="$!" @@ -143,13 +143,13 @@ echo echo echo "-- IBDing more blocks to the server node (height=$FINAL_HEIGHT) so there is a diff between snapshot and tip..." # shellcheck disable=SC2086 -./src/bitcoind $SERVER_PORTS -logthreadnames=1 -datadir="$SERVER_DATADIR" \ +./src/navcoind $SERVER_PORTS -logthreadnames=1 -datadir="$SERVER_DATADIR" \ $EARLY_IBD_FLAGS -stopatheight="$FINAL_HEIGHT" >/dev/null echo echo "-- Starting the server node to provide blocks to the client node..." # shellcheck disable=SC2086 -./src/bitcoind $SERVER_PORTS -logthreadnames=1 -debug=net -datadir="$SERVER_DATADIR" \ +./src/navcoind $SERVER_PORTS -logthreadnames=1 -debug=net -datadir="$SERVER_DATADIR" \ $EARLY_IBD_FLAGS -connect=0 -listen=1 >/dev/null & SERVER_PID="$!" server_sleep_til_boot @@ -173,7 +173,7 @@ read -p "When you're ready for all this, hit [enter]" _ echo echo "-- Starting the client node to get headers from the server, then load the snapshot..." # shellcheck disable=SC2086 -./src/bitcoind $CLIENT_PORTS $ALL_INDEXES -logthreadnames=1 -datadir="$CLIENT_DATADIR" \ +./src/navcoind $CLIENT_PORTS $ALL_INDEXES -logthreadnames=1 -datadir="$CLIENT_DATADIR" \ -connect=0 -addnode=127.0.0.1:$SERVER_PORT -debug=net $EARLY_IBD_FLAGS >/dev/null & CLIENT_PID="$!" client_sleep_til_boot @@ -198,7 +198,7 @@ read -p "Press [enter] to continue" client_sleep_til_boot # shellcheck disable=SC2086 -./src/bitcoind $CLIENT_PORTS $ALL_INDEXES -logthreadnames=1 -datadir="$CLIENT_DATADIR" -connect=0 \ +./src/navcoind $CLIENT_PORTS $ALL_INDEXES -logthreadnames=1 -datadir="$CLIENT_DATADIR" -connect=0 \ -addnode=127.0.0.1:$SERVER_PORT "$EARLY_IBD_FLAGS" >/dev/null & CLIENT_PID="$!" client_sleep_til_boot diff --git a/contrib/init/README.md b/contrib/init/README.md index affc7c2e75063..2ee0ec9ebda1b 100644 --- a/contrib/init/README.md +++ b/contrib/init/README.md @@ -1,11 +1,11 @@ Sample configuration files for: ``` -systemd: bitcoind.service -Upstart: bitcoind.conf -OpenRC: bitcoind.openrc - bitcoind.openrcconf -CentOS: bitcoind.init -macOS: org.bitcoin.bitcoind.plist +systemd: navcoind.service +Upstart: navcoind.conf +OpenRC: navcoind.openrc + navcoind.openrcconf +CentOS: navcoind.init +macOS: org.bitcoin.navcoind.plist ``` have been made available to assist packagers in creating node packages here. diff --git a/contrib/init/bitcoind.conf b/contrib/init/navcoind.conf similarity index 85% rename from contrib/init/bitcoind.conf rename to contrib/init/navcoind.conf index dde1bd0c4d16b..4bb7e9bb3c3a2 100644 --- a/contrib/init/bitcoind.conf +++ b/contrib/init/navcoind.conf @@ -3,14 +3,14 @@ description "Bitcoin Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] -env BITCOIND_BIN="/usr/bin/bitcoind" +env BITCOIND_BIN="/usr/bin/navcoind" env BITCOIND_USER="bitcoin" env BITCOIND_GROUP="bitcoin" -env BITCOIND_PIDDIR="/var/run/bitcoind" +env BITCOIND_PIDDIR="/var/run/navcoind" # upstart can't handle variables constructed with other variables -env BITCOIND_PIDFILE="/var/run/bitcoind/bitcoind.pid" +env BITCOIND_PIDFILE="/var/run/navcoind/navcoind.pid" env BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf" -env BITCOIND_DATADIR="/var/lib/bitcoind" +env BITCOIND_DATADIR="/var/lib/navcoind" expect fork @@ -20,12 +20,12 @@ kill timeout 600 pre-start script # this will catch non-existent config files - # bitcoind will check and exit with this very warning, but it can do so + # navcoind will check and exit with this very warning, but it can do so # long after forking, leaving upstart to think everything started fine. # since this is a commonly encountered case on install, just check and # warn here. if ! grep -qs '^rpcpassword=' "$BITCOIND_CONFIGFILE" ; then - echo "ERROR: You must set a secure rpcpassword to run bitcoind." + echo "ERROR: You must set a secure rpcpassword to run navcoind." echo "The setting must appear in $BITCOIND_CONFIGFILE" echo echo "This password is security critical to securing wallets " diff --git a/contrib/init/bitcoind.init b/contrib/init/navcoind.init similarity index 56% rename from contrib/init/bitcoind.init rename to contrib/init/navcoind.init index 19e1f76d094ce..117b39b2b2de3 100644 --- a/contrib/init/bitcoind.init +++ b/contrib/init/navcoind.init @@ -1,36 +1,36 @@ #!/usr/bin/env bash # -# bitcoind The bitcoin core server. +# navcoind The bitcoin core server. # # # chkconfig: 345 80 20 -# description: bitcoind -# processname: bitcoind +# description: navcoind +# processname: navcoind # # Source function library. . /etc/init.d/functions -# you can override defaults in /etc/sysconfig/bitcoind, see below -if [ -f /etc/sysconfig/bitcoind ]; then - . /etc/sysconfig/bitcoind +# you can override defaults in /etc/sysconfig/navcoind, see below +if [ -f /etc/sysconfig/navcoind ]; then + . /etc/sysconfig/navcoind fi RETVAL=0 -prog=bitcoind -# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/bitcoind -lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/bitcoind} +prog=navcoind +# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/navcoind +lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/navcoind} -# bitcoind defaults to /usr/bin/bitcoind, override with BITCOIND_BIN -bitcoind=${BITCOIND_BIN-/usr/bin/bitcoind} +# navcoind defaults to /usr/bin/navcoind, override with BITCOIND_BIN +navcoind=${BITCOIND_BIN-/usr/bin/navcoind} -# bitcoind opts default to -disablewallet, override with BITCOIND_OPTS -bitcoind_opts=${BITCOIND_OPTS--disablewallet} +# navcoind opts default to -disablewallet, override with BITCOIND_OPTS +navcoind_opts=${BITCOIND_OPTS--disablewallet} start() { echo -n $"Starting $prog: " - daemon $DAEMONOPTS $bitcoind $bitcoind_opts + daemon $DAEMONOPTS $navcoind $navcoind_opts RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/contrib/init/bitcoind.openrc b/contrib/init/navcoind.openrc similarity index 88% rename from contrib/init/bitcoind.openrc rename to contrib/init/navcoind.openrc index 013a1a607027c..69b1234512388 100644 --- a/contrib/init/bitcoind.openrc +++ b/contrib/init/navcoind.openrc @@ -5,23 +5,23 @@ if [ -d "/var/lib/bitcoin/.bitcoin" ]; then BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoin/.bitcoin" else - BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoind" + BITCOIND_DEFAULT_DATADIR="/var/lib/navcoind" fi BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/bitcoin/bitcoin.conf} -BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bitcoind} -BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bitcoind.pid} +BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/navcoind} +BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/navcoind.pid} BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bitcoin}} BITCOIND_GROUP=${BITCOIND_GROUP:-bitcoin} -BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind} +BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/navcoind} BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" name="Bitcoin Core Daemon" description="Bitcoin cryptocurrency P2P network daemon" -command="/usr/bin/bitcoind" +command="/usr/bin/navcoind" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ -conf=\"${BITCOIND_CONFIGFILE}\" \ -datadir=\"${BITCOIND_DATADIR}\" \ @@ -72,7 +72,7 @@ checkconfig() if grep -qs '^rpcuser=' "${BITCOIND_CONFIGFILE}" && \ ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then eerror "" - eerror "ERROR: You must set a secure rpcpassword to run bitcoind." + eerror "ERROR: You must set a secure rpcpassword to run navcoind." eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" eerror "" eerror "This password is security critical to securing wallets " diff --git a/contrib/init/bitcoind.openrcconf b/contrib/init/navcoind.openrcconf similarity index 57% rename from contrib/init/bitcoind.openrcconf rename to contrib/init/navcoind.openrcconf index c8a22a08d9241..e7ea5f0d24d1a 100644 --- a/contrib/init/bitcoind.openrcconf +++ b/contrib/init/navcoind.openrcconf @@ -1,31 +1,31 @@ -# /etc/conf.d/bitcoind: config file for /etc/init.d/bitcoind +# /etc/conf.d/navcoind: config file for /etc/init.d/navcoind # Config file location #BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf" # What directory to write pidfile to? (created and owned by $BITCOIND_USER) -#BITCOIND_PIDDIR="/var/run/bitcoind" +#BITCOIND_PIDDIR="/var/run/navcoind" # What filename to give the pidfile -#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/bitcoind.pid" +#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/navcoind.pid" -# Where to write bitcoind data (be mindful that the blockchain is large) -#BITCOIND_DATADIR="/var/lib/bitcoind" +# Where to write navcoind data (be mindful that the blockchain is large) +#BITCOIND_DATADIR="/var/lib/navcoind" -# User and group to own bitcoind process +# User and group to own navcoind process #BITCOIND_USER="bitcoin" #BITCOIND_GROUP="bitcoin" -# Path to bitcoind executable -#BITCOIND_BIN="/usr/bin/bitcoind" +# Path to navcoind executable +#BITCOIND_BIN="/usr/bin/navcoind" -# Nice value to run bitcoind under +# Nice value to run navcoind under #BITCOIND_NICE=0 # Additional options (avoid -conf and -datadir, use flags above) #BITCOIND_OPTS="" -# The timeout in seconds OpenRC will wait for bitcoind to terminate +# The timeout in seconds OpenRC will wait for navcoind to terminate # after a SIGTERM has been raised. # Note that this will be mapped as argument to start-stop-daemon's # '--retry' option, which means you can specify a retry schedule diff --git a/contrib/init/bitcoind.service b/contrib/init/navcoind.service similarity index 88% rename from contrib/init/bitcoind.service rename to contrib/init/navcoind.service index 87da17f95527f..e56c33f4a3120 100644 --- a/contrib/init/bitcoind.service +++ b/contrib/init/navcoind.service @@ -1,7 +1,7 @@ # It is not recommended to modify this file in-place, because it will # be overwritten during package upgrades. If you want to add further # options or overwrite existing ones then use -# $ systemctl edit bitcoind.service +# $ systemctl edit navcoind.service # See "man systemd.service" for details. # Note that almost all daemon options could be specified in @@ -18,9 +18,9 @@ After=network-online.target Wants=network-online.target [Service] -ExecStart=/usr/bin/bitcoind -pid=/run/bitcoind/bitcoind.pid \ +ExecStart=/usr/bin/navcoind -pid=/run/navcoind/navcoind.pid \ -conf=/etc/bitcoin/bitcoin.conf \ - -datadir=/var/lib/bitcoind \ + -datadir=/var/lib/navcoind \ -startupnotify='systemd-notify --ready' \ -shutdownnotify='systemd-notify --stopping' @@ -33,7 +33,7 @@ ExecStartPre=/bin/chgrp bitcoin /etc/bitcoin Type=notify NotifyAccess=all -PIDFile=/run/bitcoind/bitcoind.pid +PIDFile=/run/navcoind/navcoind.pid Restart=on-failure TimeoutStartSec=infinity @@ -46,16 +46,16 @@ TimeoutStopSec=600 User=bitcoin Group=bitcoin -# /run/bitcoind -RuntimeDirectory=bitcoind +# /run/navcoind +RuntimeDirectory=navcoind RuntimeDirectoryMode=0710 # /etc/bitcoin ConfigurationDirectory=bitcoin ConfigurationDirectoryMode=0710 -# /var/lib/bitcoind -StateDirectory=bitcoind +# /var/lib/navcoind +StateDirectory=navcoind StateDirectoryMode=0710 # Hardening measures diff --git a/contrib/init/org.bitcoin.bitcoind.plist b/contrib/init/org.navcoin.navcoind.plist similarity index 77% rename from contrib/init/org.bitcoin.bitcoind.plist rename to contrib/init/org.navcoin.navcoind.plist index 95b5342f1ef9d..5587888042c19 100644 --- a/contrib/init/org.bitcoin.bitcoind.plist +++ b/contrib/init/org.navcoin.navcoind.plist @@ -3,10 +3,10 @@ Label - org.bitcoin.bitcoind + org.navcoin.navcoind ProgramArguments - /usr/local/bin/bitcoind + /usr/local/bin/navcoind RunAtLoad diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index 25a1c7351a297..97c385d85ac5e 100644 --- a/contrib/linearize/README.md +++ b/contrib/linearize/README.md @@ -20,7 +20,7 @@ standalone hash lists but safe to use with linearize-data.py, which will output the same data no matter which byte format is chosen. The `linearize-hashes` script requires a connection, local or remote, to a -JSON-RPC server. Running `bitcoind` or `bitcoin-qt -server` will be sufficient. +JSON-RPC server. Running `navcoind` or `bitcoin-qt -server` will be sufficient. ## Step 2: Copy local block data @@ -38,7 +38,7 @@ will be printed. respectively, to the current time and to the timestamp of the most recent block written to the script's blockchain. * `genesis`: The hash of the genesis block in the blockchain. -* `input`: bitcoind blocks/ directory containing blkNNNNN.dat +* `input`: navcoind blocks/ directory containing blkNNNNN.dat * `hashlist`: text file containing list of block hashes created by linearize-hashes.py. * `max_out_sz`: Maximum size for files created by the `output_file` option. diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 5f566261ca674..65569605f1383 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -1,4 +1,4 @@ -# bitcoind RPC settings (linearize-hashes) +# navcoind RPC settings (linearize-hashes) rpcuser=someuser rpcpassword=somepassword #datadir=~/.bitcoin diff --git a/contrib/message-capture/message-capture-docs.md b/contrib/message-capture/message-capture-docs.md index 730196846134f..571c541b2ec75 100644 --- a/contrib/message-capture/message-capture-docs.md +++ b/contrib/message-capture/message-capture-docs.md @@ -6,7 +6,7 @@ This feature allows for message capture on a per-peer basis. It answers the sim ## Usage and Functionality -* Run `bitcoind` with the `-capturemessages` option. +* Run `navcoind` with the `-capturemessages` option. * Look in the `message_capture` folder in your datadir. * Typically this will be `~/.bitcoin/message_capture`. * See that there are many folders inside, one for each peer names with its IP address and port. diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 0ded87c58f4ee..041f93f6d240f 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -2,4 +2,4 @@ This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN. -This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. +This means one can have an always-on navcoind instance running, and another local navcoind/bitcoin-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/tracing/README.md b/contrib/tracing/README.md index 206bec1647880..da9791764110c 100644 --- a/contrib/tracing/README.md +++ b/contrib/tracing/README.md @@ -30,12 +30,12 @@ information. For development there exist a [bpftrace Reference Guide], a ## Examples -The bpftrace examples contain a relative path to the `bitcoind` binary. By +The bpftrace examples contain a relative path to the `navcoind` binary. By default, the scripts should be run from the repository-root and assume a -self-compiled `bitcoind` binary. The paths in the examples can be changed, for +self-compiled `navcoind` binary. The paths in the examples can be changed, for example, to point to release builds if needed. See the [Bitcoin Core USDT documentation] on how to list available tracepoints in your -`bitcoind` binary. +`navcoind` binary. [Bitcoin Core USDT documentation]: ../../doc/tracing.md#listing-available-tracepoints @@ -82,7 +82,7 @@ about the connection. Peers can be selected individually to view recent P2P messages. ``` -$ python3 contrib/tracing/p2p_monitor.py ./src/bitcoind +$ python3 contrib/tracing/p2p_monitor.py ./src/navcoind ``` Lists selectable peers and traffic and connection information. @@ -150,7 +150,7 @@ lost. BCC prints: `Possibly lost 2 samples` on lost messages. ``` -$ python3 contrib/tracing/log_raw_p2p_msgs.py ./src/bitcoind +$ python3 contrib/tracing/log_raw_p2p_msgs.py ./src/navcoind ``` ``` @@ -188,7 +188,7 @@ In a different terminal, starting Bitcoin Core in SigNet mode and with re-indexing enabled. ``` -$ ./src/bitcoind -signet -reindex +$ ./src/navcoind -signet -reindex ``` This produces the following output. @@ -241,7 +241,7 @@ A BCC Python script to log the UTXO cache flushes. Based on the `utxocache:flush` tracepoint. ```bash -$ python3 contrib/tracing/log_utxocache_flush.py ./src/bitcoind +$ python3 contrib/tracing/log_utxocache_flush.py ./src/navcoind ``` ``` @@ -300,7 +300,7 @@ comprising a timestamp along with all event data available via the event's tracepoint. ```console -$ python3 contrib/tracing/mempool_monitor.py ./src/bitcoind +$ python3 contrib/tracing/mempool_monitor.py ./src/navcoind ``` ``` diff --git a/contrib/tracing/connectblock_benchmark.bt b/contrib/tracing/connectblock_benchmark.bt index 6e7a98ef07664..ae5d04ab4a91c 100755 --- a/contrib/tracing/connectblock_benchmark.bt +++ b/contrib/tracing/connectblock_benchmark.bt @@ -14,15 +14,15 @@ over . - Threshold - This script requires a 'bitcoind' binary compiled with eBPF support and the - 'validation:block_connected' USDT. By default, it's assumed that 'bitcoind' is - located in './src/bitcoind'. This can be modified in the script below. + This script requires a 'navcoind' binary compiled with eBPF support and the + 'validation:block_connected' USDT. By default, it's assumed that 'navcoind' is + located in './src/navcoind'. This can be modified in the script below. EXAMPLES: bpftrace contrib/tracing/connectblock_benchmark.bt 300000 680000 1000 - When run together 'bitcoind -reindex', this benchmarks the time it takes to + When run together 'navcoind -reindex', this benchmarks the time it takes to connect the blocks between height 300.000 and 680.000 (inclusive) and prints details about all blocks that take longer than 1000ms to connect. Prints a histogram with block connection times when the benchmark is finished. @@ -30,7 +30,7 @@ bpftrace contrib/tracing/connectblock_benchmark.bt 0 0 500 - When running together 'bitcoind', all newly connected blocks that + When running together 'navcoind', all newly connected blocks that take longer than 500ms to connect are logged. A histogram with block connection times is shown when the script is terminated. @@ -67,7 +67,7 @@ BEGIN connected block is between the start and end height (or the end height is unset). */ -usdt:./src/bitcoind:validation:block_connected /arg1 >= $1 && (arg1 <= $2 || $2 == 0 )/ +usdt:./src/navcoind:validation:block_connected /arg1 >= $1 && (arg1 <= $2 || $2 == 0 )/ { $height = arg1; $transactions = arg2; @@ -102,7 +102,7 @@ usdt:./src/bitcoind:validation:block_connected /arg1 >= $1 && (arg1 <= $2 || $2 blocks where the time it took to connect the block is above the . */ -usdt:./src/bitcoind:validation:block_connected / (uint64) arg5 / 1000> $3 / +usdt:./src/navcoind:validation:block_connected / (uint64) arg5 / 1000> $3 / { $hash = arg0; $height = (int32) arg1; diff --git a/contrib/tracing/log_p2p_traffic.bt b/contrib/tracing/log_p2p_traffic.bt index f62956aa5e1c3..85dc8051fe9d9 100755 --- a/contrib/tracing/log_p2p_traffic.bt +++ b/contrib/tracing/log_p2p_traffic.bt @@ -5,7 +5,7 @@ BEGIN printf("Logging P2P traffic\n") } -usdt:./src/bitcoind:net:inbound_message +usdt:./src/navcoind:net:inbound_message { $peer_id = (int64) arg0; $peer_addr = str(arg1); @@ -15,7 +15,7 @@ usdt:./src/bitcoind:net:inbound_message printf("inbound '%s' msg from peer %d (%s, %s) with %d bytes\n", $msg_type, $peer_id, $peer_type, $peer_addr, $msg_len); } -usdt:./src/bitcoind:net:outbound_message +usdt:./src/navcoind:net:outbound_message { $peer_id = (int64) arg0; $peer_addr = str(arg1); diff --git a/contrib/tracing/log_raw_p2p_msgs.py b/contrib/tracing/log_raw_p2p_msgs.py index c0ab70410622b..dbf3374820c3b 100755 --- a/contrib/tracing/log_raw_p2p_msgs.py +++ b/contrib/tracing/log_raw_p2p_msgs.py @@ -132,15 +132,15 @@ def print_message(event, inbound): ) -def main(bitcoind_path): - bitcoind_with_usdts = USDT(path=str(bitcoind_path)) +def main(navcoind_path): + navcoind_with_usdts = USDT(path=str(navcoind_path)) # attaching the trace functions defined in the BPF program to the tracepoints - bitcoind_with_usdts.enable_probe( + navcoind_with_usdts.enable_probe( probe="inbound_message", fn_name="trace_inbound_message") - bitcoind_with_usdts.enable_probe( + navcoind_with_usdts.enable_probe( probe="outbound_message", fn_name="trace_outbound_message") - bpf = BPF(text=program, usdt_contexts=[bitcoind_with_usdts]) + bpf = BPF(text=program, usdt_contexts=[navcoind_with_usdts]) # BCC: perf buffer handle function for inbound_messages def handle_inbound(_, data, size): @@ -177,7 +177,7 @@ def handle_outbound(_, data, size): if __name__ == "__main__": if len(sys.argv) < 2: - print("USAGE:", sys.argv[0], "path/to/bitcoind") + print("USAGE:", sys.argv[0], "path/to/navcoind") exit() path = sys.argv[1] main(path) diff --git a/contrib/tracing/log_utxocache_flush.py b/contrib/tracing/log_utxocache_flush.py index 6c568998e9923..20e3e2d0026a6 100755 --- a/contrib/tracing/log_utxocache_flush.py +++ b/contrib/tracing/log_utxocache_flush.py @@ -10,7 +10,7 @@ """Example logging Bitcoin Core utxo set cache flushes utilizing the utxocache:flush tracepoint.""" -# USAGE: ./contrib/tracing/log_utxocache_flush.py path/to/bitcoind +# USAGE: ./contrib/tracing/log_utxocache_flush.py path/to/navcoind # BCC: The C program to be compiled to an eBPF program (by BCC) and loaded into # a sandboxed Linux kernel VM. @@ -70,14 +70,14 @@ def print_event(event): )) -def main(bitcoind_path): - bitcoind_with_usdts = USDT(path=str(bitcoind_path)) +def main(navcoind_path): + navcoind_with_usdts = USDT(path=str(navcoind_path)) # attaching the trace functions defined in the BPF program # to the tracepoints - bitcoind_with_usdts.enable_probe( + navcoind_with_usdts.enable_probe( probe="flush", fn_name="trace_flush") - b = BPF(text=program, usdt_contexts=[bitcoind_with_usdts]) + b = BPF(text=program, usdt_contexts=[navcoind_with_usdts]) def handle_flush(_, data, size): """ Coins Flush handler. @@ -100,7 +100,7 @@ def handle_flush(_, data, size): if __name__ == "__main__": if len(sys.argv) < 2: - print("USAGE: ", sys.argv[0], "path/to/bitcoind") + print("USAGE: ", sys.argv[0], "path/to/navcoind") exit(1) path = sys.argv[1] diff --git a/contrib/tracing/log_utxos.bt b/contrib/tracing/log_utxos.bt index 54d5010f825e4..edda6f4fd07c8 100755 --- a/contrib/tracing/log_utxos.bt +++ b/contrib/tracing/log_utxos.bt @@ -6,9 +6,9 @@ bpftrace contrib/tracing/log_utxos.bt - This script requires a 'bitcoind' binary compiled with eBPF support and the - 'utxocache' tracepoints. By default, it's assumed that 'bitcoind' is - located in './src/bitcoind'. This can be modified in the script below. + This script requires a 'navcoind' binary compiled with eBPF support and the + 'utxocache' tracepoints. By default, it's assumed that 'navcoind' is + located in './src/navcoind'. This can be modified in the script below. NOTE: requires bpftrace v0.12.0 or above. */ @@ -22,7 +22,7 @@ BEGIN /* Attaches to the 'utxocache:add' tracepoint and prints additions to the UTXO set cache. */ -usdt:./src/bitcoind:utxocache:add +usdt:./src/navcoind:utxocache:add { $txid = arg0; $index = (uint32)arg1; @@ -44,7 +44,7 @@ usdt:./src/bitcoind:utxocache:add /* Attaches to the 'utxocache:spent' tracepoint and prints spents from the UTXO set cache. */ -usdt:./src/bitcoind:utxocache:spent +usdt:./src/navcoind:utxocache:spent { $txid = arg0; $index = (uint32)arg1; @@ -66,7 +66,7 @@ usdt:./src/bitcoind:utxocache:spent /* Attaches to the 'utxocache:uncache' tracepoint and uncache UTXOs from the UTXO set cache. */ -usdt:./src/bitcoind:utxocache:uncache +usdt:./src/navcoind:utxocache:uncache { $txid = arg0; $index = (uint32)arg1; diff --git a/contrib/tracing/mempool_monitor.py b/contrib/tracing/mempool_monitor.py index afb5e603722b1..11c04127fcffe 100755 --- a/contrib/tracing/mempool_monitor.py +++ b/contrib/tracing/mempool_monitor.py @@ -114,16 +114,16 @@ """ -def main(bitcoind_path): - bitcoind_with_usdts = USDT(path=str(bitcoind_path)) +def main(navcoind_path): + navcoind_with_usdts = USDT(path=str(navcoind_path)) # attaching the trace functions defined in the BPF program # to the tracepoints - bitcoind_with_usdts.enable_probe(probe="mempool:added", fn_name="trace_added") - bitcoind_with_usdts.enable_probe(probe="mempool:removed", fn_name="trace_removed") - bitcoind_with_usdts.enable_probe(probe="mempool:replaced", fn_name="trace_replaced") - bitcoind_with_usdts.enable_probe(probe="mempool:rejected", fn_name="trace_rejected") - bpf = BPF(text=PROGRAM, usdt_contexts=[bitcoind_with_usdts]) + navcoind_with_usdts.enable_probe(probe="mempool:added", fn_name="trace_added") + navcoind_with_usdts.enable_probe(probe="mempool:removed", fn_name="trace_removed") + navcoind_with_usdts.enable_probe(probe="mempool:replaced", fn_name="trace_replaced") + navcoind_with_usdts.enable_probe(probe="mempool:rejected", fn_name="trace_rejected") + bpf = BPF(text=PROGRAM, usdt_contexts=[navcoind_with_usdts]) events = [] @@ -365,7 +365,7 @@ def timestamp_age(timestamp): if __name__ == "__main__": if len(sys.argv) < 2: - print("USAGE: ", sys.argv[0], "path/to/bitcoind") + print("USAGE: ", sys.argv[0], "path/to/navcoind") exit(1) path = sys.argv[1] diff --git a/contrib/tracing/p2p_monitor.py b/contrib/tracing/p2p_monitor.py index 4ff701cac3c8c..58bcfeea8105c 100755 --- a/contrib/tracing/p2p_monitor.py +++ b/contrib/tracing/p2p_monitor.py @@ -3,7 +3,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -""" Interactive bitcoind P2P network traffic monitor utilizing USDT and the +""" Interactive navcoind P2P network traffic monitor utilizing USDT and the net:inbound_message and net:outbound_message tracepoints. """ # This script demonstrates what USDT for Bitcoin Core can enable. It uses BCC @@ -115,17 +115,17 @@ def add_message(self, message): self.total_outbound_msgs += 1 -def main(bitcoind_path): +def main(navcoind_path): peers = dict() - bitcoind_with_usdts = USDT(path=str(bitcoind_path)) + navcoind_with_usdts = USDT(path=str(navcoind_path)) # attaching the trace functions defined in the BPF program to the tracepoints - bitcoind_with_usdts.enable_probe( + navcoind_with_usdts.enable_probe( probe="inbound_message", fn_name="trace_inbound_message") - bitcoind_with_usdts.enable_probe( + navcoind_with_usdts.enable_probe( probe="outbound_message", fn_name="trace_outbound_message") - bpf = BPF(text=program, usdt_contexts=[bitcoind_with_usdts]) + bpf = BPF(text=program, usdt_contexts=[navcoind_with_usdts]) # BCC: perf buffer handle function for inbound_messages def handle_inbound(_, data, size): @@ -247,7 +247,7 @@ def render(screen, peers, cur_list_pos, scroll, ROWS_AVALIABLE_FOR_LIST, info_pa if __name__ == "__main__": if len(sys.argv) < 2: - print("USAGE:", sys.argv[0], "path/to/bitcoind") + print("USAGE:", sys.argv[0], "path/to/navcoind") exit() path = sys.argv[1] main(path) diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py index d8087a4db387c..9cfa851d4b758 100755 --- a/contrib/zmq/zmq_sub.py +++ b/contrib/zmq/zmq_sub.py @@ -7,7 +7,7 @@ ZMQ example using python3's asyncio Bitcoin should be started with the command line arguments: - bitcoind -testnet -daemon \ + navcoind -testnet -daemon \ -zmqpubrawtx=tcp://127.0.0.1:28332 \ -zmqpubrawblock=tcp://127.0.0.1:28332 \ -zmqpubhashtx=tcp://127.0.0.1:28332 \ diff --git a/doc/build-netbsd.md b/doc/build-netbsd.md index 0f05cdcba7891..a7e3282cf1782 100644 --- a/doc/build-netbsd.md +++ b/doc/build-netbsd.md @@ -2,7 +2,7 @@ Updated for NetBSD [9.2](https://netbsd.org/releases/formal-9/NetBSD-9.2.html). -This guide describes how to build bitcoind, command-line utilities, and GUI on NetBSD. +This guide describes how to build navcoind, command-line utilities, and GUI on NetBSD. ## Preparation @@ -46,7 +46,7 @@ git clone https://github.com/bitcoin/bitcoin.git #### Wallet Dependencies -It is not necessary to build wallet functionality to run bitcoind or the GUI. +It is not necessary to build wallet functionality to run navcoind or the GUI. ###### Descriptor Wallet Support diff --git a/doc/build-unix.md b/doc/build-unix.md index f411c2b2d3c20..ed38410774a30 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -208,6 +208,6 @@ This example lists the steps necessary to setup and build a command line only di ./autogen.sh ./configure make check - ./src/bitcoind + ./src/navcoind If you intend to work with legacy Berkeley DB wallets, see [Berkeley DB](#berkeley-db) section. diff --git a/doc/design/libraries.md b/doc/design/libraries.md index 7cda64e713a05..e137ce8a9f9ea 100644 --- a/doc/design/libraries.md +++ b/doc/design/libraries.md @@ -5,15 +5,15 @@ | *libbitcoin_cli* | RPC client functionality used by *bitcoin-cli* executable | | *libbitcoin_common* | Home for common functionality shared by different executables and libraries. Similar to *libbitcoin_util*, but higher-level (see [Dependencies](#dependencies)). | | *libbitcoin_consensus* | Stable, backwards-compatible consensus functionality used by *libbitcoin_node* and *libbitcoin_wallet* and also exposed as a [shared library](../shared-libraries.md). | -| *libbitcoinconsensus* | Shared library build of static *libbitcoin_consensus* library | +| *libnavcoinconsensus* | Shared library build of static *libbitcoin_consensus* library | | *libbitcoin_kernel* | Consensus engine and support library used for validation by *libbitcoin_node* and also exposed as a [shared library](../shared-libraries.md). | | *libbitcoinqt* | GUI functionality used by *bitcoin-qt* and *bitcoin-gui* executables | | *libbitcoin_ipc* | IPC functionality used by *bitcoin-node*, *bitcoin-wallet*, *bitcoin-gui* executables to communicate when [`--enable-multiprocess`](multiprocess.md) is used. | -| *libbitcoin_node* | P2P and RPC server functionality used by *bitcoind* and *bitcoin-qt* executables. | +| *libbitcoin_node* | P2P and RPC server functionality used by *navcoind* and *bitcoin-qt* executables. | | *libbitcoin_util* | Home for common functionality shared by different executables and libraries. Similar to *libbitcoin_common*, but lower-level (see [Dependencies](#dependencies)). | -| *libbitcoin_wallet* | Wallet functionality used by *bitcoind* and *bitcoin-wallet* executables. | +| *libbitcoin_wallet* | Wallet functionality used by *navcoind* and *bitcoin-wallet* executables. | | *libbitcoin_wallet_tool* | Lower-level wallet functionality used by *bitcoin-wallet* executable. | -| *libbitcoin_zmq* | [ZeroMQ](../zmq.md) functionality used by *bitcoind* and *bitcoin-qt* executables. | +| *libbitcoin_zmq* | [ZeroMQ](../zmq.md) functionality used by *navcoind* and *bitcoin-qt* executables. | ## Conventions @@ -41,8 +41,8 @@ graph TD; bitcoin-cli[bitcoin-cli]-->libbitcoin_cli; -bitcoind[bitcoind]-->libbitcoin_node; -bitcoind[bitcoind]-->libbitcoin_wallet; +navcoind[navcoind]-->libbitcoin_node; +navcoind[navcoind]-->libbitcoin_wallet; bitcoin-qt[bitcoin-qt]-->libbitcoin_node; bitcoin-qt[bitcoin-qt]-->libbitcoinqt; @@ -75,7 +75,7 @@ libbitcoin_wallet_tool-->libbitcoin_wallet; libbitcoin_wallet_tool-->libbitcoin_util; classDef bold stroke-width:2px, font-weight:bold, font-size: smaller; -class bitcoin-qt,bitcoind,bitcoin-cli,bitcoin-wallet bold +class bitcoin-qt,navcoind,bitcoin-cli,bitcoin-wallet bold ``` @@ -100,5 +100,5 @@ class bitcoin-qt,bitcoind,bitcoin-cli,bitcoin-wallet bold ## Work in progress -- Validation code is moving from *libbitcoin_node* to *libbitcoin_kernel* as part of [The libbitcoinkernel Project #24303](https://github.com/bitcoin/bitcoin/issues/24303) +- Validation code is moving from *libbitcoin_node* to *libbitcoin_kernel* as part of [The libnavcoinkernel Project #24303](https://github.com/bitcoin/bitcoin/issues/24303) - Source code organization is discussed in general in [Library source code organization #15732](https://github.com/bitcoin/bitcoin/issues/15732) diff --git a/doc/design/multiprocess.md b/doc/design/multiprocess.md index 636d78d905c45..9cd14e85431ee 100644 --- a/doc/design/multiprocess.md +++ b/doc/design/multiprocess.md @@ -31,7 +31,7 @@ The Bitcoin Core software has historically employed a monolithic architecture. T ## Current Architecture -The current system features two primary executables: `bitcoind` and `bitcoin-qt`. `bitcoind` combines a Bitcoin P2P node with an integrated JSON-RPC server, wallet, and indexes. `bitcoin-qt` extends this by incorporating a Qt-based GUI. This monolithic structure, although robust, presents challenges such as limited operational flexibility and increased security risks due to the tight integration of components. +The current system features two primary executables: `navcoind` and `bitcoin-qt`. `navcoind` combines a Bitcoin P2P node with an integrated JSON-RPC server, wallet, and indexes. `bitcoin-qt` extends this by incorporating a Qt-based GUI. This monolithic structure, although robust, presents challenges such as limited operational flexibility and increased security risks due to the tight integration of components. ## Proposed Architecture diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 4d203b70ddefc..00ab22c1a6e4b 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -392,8 +392,8 @@ If the code is behaving strangely, take a look in the `debug.log` file in the da error and debugging messages are written there. Debug logging can be enabled on startup with the `-debug` and `-loglevel` -configuration options and toggled while bitcoind is running with the `logging` -RPC. For instance, launching bitcoind with `-debug` or `-debug=1` will turn on +configuration options and toggled while navcoind is running with the `logging` +RPC. For instance, launching navcoind with `-debug` or `-debug=1` will turn on all log categories and `-loglevel=trace` will turn on all log severity levels. The Qt code routes `qDebug()` output to `debug.log` under category "qt": run with `-debug=qt` diff --git a/doc/multiprocess.md b/doc/multiprocess.md index 7ba89b3ff56a2..3c6f61e13cde1 100644 --- a/doc/multiprocess.md +++ b/doc/multiprocess.md @@ -4,7 +4,7 @@ _This document describes usage of the multiprocess feature. For design informati ## Build Option -On unix systems, the `--enable-multiprocess` build option can be passed to `./configure` to build new `bitcoin-node`, `bitcoin-wallet`, and `bitcoin-gui` executables alongside existing `bitcoind` and `bitcoin-qt` executables. +On unix systems, the `--enable-multiprocess` build option can be passed to `./configure` to build new `bitcoin-node`, `bitcoin-wallet`, and `bitcoin-gui` executables alongside existing `navcoind` and `bitcoin-qt` executables. ## Debugging @@ -29,6 +29,6 @@ Alternately, you can install [Cap'n Proto](https://capnproto.org/) and [libmulti ## Usage -`bitcoin-node` is a drop-in replacement for `bitcoind`, and `bitcoin-gui` is a drop-in replacement for `bitcoin-qt`, and there are no differences in use or external behavior between the new and old executables. But internally after [#10102](https://github.com/bitcoin/bitcoin/pull/10102), `bitcoin-gui` will spawn a `bitcoin-node` process to run P2P and RPC code, communicating with it across a socket pair, and `bitcoin-node` will spawn `bitcoin-wallet` to run wallet code, also communicating over a socket pair. This will let node, wallet, and GUI code run in separate address spaces for better isolation, and allow future improvements like being able to start and stop components independently on different machines and environments. -[#19460](https://github.com/bitcoin/bitcoin/pull/19460) also adds a new `bitcoin-node` `-ipcbind` option and an `bitcoind-wallet` `-ipcconnect` option to allow new wallet processes to connect to an existing node process. +`bitcoin-node` is a drop-in replacement for `navcoind`, and `bitcoin-gui` is a drop-in replacement for `bitcoin-qt`, and there are no differences in use or external behavior between the new and old executables. But internally after [#10102](https://github.com/bitcoin/bitcoin/pull/10102), `bitcoin-gui` will spawn a `bitcoin-node` process to run P2P and RPC code, communicating with it across a socket pair, and `bitcoin-node` will spawn `bitcoin-wallet` to run wallet code, also communicating over a socket pair. This will let node, wallet, and GUI code run in separate address spaces for better isolation, and allow future improvements like being able to start and stop components independently on different machines and environments. +[#19460](https://github.com/bitcoin/bitcoin/pull/19460) also adds a new `bitcoin-node` `-ipcbind` option and an `navcoind-wallet` `-ipcconnect` option to allow new wallet processes to connect to an existing node process. And [#19461](https://github.com/bitcoin/bitcoin/pull/19461) adds a new `bitcoin-gui` `-ipcconnect` option to allow new GUI processes to connect to an existing node process. diff --git a/doc/shared-libraries.md b/doc/shared-libraries.md index 07aee46f0bbf8..a9b47eb5335fb 100644 --- a/doc/shared-libraries.md +++ b/doc/shared-libraries.md @@ -1,33 +1,33 @@ Shared Libraries ================ -## bitcoinconsensus +## navcoinconsensus The purpose of this library is to make the verification functionality that is critical to Bitcoin's consensus available to other applications, e.g. to language bindings. ### API -The interface is defined in the C header `bitcoinconsensus.h` located in `src/script/bitcoinconsensus.h`. +The interface is defined in the C header `navcoinconsensus.h` located in `src/script/navcoinconsensus.h`. #### Version -`bitcoinconsensus_version` returns an `unsigned int` with the API version *(currently `2`)*. +`navcoinconsensus_version` returns an `unsigned int` with the API version *(currently `2`)*. #### Script Validation -`bitcoinconsensus_verify_script`, `bitcoinconsensus_verify_script_with_amount` and `bitcoinconsensus_verify_script_with_spent_outputs` return an `int` with the status of the verification. It will be `1` if the input script correctly spends the previous output `scriptPubKey`. +`navcoinconsensus_verify_script`, `navcoinconsensus_verify_script_with_amount` and `navcoinconsensus_verify_script_with_spent_outputs` return an `int` with the status of the verification. It will be `1` if the input script correctly spends the previous output `scriptPubKey`. ##### Parameters -###### bitcoinconsensus_verify_script +###### navcoinconsensus_verify_script - `const unsigned char *scriptPubKey` - The previous output script that encumbers spending. - `unsigned int scriptPubKeyLen` - The number of bytes for the `scriptPubKey`. - `const unsigned char *txTo` - The transaction with the input that is spending the previous output. - `unsigned int txToLen` - The number of bytes for the `txTo`. - `unsigned int nIn` - The index of the input in `txTo` that spends the `scriptPubKey`. - `unsigned int flags` - The script validation flags *(see below)*. -- `bitcoinconsensus_error* err` - Will have the error/success code for the operation *(see below)*. +- `navcoinconsensus_error* err` - Will have the error/success code for the operation *(see below)*. -###### bitcoinconsensus_verify_script_with_amount +###### navcoinconsensus_verify_script_with_amount - `const unsigned char *scriptPubKey` - The previous output script that encumbers spending. - `unsigned int scriptPubKeyLen` - The number of bytes for the `scriptPubKey`. - `int64_t amount` - The amount spent in the input @@ -35,9 +35,9 @@ The interface is defined in the C header `bitcoinconsensus.h` located in `src/sc - `unsigned int txToLen` - The number of bytes for the `txTo`. - `unsigned int nIn` - The index of the input in `txTo` that spends the `scriptPubKey`. - `unsigned int flags` - The script validation flags *(see below)*. -- `bitcoinconsensus_error* err` - Will have the error/success code for the operation *(see below)*. +- `navcoinconsensus_error* err` - Will have the error/success code for the operation *(see below)*. -###### bitcoinconsensus_verify_script_with_spent_outputs +###### navcoinconsensus_verify_script_with_spent_outputs - `const unsigned char *scriptPubKey` - The previous output script that encumbers spending. - `unsigned int scriptPubKeyLen` - The number of bytes for the `scriptPubKey`. - `int64_t amount` - The amount spent in the input @@ -47,31 +47,31 @@ The interface is defined in the C header `bitcoinconsensus.h` located in `src/sc - `unsigned int spentOutputsLen` - The number of bytes for the `spentOutputs`. - `unsigned int nIn` - The index of the input in `txTo` that spends the `scriptPubKey`. - `unsigned int flags` - The script validation flags *(see below)*. -- `bitcoinconsensus_error* err` - Will have the error/success code for the operation *(see below)*. +- `navcoinconsensus_error* err` - Will have the error/success code for the operation *(see below)*. ##### Script Flags -- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NONE` -- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH` - Evaluate P2SH ([BIP16](https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki)) subscripts -- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG` - Enforce strict DER ([BIP66](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki)) compliance -- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NULLDUMMY` - Enforce NULLDUMMY ([BIP147](https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki)) -- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY` - Enable CHECKLOCKTIMEVERIFY ([BIP65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki)) -- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY` - Enable CHECKSEQUENCEVERIFY ([BIP112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki)) -- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS` - Enable WITNESS ([BIP141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki)) -- `bitcoinconsensus_SCRIPT_FLAGS_VERIFY_TAPROOT` - Enable TAPROOT ([BIP340](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki), [BIP341](https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki), [BIP342](https://github.com/bitcoin/bips/blob/master/bip-0342.mediawiki)) +- `navcoinconsensus_SCRIPT_FLAGS_VERIFY_NONE` +- `navcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH` - Evaluate P2SH ([BIP16](https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki)) subscripts +- `navcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG` - Enforce strict DER ([BIP66](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki)) compliance +- `navcoinconsensus_SCRIPT_FLAGS_VERIFY_NULLDUMMY` - Enforce NULLDUMMY ([BIP147](https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki)) +- `navcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY` - Enable CHECKLOCKTIMEVERIFY ([BIP65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki)) +- `navcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY` - Enable CHECKSEQUENCEVERIFY ([BIP112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki)) +- `navcoinconsensus_SCRIPT_FLAGS_VERIFY_WITNESS` - Enable WITNESS ([BIP141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki)) +- `navcoinconsensus_SCRIPT_FLAGS_VERIFY_TAPROOT` - Enable TAPROOT ([BIP340](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki), [BIP341](https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki), [BIP342](https://github.com/bitcoin/bips/blob/master/bip-0342.mediawiki)) ##### Errors -- `bitcoinconsensus_ERR_OK` - No errors with input parameters *(see the return value of `bitcoinconsensus_verify_script` for the verification status)* -- `bitcoinconsensus_ERR_TX_INDEX` - An invalid index for `txTo` -- `bitcoinconsensus_ERR_TX_SIZE_MISMATCH` - `txToLen` did not match with the size of `txTo` -- `bitcoinconsensus_ERR_DESERIALIZE` - An error deserializing `txTo` -- `bitcoinconsensus_ERR_AMOUNT_REQUIRED` - Input amount is required if WITNESS is used -- `bitcoinconsensus_ERR_INVALID_FLAGS` - Script verification `flags` are invalid (i.e. not part of the libconsensus interface) -- `bitcoinconsensus_ERR_SPENT_OUTPUTS_REQUIRED` - Spent outputs are required if TAPROOT is used -- `bitcoinconsensus_ERR_SPENT_OUTPUTS_MISMATCH` - Spent outputs size doesn't match tx inputs size +- `navcoinconsensus_ERR_OK` - No errors with input parameters *(see the return value of `navcoinconsensus_verify_script` for the verification status)* +- `navcoinconsensus_ERR_TX_INDEX` - An invalid index for `txTo` +- `navcoinconsensus_ERR_TX_SIZE_MISMATCH` - `txToLen` did not match with the size of `txTo` +- `navcoinconsensus_ERR_DESERIALIZE` - An error deserializing `txTo` +- `navcoinconsensus_ERR_AMOUNT_REQUIRED` - Input amount is required if WITNESS is used +- `navcoinconsensus_ERR_INVALID_FLAGS` - Script verification `flags` are invalid (i.e. not part of the libconsensus interface) +- `navcoinconsensus_ERR_SPENT_OUTPUTS_REQUIRED` - Spent outputs are required if TAPROOT is used +- `navcoinconsensus_ERR_SPENT_OUTPUTS_MISMATCH` - Spent outputs size doesn't match tx inputs size ### Example Implementations - [NBitcoin](https://github.com/MetacoSA/NBitcoin/blob/5e1055cd7c4186dee4227c344af8892aea54faec/NBitcoin/Script.cs#L979-#L1031) (.NET Bindings) -- [node-libbitcoinconsensus](https://github.com/bitpay/node-libbitcoinconsensus) (Node.js Bindings) -- [java-libbitcoinconsensus](https://github.com/dexX7/java-libbitcoinconsensus) (Java Bindings) -- [bitcoinconsensus-php](https://github.com/Bit-Wasp/bitcoinconsensus-php) (PHP Bindings) -- [rust-bitcoinconsensus](https://github.com/rust-bitcoin/rust-bitcoinconsensus) (Rust Bindings) \ No newline at end of file +- [node-libnavcoinconsensus](https://github.com/bitpay/node-libnavcoinconsensus) (Node.js Bindings) +- [java-libnavcoinconsensus](https://github.com/dexX7/java-libnavcoinconsensus) (Java Bindings) +- [navcoinconsensus-php](https://github.com/Bit-Wasp/navcoinconsensus-php) (PHP Bindings) +- [rust-navcoinconsensus](https://github.com/rust-bitcoin/rust-navcoinconsensus) (Rust Bindings) \ No newline at end of file diff --git a/libbitcoinconsensus.pc.in b/libnavcoinconsensus.pc.in similarity index 100% rename from libbitcoinconsensus.pc.in rename to libnavcoinconsensus.pc.in diff --git a/src/Makefile.am b/src/Makefile.am index 560d99bbba52e..d6fa3a35f3e14 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,10 +42,10 @@ if ENABLE_ZMQ LIBBITCOIN_ZMQ=libbitcoin_zmq.a endif if BUILD_BITCOIN_LIBS -LIBBITCOINCONSENSUS=libbitcoinconsensus.la +LIBBITCOINCONSENSUS=libnavcoinconsensus.la endif if BUILD_BITCOIN_KERNEL_LIB -LIBBITCOINKERNEL=libbitcoinkernel.la +LIBBITCOINKERNEL=libnavcoinkernel.la endif if ENABLE_WALLET LIBBITCOIN_WALLET=libbitcoin_wallet.a @@ -825,7 +825,7 @@ libbitcoin_consensus_a_SOURCES = \ primitives/transaction.h \ pubkey.cpp \ pubkey.h \ - script/bitcoinconsensus.cpp \ + script/navcoinconsensus.cpp \ script/interpreter.cpp \ script/interpreter.h \ script/script.cpp \ @@ -996,13 +996,13 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # navcoind & navcoin-node binaries # -navcoin_daemon_sources = bitcoind.cpp +navcoin_daemon_sources = navcoind.cpp navcoin_bin_cppflags = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) navcoin_bin_cxxflags = $(AM_CXXFLAGS) $(PIE_FLAGS) navcoin_bin_ldflags = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) if TARGET_WINDOWS -navcoin_daemon_sources += bitcoind-res.rc +navcoin_daemon_sources += navcoind-res.rc endif navcoin_bin_ldadd = \ @@ -1021,7 +1021,7 @@ navcoin_bin_ldadd = \ navcoin_bin_ldadd += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(SQLITE_LIBS) -navcoind_SOURCES = $(navcoin_daemon_sources) init/bitcoind.cpp +navcoind_SOURCES = $(navcoin_daemon_sources) init/navcoind.cpp navcoind_CPPFLAGS = $(navcoin_bin_cppflags) navcoind_CXXFLAGS = $(navcoin_bin_cxxflags) navcoind_LDFLAGS = $(navcoin_bin_ldflags) @@ -1129,31 +1129,31 @@ navcoin_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(PTHREAD_FLAGS) $(LIBTO navcoin_chainstate_LDADD = $(LIBBITCOINKERNEL) # libtool is unable to calculate this indirect dependency, presumably because it's a subproject. -# libsecp256k1 only needs to be linked in when libbitcoinkernel is static. +# libsecp256k1 only needs to be linked in when libnavcoinkernel is static. navcoin_chainstate_LDADD += $(LIBSECP256K1) $(LIBBLS) $(LIBMCL) # -# bitcoinkernel library # +# navcoinkernel library # if BUILD_BITCOIN_KERNEL_LIB lib_LTLIBRARIES += $(LIBBITCOINKERNEL) -libbitcoinkernel_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) $(PTHREAD_FLAGS) -libbitcoinkernel_la_LIBADD = $(LIBBITCOIN_CRYPTO) $(LIBLEVELDB) $(LIBMEMENV) $(LIBSECP256K1) $(LIBBLS) $(LIBMCL) -libbitcoinkernel_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include $(BLS_INCLUDES) -DBUILD_BITCOIN_INTERNAL $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) +libnavcoinkernel_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) $(PTHREAD_FLAGS) +libnavcoinkernel_la_LIBADD = $(LIBBITCOIN_CRYPTO) $(LIBLEVELDB) $(LIBMEMENV) $(LIBSECP256K1) $(LIBBLS) $(LIBMCL) +libnavcoinkernel_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include $(BLS_INCLUDES) -DBUILD_BITCOIN_INTERNAL $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) -# libbitcoinkernel requires default symbol visibility, explicitly specify that +# libnavcoinkernel requires default symbol visibility, explicitly specify that # here so that things still work even when user configures with # --enable-reduce-exports # # Note this is a quick hack that will be removed as we incrementally define what # to export from the library. -libbitcoinkernel_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -fvisibility=default +libnavcoinkernel_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -fvisibility=default -# TODO: libbitcoinkernel is a work in progress consensus engine library, as more +# TODO: libnavcoinkernel is a work in progress consensus engine library, as more # and more modules are decoupled from the consensus engine, this list will # shrink to only those which are absolutely necessary. -libbitcoinkernel_la_SOURCES = \ - kernel/bitcoinkernel.cpp \ +libnavcoinkernel_la_SOURCES = \ + kernel/navcoinkernel.cpp \ arith_uint256.cpp \ blockfilter.cpp \ blsct/arith/mcl/mcl_g1point.cpp \ @@ -1272,24 +1272,24 @@ libbitcoinkernel_la_SOURCES = \ # Required for obj/build.h to be generated first. # More details: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html -libbitcoinkernel_la-clientversion.l$(OBJEXT): obj/build.h +libnavcoinkernel_la-clientversion.l$(OBJEXT): obj/build.h endif # BUILD_BITCOIN_KERNEL_LIB # -# bitcoinconsensus library # +# navcoinconsensus library # if BUILD_BITCOIN_LIBS lib_LTLIBRARIES += $(LIBBITCOINCONSENSUS) -include_HEADERS = script/bitcoinconsensus.h -libbitcoinconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_la_SOURCES) $(libbitcoin_consensus_a_SOURCES) +include_HEADERS = script/navcoinconsensus.h +libnavcoinconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_la_SOURCES) $(libbitcoin_consensus_a_SOURCES) -libbitcoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) -libbitcoinconsensus_la_LIBADD = \ +libnavcoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) +libnavcoinconsensus_la_LIBADD = \ $(LIBBLS) \ $(LIBMCL) \ $(LIBSECP256K1) -libbitcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include $(BLS_INCLUDES) -DBUILD_BITCOIN_INTERNAL -libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnavcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include $(BLS_INCLUDES) -DBUILD_BITCOIN_INTERNAL +libnavcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) endif # diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp index 3682b3351873b..9a0543053f185 100644 --- a/src/bench/verify_script.cpp +++ b/src/bench/verify_script.cpp @@ -5,7 +5,7 @@ #include #include #if defined(HAVE_CONSENSUS_LIB) -#include