diff --git a/configure.ac b/configure.ac index 2c2db60cc03e2..d6166c5eb8585 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 18) define(_CLIENT_VERSION_REVISION, 1) -define(_CLIENT_VERSION_PARTICL, 5) +define(_CLIENT_VERSION_PARTICL, 6) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index ef777adeb1a6f..044ba06e542c5 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "particl-linux-0.18.1.5" +name: "particl-linux-0.18.1.6" enable_cache: true sudo: true suites: diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index d4e952819f4cd..01bbcbee3c7d6 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "particl-osx-0.18.1.5" +name: "particl-osx-0.18.1.6" enable_cache: true suites: - "bionic" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index e02ee78aa8c26..c4aa1c47bb3d8 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "particl-win-0.18.1.5" +name: "particl-win-0.18.1.6" enable_cache: true sudo: true suites: diff --git a/doc/man/particl-cli.1 b/doc/man/particl-cli.1 index 412e742e5cdfa..41ab62ea540ad 100644 --- 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.5.0" "User Commands" +.TH PARTICL-CLI "1" "August 2019" "particl-cli v0.18.1.6.0" "User Commands" .SH NAME -particl-cli \- manual page for particl-cli v0.18.1.5.0 +particl-cli \- manual page for particl-cli v0.18.1.6.0 .SH SYNOPSIS .B particl-cli [\fI\,options\/\fR] \fI\, \/\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.5.0 .B particl-cli [\fI\,options\/\fR] \fI\,help Get help for a command\/\fR .SH DESCRIPTION -Particl Core RPC client version v0.18.1.5.0\-dirty +Particl Core RPC client version v0.18.1.6.0\-dirty .SH OPTIONS .HP \-? diff --git a/doc/man/particl-qt.1 b/doc/man/particl-qt.1 index 00a04b2d78529..aa56b1a40e377 100644 --- 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.5.0" "User Commands" +.TH PARTICL-QT "1" "August 2019" "particl-qt v0.18.1.6.0" "User Commands" .SH NAME -particl-qt \- manual page for particl-qt v0.18.1.5.0 +particl-qt \- manual page for particl-qt v0.18.1.6.0 .SH SYNOPSIS .B particl-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Particl Core version v0.18.1.5.0\-dirty (64\-bit) +Particl Core version v0.18.1.6.0\-dirty (64\-bit) .SH OPTIONS .HP \-? diff --git a/doc/man/particl-tx.1 b/doc/man/particl-tx.1 index da24cba27b6ff..707fe5346bf6f 100644 --- a/doc/man/particl-tx.1 +++ b/doc/man/particl-tx.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH PARTICL-TX "1" "August 2019" "particl-tx v0.18.1.5.0" "User Commands" +.TH PARTICL-TX "1" "August 2019" "particl-tx v0.18.1.6.0" "User Commands" .SH NAME -particl-tx \- manual page for particl-tx v0.18.1.5.0 +particl-tx \- manual page for particl-tx v0.18.1.6.0 .SH SYNOPSIS .B particl-tx [\fI\,options\/\fR] \fI\, \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded transaction\/\fR @@ -9,7 +9,7 @@ particl-tx \- manual page for particl-tx v0.18.1.5.0 .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.5.0\-dirty +Particl Core particl\-tx utility version v0.18.1.6.0\-dirty .SH OPTIONS .HP \-? diff --git a/doc/man/particl-wallet.1 b/doc/man/particl-wallet.1 index d686e3a06a3fa..de60e15daa2cd 100644 --- 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.5.0" "User Commands" +.TH PARTICL-WALLET "1" "August 2019" "particl-wallet v0.18.1.6.0" "User Commands" .SH NAME -particl-wallet \- manual page for particl-wallet v0.18.1.5.0 +particl-wallet \- manual page for particl-wallet v0.18.1.6.0 .SH DESCRIPTION -Particl Core particl\-wallet version v0.18.1.5.0\-dirty +Particl Core particl\-wallet version v0.18.1.6.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 index e15b6d0561ec6..d6ed4bf01e71f 100644 --- 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.5.0" "User Commands" +.TH PARTICLD "1" "August 2019" "particld v0.18.1.6.0" "User Commands" .SH NAME -particld \- manual page for particld v0.18.1.5.0 +particld \- manual page for particld v0.18.1.6.0 .SH SYNOPSIS .B particld [\fI\,options\/\fR] \fI\,Start Particl Core Daemon\/\fR .SH DESCRIPTION -Particl Core Daemon version v0.18.1.5.0\-dirty +Particl Core Daemon version v0.18.1.6.0\-dirty .SH OPTIONS .HP \-? diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 16238852fecf2..71628f25c8aae 100644 --- 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("0x00000000000000000000000000000000000000000000006891f771805a3ac790"); + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000006e8971ba3f3faf0d8f"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x769203b7076c5bfd02b22e3798f12f1de91fb751839a3903d9a57537898f9daa"); // 536715 + consensus.defaultAssumeValid = uint256S("0x5a1e8651002ce2d5a43144e4e62b4a91b8189e976175fa4e69195c21607d1bf9"); // 560766 consensus.nMinRCTOutputDepth = 12; @@ -569,15 +569,15 @@ class CMainParams : public CChainParams { { 376100, uint256S("0xff704cb42547da4efb2b32054c72c7682b7634ac34fda4ec88fe7badc666338c")}, { 421718, uint256S("0xd22f8acde6c5aed109087eb2799620c560a78e573fa587a1660aef854069d75d")}, { 443228, uint256S("0x1e2ae3edb2fa5b398c2f719d2bbb44b3089fb96170b6676c0c963f12bceba489")}, - { 501540, uint256S("0x4f99098be0e8c21571d0b10ac246265a6b1ac52a609dbd16690c5b3ff9ac2ec6")}, { 536715, uint256S("0x769203b7076c5bfd02b22e3798f12f1de91fb751839a3903d9a57537898f9daa")}, + { 560766, uint256S("0x5a1e8651002ce2d5a43144e4e62b4a91b8189e976175fa4e69195c21607d1bf9")}, } }; chainTxData = ChainTxData { - // Data from rpc: getchaintxstats 4096 769203b7076c5bfd02b22e3798f12f1de91fb751839a3903d9a57537898f9daa - /* nTime */ 1569444640, - /* nTxCount */ 600836, + // Data from rpc: getchaintxstats 4096 5a1e8651002ce2d5a43144e4e62b4a91b8189e976175fa4e69195c21607d1bf9 + /* nTime */ 1572541952, + /* nTxCount */ 631841, /* 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("0x000000000000000000000000000000000000000000000006a4c2566a933e6ca9"); + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000071e14839bcfb9dada"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x1caad78f80d1f6849c08fc8c2a89f2e1eb1b0e5bc365f6d6bb4d72e6bed478ed"); // 487908 + consensus.defaultAssumeValid = uint256S("0x51143e8e5a5fd68f0aebdb8eca15950826db6cc3d7ed8aec447444aff74174bc"); // 511910 consensus.nMinRCTOutputDepth = 12; @@ -741,15 +741,15 @@ class CTestNetParams : public CChainParams { {375987, uint256S("0x96bb6bb7085d0fdb85757069af7b1513c6a86b476ba531a67af6e9dd21385255")}, {428386, uint256S("0x08bbc92c831b864c809b575901e37aaa9aa2b2e38212594aedf2712a87267da9")}, {455325, uint256S("0x801444340d20609ad4525bac23f75d47c9525bd9c7a2390f2a41106c4048e4a5")}, - {487908, uint256S("0x1caad78f80d1f6849c08fc8c2a89f2e1eb1b0e5bc365f6d6bb4d72e6bed478ed")}, + {511910, uint256S("0x51143e8e5a5fd68f0aebdb8eca15950826db6cc3d7ed8aec447444aff74174bc")}, } }; chainTxData = ChainTxData{ - // Data from rpc: getchaintxstats 4096 1caad78f80d1f6849c08fc8c2a89f2e1eb1b0e5bc365f6d6bb4d72e6bed478ed - /* nTime */ 1569444720, - /* nTxCount */ 532511, - /* dTxRate */ 0.004 + // Data from rpc: getchaintxstats 4096 51143e8e5a5fd68f0aebdb8eca15950826db6cc3d7ed8aec447444aff74174bc + /* nTime */ 1572541600, + /* nTxCount */ 557095, + /* dTxRate */ 0.005 }; /* enable fallback fee on testnet */