Skip to content

Commit

Permalink
Merge pull request #56 from ignitioncoin/1.1-staging
Browse files Browse the repository at this point in the history
Final Version 1.1 Release PR
  • Loading branch information
TechniumUnlimited committed Jul 2, 2018
2 parents d390f9c + f4d27e0 commit 5c270b8
Show file tree
Hide file tree
Showing 163 changed files with 14,235 additions and 366,342 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -9,3 +9,5 @@ qrc_bitcoin\.cpp
build/
*.qm


\.idea/
50 changes: 50 additions & 0 deletions .vscode/c_cpp_properties.json
@@ -0,0 +1,50 @@
{
"configurations": [
{
"name": "Linux",
"includePathOld": [
"/usr/include/c++/6",
"/usr/include/x86_64-linux-gnu/c++/6",
"/usr/include/c++/6/backward",
"/usr/lib/gcc/x86_64-linux-gnu/6/include",
"/usr/local/include",
"/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
"/usr/include/x86_64-linux-gnu",
"/usr/include",
"/usr/include/x86_64-linux-gnu/qt5/QtCore",
"/usr/include/x86_64-linux-gnu/qt5",
"${workspaceRoot}/src/leveldb/include",
"${workspaceRoot}/src",
"${workspaceRoot}"
],
"includePath": [
"${workspaceRoot}/src/leveldb/include",
"${workspaceRoot}/src",
"${workspaceRoot}"
],
"defines": [
"USE_UPNP"
],
"intelliSenseMode": "clang-x64",
"browse": {
"path": [
"/usr/include/c++/6",
"/usr/include/x86_64-linux-gnu/c++/6",
"/usr/include/c++/6/backward",
"/usr/lib/gcc/x86_64-linux-gnu/6/include",
"/usr/local/include",
"/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
"/usr/include/x86_64-linux-gnu",
"/usr/include",
"${workspaceRoot}"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
},
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"cppStandard": "c++17"
}
],
"version": 4
}
48 changes: 48 additions & 0 deletions .vscode/launch.json
@@ -0,0 +1,48 @@
{
// Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
// Pointez pour afficher la description des attributs existants.
// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Ignition-qt",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/Ignition-qt",
"args": ["-addnode=127.0.0.1:7890"],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
"externalConsole": false,
"MIMode": "gdb",
"miDebuggerPath": "/usr/bin/gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
},
{
"name": "Ignition-qt TESTNET NEOSCRYPT",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/Ignition-qt",
"args": ["--datadir=/home/jere/ic-data/testnet-neoscrypt"],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
"externalConsole": false,
"MIMode": "gdb",
"miDebuggerPath": "/usr/bin/gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
}
]
}
7 changes: 7 additions & 0 deletions .vscode/settings.json
@@ -0,0 +1,7 @@
{
"files.associations": {
"slist": "cpp",
"chrono": "cpp",
"functional": "cpp"
}
}
16 changes: 16 additions & 0 deletions .vscode/tasks.json
@@ -0,0 +1,16 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Build 4 cores",
"type": "shell",
"command": "cd src; make -j5 -f makefile.unix; cd ..; qmake CONFIG+=debug; make -j5",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
23 changes: 23 additions & 0 deletions CHANGELOG
@@ -1,3 +1,26 @@

v1.1.0.0
--------
~~~This is a mandatory update!!~~~
Net.cpp SendData Interruption/Idle Peer fix
RefreshRecentConnections
GUI fix (Auto refresh My Masternode Info)
Retarget Algorithm changed from Peercoin Retarget algo to OSS (OrbitShield)
PoW Algorithm Changed from Scrypt to ASIC-Resistant Neoscrypt
Several networking issue improved
Documentation Updated
Increased BlockVersion to 8 from 7
Increased Proto, PoolProto, InstantXProto to 60029
Added Disconnect <60028 Proto Function
Added Upgrades that Improve and Secure Masternode Features Better
Added VisualCode Debugging Example Configurations
Added `backtoblock` function to easily rollback your blockheight
Added File Menu Options to Easily Open Config & Data Directory
Fixed bug with trying to send and wallet being unresponsive if not enough balance for fees
Fixed Permissions in secp256k & leveldb
Increased min peers to be able to stake to 5 from 2
Masternodes are no longer capable of setting an external reward address

v1.0.0.3
--------
Ignitiond binary will now compile out to ignitiond (lower case)
Expand Down
4 changes: 4 additions & 0 deletions COPYING
Expand Up @@ -21,3 +21,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

Resource licences:
- editconf.png: icon made by Freepik from www.flaticon.com
- folder.png: icon made by Vaadin from www.flaticon.com
47 changes: 27 additions & 20 deletions Ignition.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = Ignition-qt
VERSION = 1.0.0.3
VERSION = 1.1.0.0
INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
QT += network printsupport
DEFINES += ENABLE_WALLET
Expand All @@ -10,9 +10,10 @@ CONFIG += thread
CONFIG += static
#CONFIG += openssl-linked
CONFIG += openssl
QMAKE_CFLAGS += -DSHA256 -DASM -DOPT

greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets
QT += widgets gui
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
}

Expand All @@ -26,6 +27,15 @@ greaterThan(QT_MAJOR_VERSION, 4) {
# BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
# BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively

macx:BOOST_INCLUDE_PATH = /usr/local/Cellar/boost@1.59/1.59.0/include
macx:BOOST_LIB_PATH = /usr/local/Cellar/boost@1.59/1.59.0/lib
macx:BDB_INCLUDE_PATH = /usr/local/Cellar/berkeley-db@4/4.8.30/include
macx:BDB_LIB_PATH = /usr/local/Cellar/berkeley-db@4/4.8.30/lib
macx:OPENSSL_INCLUDE_PATH = /usr/local/Cellar/openssl/1.0.2n/include
macx:OPENSSL_LIB_PATH = /usr/local/Cellar/openssl/1.0.2n/lib
macx:MINIUPNPC_INCLUDE_PATH = /usr/local/Cellar/miniupnpc/include
macx:MINIUPNPC_LIB_PATH = /usr/local/Cellar/miniupnpc/lib

# workaround for boost 1.58
DEFINES += BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT

Expand All @@ -36,10 +46,10 @@ UI_DIR = build
# use: qmake "RELEASE=1"
contains(RELEASE, 1) {
# Mac: compile for maximum compatibility (10.5, 32-bit)
macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
macx:QMAKE_LFLAGS += -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
macx:QMAKE_LFLAGS += -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk


!windows:!macx {
Expand All @@ -48,15 +58,6 @@ contains(RELEASE, 1) {
}
}

!win32 {
# for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
# We need to exclude this for Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
# This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
}
# for extra security (see: https://wiki.debian.org/Hardening): this flag is GCC compiler-specific
QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
# on Windows: enable GCC large address aware linker flag
Expand Down Expand Up @@ -96,7 +97,7 @@ SOURCES += src/txdb-leveldb.cpp \
src/qt/darksendpage.cpp
!win32 {
# we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
genleveldb.commands = cd $$PWD/src/leveldb && chmod 755 * && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
} else {
# make an educated guess about what the ranlib command is called
isEmpty(QMAKE_RANLIB) {
Expand All @@ -118,7 +119,7 @@ QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) cl
INCLUDEPATH += src/secp256k1/include
LIBS += $$PWD/src/secp256k1/src/libsecp256k1_la-secp256k1.o
# we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
gensecp256k1.commands = cd $$PWD/src/secp256k1 && ./autogen.sh && ./configure --enable-module-recovery && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\"
gensecp256k1.commands = cd $$PWD/src/secp256k1 && chmod 755 * && ./autogen.sh && ./configure --enable-module-recovery && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\"
gensecp256k1.target = $$PWD/src/secp256k1/src/libsecp256k1_la-secp256k1.o
gensecp256k1.depends = FORCE
PRE_TARGETDEPS += $$PWD/src/secp256k1/src/libsecp256k1_la-secp256k1.o
Expand Down Expand Up @@ -191,6 +192,7 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/signverifymessagedialog.h \
src/qt/aboutdialog.h \
src/qt/editaddressdialog.h \
src/qt/editconfigdialog.h \
src/qt/bitcoinaddressvalidator.h \
src/alert.h \
src/allocators.h \
Expand Down Expand Up @@ -223,6 +225,7 @@ HEADERS += src/qt/bitcoingui.h \
src/walletdb.h \
src/script.h \
src/scrypt.h \
src/neoscrypt.h \
src/init.h \
src/mruset.h \
src/json/json_spirit_writer_template.h \
Expand Down Expand Up @@ -319,6 +322,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/signverifymessagedialog.cpp \
src/qt/aboutdialog.cpp \
src/qt/editaddressdialog.cpp \
src/qt/editconfigdialog.cpp \
src/qt/bitcoinaddressvalidator.cpp \
src/alert.cpp \
src/allocators.cpp \
Expand All @@ -335,6 +339,8 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/pubkey.cpp \
src/script.cpp \
src/scrypt.cpp \
src/neoscrypt.c \
src/neoscrypt_asm.S \
src/core.cpp \
src/main.cpp \
src/miner.cpp \
Expand Down Expand Up @@ -431,6 +437,7 @@ FORMS += \
src/qt/forms/signverifymessagedialog.ui \
src/qt/forms/aboutdialog.ui \
src/qt/forms/editaddressdialog.ui \
src/qt/forms/editconfigdialog.ui \
src/qt/forms/transactiondescdialog.ui \
src/qt/forms/overviewpage.ui \
src/qt/forms/sendcoinsentry.ui \
Expand Down Expand Up @@ -580,7 +587,7 @@ windows:!contains(MINGW_THREAD_BUGFIX, 0) {
macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 Q_OS_MAC
macx:ICON = src/qt/res/icons/Ignition.icns
macx:TARGET = "Ignition-Qt"
macx:QMAKE_CFLAGS_THREAD += -pthread
Expand All @@ -589,8 +596,8 @@ macx:QMAKE_CXXFLAGS_THREAD += -pthread
macx:QMAKE_INFO_PLIST = share/qt/Info.plist

# Set libraries and includes at end, to use platform-defined defaults if not overridden
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$MINIUPNPC_INCLUDE_PATH
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) $$join(MINIUPNPC_LIB_PATH,,-L,)
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
# -lgdi32 has to happen after -lcrypto (see #681)
windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 -pthread
Expand Down

0 comments on commit 5c270b8

Please sign in to comment.