diff --git a/src/Makefile.am b/src/Makefile.am index e31519651..88c1aaa78 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,11 +66,11 @@ TESTS = BENCHMARKS = if BUILD_BITCOIND - bin_PROGRAMS += litecoind + bin_PROGRAMS += flod endif if BUILD_BITCOIN_UTILS - bin_PROGRAMS += litecoin-cli litecoin-tx + bin_PROGRAMS += flo-cli flo-tx endif .PHONY: FORCE check-symbols check-security @@ -370,16 +370,16 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # bitcoind binary # -litecoind_SOURCES = bitcoind.cpp -litecoind_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -litecoind_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -litecoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +flod_SOURCES = bitcoind.cpp +flod_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +flod_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +flod_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -litecoind_SOURCES += bitcoind-res.rc +flod_SOURCES += bitcoind-res.rc endif -litecoind_LDADD = \ +flod_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBUNIVALUE) \ @@ -393,38 +393,38 @@ litecoind_LDADD = \ $(LIBMEMENV) \ $(LIBSECP256K1) -litecoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) +flod_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) # bitcoin-cli binary # -litecoin_cli_SOURCES = bitcoin-cli.cpp -litecoin_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) -litecoin_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -litecoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +flo_cli_SOURCES = bitcoin-cli.cpp +flo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) +flo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +flo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -litecoin_cli_SOURCES += bitcoin-cli-res.rc +flo_cli_SOURCES += bitcoin-cli-res.rc endif -litecoin_cli_LDADD = \ +flo_cli_LDADD = \ $(LIBBITCOIN_CLI) \ $(LIBUNIVALUE) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CRYPTO) -litecoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) +flo_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) # # bitcoin-tx binary # -litecoin_tx_SOURCES = bitcoin-tx.cpp -litecoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -litecoin_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -litecoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +flo_tx_SOURCES = bitcoin-tx.cpp +flo_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +flo_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +flo_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -litecoin_tx_SOURCES += bitcoin-tx-res.rc +flo_tx_SOURCES += bitcoin-tx-res.rc endif -litecoin_tx_LDADD = \ +flo_tx_LDADD = \ $(LIBUNIVALUE) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ @@ -432,7 +432,7 @@ litecoin_tx_LDADD = \ $(LIBBITCOIN_CRYPTO) \ $(LIBSECP256K1) -litecoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) +flo_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) # # bitcoinconsensus library # diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index c1f3a0d97..306a8aa4c 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -2,15 +2,15 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -bin_PROGRAMS += bench/bench_litecoin +bin_PROGRAMS += bench/bench_flo BENCH_SRCDIR = bench -BENCH_BINARY = bench/bench_litecoin$(EXEEXT) +BENCH_BINARY = bench/bench_flo$(EXEEXT) RAW_TEST_FILES = \ bench/data/block413567.raw GENERATED_TEST_FILES = $(RAW_TEST_FILES:.raw=.raw.h) -bench_bench_litecoin_SOURCES = \ +bench_bench_flo_SOURCES = \ bench/bench_bitcoin.cpp \ bench/bench.cpp \ bench/bench.h \ @@ -28,11 +28,11 @@ bench_bench_litecoin_SOURCES = \ bench/perf.h \ bench/prevector_destructor.cpp -nodist_bench_bench_litecoin_SOURCES = $(GENERATED_TEST_FILES) +nodist_bench_bench_flo_SOURCES = $(GENERATED_TEST_FILES) -bench_bench_litecoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ -bench_bench_litecoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bench_bench_litecoin_LDADD = \ +bench_bench_flo_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ +bench_bench_flo_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +bench_bench_flo_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ @@ -45,16 +45,16 @@ bench_bench_litecoin_LDADD = \ $(LIBUNIVALUE) if ENABLE_ZMQ -bench_bench_litecoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +bench_bench_flo_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif if ENABLE_WALLET -bench_bench_litecoin_SOURCES += bench/coin_selection.cpp -bench_bench_litecoin_LDADD += $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CRYPTO) +bench_bench_flo_SOURCES += bench/coin_selection.cpp +bench_bench_flo_LDADD += $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CRYPTO) endif -bench_bench_litecoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) -bench_bench_litecoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +bench_bench_flo_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) +bench_bench_flo_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_TEST_FILES) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 2973e3def..fee00dace 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -2,7 +2,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -bin_PROGRAMS += qt/litecoin-qt +bin_PROGRAMS += qt/flo-qt EXTRA_LIBRARIES += qt/libbitcoinqt.a # bitcoin qt core # @@ -288,7 +288,7 @@ RES_ICONS = \ qt/res/icons/history.png \ qt/res/icons/info.png \ qt/res/icons/key.png \ - qt/res/icons/litecoin_splash.png \ + qt/res/icons/flo_splash.png \ qt/res/icons/lock_closed.png \ qt/res/icons/lock_open.png \ qt/res/icons/network_disabled.png \ @@ -397,7 +397,7 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI: # Most files will depend on the forms and moc files as includes. Generate them # before anything else. $(QT_MOC): $(QT_FORMS_H) -$(qt_libbitcoinqt_a_OBJECTS) $(qt_litecoin_qt_OBJECTS) : | $(QT_MOC) +$(qt_libbitcoinqt_a_OBJECTS) $(qt_flo_qt_OBJECTS) : | $(QT_MOC) #Generating these with a half-written protobuf header leads to wacky results. #This makes sure it's done. @@ -405,29 +405,29 @@ $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) # bitcoin-qt binary # -qt_litecoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_flo_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_litecoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_flo_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -qt_litecoin_qt_SOURCES = qt/bitcoin.cpp +qt_flo_qt_SOURCES = qt/bitcoin.cpp if TARGET_DARWIN - qt_litecoin_qt_SOURCES += $(BITCOIN_MM) + qt_flo_qt_SOURCES += $(BITCOIN_MM) endif if TARGET_WINDOWS - qt_litecoin_qt_SOURCES += $(BITCOIN_RC) + qt_flo_qt_SOURCES += $(BITCOIN_RC) endif -qt_litecoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) +qt_flo_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_litecoin_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_flo_qt_LDADD += $(LIBBITCOIN_WALLET) endif if ENABLE_ZMQ -qt_litecoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +qt_flo_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif -qt_litecoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \ +qt_flo_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) -qt_litecoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_litecoin_qt_LIBTOOLFLAGS = --tag CXX +qt_flo_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_flo_qt_LIBTOOLFLAGS = --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) @@ -459,9 +459,9 @@ CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda CLEANFILES += $(CLEAN_QT) bitcoin_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_litecoin_qt_OBJECTS) qt/litecoin-qt$(EXEEXT) $(LIBBITCOINQT) + rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_flo_qt_OBJECTS) qt/flo-qt$(EXEEXT) $(LIBBITCOINQT) -bitcoin_qt : qt/litecoin-qt$(EXEEXT) +bitcoin_qt : qt/flo-qt$(EXEEXT) ui_%.h: %.ui @test -f $(UIC) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index ae5fbfb83..bac66fb32 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -2,8 +2,8 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -bin_PROGRAMS += qt/test/test_litecoin-qt -TESTS += qt/test/test_litecoin-qt +bin_PROGRAMS += qt/test/test_flo-qt +TESTS += qt/test/test_flo-qt TEST_QT_MOC_CPP = \ qt/test/moc_compattests.cpp \ @@ -32,10 +32,10 @@ TEST_BITCOIN_H = \ test/test_bitcoin.h \ test/testutil.h -qt_test_test_litecoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_test_test_flo_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) -qt_test_test_litecoin_qt_SOURCES = \ +qt_test_test_flo_qt_SOURCES = \ qt/test/compattests.cpp \ qt/test/rpcnestedtests.cpp \ qt/test/test_main.cpp \ @@ -44,35 +44,35 @@ qt_test_test_litecoin_qt_SOURCES = \ $(TEST_BITCOIN_CPP) \ $(TEST_BITCOIN_H) if ENABLE_WALLET -qt_test_test_litecoin_qt_SOURCES += \ +qt_test_test_flo_qt_SOURCES += \ qt/test/paymentservertests.cpp \ qt/test/wallettests.cpp \ wallet/test/wallet_test_fixture.cpp endif -nodist_qt_test_test_litecoin_qt_SOURCES = $(TEST_QT_MOC_CPP) +nodist_qt_test_test_flo_qt_SOURCES = $(TEST_QT_MOC_CPP) -qt_test_test_litecoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) +qt_test_test_flo_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_test_test_litecoin_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_test_test_flo_qt_LDADD += $(LIBBITCOIN_WALLET) endif if ENABLE_ZMQ -qt_test_test_litecoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +qt_test_test_flo_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif -qt_test_test_litecoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \ +qt_test_test_flo_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) -qt_test_test_litecoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_test_test_litecoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_test_test_flo_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_test_test_flo_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno CLEANFILES += $(CLEAN_BITCOIN_QT_TEST) -test_bitcoin_qt : qt/test/test_litecoin-qt$(EXEEXT) +test_bitcoin_qt : qt/test/test_flo-qt$(EXEEXT) -test_bitcoin_qt_check : qt/test/test_litecoin-qt$(EXEEXT) FORCE +test_bitcoin_qt_check : qt/test/test_flo-qt$(EXEEXT) FORCE $(MAKE) check-TESTS TESTS=$^ test_bitcoin_qt_clean: FORCE diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 26036d605..5e899d709 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -2,11 +2,11 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -TESTS += test/test_litecoin -bin_PROGRAMS += test/test_litecoin -noinst_PROGRAMS += test/test_litecoin_fuzzy +TESTS += test/test_flo +bin_PROGRAMS += test/test_flo +noinst_PROGRAMS += test/test_flo_fuzzy TEST_SRCDIR = test -TEST_BINARY=test/test_litecoin$(EXEEXT) +TEST_BINARY=test/test_flo$(EXEEXT) JSON_TEST_FILES = \ test/data/script_tests.json \ @@ -94,31 +94,31 @@ BITCOIN_TESTS += \ wallet/test/crypto_tests.cpp endif -test_test_litecoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) -test_test_litecoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS) -test_test_litecoin_LDADD = +test_test_flo_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) +test_test_flo_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS) +test_test_flo_LDADD = if ENABLE_WALLET -test_test_litecoin_LDADD += $(LIBBITCOIN_WALLET) +test_test_flo_LDADD += $(LIBBITCOIN_WALLET) endif -test_test_litecoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \ +test_test_flo_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \ $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) -test_test_litecoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +test_test_flo_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -test_test_litecoin_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) -test_test_litecoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static +test_test_flo_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) +test_test_flo_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static if ENABLE_ZMQ -test_test_litecoin_LDADD += $(ZMQ_LIBS) +test_test_flo_LDADD += $(ZMQ_LIBS) endif # # test_bitcoin_fuzzy binary # -test_test_litecoin_fuzzy_SOURCES = test/test_bitcoin_fuzzy.cpp -test_test_litecoin_fuzzy_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -test_test_litecoin_fuzzy_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -test_test_litecoin_fuzzy_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +test_test_flo_fuzzy_SOURCES = test/test_bitcoin_fuzzy.cpp +test_test_flo_fuzzy_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +test_test_flo_fuzzy_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +test_test_flo_fuzzy_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -test_test_litecoin_fuzzy_LDADD = \ +test_test_flo_fuzzy_LDADD = \ $(LIBUNIVALUE) \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ @@ -127,10 +127,10 @@ test_test_litecoin_fuzzy_LDADD = \ $(LIBBITCOIN_CRYPTO) \ $(LIBSECP256K1) -test_test_litecoin_fuzzy_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) +test_test_flo_fuzzy_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) # -nodist_test_test_litecoin_SOURCES = $(GENERATED_TEST_FILES) +nodist_test_test_flo_SOURCES = $(GENERATED_TEST_FILES) $(BITCOIN_TESTS): $(GENERATED_TEST_FILES) diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc index 61100934a..7747dd9d6 100644 --- a/src/bitcoin-cli-res.rc +++ b/src/bitcoin-cli-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Litecoin" - VALUE "FileDescription", "litecoin-cli (JSON-RPC client for " PACKAGE_NAME ")" + VALUE "CompanyName", "FLO" + VALUE "FileDescription", "flo-cli (JSON-RPC client for " PACKAGE_NAME ")" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "litecoin-cli" + VALUE "InternalName", "flo-cli" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "litecoin-cli.exe" - VALUE "ProductName", "litecoin-cli" + VALUE "OriginalFilename", "flo-cli.exe" + VALUE "ProductName", "flo-cli" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 7daa4e4f7..f91829d8c 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -84,10 +84,10 @@ static int AppInitRPC(int argc, char* argv[]) std::string strUsage = strprintf(_("%s RPC client version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n"; if (!gArgs.IsArgSet("-version")) { strUsage += "\n" + _("Usage:") + "\n" + - " litecoin-cli [options] [params] " + strprintf(_("Send command to %s"), _(PACKAGE_NAME)) + "\n" + - " litecoin-cli [options] -named [name=value] ... " + strprintf(_("Send command to %s (with named arguments)"), _(PACKAGE_NAME)) + "\n" + - " litecoin-cli [options] help " + _("List commands") + "\n" + - " litecoin-cli [options] help " + _("Get help for a command") + "\n"; + " flo-cli [options] [params] " + strprintf(_("Send command to %s"), _(PACKAGE_NAME)) + "\n" + + " flo-cli [options] -named [name=value] ... " + strprintf(_("Send command to %s (with named arguments)"), _(PACKAGE_NAME)) + "\n" + + " flo-cli [options] help " + _("List commands") + "\n" + + " flo-cli [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessageCli(); } diff --git a/src/bitcoin-tx-res.rc b/src/bitcoin-tx-res.rc index c5111fb0e..b9642d41c 100644 --- a/src/bitcoin-tx-res.rc +++ b/src/bitcoin-tx-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Litecoin" - VALUE "FileDescription", "litecoin-tx (CLI Litecoin transaction editor utility)" + VALUE "CompanyName", "FLO" + VALUE "FileDescription", "flo-tx (CLI FLO transaction editor utility)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "litecoin-tx" + VALUE "InternalName", "flo-tx" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "litecoin-tx.exe" - VALUE "ProductName", "litecoin-tx" + VALUE "OriginalFilename", "flo-tx.exe" + VALUE "ProductName", "flo-tx" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 7fd34fe5f..cf9f79ac7 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -54,10 +54,10 @@ static int AppInitRawTx(int argc, char* argv[]) if (argc<2 || gArgs.IsArgSet("-?") || gArgs.IsArgSet("-h") || gArgs.IsArgSet("-help")) { // First part of help message is specific to this utility - std::string strUsage = strprintf(_("%s litecoin-tx utility version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n\n" + + std::string strUsage = strprintf(_("%s flo-tx utility version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " litecoin-tx [options] [commands] " + _("Update hex-encoded litecoin transaction") + "\n" + - " litecoin-tx [options] -create [commands] " + _("Create hex-encoded litecoin transaction") + "\n" + + " flo-tx [options] [commands] " + _("Update hex-encoded flo transaction") + "\n" + + " flo-tx [options] -create [commands] " + _("Create hex-encoded flo transaction") + "\n" + "\n"; fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc index 3dc7c38af..b598ff7a1 100644 --- a/src/bitcoind-res.rc +++ b/src/bitcoind-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Litecoin" - VALUE "FileDescription", "litecoind (Litecoin node with a JSON-RPC server)" + VALUE "CompanyName", "FLO" + VALUE "FileDescription", "flod (FLO node with a JSON-RPC server)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "litecoind" + VALUE "InternalName", "flod" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "litecoind.exe" - VALUE "ProductName", "litecoind" + VALUE "OriginalFilename", "flod.exe" + VALUE "ProductName", "flod" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index ba875aa81..21a3cf59f 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -85,7 +85,7 @@ bool AppInit(int argc, char* argv[]) else { strUsage += "\n" + _("Usage:") + "\n" + - " litecoind [options] " + strprintf(_("Start %s Daemon"), _(PACKAGE_NAME)) + "\n"; + " flod [options] " + strprintf(_("Start %s Daemon"), _(PACKAGE_NAME)) + "\n"; strUsage += "\n" + HelpMessage(HMM_BITCOIND); } @@ -119,7 +119,7 @@ bool AppInit(int argc, char* argv[]) // Error out when loose non-argument tokens are encountered on command line for (int i = 1; i < argc; i++) { if (!IsSwitchChar(argv[i][0])) { - fprintf(stderr, "Error: Command line contains unexpected token '%s', see litecoind -h for a list of options.\n", argv[i]); + fprintf(stderr, "Error: Command line contains unexpected token '%s', see flod -h for a list of options.\n", argv[i]); exit(EXIT_FAILURE); } } @@ -147,7 +147,7 @@ bool AppInit(int argc, char* argv[]) if (gArgs.GetBoolArg("-daemon", false)) { #if HAVE_DECL_DAEMON - fprintf(stdout, "Litecoin server starting\n"); + fprintf(stdout, "FLO server starting\n"); // Daemonize if (daemon(1, 0)) { // don't chdir (1), do close FDs (0) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 6e516b085..6fceade7d 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -82,10 +82,12 @@ public: consensus.BIP65Height = 1679161; // 490a10507efe42b89104408787088b7c43310cc230310201b5f57dac6f513b8b consensus.BIP66Height = 1679161; // 490a10507efe42b89104408787088b7c43310cc230310201b5f57dac6f513b8b consensus.powLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); +// consensus.nPowTargetTimespan = 360 // Florincoin: 60 minutes (Litecoin: 3.5 days)? +// consensus.nPowTargetSpacing = 40; // Florincoin: 40 seconds (~1/4x Litecoin: 2.5 minutes) consensus.fPowAllowMinDifficultyBlocks = false; consensus.fPowNoRetargeting = false; consensus.nRuleChangeActivationThreshold = 6048; // 75% of 8064 - consensus.nMinerConfirmationWindow = 8064; // nPowTargetTimespan / nPowTargetSpacing * 4 + consensus.nMinerConfirmationWindow = 8064; // nPowTargetTimespan / nPowTargetSpacing * 4 //TODO: this value would be 9 * 4, not 2016 *4; should value be 9? consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28; consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008 consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008 @@ -93,15 +95,15 @@ public: // Deployment of BIP68, BIP112, and BIP113. consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0; consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1485561600; // January 28, 2017 - consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1517356801; // January 31st, 2018 + consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1530446401; // July 1, 2018 FLO future date // Deployment of SegWit (BIP141, BIP143, and BIP147) consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1; consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1485561600; // January 28, 2017 - consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1517356801; // January 31st, 2018 + consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1530446401; // July 1, 2018 FLO future date // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000000000000"); + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000011f1db4843f05806"); // By default assume that the signatures in ancestors of this block are valid. consensus.defaultAssumeValid = uint256S("0x4a8cb5ca397b7c92c270ccfa9139ffb93f7c5b9515e52486c635c7a1dee9d221"); // 2000000 @@ -186,10 +188,10 @@ public: {2094558, uint256S("0x946616c88286f32bfac15868456d87a86f8611e1f9b56594b81e46831ce43f81")}, } }; - + //TODO: fix this below chainTxData = ChainTxData{ - // Data as of block db42d00d824950a125f9b08b6b6c282c484781562fa8b3bd29d6ce4a2627c348 (height 1259851). - 1514751180, // * UNIX timestamp of last known number of transactions + // Data as of block 5d64c04d52b041508c0e95f5b2de6203a2d6e2fd879d0b4e0c1cddab2213a658 (not: db42d00d824950a125f9b08b6b6c282c484781562fa8b3bd29d6ce4a2627c348) (height 1259851). + 1436254405, //not 1514751180, // * UNIX timestamp of last known number of transactions 3210200, // * total number of transactions between genesis and that timestamp // (the tx=... number in the SetBestChain debug.log lines) 0.05 // * estimated number of transactions per second after that timestamp @@ -204,17 +206,18 @@ class CTestNetParams : public CChainParams { public: CTestNetParams() { strNetworkID = "test"; - consensus.nSubsidyHalvingInterval = 840000; - consensus.BIP34Height = 76; - consensus.BIP34Hash = uint256S("8075c771ed8b495ffd943980a95f702ab34fce3c8c54e379548bda33cc8c0573"); - consensus.BIP65Height = 76; // 8075c771ed8b495ffd943980a95f702ab34fce3c8c54e379548bda33cc8c0573 - consensus.BIP66Height = 76; // 8075c771ed8b495ffd943980a95f702ab34fce3c8c54e379548bda33cc8c0573 + consensus.nSubsidyHalvingInterval = 800000; + consensus.BIP34Height = 33600; //already activated on main so activate here too + consensus.BIP34Hash = uint256S("4ac31d938531317c065405a9b23478c8c99204ff17fc294cb09821e2c2b42e65"); + consensus.BIP65Height = 33600; // 4ac31d938531317c065405a9b23478c8c99204ff17fc294cb09821e2c2b42e65 + consensus.BIP66Height = 33600; // 4ac31d938531317c065405a9b23478c8c99204ff17fc294cb09821e2c2b42e65 consensus.powLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); - consensus.nPowTargetSpacing = 2.5 * 60; +// consensus.nPowTargetTimespan = 360 // Florincoin: 60 minutes (Litecoin: 3.5 days)? +// consensus.nPowTargetSpacing = 40; // Florincoin: 40 seconds (~1/4x Litecoin: 2.5 minutes) consensus.fPowAllowMinDifficultyBlocks = true; consensus.fPowNoRetargeting = false; - consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains - consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing + consensus.nRuleChangeActivationThreshold = 6048; // 75% of 8064 + consensus.nMinerConfirmationWindow = 8064; // nPowTargetTimespan / nPowTargetSpacing * 4 //TODO: this value would be 9 * 4, not 2016 *4; should value be 9? consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28; consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008 consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008 @@ -222,44 +225,42 @@ public: // Deployment of BIP68, BIP112, and BIP113. consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0; consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1483228800; // January 1, 2017 - consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1517356801; // January 31st, 2018 + consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1530446401; // July 1, 2018 FLO future date // Deployment of SegWit (BIP141, BIP143, and BIP147) consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1; consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1483228800; // January 1, 2017 - consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1517356801; // January 31st, 2018 + consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1530446401; // July 1, 2018 FLO future date // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000364b0cbc3568"); + consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000000083540886d"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0xad8ff6c2f5580d2b50bd881e11312425ea84fa99f322bf132beb722f97971bba"); //153490 + consensus.defaultAssumeValid = uint256S("0x4be79531ee8b0f410f0d8c8d785083acb4e14e5d54b0820502bc60f98a629b19"); //flo testnet block 20,000 pchMessageStart[0] = 0xfd; - pchMessageStart[1] = 0xd2; - pchMessageStart[2] = 0xc8; - pchMessageStart[3] = 0xf1; - nDefaultPort = 19335; - nPruneAfterHeight = 1000; + pchMessageStart[1] = 0xc0; + pchMessageStart[2] = 0x5a; + pchMessageStart[3] = 0xf2; + nDefaultPort = 17312; + nPruneAfterHeight = 100000; - genesis = CreateGenesisBlock(1486949366, 293345, 0x1e0ffff0, 1, 50 * COIN); + genesis = CreateGenesisBlock(1371387277, 1000580675, 0x1e0ffff0, 1, 100 * COIN); consensus.hashGenesisBlock = genesis.GetHash(); - assert(consensus.hashGenesisBlock == uint256S("0x4966625a4b2851d9fdee139e56211a0d88575f59ed816ff5e6a63deb4e3e29a0")); - assert(genesis.hashMerkleRoot == uint256S("0x97ddfbbae6be97fd6cdf3e7ca13232a3afff2353e29badfab7f73011edd4ced9")); + assert(consensus.hashGenesisBlock == uint256S("0x9b7bc86236c34b5e3a39367c036b7fe8807a966c22a7a1f0da2a198a27e03731")); + assert(genesis.hashMerkleRoot == uint256S("0x730f0c8ddc5a592d5512566890e2a73e45feaa6748b24b849d1c29a7ab2b2300")); vFixedSeeds.clear(); vSeeds.clear(); // nodes with support for servicebits filtering should be at the top - vSeeds.emplace_back("testnet-seed.litecointools.com", true); - vSeeds.emplace_back("seed-b.litecoin.loshan.co.uk", true); - vSeeds.emplace_back("dnsseed-testnet.thrasher.io", true); + vSeeds.emplace_back("testnet.florincoin.info", true); - base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,111); - base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,196); - base58Prefixes[SCRIPT_ADDRESS2] = std::vector(1,58); - base58Prefixes[SECRET_KEY] = std::vector(1,239); - base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF}; - base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94}; + base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,115); + base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,198); + base58Prefixes[SCRIPT_ADDRESS2] = std::vector(1,58); // ToDo: bflorincoin? + base58Prefixes[SECRET_KEY] = std::vector(1,239); // ToDo: bflorincoin? + base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF}; // ToDo: bflorincoin? + base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94}; // ToDo: bflorincoin? vFixedSeeds = std::vector(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test)); @@ -269,12 +270,12 @@ public: checkpointData = (CCheckpointData) { { - {2056, uint256S("17748a31ba97afdc9a4f86837a39d287e3e7c7290a08a1d816c5969c78a83289")}, + {2056, uint256S("0xd3334db071731beaa651f10624c2fea1a5e8c6f9e50f0e602f86262938374148")}, } }; - + //TODO: fix this below chainTxData = ChainTxData{ - // Data as of block 3351b6229da00b47ad7a8d7e1323b0e2874744b5296e3d6448293463ab758624 (height 153489) + // todo: flo; (litecoin: Data as of block 3351b6229da00b47ad7a8d7e1323b0e2874744b5296e3d6448293463ab758624 (height 153489) 1502953751, 382986, 0.01 diff --git a/src/clientversion.cpp b/src/clientversion.cpp index dec014ef5..88a301d56 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -13,7 +13,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("LitecoinCore"); +const std::string CLIENT_NAME("FLOCore"); /** * Client version number diff --git a/src/init.cpp b/src/init.cpp index c564a37ea..e0b834478 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -526,7 +526,7 @@ std::string HelpMessage(HelpMessageMode mode) std::string LicenseInfo() { const std::string URL_SOURCE_CODE = ""; - const std::string URL_WEBSITE = ""; + const std::string URL_WEBSITE = ""; return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2011, COPYRIGHT_YEAR) + " ") + "\n" + "\n" + @@ -815,7 +815,7 @@ void InitLogging() fLogIPs = gArgs.GetBoolArg("-logips", DEFAULT_LOGIPS); LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - LogPrintf("Litecoin version %s\n", FormatFullVersion()); + LogPrintf("FLO version %s\n", FormatFullVersion()); } namespace { // Variables internal to initialization process only diff --git a/src/net.cpp b/src/net.cpp index 6dacb41da..8be9391c1 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1483,7 +1483,7 @@ void ThreadMapPort() } } - std::string strDesc = "Litecoin " + FormatFullVersion(); + std::string strDesc = "FLO " + FormatFullVersion(); try { while (true) { diff --git a/src/net_processing.cpp b/src/net_processing.cpp index faf4ec32b..8236145ec 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -32,7 +32,7 @@ #include "validationinterface.h" #if defined(NDEBUG) -# error "Litecoin cannot be compiled without assertions." +# error "FLO cannot be compiled without assertions." #endif std::atomic nTimeBestReceived(0); // Used only to inform the wallet of when we last received a block diff --git a/src/pow.cpp b/src/pow.cpp index 10a189c95..637e84d46 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -40,7 +40,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead int averagingInterval = params.AveragingInterval(pindexLast->nHeight+1); // Go back by what we want to be 14 days worth of blocks - // Litecoin: This fixes an issue where a 51% attack can change difficulty at will. + // FLO: This fixes an issue where a 51% attack can change difficulty at will. // Go back the full period unless it's the first retarget after genesis. Code courtesy of Art Forz int blockstogoback = averagingInterval-1; if ((pindexLast->nHeight+1) != averagingInterval) @@ -76,7 +76,7 @@ unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nF arith_uint256 bnOld; bnNew.SetCompact(pindexLast->nBits); bnOld = bnNew; - // Litecoin: intermediate uint256 can overflow by 1 bit + // FLO: intermediate uint256 can overflow by 1 bit const arith_uint256 bnPowLimit = UintToArith256(params.powLimit); bool fShift = bnNew.bits() > bnPowLimit.bits() - 1; if (fShift) diff --git a/src/txdb.cpp b/src/txdb.cpp index 1c76b6827..e364ab66b 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -287,7 +287,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts(const Consensus::Params& consensusParams, pindexNew->nStatus = diskindex.nStatus; pindexNew->nTx = diskindex.nTx; - // Litecoin: Disable PoW Sanity check while loading block index from disk. + // FLO: Disable PoW Sanity check while loading block index from disk. // We use the sha256 hash for the block index for performance reasons, which is recorded for later use. // CheckProofOfWork() uses the scrypt hash which is discarded after a block is accepted. // While it is technically feasible to verify the PoW, doing so takes several minutes as it diff --git a/src/util.cpp b/src/util.cpp index 487009e7d..71c23b7f1 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -87,8 +87,8 @@ // Application startup time (used for uptime calculation) const int64_t nStartupTime = GetTime(); -const char * const BITCOIN_CONF_FILENAME = "litecoin.conf"; -const char * const BITCOIN_PID_FILENAME = "litecoin.pid"; +const char * const BITCOIN_CONF_FILENAME = "flo.conf"; +const char * const BITCOIN_PID_FILENAME = "flo.pid"; ArgsManager gArgs; bool fPrintToConsole = false; @@ -505,7 +505,7 @@ static std::string FormatException(const std::exception* pex, const char* pszThr char pszModule[MAX_PATH] = ""; GetModuleFileNameA(nullptr, pszModule, sizeof(pszModule)); #else - const char* pszModule = "litecoin"; + const char* pszModule = "flo"; #endif if (pex) return strprintf( @@ -530,7 +530,7 @@ fs::path GetDefaultDataDir() // Unix: ~/.bitcoin #ifdef WIN32 // Windows - return GetSpecialFolderPath(CSIDL_APPDATA) / "Litecoin"; + return GetSpecialFolderPath(CSIDL_APPDATA) / "FLO"; #else fs::path pathRet; char* pszHome = getenv("HOME"); @@ -540,10 +540,10 @@ fs::path GetDefaultDataDir() pathRet = fs::path(pszHome); #ifdef MAC_OSX // Mac - return pathRet / "Library/Application Support/Litecoin"; + return pathRet / "Library/Application Support/FLO"; #else // Unix - return pathRet / ".litecoin"; + return pathRet / ".flo"; #endif #endif } diff --git a/src/validation.cpp b/src/validation.cpp index 1587aafef..78104a4a6 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -50,7 +50,7 @@ #include #if defined(NDEBUG) -# error "Litecoin cannot be compiled without assertions." +# error "FLO cannot be compiled without assertions." #endif /** @@ -92,7 +92,7 @@ static void CheckBlockIndex(const Consensus::Params& consensusParams); /** Constant stuff for coinbase transactions we create: */ CScript COINBASE_FLAGS; -const std::string strMessageMagic = "Litecoin Signed Message:\n"; +const std::string strMessageMagic = "FLO Signed Message:\n"; // Internal stuff namespace { @@ -839,7 +839,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool // Remove conflicting transactions from the mempool for (const CTxMemPool::txiter it : allConflicting) { - LogPrint(BCLog::MEMPOOL, "replacing tx %s with %s for %s LTC additional fees, %d delta bytes\n", + LogPrint(BCLog::MEMPOOL, "replacing tx %s with %s for %s FLO additional fees, %d delta bytes\n", it->GetTx().GetHash().ToString(), hash.ToString(), FormatMoney(nModifiedFees - nConflictingFees),