Raise version. Update checkpoints.

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 18)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_PARTICL, 6)
+define(_CLIENT_VERSION_PARTICL, 7)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "particl-linux-0.18.0.6"
+name: "particl-linux-0.18.0.7"
 enable_cache: true
 sudo: true
 suites:

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "particl-osx-0.18.0.6"
+name: "particl-osx-0.18.0.7"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "particl-win-0.18.0.6"
+name: "particl-win-0.18.0.7"
 enable_cache: true
 sudo: true
 suites:

doc/man/particl-cli.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH PARTICL-CLI "1" "March 2019" "particl-cli v0.18.0.6.0" "User Commands"
+.TH PARTICL-CLI "1" "March 2019" "particl-cli v0.18.0.7.0" "User Commands"
 .SH NAME
-particl-cli \- manual page for particl-cli v0.18.0.6.0
+particl-cli \- manual page for particl-cli v0.18.0.7.0
 .SH SYNOPSIS
 .B particl-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Particl Core\/\fR
@@ -15,7 +15,7 @@ particl-cli \- manual page for particl-cli v0.18.0.6.0
 .B particl-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Particl Core RPC client version v0.18.0.6.0\-dirty
+Particl Core RPC client version v0.18.0.7.0\-dirty
 .SH OPTIONS
 .HP
 \-?

doc/man/particl-qt.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH PARTICL-QT "1" "March 2019" "particl-qt v0.18.0.6.0" "User Commands"
+.TH PARTICL-QT "1" "March 2019" "particl-qt v0.18.0.7.0" "User Commands"
 .SH NAME
-particl-qt \- manual page for particl-qt v0.18.0.6.0
+particl-qt \- manual page for particl-qt v0.18.0.7.0
 .SH SYNOPSIS
 .B particl-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Particl Core version v0.18.0.6.0\-dirty (64\-bit)
+Particl Core version v0.18.0.7.0\-dirty (64\-bit)
 .SH OPTIONS
 .HP
 \-?

doc/man/particl-tx.1

@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH PARTICL-TX "1" "March 2019" "particl-tx v0.18.0.6.0" "User Commands"
+.TH PARTICL-TX "1" "March 2019" "particl-tx v0.18.0.7.0" "User Commands"
 .SH NAME
-particl-tx \- manual page for particl-tx v0.18.0.6.0
+particl-tx \- manual page for particl-tx v0.18.0.7.0
 .SH SYNOPSIS
 .B particl-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded bitcoin transaction\/\fR
 .br
 .B particl-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded bitcoin transaction\/\fR
 .SH DESCRIPTION
-Particl Core particl\-tx utility version v0.18.0.6.0\-dirty
+Particl Core particl\-tx utility version v0.18.0.7.0\-dirty
 .SH OPTIONS
 .HP
 \-?

doc/man/particl-wallet.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH PARTICL-WALLET "1" "March 2019" "particl-wallet v0.18.0.6.0" "User Commands"
+.TH PARTICL-WALLET "1" "March 2019" "particl-wallet v0.18.0.7.0" "User Commands"
 .SH NAME
-particl-wallet \- manual page for particl-wallet v0.18.0.6.0
+particl-wallet \- manual page for particl-wallet v0.18.0.7.0
 .SH DESCRIPTION
-Particl Core particl\-wallet version v0.18.0.6.0\-dirty
+Particl Core particl\-wallet version v0.18.0.7.0\-dirty
 .PP
 wallet\-tool is an offline tool for creating and interacting with Particl Core wallet files.
 By default wallet\-tool will act on wallets in the default mainnet wallet directory in the datadir.

doc/man/particld.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH PARTICLD "1" "March 2019" "particld v0.18.0.6.0" "User Commands"
+.TH PARTICLD "1" "March 2019" "particld v0.18.0.7.0" "User Commands"
 .SH NAME
-particld \- manual page for particld v0.18.0.6.0
+particld \- manual page for particld v0.18.0.7.0
 .SH SYNOPSIS
 .B particld
 [\fI\,options\/\fR]                     \fI\,Start Particl Core Daemon\/\fR
 .SH DESCRIPTION
-Particl Core Daemon version v0.18.0.6.0\-dirty
+Particl Core Daemon version v0.18.0.7.0\-dirty
 .SH OPTIONS
 .HP
 \-?

doc/release-notes-particl.md

@@ -5,6 +5,7 @@ Master
 ==============
 
 - Fixed regression causing wallet catch-up rescan to never trigger.
+- New checkpoints.
 
 
 0.18.0.6 rc2

src/chainparams.cpp

@@ -464,10 +464,10 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000004fc613540f68dfec6b");
+        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000544d9194077c2e14d8");
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0xd22f8acde6c5aed109087eb2799620c560a78e573fa587a1660aef854069d75d"); // 421718
+        consensus.defaultAssumeValid = uint256S("0x1e2ae3edb2fa5b398c2f719d2bbb44b3089fb96170b6676c0c963f12bceba489"); // 443228
 
         consensus.nMinRCTOutputDepth = 12;
 
@@ -567,13 +567,14 @@ class CMainParams : public CChainParams {
                 { 357320,   uint256S("0x20b01f2bef93197bb014d27125939cd8d4f6a34257fdb498ae64c8644b8f2289")},
                 { 376100,   uint256S("0xff704cb42547da4efb2b32054c72c7682b7634ac34fda4ec88fe7badc666338c")},
                 { 421718,   uint256S("0xd22f8acde6c5aed109087eb2799620c560a78e573fa587a1660aef854069d75d")},
+                { 443228,   uint256S("0x1e2ae3edb2fa5b398c2f719d2bbb44b3089fb96170b6676c0c963f12bceba489")},
             }
         };
 
         chainTxData = ChainTxData {
-            // Data from rpc: getchaintxstats 4096 d22f8acde6c5aed109087eb2799620c560a78e573fa587a1660aef854069d75d
-            /* nTime    */ 1554625440,
-            /* nTxCount */ 467906,
+            // Data from rpc: getchaintxstats 4096 1e2ae3edb2fa5b398c2f719d2bbb44b3089fb96170b6676c0c963f12bceba489
+            /* nTime    */ 1557394608,
+            /* nTxCount */ 491240,
             /* dTxRate  */ 0.008
         };
 
@@ -650,10 +651,10 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000004830e68a363e5525f");
+        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000004e2abd3aa581ae4d2");
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x96bb6bb7085d0fdb85757069af7b1513c6a86b476ba531a67af6e9dd21385255"); // 375987
+        consensus.defaultAssumeValid = uint256S("0xa3aeeacabda53c6d29252f1745496ec1654597e02969d1c6ba7cb53678a46218"); // 397480
 
         consensus.nMinRCTOutputDepth = 12;
 
@@ -732,13 +733,14 @@ class CTestNetParams : public CChainParams {
                 {259290, uint256S("0x58267bdf935a2e0716cb910d055b8cdaa019089a5f71c3db90765dc7101dc5dc")},
                 {312860, uint256S("0xaba2e3b2dcf1970b53b67c869325c5eefd3a107e62518fa4640ddcfadf88760d")},
                 {375987, uint256S("0x96bb6bb7085d0fdb85757069af7b1513c6a86b476ba531a67af6e9dd21385255")},
+                {397480, uint256S("0xa3aeeacabda53c6d29252f1745496ec1654597e02969d1c6ba7cb53678a46218")},
             }
         };
 
         chainTxData = ChainTxData{
-            // Data from rpc: getchaintxstats 4096 96bb6bb7085d0fdb85757069af7b1513c6a86b476ba531a67af6e9dd21385255
-            /* nTime    */ 1554626352,
-            /* nTxCount */ 406684,
+            // Data from rpc: getchaintxstats 4096 a3aeeacabda53c6d29252f1745496ec1654597e02969d1c6ba7cb53678a46218
+            /* nTime    */ 1557394688,
+            /* nTxCount */ 430042,
             /* dTxRate  */ 0.007
         };
 

src/qt/locale/bitcoin_en.ts

@@ -1903,7 +1903,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+97"/>
         <source>Confirm options reset</source>
         <translation>Confirm options reset</translation>
     </message>

src/wallet/hdwallet.cpp

@@ -1437,7 +1437,7 @@ DBErrors CHDWallet::LoadWallet(bool& fFirstRunRet)
     }
 
     auto rv = CWallet::LoadWallet(fFirstRunRet);
-    if (pEKMaster) {
+    if (pEKMaster || !idDefaultAccount.IsNull()) {
         fFirstRunRet = false; // if fFirstRun is true, CreateWalletFromFile -> upgrade -> ChainStateFlushed -> WriteBestBlock before catch-up rescan tries to run
     }
     return rv;

test/functional/wallet_part_multiwallet.py

@@ -3,11 +3,8 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-from decimal import Decimal
-
-from test_framework.test_particl import ParticlTestFramework, isclose
-from test_framework.util import connect_nodes_bi, satoshi_round
-from test_framework.authproxy import JSONRPCException
+from test_framework.test_particl import ParticlTestFramework
+from test_framework.util import connect_nodes_bi
 
 
 class MultiWalletTest(ParticlTestFramework):