From b202ef2d47da79b83fe500c6b4689ff0f85b7896 Mon Sep 17 00:00:00 2001 From: -k Date: Fri, 5 Apr 2019 00:26:15 -0700 Subject: [PATCH 01/25] release status change --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0598c5dfc..cdfda5f29 100755 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 3) define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_IS_RELEASE, true) +define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Axe Core]]) diff --git a/src/clientversion.h b/src/clientversion.h index eb71e2a47..c0781b0ae 100755 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -20,7 +20,7 @@ #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build -#define CLIENT_VERSION_IS_RELEASE true +#define CLIENT_VERSION_IS_RELEASE false /** * Copyright year (2009-this) From a101393b292fad59d29b31b3d76b51eae880ab87 Mon Sep 17 00:00:00 2001 From: -k Date: Fri, 5 Apr 2019 00:26:48 -0700 Subject: [PATCH 02/25] version bump --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index cdfda5f29..003db874f 100755 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 3) -define(_CLIENT_VERSION_REVISION, 0) +define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2019) diff --git a/src/clientversion.h b/src/clientversion.h index c0781b0ae..f1966fefe 100755 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -16,7 +16,7 @@ //! These need to be macros, as clientversion.cpp's and axe*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 3 -#define CLIENT_VERSION_REVISION 0 +#define CLIENT_VERSION_REVISION 1 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build From be3873421419d73ae80138b7de500017fa5466f5 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 7 Apr 2019 04:59:19 -0700 Subject: [PATCH 03/25] fix copyright_header.py --- contrib/devtools/copyright_header.py | 34 ++++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index 9f35c378b..440000084 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -1,5 +1,7 @@ #!/usr/bin/env python3 # Copyright (c) 2016 The Bitcoin Core developers +# Copyright (c) 2019 The Dash Core developers +# Copyright (c) 2019 The Axe Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -105,6 +107,8 @@ def compile_copyright_regex(copyright_style, year_style, name): "Jan-Klaas Kollhof\n", "Sam Rushing\n", "ArtForz -- public domain half-a-node\n", + "The Dash Core developers\n", + "The Axe Core developers\n", ] DOMINANT_STYLE_COMPILED = {} @@ -277,7 +281,7 @@ def exec_report(base_directory, verbose): $ ./copyright_header.py report [verbose] Arguments: - - The base directory of a bitcoin source code repository. + - The base directory of a Axe Core source code repository. [verbose] - Includes a list of every file of each subcategory in the report. """ @@ -340,7 +344,7 @@ def write_file_lines(filename, file_lines): COPYRIGHT = 'Copyright \(c\)' YEAR = "20[0-9][0-9]" YEAR_RANGE = '(%s)(-%s)?' % (YEAR, YEAR) -HOLDER = 'The Bitcoin Core developers' +HOLDER = 'The Axe Core developers' UPDATEABLE_LINE_COMPILED = re.compile(' '.join([COPYRIGHT, YEAR_RANGE, HOLDER])) def get_updatable_copyright_line(file_lines): @@ -408,24 +412,24 @@ def exec_update_header_year(base_directory): ################################################################################ UPDATE_USAGE = """ -Updates all the copyright headers of "The Bitcoin Core developers" which were +Updates all the copyright headers of "The Axe Core developers" which were changed in a year more recent than is listed. For example: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Axe Core developers will be updated to: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Axe Core developers where is obtained from the 'git log' history. This subcommand also handles copyright headers that have only a single year. In those cases: -// Copyright (c) The Bitcoin Core developers +// Copyright (c) The Axe Core developers will be updated to: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Axe Core developers where the update is appropriate. @@ -433,7 +437,7 @@ def exec_update_header_year(base_directory): $ ./copyright_header.py update Arguments: - - The base directory of a bitcoin source code repository. + - The base directory of Axe Core source code repository. """ def print_file_action_message(filename, action): @@ -458,7 +462,7 @@ def get_header_lines(header, start_year, end_year): return [line + '\n' for line in lines] CPP_HEADER = ''' -// Copyright (c) %s The Bitcoin Core developers +// Copyright (c) %s The Axe Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' @@ -467,7 +471,7 @@ def get_cpp_header_lines_to_insert(start_year, end_year): return reversed(get_header_lines(CPP_HEADER, start_year, end_year)) PYTHON_HEADER = ''' -# Copyright (c) %s The Bitcoin Core developers +# Copyright (c) %s The Axe Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' @@ -521,7 +525,7 @@ def insert_cpp_header(filename, file_lines, start_year, end_year): def exec_insert_header(filename, style): file_lines = read_file_lines(filename) if file_already_has_core_copyright(file_lines): - sys.exit('*** %s already has a copyright by The Bitcoin Core developers' + sys.exit('*** %s already has a copyright by The Axe Core developers' % (filename)) start_year, end_year = get_git_change_year_range(filename) if style == 'python': @@ -534,7 +538,7 @@ def exec_insert_header(filename, style): ################################################################################ INSERT_USAGE = """ -Inserts a copyright header for "The Bitcoin Core developers" at the top of the +Inserts a copyright header for "The Axe Core developers" at the top of the file in either Python or C++ style as determined by the file extension. If the file is a Python file and it has a '#!' starting the first line, the header is inserted in the line below it. @@ -548,14 +552,14 @@ def exec_insert_header(filename, style): "" -If the file already has a copyright for "The Bitcoin Core developers", the +If the file already has a copyright for "The Axe Core developers", the script will exit. Usage: $ ./copyright_header.py insert Arguments: - - A source file in the bitcoin repository. + - A source file in the Axe Core repository. """ def insert_cmd(argv): @@ -580,7 +584,7 @@ def insert_cmd(argv): ################################################################################ USAGE = """ -copyright_header.py - utilities for managing copyright headers of 'The Bitcoin +copyright_header.py - utilities for managing copyright headers of 'The Axe Core developers' in repository source files. Usage: From 48d3a3c8f579ad2563aea0efa1628e1befad1fe7 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 7 Apr 2019 05:06:13 -0700 Subject: [PATCH 04/25] update readme --- contrib/devtools/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 3f67d50dc..fb269237a 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -23,7 +23,7 @@ git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v copyright\_header.py ==================== -Provides utilities for managing copyright headers of `The Bitcoin Core +Provides utilities for managing copyright headers of `The Axe Core developers` in repository source files. It has three subcommands: ``` @@ -42,31 +42,31 @@ Specifying `verbose` will list the full filenames of files of each category. copyright\_header.py update \ [verbose] --------------------------------------------------------- -Updates all the copyright headers of `The Bitcoin Core developers` which were +Updates all the copyright headers of `The Axe Core developers` which were changed in a year more recent than is listed. For example: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Axe Core developers ``` will be updated to: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Axe Core developers ``` where `` is obtained from the `git log` history. This subcommand also handles copyright headers that have only a single year. In those cases: ``` -// Copyright (c) The Bitcoin Core developers +// Copyright (c) The Axe Core developers ``` will be updated to: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Axe Core developers ``` where the update is appropriate. copyright\_header.py insert \ ------------------------------------ -Inserts a copyright header for `The Bitcoin Core developers` at the top of the +Inserts a copyright header for `The Axe Core developers` at the top of the file in either Python or C++ style as determined by the file extension. If the file is a Python file and it has `#!` starting the first line, the header is inserted in the line below it. @@ -76,7 +76,7 @@ The copyright dates will be set to be `-` where `` is equal to ``, it will be set as a single year rather than two hyphenated years. -If the file already has a copyright for `The Bitcoin Core developers`, the +If the file already has a copyright for `The Axe Core developers`, the script will exit. gen-manpages.sh From 390d8f888933c2581dcf405212bbd0c8b0e1e51b Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 7 Apr 2019 11:26:09 -0700 Subject: [PATCH 05/25] Ignore cache files on reindex --- src/init.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index 67de20388..ef00f47e3 100755 --- a/src/init.cpp +++ b/src/init.cpp @@ -2035,7 +2035,8 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) // LOAD SERIALIZED DAT FILES INTO DATA CACHES FOR INTERNAL USE - if (!fLiteMode) { + bool fIgnoreCacheFiles = fLiteMode || fReindex || fReindexChainState; + if (!fIgnoreCacheFiles) { boost::filesystem::path pathDB = GetDataDir(); std::string strDBName; From 5565396110585f1ee8eae86316d3b3de10c1419b Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 7 Apr 2019 20:15:57 -0700 Subject: [PATCH 06/25] fix armv7l build --- depends/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/depends/Makefile b/depends/Makefile index dedb0674c..71aa4ecb8 100755 --- a/depends/Makefile +++ b/depends/Makefile @@ -21,7 +21,6 @@ BUILD_ID_SALT ?= salt host:=$(BUILD) ifneq ($(HOST),) host:=$(HOST) -host_toolchain:=$(HOST)- endif ifneq ($(DEBUG),) From 41371ee4d8d8fc49323c7c192346b6e643f4b810 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 7 Apr 2019 20:17:52 -0700 Subject: [PATCH 07/25] fix openssl for armv7l --- depends/packages/openssl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index 5ee9f17a6..37f0c28a5 100755 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -47,6 +47,7 @@ $(package)_config_opts_linux=-fPIC -Wa,--noexecstack $(package)_config_opts_x86_64_linux=linux-x86_64 $(package)_config_opts_i686_linux=linux-generic32 $(package)_config_opts_arm_linux=linux-generic32 +$(package)_config_opts_armv7l_linux=linux-generic32 $(package)_config_opts_aarch64_linux=linux-generic64 $(package)_config_opts_mipsel_linux=linux-generic32 $(package)_config_opts_mips_linux=linux-generic32 From ac1c34a6f7e1e88b2de9cd7463f11b1a1c358792 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 7 Apr 2019 20:19:04 -0700 Subject: [PATCH 08/25] fix armv7l build --- depends/hosts/default.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/depends/hosts/default.mk b/depends/hosts/default.mk index 6f60d6b3f..144e5f88b 100755 --- a/depends/hosts/default.mk +++ b/depends/hosts/default.mk @@ -1,3 +1,7 @@ +ifneq ($(host),$(build)) +host_toolchain:=$(host)- +endif + default_host_CC = $(host_toolchain)gcc default_host_CXX = $(host_toolchain)g++ default_host_AR = $(host_toolchain)ar From 88b52a62f29bf9d1c8286bc60a47ae69b643646a Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 7 Apr 2019 21:40:43 -0700 Subject: [PATCH 09/25] armv7l build fixes --- depends/packages/chia_bls.mk | 1 + depends/packages/gmp.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/depends/packages/chia_bls.mk b/depends/packages/chia_bls.mk index 85eb21472..2a54e0797 100755 --- a/depends/packages/chia_bls.mk +++ b/depends/packages/chia_bls.mk @@ -21,6 +21,7 @@ define $(package)_set_vars $(package)_config_opts_i686+= -DWSIZE=32 $(package)_config_opts_x86_64+= -DWSIZE=64 $(package)_config_opts_arm+= -DWSIZE=32 + $(package)_config_opts_armv7l+= -DWSIZE=32 $(package)_config_opts_debug=-DDEBUG=ON -DCMAKE_BUILD_TYPE=Debug ifneq ($(darwin_native_toolchain),) diff --git a/depends/packages/gmp.mk b/depends/packages/gmp.mk index 0003b24a3..ac685d767 100755 --- a/depends/packages/gmp.mk +++ b/depends/packages/gmp.mk @@ -6,6 +6,7 @@ $(package)_sha256_hash=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d define $(package)_set_vars $(package)_config_opts+=--enable-cxx --enable-fat --with-pic --disable-shared +$(package)_cflags_armv7l_linux+=-march=armv7-a endef define $(package)_config_cmds From 70878fca8d54994d8ad552940c0a7bccb8e274f8 Mon Sep 17 00:00:00 2001 From: -k Date: Mon, 8 Apr 2019 10:31:05 -0700 Subject: [PATCH 10/25] Fix devnet genesis check in InitBlockIndex() --- src/validation.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index 017b2fed6..87e78dec2 100755 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4163,8 +4163,10 @@ bool InitBlockIndex(const CChainParams& chainparams) if (chainparams.NetworkIDString() == CBaseChainParams::DEVNET) { // We can't continue if devnet genesis block is invalid std::shared_ptr shared_pblock = std::make_shared(chainparams.DevNetGenesisBlock()); - bool fProcessDevnetGenesisBlock = ProcessNewBlock(chainparams, shared_pblock, true, NULL); - assert(fProcessDevnetGenesisBlock); + bool fCheckBlock = CheckBlock(*shared_pblock, state, chainparams.GetConsensus()); + assert(fCheckBlock); + if (!AcceptBlock(shared_pblock, state, chainparams, NULL, true, NULL, NULL)) + return false; } // Force a chainstate write so that when we VerifyDB in a moment, it doesn't check stale data From b23aad0a9d76f60e7e6b230a63c82c8462f568b8 Mon Sep 17 00:00:00 2001 From: -k Date: Mon, 8 Apr 2019 18:37:12 -0700 Subject: [PATCH 11/25] Add RPC for BLS secret to public key --- src/rpc/rpcevo.cpp | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp index 471e79d83..a0cd28754 100755 --- a/src/rpc/rpcevo.cpp +++ b/src/rpc/rpcevo.cpp @@ -1158,6 +1158,40 @@ UniValue bls_generate(const JSONRPCRequest& request) return ret; } +void bls_fromsecret_help() +{ + throw std::runtime_error( + "bls fromsecret \"secret\"\n" + "\nParses a BLS secret key and returns the secret/public key pair.\n" + "\nArguments:\n" + "1. \"secret\" (string, required) The BLS secret key\n" + "\nResult:\n" + "{\n" + " \"secret\": \"xxxx\", (string) BLS secret key\n" + " \"public\": \"xxxx\", (string) BLS public key\n" + "}\n" + "\nExamples:\n" + + HelpExampleCli("bls fromsecret", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f") + ); +} + +UniValue bls_fromsecret(const JSONRPCRequest& request) +{ + if (request.fHelp || request.params.size() != 2) { + bls_fromsecret_help(); + } + + CBLSSecretKey sk; + if (!sk.SetHexStr(request.params[1].get_str())) { + throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Secret key must be a valid hex string of length %d", sk.SerSize*2)); + } + + UniValue ret(UniValue::VOBJ); + ret.push_back(Pair("secret", sk.ToString())); + ret.push_back(Pair("public", sk.GetPublicKey().ToString())); + return ret; +} + [[ noreturn ]] void bls_help() { throw std::runtime_error( @@ -1168,6 +1202,7 @@ UniValue bls_generate(const JSONRPCRequest& request) "1. \"command\" (string, required) The command to execute\n" "\nAvailable commands:\n" " generate - Create a BLS secret/public key pair\n" + " fromsecret - Parse a BLS secret key and return the secret/public key pair\n" ); } @@ -1184,6 +1219,8 @@ UniValue _bls(const JSONRPCRequest& request) if (command == "generate") { return bls_generate(request); + } else if (command == "fromsecret") { + return bls_fromsecret(request); } else { bls_help(); } From 28192ab4c417bde9ad08e9d8005fad448bc8218d Mon Sep 17 00:00:00 2001 From: -k Date: Mon, 8 Apr 2019 20:35:37 -0700 Subject: [PATCH 12/25] Clean up theme display names --- src/qt/optionsdialog.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 0d96c0238..f97a42dc8 100755 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -92,14 +92,14 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : } /* Theme selector */ - ui->theme->addItem(QString("AXE-light"), QVariant("light")); - ui->theme->addItem(QString("AXE-light-hires"), QVariant("light-hires")); - ui->theme->addItem(QString("AXE-light-retro"), QVariant("light-retro")); - ui->theme->addItem(QString("AXE-light-hires-retro"), QVariant("light-hires-retro")); - ui->theme->addItem(QString("AXE-blue"), QVariant("drkblue")); - ui->theme->addItem(QString("AXE-Crownium"), QVariant("crownium")); - ui->theme->addItem(QString("AXE-traditional"), QVariant("trad")); - + ui->theme->addItem(QString("Light"), QVariant("light")); + ui->theme->addItem(QString("Light-HiRes"), QVariant("light-hires")); + ui->theme->addItem(QString("Light-Retro"), QVariant("light-retro")); + ui->theme->addItem(QString("Light-HiRes-Retro"), QVariant("light-hires-retro")); + ui->theme->addItem(QString("Blue"), QVariant("drkblue")); + ui->theme->addItem(QString("Crownium"), QVariant("crownium")); + ui->theme->addItem(QString("Traditional"), QVariant("trad")); + /* Language selector */ QDir translations(":translations"); From 54fac2559c079d0176705694c2b24bbba0b928b2 Mon Sep 17 00:00:00 2001 From: -k Date: Mon, 8 Apr 2019 23:23:34 -0700 Subject: [PATCH 13/25] drop old icons --- src/qt/res/icons/light-retro/toolbar.png | Bin 342 -> 0 bytes src/qt/res/icons/light-retro/toolbar_testnet.png | Bin 346 -> 0 bytes src/qt/res/icons/light/toolbar.png | Bin 3153 -> 0 bytes src/qt/res/icons/light/toolbar_testnet.png | Bin 3153 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100755 src/qt/res/icons/light-retro/toolbar.png delete mode 100755 src/qt/res/icons/light-retro/toolbar_testnet.png delete mode 100644 src/qt/res/icons/light/toolbar.png delete mode 100644 src/qt/res/icons/light/toolbar_testnet.png diff --git a/src/qt/res/icons/light-retro/toolbar.png b/src/qt/res/icons/light-retro/toolbar.png deleted file mode 100755 index 556eeb486d7d609e43f1fc765a71524e8874fa97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}U4T!BE09)Q^j~ekf3^AlHD>*1 zX!x%_AH-Ih_g`}+hyucq@bTm3mGMu{=s4Ldf#W6%ea_&KQ zp(Y0ghJ%KNY$Ar;j7R_c=ie2*^u^4)S(#h2=jvVX{_~Q#`Qdes;A4|DlxJm~JCotJ zAz=C%o@>%gYt>kH*A^&PWpOV5^Cxhn_>N!C+3v`1ectVMFIkTLiSWN`IzWpUJYD@< J);T3K0RZd_lh*(M diff --git a/src/qt/res/icons/light-retro/toolbar_testnet.png b/src/qt/res/icons/light-retro/toolbar_testnet.png deleted file mode 100755 index 6809da71112e5c22988f7a77f35157e7911dbe7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 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 diff --git a/src/qt/res/icons/light/toolbar_testnet.png b/src/qt/res/icons/light/toolbar_testnet.png deleted file mode 100644 index 5f807b87895399ade5f36e9b5355d140053d12e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3153 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 From 9915f712e41c5a270c345a5bd2c81bc693c6be86 Mon Sep 17 00:00:00 2001 From: -k Date: Tue, 9 Apr 2019 14:42:27 -0700 Subject: [PATCH 14/25] Remove netfulfilledman.h duplicate --- src/init.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index ef00f47e3..404912faa 100755 --- a/src/init.cpp +++ b/src/init.cpp @@ -25,7 +25,6 @@ #include "miner.h" #include "netbase.h" #include "net.h" -#include "netfulfilledman.h" #include "net_processing.h" #include "policy/policy.h" #include "rpc/server.h" From 9440f1b947c81bbbf8d7e812333a346cfc267e53 Mon Sep 17 00:00:00 2001 From: -k Date: Tue, 9 Apr 2019 16:40:04 -0700 Subject: [PATCH 15/25] doc/readme version bump --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index 2318edafa..04d2fd05f 100755 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,4 @@ -Axe Core 1.2.0 +Axe Core 1.3.1 ===================== This is the official reference wallet for AXE digital currency and comprises the backbone of the AXE peer-to-peer network. You can [download AXE Core](https://axerunners.com/) or [build it yourself](#building) using the guides below. From 8109441e8c5ae223614ef13b742eaae313ee0f5d Mon Sep 17 00:00:00 2001 From: -k Date: Fri, 19 Apr 2019 13:20:29 -0700 Subject: [PATCH 16/25] Update overview icon --- src/qt/res/icons/light-retro/overview.png | Bin 346 -> 6026 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/qt/res/icons/light-retro/overview.png b/src/qt/res/icons/light-retro/overview.png index 00acd976e0be68d7eed0efac7cac35cfcdcb2ad0..724a0104e70b2f7c7fcef389072a7d39c5dc19fa 100755 GIT binary patch literal 6026 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 Date: Wed, 1 May 2019 01:01:04 -0700 Subject: [PATCH 17/25] Set proposal fee to 0.2 --- src/governance-object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/governance-object.h b/src/governance-object.h index dfc5f5633..44f189965 100755 --- a/src/governance-object.h +++ b/src/governance-object.h @@ -35,7 +35,7 @@ static const int GOVERNANCE_OBJECT_PROPOSAL = 1; static const int GOVERNANCE_OBJECT_TRIGGER = 2; static const int GOVERNANCE_OBJECT_WATCHDOG = 3; -static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (5.0 * COIN); +static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (0.2 * COIN); static const int64_t GOVERNANCE_FEE_CONFIRMATIONS = 6; static const int64_t GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS = 1; From b54df0704a0b3b5e5a45d006a7a36820fbf780d9 Mon Sep 17 00:00:00 2001 From: -k Date: Wed, 1 May 2019 10:03:16 -0700 Subject: [PATCH 18/25] Change proposal fee to 0.5 --- src/governance-object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/governance-object.h b/src/governance-object.h index 44f189965..850f2ab1a 100755 --- a/src/governance-object.h +++ b/src/governance-object.h @@ -35,7 +35,7 @@ static const int GOVERNANCE_OBJECT_PROPOSAL = 1; static const int GOVERNANCE_OBJECT_TRIGGER = 2; static const int GOVERNANCE_OBJECT_WATCHDOG = 3; -static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (0.2 * COIN); +static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (0.5 * COIN); static const int64_t GOVERNANCE_FEE_CONFIRMATIONS = 6; static const int64_t GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS = 1; From d79ef4c80247cc3ccd8167ffc1ac312994ca30f7 Mon Sep 17 00:00:00 2001 From: -k Date: Wed, 1 May 2019 17:47:02 -0700 Subject: [PATCH 19/25] Enable spork 9 --- src/spork.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spork.cpp b/src/spork.cpp index 0812a85c8..a6affd084 100755 --- a/src/spork.cpp +++ b/src/spork.cpp @@ -23,7 +23,7 @@ std::map mapSporkDefaults = { {SPORK_5_INSTANTSEND_MAX_VALUE, 1000}, // 1000 Axe {SPORK_6_NEW_SIGS, 4070908800ULL}, // OFF {SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT, 0}, // ON - {SPORK_9_SUPERBLOCKS_ENABLED, 4070908800ULL}, // OFF + {SPORK_9_SUPERBLOCKS_ENABLED, 0}, // ON {SPORK_10_MASTERNODE_PAY_UPDATED_NODES, 0}, // ON {SPORK_12_RECONSIDER_BLOCKS, 0}, // 0 BLOCKS {SPORK_14_REQUIRE_SENTINEL_FLAG, 4070908800ULL}, // OFF From cef977b07194c4da4a5f156589336a041d6e4f86 Mon Sep 17 00:00:00 2001 From: -k Date: Wed, 1 May 2019 20:34:21 -0700 Subject: [PATCH 20/25] Set budget startblock --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 148c053d6..8e2899528 100755 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -184,7 +184,7 @@ class CMainParams : public CChainParams { consensus.nMasternodePaymentsIncreasePeriod = 576*30; consensus.nInstantSendConfirmationsRequired = 6; consensus.nInstantSendKeepLock = 24; - consensus.nBudgetPaymentsStartBlock = 9999999; + consensus.nBudgetPaymentsStartBlock = 271350; consensus.nBudgetPaymentsCycleBlocks = 16616; consensus.nBudgetPaymentsWindowBlocks = 100; consensus.nSuperblockStartBlock = 9999999; From 5df6074595e4d3626bce3a7a87cf816b0a291c6c Mon Sep 17 00:00:00 2001 From: -k Date: Wed, 1 May 2019 20:35:29 -0700 Subject: [PATCH 21/25] Set superblock startblock --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 8e2899528..18a1aac07 100755 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -187,7 +187,7 @@ class CMainParams : public CChainParams { consensus.nBudgetPaymentsStartBlock = 271350; consensus.nBudgetPaymentsCycleBlocks = 16616; consensus.nBudgetPaymentsWindowBlocks = 100; - consensus.nSuperblockStartBlock = 9999999; + consensus.nSuperblockStartBlock = 304800; consensus.nSuperblockStartHash = uint256S(""); consensus.nSuperblockCycle = 16616; // ~(60*24*30)/2.6, actual number of blocks per month is 200700 / 12 = 16725 consensus.nGovernanceMinQuorum = 10; From 1fef5ffa4d13d4dae323fa7688c8e5e15c151687 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 2 May 2019 10:03:24 -0700 Subject: [PATCH 22/25] Harden DIP3 activation to mainnet --- src/spork.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spork.cpp b/src/spork.cpp index a6affd084..08ea8816a 100755 --- a/src/spork.cpp +++ b/src/spork.cpp @@ -28,7 +28,7 @@ std::map mapSporkDefaults = { {SPORK_12_RECONSIDER_BLOCKS, 0}, // 0 BLOCKS {SPORK_14_REQUIRE_SENTINEL_FLAG, 4070908800ULL}, // OFF {SPORK_16_INSTANTSEND_AUTOLOCKS, 0}, // ON - {SPORK_15_DETERMINISTIC_MNS_ENABLED, 0}, // ON + {SPORK_15_DETERMINISTIC_MNS_ENABLED, 239045}, // Hardened to mainnet {SPORK_17_QUORUM_DKG_ENABLED, 4070908800ULL}, // OFF }; From 500cd49ac136f5b31a5e72a5874a8c11ce3e7ad7 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 2 May 2019 15:15:58 -0700 Subject: [PATCH 23/25] Change release status --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 003db874f..280fa98da 100755 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 3) define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_IS_RELEASE, false) +define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Axe Core]]) diff --git a/src/clientversion.h b/src/clientversion.h index f1966fefe..e3cf4462f 100755 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -20,7 +20,7 @@ #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build -#define CLIENT_VERSION_IS_RELEASE false +#define CLIENT_VERSION_IS_RELEASE true /** * Copyright year (2009-this) From 6bdb506464466d52a8a91f23a4b039941eb2939a Mon Sep 17 00:00:00 2001 From: -k Date: Fri, 3 May 2019 10:13:50 -0700 Subject: [PATCH 24/25] Update release-notes.md --- doc/release-notes.md | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index 197800197..2b945939f 100755 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,11 +1,11 @@ -Axe Core version 1.3.0.0 +Axe Core version 1.3.1.0 ========================== Release is now available from: -This is a new minor version release, bringing various bugfixes and other improvements. +This is a new version release, bringing various bugfixes and other improvements. Please report bugs using the issue tracker at github: @@ -32,22 +32,4 @@ the node. Notable changes =============== -Instantsend Autolocks activated. - -Number of false-positives from anti virus software should be reduced --------------------------------------------------------------------- -We have removed all mining code from Windows and Mac binaries, which should avoid most of the false-positive alerts -from anti virus software. Linux builds are not affected. The mining code found in `axe-qt` and `axed` are only meant -for regression/integration tests and devnets, so there is no harm in removing this code from non-linux builds. - -Fixed an issue with invalid merkle blocks causing SPV nodes to ban other nodes ------------------------------------------------------------------------------- -A fix that was introduces in the last minor version caused creation of invalid merkle blocks, which in turn cause SPV -nodes to ban 1.2.3 nodes. This can be observed on mobile clients which have troubles maintaining connections. This -release fixes this issue and should allow SPV/mobile clients to sync with upgraded nodes. - -Bug fixes/Other improvements ----------------------------- -There are few bug fixes in this release: -- Fixed an issue with transaction sometimes not being fully zapped when `-zapwallettxes` is used -- Fixed an issue with the `protx revoke` RPC and REASON_CHANGE_OF_KEYS +Decentralized governance activated. From 4824cd6c8c19d73d48b54f8db4467a09eb5c0413 Mon Sep 17 00:00:00 2001 From: -k Date: Fri, 3 May 2019 10:15:12 -0700 Subject: [PATCH 25/25] Version bump --- doc/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index 93faab459..995c2b852 100755 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -41,7 +41,7 @@ PROJECT_NAME = "Axe Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.3.0.0 +PROJECT_NUMBER = 1.3.1.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a