Skip to content

Commit

Permalink
Changed client and variable names
Browse files Browse the repository at this point in the history
  • Loading branch information
Trnquil authored and wirksh committed Jul 22, 2019
1 parent 1395fc9 commit 30ad7da
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 52 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Expand Up @@ -5,8 +5,8 @@ RUN apt-get update -q && \
rm -rf /var/lib/apt/lists/* && \
apt-get autoremove -y && \
apt-get clean
WORKDIR /platinum
VOLUME /root/.platinumcoin/
ADD . /platinum
RUN ./autogen.sh && ./configure --with-gui=no --with-incompatible-bdb --enable-static --disable-shared && make -j4 && cp src/bitcoind /usr/local/bin/platinumd && cp src/bitcoin-cli /usr/local/bin/platinum-cli && make distclean
CMD ["platinumd"]
WORKDIR /argentumnt
VOLUME /root/.argentumntcoin/
ADD . /argentumnt
RUN ./autogen.sh && ./configure --with-gui=no --with-incompatible-bdb --enable-static --disable-shared && make -j4 && cp src/bitcoind /usr/local/bin/argentumntd && cp src/bitcoin-cli /usr/local/bin/argentumnt-cli && make distclean
CMD ["argentumntd"]
10 changes: 5 additions & 5 deletions configure.ac
Expand Up @@ -16,11 +16,11 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])
AM_PROG_AS

BITCOIN_DAEMON_NAME=bitcoind
BITCOIN_GUI_NAME=bitcoin-qt
BITCOIN_CLI_NAME=bitcoin-cli
BITCOIN_TX_NAME=bitcoin-tx
BITCOIN_WALLET_TOOL_NAME=bitcoin-wallet
BITCOIN_DAEMON_NAME=argentumntd
BITCOIN_GUI_NAME=argentumnt-qt
BITCOIN_CLI_NAME=argentumnt-cli
BITCOIN_TX_NAME=argentumnt-tx
BITCOIN_WALLET_TOOL_NAME=argentumnt-wallet

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])
Expand Down
2 changes: 1 addition & 1 deletion contrib/seeds/makeseeds.py
Expand Up @@ -20,7 +20,7 @@
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$")
PATTERN_AGENT = re.compile(r"^/Platinumcoin:0.17.(0|99)/$")
PATTERN_AGENT = re.compile(r"^/Argentumntcoin:0.17.(0|99)/$")

def parseline(line):
sline = line.split()
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
@@ -1,6 +1,6 @@
version: '3'
services:
platinum:
argentumnt:
build: .
ports:
- '13580:13580'
72 changes: 36 additions & 36 deletions src/Makefile.am
Expand Up @@ -82,18 +82,18 @@ TESTS =
BENCHMARKS =

if BUILD_BITCOIND
bin_PROGRAMS += bitcoind
bin_PROGRAMS += argentumntd
endif

if BUILD_BITCOIN_CLI
bin_PROGRAMS += bitcoin-cli
bin_PROGRAMS += argentumnt-cli
endif
if BUILD_BITCOIN_TX
bin_PROGRAMS += bitcoin-tx
bin_PROGRAMS += argentumnt-tx
endif
if ENABLE_WALLET
if BUILD_BITCOIN_WALLET
bin_PROGRAMS += bitcoin-wallet
bin_PROGRAMS += argentumnt-wallet
endif
endif

Expand Down Expand Up @@ -487,17 +487,17 @@ libbitcoin_cli_a_SOURCES = \
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
#

# bitcoind binary #
bitcoind_SOURCES = bitcoind.cpp
bitcoind_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
bitcoind_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
# argentumntd binary #
argentumntd_SOURCES = bitcoind.cpp
argentumntd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
argentumntd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
argentumntd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

if TARGET_WINDOWS
bitcoind_SOURCES += bitcoind-res.rc
argentumntd_SOURCES += bitcoind-res.rc
endif

bitcoind_LDADD = \
argentumntd_LDADD = \
$(LIBBITCOIN_SERVER) \
$(LIBBITCOIN_WALLET) \
$(LIBBITCOIN_SERVER) \
Expand All @@ -512,59 +512,59 @@ bitcoind_LDADD = \
$(LIBMEMENV) \
$(LIBSECP256K1)

bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
argentumntd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)

# bitcoin-cli binary #
bitcoin_cli_SOURCES = bitcoin-cli.cpp
bitcoin_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
bitcoin_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
# argentumnt-cli binary #
argentumnt_cli_SOURCES = bitcoin-cli.cpp
argentumnt_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
argentumnt_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
argentumnt_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

if TARGET_WINDOWS
bitcoin_cli_SOURCES += bitcoin-cli-res.rc
argentumnt_cli_SOURCES += bitcoin-cli-res.rc
endif

bitcoin_cli_LDADD = \
argentumnt_cli_LDADD = \
$(LIBBITCOIN_CLI) \
$(LIBUNIVALUE) \
$(LIBBITCOIN_UTIL) \
$(LIBBITCOIN_CRYPTO)

bitcoin_cli_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
argentumnt_cli_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
#

# bitcoin-tx binary #
bitcoin_tx_SOURCES = bitcoin-tx.cpp
bitcoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
bitcoin_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
# argentumnt-tx binary #
argentumnt_tx_SOURCES = bitcoin-tx.cpp
argentumnt_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
argentumnt_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
argentumnt_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

if TARGET_WINDOWS
bitcoin_tx_SOURCES += bitcoin-tx-res.rc
argentumnt_tx_SOURCES += bitcoin-tx-res.rc
endif

bitcoin_tx_LDADD = \
argentumnt_tx_LDADD = \
$(LIBUNIVALUE) \
$(LIBBITCOIN_COMMON) \
$(LIBBITCOIN_UTIL) \
$(LIBBITCOIN_CONSENSUS) \
$(LIBBITCOIN_CRYPTO) \
$(LIBSECP256K1)

bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
argentumnt_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
#

# bitcoin-wallet binary #
bitcoin_wallet_SOURCES = bitcoin-wallet.cpp
bitcoin_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
bitcoin_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
bitcoin_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
# argentumnt-wallet binary #
argentumnt_wallet_SOURCES = bitcoin-wallet.cpp
argentumnt_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
argentumnt_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
argentumnt_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

if TARGET_WINDOWS
bitcoin_wallet_SOURCES += bitcoin-wallet-res.rc
argentumnt_wallet_SOURCES += bitcoin-wallet-res.rc
endif

bitcoin_wallet_LDADD = \
argentumnt_wallet_LDADD = \
$(LIBBITCOIN_WALLET_TOOL) \
$(LIBBITCOIN_WALLET) \
$(LIBBITCOIN_SERVER) \
Expand All @@ -577,7 +577,7 @@ bitcoin_wallet_LDADD = \
$(LIBMEMENV) \
$(LIBSECP256K1)

bitcoin_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
argentumnt_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
#

# bitcoinconsensus library #
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.cpp
Expand Up @@ -12,7 +12,7 @@
* for both bitcoind and bitcoin-qt, to make it harder for attackers to
* target servers or GUI users specifically.
*/
const std::string CLIENT_NAME("Platinumcoin");
const std::string CLIENT_NAME("Argentumntcoin");

/**
* Client version number
Expand Down
6 changes: 3 additions & 3 deletions src/util/system.cpp
Expand Up @@ -688,7 +688,7 @@ fs::path GetDefaultDataDir()
// Unix: ~/.bitcoin
#ifdef WIN32
// Windows
return GetSpecialFolderPath(CSIDL_APPDATA) / "Platinumcoin";
return GetSpecialFolderPath(CSIDL_APPDATA) / "Argentumntcoin";
#else
fs::path pathRet;
char* pszHome = getenv("HOME");
Expand All @@ -698,10 +698,10 @@ fs::path GetDefaultDataDir()
pathRet = fs::path(pszHome);
#ifdef MAC_OSX
// Mac
return pathRet / "Library/Application Support/Platinumcoin";
return pathRet / "Library/Application Support/Argentumntcoin";
#else
// Unix
return pathRet / ".platinumcoin";
return pathRet / ".argentumntcoin";
#endif
#endif
}
Expand Down

0 comments on commit 30ad7da

Please sign in to comment.