Raise version, new checkpoints.

particl · Sep 25, 2019 · 68f0f6b · 68f0f6b
1 parent 3e9f5fd
commit 68f0f6b
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 64 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,8 +3,8 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 18)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_PARTICL, 4)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_PARTICL, 5)
+define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "particl-linux-0.18.1.4"
+name: "particl-linux-0.18.1.5"
 enable_cache: true
 sudo: true
 suites:

diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,5 +1,5 @@
 ---
-name: "particl-osx-0.18.1.4"
+name: "particl-osx-0.18.1.5"
 enable_cache: true
 suites:
 - "bionic"

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
 ---
-name: "particl-win-0.18.1.4"
+name: "particl-win-0.18.1.5"
 enable_cache: true
 sudo: true
 suites:

diff --git a/doc/man/particl-cli.1 b/doc/man/particl-cli.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH PARTICL-CLI "1" "August 2019" "particl-cli v0.18.1.4.0" "User Commands"
+.TH PARTICL-CLI "1" "August 2019" "particl-cli v0.18.1.5.0" "User Commands"
 .SH NAME
-particl-cli \- manual page for particl-cli v0.18.1.4.0
+particl-cli \- manual page for particl-cli v0.18.1.5.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.1.4.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.1.4.0\-dirty
+Particl Core RPC client version v0.18.1.5.0\-dirty
 .SH OPTIONS
 .HP
 \-?

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

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

diff --git a/doc/man/particl-wallet.1 b/doc/man/particl-wallet.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH PARTICL-WALLET "1" "August 2019" "particl-wallet v0.18.1.4.0" "User Commands"
+.TH PARTICL-WALLET "1" "August 2019" "particl-wallet v0.18.1.5.0" "User Commands"
 .SH NAME
-particl-wallet \- manual page for particl-wallet v0.18.1.4.0
+particl-wallet \- manual page for particl-wallet v0.18.1.5.0
 .SH DESCRIPTION
-Particl Core particl\-wallet version v0.18.1.4.0\-dirty
+Particl Core particl\-wallet version v0.18.1.5.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.

diff --git a/doc/man/particld.1 b/doc/man/particld.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH PARTICLD "1" "August 2019" "particld v0.18.1.4.0" "User Commands"
+.TH PARTICLD "1" "August 2019" "particld v0.18.1.5.0" "User Commands"
 .SH NAME
-particld \- manual page for particld v0.18.1.4.0
+particld \- manual page for particld v0.18.1.5.0
 .SH SYNOPSIS
 .B particld
 [\fI\,options\/\fR]                     \fI\,Start Particl Core Daemon\/\fR
 .SH DESCRIPTION
-Particl Core Daemon version v0.18.1.4.0\-dirty
+Particl Core Daemon version v0.18.1.5.0\-dirty
 .SH OPTIONS
 .HP
 \-?

diff --git a/src/chainparams.cpp b/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("0x000000000000000000000000000000000000000000000065119d6b4ac6628f42");
+        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000006891f771805a3ac790");
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x65ff74dc7dee992958af41ecf0011e029778fcbf30c28e1c92f4b784c5596a75"); // 521036
+        consensus.defaultAssumeValid = uint256S("0x769203b7076c5bfd02b22e3798f12f1de91fb751839a3903d9a57537898f9daa"); // 536715
 
         consensus.nMinRCTOutputDepth = 12;
 
@@ -570,14 +570,14 @@ class CMainParams : public CChainParams {
                 { 421718,   uint256S("0xd22f8acde6c5aed109087eb2799620c560a78e573fa587a1660aef854069d75d")},
                 { 443228,   uint256S("0x1e2ae3edb2fa5b398c2f719d2bbb44b3089fb96170b6676c0c963f12bceba489")},
                 { 501540,   uint256S("0x4f99098be0e8c21571d0b10ac246265a6b1ac52a609dbd16690c5b3ff9ac2ec6")},
-                { 521036,   uint256S("0x65ff74dc7dee992958af41ecf0011e029778fcbf30c28e1c92f4b784c5596a75")},
+                { 536715,   uint256S("0x769203b7076c5bfd02b22e3798f12f1de91fb751839a3903d9a57537898f9daa")},
             }
         };
 
         chainTxData = ChainTxData {
-            // Data from rpc: getchaintxstats 4096 65ff74dc7dee992958af41ecf0011e029778fcbf30c28e1c92f4b784c5596a75
-            /* nTime    */ 1567421712,
-            /* nTxCount */ 580689,
+            // Data from rpc: getchaintxstats 4096 769203b7076c5bfd02b22e3798f12f1de91fb751839a3903d9a57537898f9daa
+            /* nTime    */ 1569444640,
+            /* nTxCount */ 600836,
             /* dTxRate  */ 0.009
         };
 
@@ -656,10 +656,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("0x00000000000000000000000000000000000000000000000649534a7af31cbdec");
+        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000006a4c2566a933e6ca9");
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x4b95cc3e678f400dcfdfefe17c2787e2a1a5928fcea1d43f83b1198c9e1f3279"); // 472199
+        consensus.defaultAssumeValid = uint256S("0x1caad78f80d1f6849c08fc8c2a89f2e1eb1b0e5bc365f6d6bb4d72e6bed478ed"); // 487908
 
         consensus.nMinRCTOutputDepth = 12;
 
@@ -741,14 +741,14 @@ class CTestNetParams : public CChainParams {
                 {375987, uint256S("0x96bb6bb7085d0fdb85757069af7b1513c6a86b476ba531a67af6e9dd21385255")},
                 {428386, uint256S("0x08bbc92c831b864c809b575901e37aaa9aa2b2e38212594aedf2712a87267da9")},
                 {455325, uint256S("0x801444340d20609ad4525bac23f75d47c9525bd9c7a2390f2a41106c4048e4a5")},
-                {472199, uint256S("0x4b95cc3e678f400dcfdfefe17c2787e2a1a5928fcea1d43f83b1198c9e1f3279")},
+                {487908, uint256S("0x1caad78f80d1f6849c08fc8c2a89f2e1eb1b0e5bc365f6d6bb4d72e6bed478ed")},
             }
         };
 
         chainTxData = ChainTxData{
-            // Data from rpc: getchaintxstats 4096 4b95cc3e678f400dcfdfefe17c2787e2a1a5928fcea1d43f83b1198c9e1f3279
-            /* nTime    */ 1567421648,
-            /* nTxCount */ 515930,
+            // Data from rpc: getchaintxstats 4096 1caad78f80d1f6849c08fc8c2a89f2e1eb1b0e5bc365f6d6bb4d72e6bed478ed
+            /* nTime    */ 1569444720,
+            /* nTxCount */ 532511,
             /* dTxRate  */ 0.004
         };
 

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
@@ -139,7 +139,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Could not convert prefix to number."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Could not decode scan secret as WIF, hex or base58."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Could not decode spend secret as hex or base58."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Could not get scan public key."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Could not get spend public key."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Default account not found"),
 QT_TRANSLATE_NOOP("bitcoin-core", "DeriveNextKey failed"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
@@ -166,6 +165,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "ExtKeyGetIndex failed."),
 QT_TRANSLATE_NOOP("bitcoin-core", "ExtKeySaveAccountToDB failed"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Fee exceeds maximum configured by -maxtxfee"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Hit nMaxTries limit, %d, %d, have %d, lastindex %d"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Import failed - AddKeyPubKey failed."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Import failed - stealth address exists."),
@@ -238,7 +238,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is a relative path"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is not a directory"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Specified blocks directory \"%s\" does not exist."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Spend secret is not 32 bytes."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Spend secret must be different to scan secret."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Stake your coins to support network and gain reward (default: true)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Starting network threads..."),