Skip to content
This repository has been archived by the owner on Apr 15, 2021. It is now read-only.

Future fork conditions #43

Closed
wants to merge 9 commits into from
Closed

Future fork conditions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3a4bd10
version bump
mammix2 Jun 14, 2018
5f8e413
future fork protocol minumims
mammix2 Jun 14, 2018
83d3529
fork conditions based on nTime
mammix2 Jun 14, 2018
91f4cb2
cleanup
mammix2 Jun 14, 2018
116dfb6
qt .pro update
mammix2 Jun 14, 2018
c87fb8f
dev stake donation address check
mammix2 Jun 14, 2018
cc66412
headers
mammix2 Jun 14, 2018
85e7367
dev address check tests
mammix2 Jun 14, 2018
8077e6d
dev address check tests 2
mammix2 Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
335 changes: 314 additions & 21 deletions Spectre.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,314 @@
TEMPLATE = app
TARGET = spectre
#find . -type d
QT += testlib webenginewidgets webchannel

TEMPLATE = subdirs

macx {
SUBDIRS = \
src \ # sub-project names
}

win32 {
SUBDIRS = \
tor \ # sub-project names
leveldb \ # sub-project names
db4.8 \ # sub-project names
src \ # sub-project names

src.depends = tor leveldb db4.8
}
######################################################################
# Automatically generated by qmake (3.1) Thu Jun 14 13:57:15 2018
######################################################################

TEMPLATE = app
TARGET = spectre
INCLUDEPATH += .

# Input
HEADERS += src/addrman.h \
src/alert.h \
src/allocators.h \
src/anonymize.h \
src/base58.h \
src/bignum.h \
src/bloom.h \
src/chainparams.h \
src/chainparamsseeds.h \
src/checkpoints.h \
src/clientversion.h \
src/coincontrol.h \
src/compat.h \
src/core.h \
src/crypter.h \
src/db.h \
src/eckey.h \
src/extkey.h \
src/hash.h \
src/init.h \
src/kernel.h \
src/key.h \
src/keystore.h \
src/main.h \
src/miner.h \
src/mruset.h \
src/net.h \
src/netbase.h \
src/pbkdf2.h \
src/protocol.h \
src/ringsig.h \
src/rpcclient.h \
src/rpcprotocol.h \
src/rpcserver.h \
src/script.h \
src/scrypt.h \
src/serialize.h \
src/smessage.h \
src/state.h \
src/stealth.h \
src/strlcpy.h \
src/sync.h \
src/threadsafety.h \
src/tinyformat.h \
src/txdb-leveldb.h \
src/txdb.h \
src/txmempool.h \
src/types.h \
src/ui_interface.h \
src/uint256.h \
src/util.h \
src/version.h \
src/wallet.h \
src/walletdb.h \
src/json/json_spirit.h \
src/json/json_spirit_error_position.h \
src/json/json_spirit_reader.h \
src/json/json_spirit_reader_template.h \
src/json/json_spirit_stream_reader.h \
src/json/json_spirit_utils.h \
src/json/json_spirit_value.h \
src/json/json_spirit_writer.h \
src/json/json_spirit_writer_template.h \
src/lz4/lz4.h \
src/qt/aboutdialog.h \
src/qt/addresstablemodel.h \
src/qt/askpassphrasedialog.h \
src/qt/bitcoinaddressvalidator.h \
src/qt/bitcoinamountfield.h \
src/qt/bitcoinunits.h \
src/qt/bridgetranslations.h \
src/qt/clientmodel.h \
src/qt/coincontroldialog.h \
src/qt/coincontroltreewidget.h \
src/qt/csvmodelwriter.h \
src/qt/editaddressdialog.h \
src/qt/guiconstants.h \
src/qt/guiutil.h \
src/qt/macdockiconhandler.h \
src/qt/macnotificationhandler.h \
src/qt/messagemodel.h \
src/qt/monitoreddatamapper.h \
src/qt/notificator.h \
src/qt/optionsmodel.h \
src/qt/paymentserver.h \
src/qt/peertablemodel.h \
src/qt/qvalidatedlineedit.h \
src/qt/qvaluecombobox.h \
src/qt/rpcconsole.h \
src/qt/scicon.h \
src/qt/spectrebridge.h \
src/qt/spectregui.h \
src/qt/trafficgraphwidget.h \
src/qt/transactiondesc.h \
src/qt/transactionrecord.h \
src/qt/transactiontablemodel.h \
src/qt/walletmodel.h \
src/win/unistd.h \
src/wordlists/chinese_simplified.h \
src/wordlists/chinese_traditional.h \
src/wordlists/english.h \
src/wordlists/french.h \
src/wordlists/japanese.h \
src/wordlists/spanish.h \
src/xxhash/xxhash.h \
src/qt/test/uritests.h \
/src/win/unistd.h \
src/lz4/lz4.c \
src/xxhash/xxhash.c \
/src/json/json_spirit.h \
/src/json/json_spirit_value.h
FORMS += src/qt/forms/aboutdialog.ui \
src/qt/forms/askpassphrasedialog.ui \
src/qt/forms/coincontroldialog.ui \
src/qt/forms/editaddressdialog.ui \
src/qt/forms/rpcconsole.ui \
src/qt/forms/transactiondescdialog.ui
SOURCES += src/addrman.cpp \
src/alert.cpp \
src/anonymize.cpp \
src/bloom.cpp \
src/chainparams.cpp \
src/checkpoints.cpp \
src/core.cpp \
src/crypter.cpp \
src/db.cpp \
src/eckey.cpp \
src/extkey.cpp \
src/hash.cpp \
src/init.cpp \
src/kernel.cpp \
src/key.cpp \
src/keystore.cpp \
src/main.cpp \
src/miner.cpp \
src/net.cpp \
src/netbase.cpp \
src/noui.cpp \
src/pbkdf2.cpp \
src/protocol.cpp \
src/ringsig.cpp \
src/rpcblockchain.cpp \
src/rpcclient.cpp \
src/rpcdump.cpp \
src/rpcextkey.cpp \
src/rpcmining.cpp \
src/rpcmnemonic.cpp \
src/rpcnet.cpp \
src/rpcprotocol.cpp \
src/rpcrawtransaction.cpp \
src/rpcserver.cpp \
src/rpcsmessage.cpp \
src/rpcwallet.cpp \
src/script.cpp \
src/scrypt.cpp \
src/smessage.cpp \
src/spectrecoind.cpp \
src/state.cpp \
src/stealth.cpp \
src/sync.cpp \
src/txdb-leveldb.cpp \
src/txmempool.cpp \
src/util.cpp \
src/version.cpp \
src/wallet.cpp \
src/walletdb.cpp \
src/json/json_spirit_reader.cpp \
src/json/json_spirit_value.cpp \
src/json/json_spirit_writer.cpp \
src/lz4/lz4.c \
src/qt/aboutdialog.cpp \
src/qt/addresstablemodel.cpp \
src/qt/askpassphrasedialog.cpp \
src/qt/bitcoinaddressvalidator.cpp \
src/qt/bitcoinamountfield.cpp \
src/qt/bitcoinstrings.cpp \
src/qt/bitcoinunits.cpp \
src/qt/clientmodel.cpp \
src/qt/coincontroldialog.cpp \
src/qt/coincontroltreewidget.cpp \
src/qt/csvmodelwriter.cpp \
src/qt/editaddressdialog.cpp \
src/qt/guiutil.cpp \
src/qt/messagemodel.cpp \
src/qt/monitoreddatamapper.cpp \
src/qt/notificator.cpp \
src/qt/optionsmodel.cpp \
src/qt/paymentserver.cpp \
src/qt/peertablemodel.cpp \
src/qt/qvalidatedlineedit.cpp \
src/qt/qvaluecombobox.cpp \
src/qt/rpcconsole.cpp \
src/qt/scicon.cpp \
src/qt/spectre.cpp \
src/qt/spectrebridge.cpp \
src/qt/spectregui.cpp \
src/qt/trafficgraphwidget.cpp \
src/qt/transactiondesc.cpp \
src/qt/transactionrecord.cpp \
src/qt/transactiontablemodel.cpp \
src/qt/walletmodel.cpp \
src/test/accounting_tests.cpp \
src/test/allocator_tests.cpp \
src/test/base32_tests.cpp \
src/test/base58_tests.cpp \
src/test/base64_tests.cpp \
src/test/basic_tests.cpp \
src/test/bignum_tests.cpp \
src/test/bip32_tests.cpp \
src/test/Checkpoints_tests.cpp \
src/test/extkey_tests.cpp \
src/test/getarg_tests.cpp \
src/test/hash_tests.cpp \
src/test/hmac_tests.cpp \
src/test/key_tests.cpp \
src/test/mnemonic_tests.cpp \
src/test/mruset_tests.cpp \
src/test/multisig_tests.cpp \
src/test/netbase_tests.cpp \
src/test/ringsig_tests.cpp \
src/test/rpc_tests.cpp \
src/test/script_P2SH_tests.cpp \
src/test/script_tests.cpp \
src/test/sigopcount_tests.cpp \
src/test/smsg_tests.cpp \
src/test/stealth_tests.cpp \
src/test/test_shadow.cpp \
src/test/uint160_tests.cpp \
src/test/uint256_tests.cpp \
src/test/util_tests.cpp \
src/test/wallet_tests.cpp \
src/xxhash/xxhash.c \
src/qt/test/test_main.cpp \
src/qt/test/uritests.cpp \
src/test/other/DoS_tests.cpp \
src/test/other/miner_tests.cpp \
src/test/other/transaction_tests.cpp
RESOURCES += spectre.qrc
TRANSLATIONS += src/qt/locale/umbra_af_ZA.ts \
src/qt/locale/umbra_ar.ts \
src/qt/locale/umbra_be_BY.ts \
src/qt/locale/umbra_bg.ts \
src/qt/locale/umbra_bs.ts \
src/qt/locale/umbra_ca.ts \
src/qt/locale/umbra_ca@valencia.ts \
src/qt/locale/umbra_ca_ES.ts \
src/qt/locale/umbra_cs.ts \
src/qt/locale/umbra_cy.ts \
src/qt/locale/umbra_da.ts \
src/qt/locale/umbra_de.ts \
src/qt/locale/umbra_el.ts \
src/qt/locale/umbra_el_GR.ts \
src/qt/locale/umbra_en.ts \
src/qt/locale/umbra_eo.ts \
src/qt/locale/umbra_es.ts \
src/qt/locale/umbra_es_CL.ts \
src/qt/locale/umbra_es_DO.ts \
src/qt/locale/umbra_es_MX.ts \
src/qt/locale/umbra_es_UY.ts \
src/qt/locale/umbra_et.ts \
src/qt/locale/umbra_eu_ES.ts \
src/qt/locale/umbra_fa.ts \
src/qt/locale/umbra_fa_IR.ts \
src/qt/locale/umbra_fi.ts \
src/qt/locale/umbra_fr.ts \
src/qt/locale/umbra_fr_CA.ts \
src/qt/locale/umbra_gl.ts \
src/qt/locale/umbra_he.ts \
src/qt/locale/umbra_hi_IN.ts \
src/qt/locale/umbra_hr.ts \
src/qt/locale/umbra_hu.ts \
src/qt/locale/umbra_id_ID.ts \
src/qt/locale/umbra_it.ts \
src/qt/locale/umbra_ja.ts \
src/qt/locale/umbra_ka.ts \
src/qt/locale/umbra_kk_KZ.ts \
src/qt/locale/umbra_ko_KR.ts \
src/qt/locale/umbra_ky.ts \
src/qt/locale/umbra_la.ts \
src/qt/locale/umbra_lt.ts \
src/qt/locale/umbra_lv_LV.ts \
src/qt/locale/umbra_ms_MY.ts \
src/qt/locale/umbra_nb.ts \
src/qt/locale/umbra_nl.ts \
src/qt/locale/umbra_pam.ts \
src/qt/locale/umbra_pl.ts \
src/qt/locale/umbra_pt_BR.ts \
src/qt/locale/umbra_pt_PT.ts \
src/qt/locale/umbra_ro_RO.ts \
src/qt/locale/umbra_ru.ts \
src/qt/locale/umbra_sah.ts \
src/qt/locale/umbra_sk.ts \
src/qt/locale/umbra_sl_SI.ts \
src/qt/locale/umbra_sq.ts \
src/qt/locale/umbra_sr.ts \
src/qt/locale/umbra_sv.ts \
src/qt/locale/umbra_th_TH.ts \
src/qt/locale/umbra_tr.ts \
src/qt/locale/umbra_uk.ts \
src/qt/locale/umbra_ur_PK.ts \
src/qt/locale/umbra_vi.ts \
src/qt/locale/umbra_vi_VN.ts \
src/qt/locale/umbra_zh_CN.ts \
src/qt/locale/umbra_zh_HK.ts \
src/qt/locale/umbra_zh_TW.ts
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([spectrecoind], [1.3.8])
AC_INIT([spectrecoind], [1.4.1])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([foreign 1.13 subdir-objects -Wall -Werror -Wno-portability])
Expand Down
1 change: 1 addition & 0 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ class CMainParams : public CBaseChainParams {

//nLastPOWBlock = 2016; // Running for 1 Week after ICO
nLastPOWBlock = 17000;
nForkTime = 2000000000; // temporary epoch time set for chain fork

nFirstPosv2Block = 17001;
nFirstPosv3Block = 17010;
Expand Down
3 changes: 3 additions & 0 deletions src/chainparams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ class CChainParams


int LastPOWBlock() const { return nLastPOWBlock; }
int64_t ForkTime() const { return nForkTime; }

//int LastFairLaunchBlock() const { return nLastFairLaunchBlock; }

int64_t GetProofOfWorkReward(int nHeight, int64_t nFees) const;
Expand Down Expand Up @@ -114,6 +116,7 @@ class CChainParams
std::vector<CDNSSeedData> vSeeds;
std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
int nLastPOWBlock;
int64_t nForkTime;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 4
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 0

// Converts the parameter X to a string after macro replacement on X has been performed.
Expand Down
Loading