From f3ae714c95f46abc39b6fd54a9db9a4b3db4e59e Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 13 Sep 2016 13:57:57 -0300 Subject: [PATCH] qt --- README.md | 23 +++++++++++++++++++++++ src/Makefile.qt.include | 30 +++++++++++++++--------------- src/Makefile.qttest.include | 24 ++++++++++++------------ src/qt/Makefile | 10 +++++----- src/qt/bitcoinstrings.cpp | 2 +- src/qt/guiconstants.h | 4 ++-- src/qt/macnotificationhandler.mm | 2 +- src/qt/res/bitcoin-qt-res.rc | 4 ++-- src/qt/test/test_main.cpp | 2 +- src/qt/utilitydialog.cpp | 2 +- src/rpcserver.cpp | 2 +- 11 files changed, 64 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 881edec3a..1ab2b4183 100644 --- a/README.md +++ b/README.md @@ -31,3 +31,26 @@ License Zcash is released under the terms of the MIT license. See [COPYING](COPYING) for more information or see http://opensource.org/licenses/MIT. + +>>>>>>>>>>>>>>>>>>>> Komodo specific notes: + +git clone https://github.com/jl777/komodo +cd komodo +./autoconf +./configure +./zcutil/fetch-params.sh +cp ~/.zcash-params/testnet3/z9* ~/.zcash-params +./zcutil/build.sh -j8 # -j8 uses 8 threads + +In ~/.komodo/komodo.conf: + +rpcuser=bitcoinrpc +rpcpassword=6cPEhaAvRk6w5MPAopJJbjucKRyDCapqC1JWzx15zLH2 +addnode="5.9.102.210" +addnode="78.47.196.146" + + +komodo/src/komodod -gen=1 -genproclimit=1 +komodo/src/komodo-cli getinfo + + diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index d45de8d20..c21016737 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -1,4 +1,4 @@ -bin_PROGRAMS += qt/bitcoin-qt +bin_PROGRAMS += qt/komodo-qt EXTRA_LIBRARIES += qt/libbitcoinqt.a # bitcoin qt core # @@ -319,7 +319,7 @@ RES_IMAGES = RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png) -BITCOIN_RC = qt/res/bitcoin-qt-res.rc +BITCOIN_RC = qt/res/komodo-qt-res.rc BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \ -I$(builddir)/qt/forms -DQT_NO_KEYWORDS @@ -339,7 +339,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_bitcoin_qt_OBJECTS) : | $(QT_MOC) +$(qt_libbitcoinqt_a_OBJECTS) $(qt_komodo_qt_OBJECTS) : | $(QT_MOC) #Generating these with a half-written protobuf header leads to wacky results. #This makes sure it's done. @@ -347,24 +347,24 @@ $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) # bitcoin-qt binary # -qt_bitcoin_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_komodo_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_bitcoin_qt_SOURCES = qt/bitcoin.cpp +qt_komodo_qt_SOURCES = qt/bitcoin.cpp if TARGET_DARWIN - qt_bitcoin_qt_SOURCES += $(BITCOIN_MM) + qt_komodo_qt_SOURCES += $(BITCOIN_MM) endif if TARGET_WINDOWS - qt_bitcoin_qt_SOURCES += $(BITCOIN_RC) + qt_komodo_qt_SOURCES += $(BITCOIN_RC) endif -qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) +qt_komodo_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_komodo_qt_LDADD += $(LIBBITCOIN_WALLET) endif -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +qt_komodo_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) $(LIBZCASH_LIBS) -qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_bitcoin_qt_LIBTOOLFLAGS = --tag CXX +qt_komodo_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_komodo_qt_LIBTOOLFLAGS = --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) @@ -394,10 +394,10 @@ 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_bitcoin_qt_OBJECTS) qt/bitcoin-qt$(EXEEXT) $(LIBBITCOINQT) +komodo_qt_clean: FORCE + rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_komodo_qt_OBJECTS) qt/bitcoin-qt$(EXEEXT) $(LIBBITCOINQT) -bitcoin_qt : qt/bitcoin-qt$(EXEEXT) +komodo_qt : qt/bitcoin-qt$(EXEEXT) ui_%.h: %.ui @test -f $(UIC) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 4963a396b..3e57a8926 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -12,37 +12,37 @@ TEST_QT_H = \ qt/test/paymentrequestdata.h \ qt/test/paymentservertests.h -qt_test_test_bitcoin_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_test_test_komodo_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) -qt_test_test_bitcoin_qt_SOURCES = \ +qt_test_test_komodo_qt_SOURCES = \ qt/test/test_main.cpp \ qt/test/uritests.cpp \ $(TEST_QT_H) if ENABLE_WALLET -qt_test_test_bitcoin_qt_SOURCES += \ +qt_test_test_komodo_qt_SOURCES += \ qt/test/paymentservertests.cpp endif -nodist_qt_test_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP) +nodist_qt_test_test_komodo_qt_SOURCES = $(TEST_QT_MOC_CPP) -qt_test_test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) +qt_test_test_komodo_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_test_test_komodo_qt_LDADD += $(LIBBITCOIN_WALLET) endif -qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ +qt_test_test_komodo_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) $(LIBZCASH_LIBS) -qt_test_test_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_test_test_komodo_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) 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_bitcoin-qt$(EXEEXT) +test_komodo_qt : qt/test/test_bitcoin-qt$(EXEEXT) -test_bitcoin_qt_check : qt/test/test_bitcoin-qt$(EXEEXT) FORCE +test_komodo_qt_check : qt/test/test_bitcoin-qt$(EXEEXT) FORCE $(MAKE) check-TESTS TESTS=$^ -test_bitcoin_qt_clean: FORCE - rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_bitcoin_qt_OBJECTS) +test_komodo_qt_clean: FORCE + rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_komodo_qt_OBJECTS) diff --git a/src/qt/Makefile b/src/qt/Makefile index b9dcf0c59..6df9746da 100644 --- a/src/qt/Makefile +++ b/src/qt/Makefile @@ -1,9 +1,9 @@ .PHONY: FORCE all: FORCE - $(MAKE) -C .. bitcoin_qt test_bitcoin_qt + $(MAKE) -C .. komodo_qt test_komodo_qt clean: FORCE - $(MAKE) -C .. bitcoin_qt_clean test_bitcoin_qt_clean + $(MAKE) -C .. komodo_qt_clean test_komodo_qt_clean check: FORCE - $(MAKE) -C .. test_bitcoin_qt_check -bitcoin-qt bitcoin-qt.exe: FORCE - $(MAKE) -C .. bitcoin_qt + $(MAKE) -C .. test_komodo_qt_check +komodo-qt komodo-qt.exe: FORCE + $(MAKE) -C .. komodo_qt diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index b3e7f4849..a3c9ec968 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -114,7 +114,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "the OpenSSL Toolkit and cryptographic software " "written by Eric Young and UPnP software written by Thomas Bernard."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"To use bitcoind, or the -server option to bitcoin-qt, you must set an " +"To use bitcoind, or the -server option to komodo-qt, you must set an " "rpcpassword in the configuration file:\n" "%s\n" "It is recommended you use the following random password:\n" diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index a0a2993ea..99594ad41 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -46,7 +46,7 @@ static const int MAX_URI_LENGTH = 255; #define QAPP_ORG_NAME "Bitcoin" #define QAPP_ORG_DOMAIN "bitcoin.org" -#define QAPP_APP_NAME_DEFAULT "Bitcoin-Qt" -#define QAPP_APP_NAME_TESTNET "Bitcoin-Qt-testnet" +#define QAPP_APP_NAME_DEFAULT "Komodo-Qt" +#define QAPP_APP_NAME_TESTNET "Komodo-Qt-testnet" #endif // BITCOIN_QT_GUICONSTANTS_H diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm index dd3f62281..254a15a70 100644 --- a/src/qt/macnotificationhandler.mm +++ b/src/qt/macnotificationhandler.mm @@ -13,7 +13,7 @@ - (NSString *)__bundleIdentifier { if (self == [NSBundle mainBundle]) { - return @"org.bitcoinfoundation.Bitcoin-Qt"; + return @"org.bitcoinfoundation.Komodo-Qt"; } else { return [self __bundleIdentifier]; } diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 9f66d0af7..8ba8bda73 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -21,10 +21,10 @@ BEGIN VALUE "CompanyName", "Bitcoin" VALUE "FileDescription", "Bitcoin Core (GUI node for Bitcoin)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "bitcoin-qt" + VALUE "InternalName", "komodo-qt" 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", "bitcoin-qt.exe" + VALUE "OriginalFilename", "komodo-qt.exe" VALUE "ProductName", "Bitcoin Core" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index bb768f132..e7d0a992e 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) // Don't remove this, it's needed to access // QCoreApplication:: in the tests QCoreApplication app(argc, argv); - app.setApplicationName("Bitcoin-Qt-test"); + app.setApplicationName("Komodo-Qt-test"); URITests test1; if (QTest::qExec(&test1) != 0) diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 5e26f3e01..99f652498 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -63,7 +63,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : } else { setWindowTitle(tr("Command-line options")); QString header = tr("Usage:") + "\n" + - " bitcoin-qt [" + tr("command-line options") + "] " + "\n"; + " komodo-qt [" + tr("command-line options") + "] " + "\n"; QTextCursor cursor(ui->helpMessage->document()); cursor.insertText(version); cursor.insertBlock(); diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 6e94b3a60..a18b9ec72 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -623,7 +623,7 @@ void StartRPCThreads() unsigned char rand_pwd[32]; GetRandBytes(rand_pwd, 32); uiInterface.ThreadSafeMessageBox(strprintf( - _("To use bitcoind, or the -server option to bitcoin-qt, you must set an rpcpassword in the configuration file:\n" + _("To use bitcoind, or the -server option to komodo-qt, you must set an rpcpassword in the configuration file:\n" "%s\n" "It is recommended you use the following random password:\n" "rpcuser=bitcoinrpc\n"