Permalink
Browse files

increased version, added seed node, delayed fork

increased version, added seed node, delayed fork
  • Loading branch information...
Greg Griffith
Greg Griffith committed Jun 27, 2017
1 parent d8dc341 commit b8aed36f10ee78717c8f8d53e6e0a45cd5651455
Showing with 61 additions and 33 deletions.
  1. +46 −28 Teslacoin-qt.pro
  2. +1 −1 src/clientversion.h
  3. +10 −1 src/kernel.cpp
  4. +2 −1 src/net.cpp
  5. +2 −2 src/version.h
View
@@ -5,11 +5,13 @@ INCLUDEPATH += src src/json src/qt src/tor
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
CONFIG += thread
windows:CONFIG += static
CONFIG += static
CONFIG += widgets
CONFIG += c++11
QT += core gui network widgets
#CONFIG += debug
QMAKE_CXXFLAGS = -fpermissive
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets
@@ -25,22 +27,20 @@ greaterThan(QT_MAJOR_VERSION, 4) {
# Dependency library locations can be customized with:
# BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
# BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
windows:LIBS += -lshlwapi
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
windows:LIBS += -lws2_32 -lole32 -loleaut32 -luuid -lgdi32
LIBS += -lboost_system-mgw46-mt-sd-1_53 -lboost_filesystem-mgw46-mt-sd-1_53 -lboost_program_options-mgw46-mt-sd-1_53 -lboost_thread-mgw46-mt-sd-1_53
BOOST_LIB_SUFFIX=-mgw46-mt-sd-1_53
BOOST_INCLUDE_PATH=C:/deps/boost_1_53_0
BOOST_LIB_PATH=C:/deps/boost_1_53_0/stage/lib
BDB_INCLUDE_PATH=c:/deps/db-4.8.30.NC/build_unix
BDB_LIB_PATH=c:/deps/db-4.8.30.NC/build_unix
OPENSSL_INCLUDE_PATH=c:/deps/openssl-1.0.2d/include
OPENSSL_LIB_PATH=c:/deps/openssl-1.0.2d
MINIUPNPC_INCLUDE_PATH=C:/deps/
MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
win32{
BOOST_LIB_SUFFIX=-mgw49-mt-s-1_57
BOOST_INCLUDE_PATH=C:/deps/boost_1_57_0
BOOST_LIB_PATH=C:/deps/boost_1_57_0/stage/lib
BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1l/include
OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1l
MINIUPNPC_INCLUDE_PATH=C:/deps/
MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
}
OBJECTS_DIR = build
MOC_DIR = build
@@ -146,7 +146,8 @@ contains(USE_UPNP, -) {
count(USE_UPNP, 0) {
USE_UPNP=1
}
DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
DEFINES += DMINIUPNP_STATICLIB
INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
win32:LIBS += -liphlpapi
@@ -192,7 +193,7 @@ genleveldb.depends = FORCE
PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
QMAKE_EXTRA_TARGETS += genleveldb
# Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
#QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
# regenerate src/build.h
!windows|contains(USE_BUILD_INFO, 1) {
@@ -260,7 +261,6 @@ HEADERS += src/qt/bitcoingui.h \
src/walletdb.h \
src/script.h \
src/init.h \
src/irc.h \
src/mruset.h \
src/json/json_spirit_writer_template.h \
src/json/json_spirit_writer.h \
@@ -303,14 +303,31 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/blockbrowser.h \
src/version.h \
src/netbase.h \
src/clientversion.h
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/clientversion.h \
src/miner.h \
src/messages.h \
src/base/block.h \
src/base/transaction.h \
src/base/index.h \
src/base/merkletx.h \
src/base/locator.h \
src/base/mempool.h
SOURCES += \
src/base/block.cpp \
src/base/transaction.cpp \
src/base/index.cpp \
src/base/merkletx.cpp \
src/base/locator.cpp \
src/base/mempool.cpp \
#
src/qt/bitcoin.cpp \
src/qt/bitcoingui.cpp \
src/qt/transactiontablemodel.cpp \
src/qt/addresstablemodel.cpp \
src/qt/optionsdialog.cpp \
src/qt/sendcoinsdialog.cpp \
src/qt/coincontroldialog.cpp \
src/qt/coincontroldialog.cpp \
src/qt/coincontroltreewidget.cpp \
src/qt/addressbookpage.cpp \
src/qt/signverifymessagedialog.cpp \
@@ -327,7 +344,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/main.cpp \
src/init.cpp \
src/net.cpp \
src/irc.cpp \
src/checkpoints.cpp \
src/addrman.cpp \
src/db.cpp \
@@ -372,7 +388,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/scrypt-x86.S \
src/scrypt-x86_64.S \
src/scrypt_mine.cpp \
src/pbkdf2.cpp
src/pbkdf2.cpp \
src/miner.cpp \
src/messages.cpp
RESOURCES += \
src/qt/bitcoin.qrc
View
@@ -7,7 +7,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 3
#define CLIENT_VERSION_MINOR 2
#define CLIENT_VERSION_MINOR 3
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0
View
@@ -292,7 +292,16 @@ bool CheckStakeKernelHash(unsigned int nBits, const CBlock& blockFrom, unsigned
// this change increases active coins participating the hash and helps
// to secure the network when proof-of-stake difficulty is low
int64 nTimeWeight = min((int64)nTimeTx - txPrev.nTime, (int64)nStakeMaxAge) - nStakeMinAge;
CBigNum bnCoinDayWeight = CBigNum(nValueIn) * nTimeWeight / COIN / (24 * 60 * 60);
CBigNum bnCoinDayWeight = 0;
if(1293600 <= pindexBest->nHeight)
{
bnCoinDayWeight = CBigNum(nValueIn) * nTimeWeight / COIN / (24 * 60 * 60);
}
else
{
bnCoinDayWeight = CBigNum(nValueIn) * nTimeWeight / (24 * 60 * 60);
}
// Calculate hash
CDataStream ss(SER_GETHASH, 0);
View
@@ -1169,7 +1169,8 @@ static const char *strDNSSeed[][2] = {
{"tesla.coin6", "115.28.38.190"},
{"tesla.coin7", "5.189.187.91"},
{"tesla.coin8", "74.65.200.29"},
{"tesla.coin9", "81.245.187.75"}
{"tesla.coin9", "81.245.187.75"},
{"teslacoinv3.3-seed", "94.177.203.132"},
};
void ThreadDNSAddressSeed(void* parg)
View
@@ -25,7 +25,7 @@ extern const std::string CLIENT_DATE;
// network protocol versioning
//
static const int PROTOCOL_VERSION = 63001;
static const int PROTOCOL_VERSION = 63002;
// earlier versions not supported as of Feb 2012, and are disconnected
static const int MIN_PROTO_VERSION = 209;
@@ -48,7 +48,7 @@ static const int MEMPOOL_GD_VERSION = 60002;
static const int DATABASE_VERSION = 63001;
#define DISPLAY_VERSION_MAJOR 3
#define DISPLAY_VERSION_MINOR 2
#define DISPLAY_VERSION_MINOR 3
#define DISPLAY_VERSION_REVISION 0
#define DISPLAY_VERSION_BUILD 0

0 comments on commit b8aed36

Please sign in to comment.