From ea0a69c3d6d8fe34f7e5a37be609342581cfc921 Mon Sep 17 00:00:00 2001 From: John Doering Date: Sun, 9 Jan 2022 09:40:43 +0000 Subject: [PATCH] Orbitcoin v1.6.3.0 --- LICENCE | 2 +- orbitcoin-qt.pro | 13 +++++++------ src/checkpoints.cpp | 1 + src/clientversion.h | 2 +- src/leveldb.cpp | 2 +- src/qt/forms/aboutdialog.ui | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/LICENCE b/LICENCE index 787a84f04be..da50245464f 100644 --- a/LICENCE +++ b/LICENCE @@ -1,7 +1,7 @@ Copyright (c) 2009-2012 Bitcoin Developers Copyright (c) 2011-2013 PPCoin Developers Copyright (c) 2013-2014 NovaCoin Developers -Copyright (c) 2013-2021 Orbitcoin Developers +Copyright (c) 2013-2022 Orbitcoin Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/orbitcoin-qt.pro b/orbitcoin-qt.pro index ebb464e47f4..2ce56e03540 100644 --- a/orbitcoin-qt.pro +++ b/orbitcoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = orbitcoin-qt -VERSION = 1.6.2.0 +VERSION = 1.6.3.0 INCLUDEPATH += src src/json src/qt QT += core gui network DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE @@ -25,9 +25,9 @@ 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 -win32:BOOST_LIB_SUFFIX=-mgw49-mt-x64-1_77 -win32:BOOST_INCLUDE_PATH="/home/Administrator/boost-1.77" -win32:BOOST_LIB_PATH="/home/Administrator/boost-1.77/stage/lib" +win32:BOOST_LIB_SUFFIX=-mgw49-mt-x64-1_78 +win32:BOOST_INCLUDE_PATH="/home/Administrator/boost-1.78" +win32:BOOST_LIB_PATH="/home/Administrator/boost-1.78/stage/lib" win32:BDB_INCLUDE_PATH="/home/Administrator/db-5.3.28/build_unix" win32:BDB_LIB_PATH="/home/Administrator/db-5.3.28/build_unix" win32:OPENSSL_INCLUDE_PATH="/home/Administrator/openssl-1.0.2u/include" @@ -137,10 +137,10 @@ contains(NEED_QT_PLUGINS, 1) { } INCLUDEPATH += src/leveldb/include src/leveldb/helpers -LIBS += -Lsrc/leveldb -lleveldb -lmemenv +LIBS += -Lsrc/leveldb -lleveldb -lmemenv -lsnappy !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 && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE -fno-builtin-memcmp\" libleveldb.a libmemenv.a libsnappy.a # 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 } else { @@ -148,6 +148,7 @@ LIBS += -Lsrc/leveldb -lleveldb -lmemenv genleveldb.commands = cd $$PWD/src/leveldb; $(MAKE) -f Makefile.mingw QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a QMAKE_CLEAN += $$PWD/src/leveldb/libmemenv.a + QMAKE_CLEAN += $$PWD/src/leveldb/libsnappy.a QMAKE_CLEAN += $$PWD/src/leveldb/obj/*.o } PRE_TARGETDEPS += genleveldb diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index d4579a1ab56..03012c628f0 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -55,6 +55,7 @@ namespace Checkpoints ( 3000000, std::make_pair(uint256("0xa134c63c612b6c020c6e32d91d9b2d7e40f94fe497b07708dd74cf5928c2ddf3"), 1595799093) ) ( 3100000, std::make_pair(uint256("0x2971bdd5cc635bd9e8d8338f52c448a5bdff27610ea69ed44d42908305f62c23"), 1607796785) ) ( 3200000, std::make_pair(uint256("0xbf4b31e512bf3ea8df33f32fb5b5fbd03508bc58414c51031b296e6f304ed3e2"), 1621404384) ) + ( 3300000, std::make_pair(uint256("0x5537fd0967b00ef018d05dbcfe640137cbcf226e4c94fb4e24c243f88cbcf110"), 1634835185) ) ; // TestNet has no checkpoints diff --git a/src/clientversion.h b/src/clientversion.h index 6539db0f484..4c9dfdcfd6c 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -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 6 -#define CLIENT_VERSION_REVISION 2 +#define CLIENT_VERSION_REVISION 3 #define CLIENT_VERSION_BUILD 0 // Converts the parameter X to a string after macro replacement on X has been performed. diff --git a/src/leveldb.cpp b/src/leveldb.cpp index 492a6220c2d..49b4963f7b3 100644 --- a/src/leveldb.cpp +++ b/src/leveldb.cpp @@ -17,7 +17,7 @@ static leveldb::Options GetOptions() { int nCacheSizeMB = GetArg("-dbcache", 25); options.block_cache = leveldb::NewLRUCache(nCacheSizeMB * 1048576); options.filter_policy = leveldb::NewBloomFilterPolicy(10); - options.compression = leveldb::kNoCompression; + options.compression = leveldb::kSnappyCompression; return options; } diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index f90b638151b..178803a8f7e 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -95,7 +95,7 @@ Copyright © 2009-2012 Bitcoin Developers Copyright © 2012-2013 Peercoin Developers Copyright © 2013-2014 NovaCoin Developers -Copyright © 2013-2021 Orbitcoin Developers +Copyright © 2013-2022 Orbitcoin Developers