Skip to content

Commit

Permalink
Raise version.
Browse files Browse the repository at this point in the history
Raise protocol version to 90009.
Schedule testnet fork for 2019-07-01 12:00:00 UTC
Schedule mainnet fork for 2019-07-16 12:00:00 UTC
New checkpoints.
  • Loading branch information
tecnovert committed Jun 24, 2019
1 parent c32e595 commit 1106835
Show file tree
Hide file tree
Showing 12 changed files with 56 additions and 45 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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, 9)
define(_CLIENT_VERSION_PARTICL, 10)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "particl-linux-0.18.0.9"
name: "particl-linux-0.18.0.10"
enable_cache: true
sudo: true
suites:
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "particl-osx-0.18.0.9"
name: "particl-osx-0.18.0.10"
enable_cache: true
suites:
- "bionic"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "particl-win-0.18.0.9"
name: "particl-win-0.18.0.10"
enable_cache: true
sudo: true
suites:
Expand Down
6 changes: 3 additions & 3 deletions doc/man/particl-cli.1
Original file line number Diff line number Diff line change
@@ -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.9.0" "User Commands"
.TH PARTICL-CLI "1" "March 2019" "particl-cli v0.18.0.10.0" "User Commands"
.SH NAME
particl-cli \- manual page for particl-cli v0.18.0.9.0
particl-cli \- manual page for particl-cli v0.18.0.10.0
.SH SYNOPSIS
.B particl-cli
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Particl Core\/\fR
Expand All @@ -15,7 +15,7 @@ particl-cli \- manual page for particl-cli v0.18.0.9.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.9.0
Particl Core RPC client version v0.18.0.10.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/particl-qt.1
Original file line number Diff line number Diff line change
@@ -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.9.0" "User Commands"
.TH PARTICL-QT "1" "March 2019" "particl-qt v0.18.0.10.0" "User Commands"
.SH NAME
particl-qt \- manual page for particl-qt v0.18.0.9.0
particl-qt \- manual page for particl-qt v0.18.0.10.0
.SH SYNOPSIS
.B particl-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
Particl Core version v0.18.0.9.0 (64\-bit)
Particl Core version v0.18.0.10.0 (64\-bit)
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/particl-tx.1
Original file line number Diff line number Diff line change
@@ -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.9.0" "User Commands"
.TH PARTICL-TX "1" "March 2019" "particl-tx v0.18.0.10.0" "User Commands"
.SH NAME
particl-tx \- manual page for particl-tx v0.18.0.9.0
particl-tx \- manual page for particl-tx v0.18.0.10.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.9.0
Particl Core particl\-tx utility version v0.18.0.10.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/particl-wallet.1
Original file line number Diff line number Diff line change
@@ -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.9.0" "User Commands"
.TH PARTICL-WALLET "1" "March 2019" "particl-wallet v0.18.0.10.0" "User Commands"
.SH NAME
particl-wallet \- manual page for particl-wallet v0.18.0.9.0
particl-wallet \- manual page for particl-wallet v0.18.0.10.0
.SH DESCRIPTION
Particl Core particl\-wallet version v0.18.0.9.0
Particl Core particl\-wallet version v0.18.0.10.0
.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.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/particld.1
Original file line number Diff line number Diff line change
@@ -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.9.0" "User Commands"
.TH PARTICLD "1" "March 2019" "particld v0.18.0.10.0" "User Commands"
.SH NAME
particld \- manual page for particld v0.18.0.9.0
particld \- manual page for particld v0.18.0.10.0
.SH SYNOPSIS
.B particld
[\fI\,options\/\fR] \fI\,Start Particl Core Daemon\/\fR
.SH DESCRIPTION
Particl Core Daemon version v0.18.0.9.0
Particl Core Daemon version v0.18.0.10.0
.SH OPTIONS
.HP
\-?
Expand Down
13 changes: 12 additions & 1 deletion doc/release-notes-particl.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
Next Release
==============

- Fixed avoidpartialspends

0.18.0.10
==============

- Fixed avoidpartialspends.
- Testnet fork scheduled for 2019-07-01 12:00:00 UTC
- Enable variable difficulty for smsg free messages.
- Mainnet fork scheduled for 2019.02.16-12:00:00 UTC
- Enable bulletproof rangeproofs.
- Enable RingCT transactions.
- Enable variable fee rate for smsg paid messages.
- Enable variable difficulty for smsg free messages.


0.18.0.9
Expand Down
48 changes: 24 additions & 24 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -425,14 +425,14 @@ class CMainParams : public CChainParams {
consensus.BIP34Height = 0;
consensus.BIP65Height = 0;
consensus.BIP66Height = 0;
consensus.OpIsCoinstakeTime = 1510272000; // 2017-11-10 00:00:00 UTC
consensus.OpIsCoinstakeTime = 0x5A04EC00; // 2017-11-10 00:00:00 UTC
consensus.fAllowOpIsCoinstakeWithP2PKH = false;
consensus.nPaidSmsgTime = 0x5C791EC0; // 2019-03-01 12:00:00
consensus.csp2shTime = 0x5C791EC0; // 2019-03-01 12:00:00
consensus.smsg_fee_time = 0xFFFFFFFF; // 2106 TODO: lower
consensus.bulletproof_time = 0xFFFFFFFF; // 2106 TODO: lower
consensus.rct_time = 0xFFFFFFFF; // 2106 TODO: lower
consensus.smsg_difficulty_time = 0xFFFFFFFF; // 2106 TODO: lower
consensus.nPaidSmsgTime = 0x5C791EC0; // 2019-03-01 12:00:00
consensus.csp2shTime = 0x5C791EC0; // 2019-03-01 12:00:00
consensus.smsg_fee_time = 0x5D2DBC40; // 2019-07-16 12:00:00
consensus.bulletproof_time = 0x5D2DBC40; // 2019-07-16 12:00:00
consensus.rct_time = 0x5D2DBC40; // 2019-07-16 12:00:00
consensus.smsg_difficulty_time = 0x5D2DBC40; // 2019-07-16 12:00:00

consensus.smsg_fee_period = 5040;
consensus.smsg_fee_funding_tx_per_k = 200000;
Expand Down Expand Up @@ -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("0x000000000000000000000000000000000000000000000057f63fa31c71fd433f");
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000005b068ad3d9a61ba9eb");

// By default assume that the signatures in ancestors of this block are valid.
consensus.defaultAssumeValid = uint256S("0x21e62a832721013d7f6f0930d51eaa8d76fa55ba540ec9f7ce639963be5b1c94"); // 460310
consensus.defaultAssumeValid = uint256S("0xdd26591439f80ddb52c360209d0bb3f9d94a391ede0ec7b5b0dcdb9c0877be54"); // 474198

consensus.nMinRCTOutputDepth = 12;

Expand Down Expand Up @@ -568,14 +568,14 @@ class CMainParams : public CChainParams {
{ 376100, uint256S("0xff704cb42547da4efb2b32054c72c7682b7634ac34fda4ec88fe7badc666338c")},
{ 421718, uint256S("0xd22f8acde6c5aed109087eb2799620c560a78e573fa587a1660aef854069d75d")},
{ 443228, uint256S("0x1e2ae3edb2fa5b398c2f719d2bbb44b3089fb96170b6676c0c963f12bceba489")},
{ 460310, uint256S("0x21e62a832721013d7f6f0930d51eaa8d76fa55ba540ec9f7ce639963be5b1c94")},
{ 474198, uint256S("0xdd26591439f80ddb52c360209d0bb3f9d94a391ede0ec7b5b0dcdb9c0877be54")},
}
};

chainTxData = ChainTxData {
// Data from rpc: getchaintxstats 4096 21e62a832721013d7f6f0930d51eaa8d76fa55ba540ec9f7ce639963be5b1c94
/* nTime */ 1559595120,
/* nTxCount */ 510981,
// Data from rpc: getchaintxstats 4096 dd26591439f80ddb52c360209d0bb3f9d94a391ede0ec7b5b0dcdb9c0877be54
/* nTime */ 1561383920,
/* nTxCount */ 526532,
/* dTxRate */ 0.008
};

Expand Down Expand Up @@ -617,11 +617,11 @@ class CTestNetParams : public CChainParams {
consensus.OpIsCoinstakeTime = 0;
consensus.fAllowOpIsCoinstakeWithP2PKH = true; // TODO: clear for next testnet
consensus.nPaidSmsgTime = 0;
consensus.csp2shTime = 0x5C67FB40; // 2019-02-16 12:00:00
consensus.smsg_fee_time = 0x5C67FB40; // 2019-02-16 12:00:00
consensus.bulletproof_time = 0x5C67FB40; // 2019-02-16 12:00:00
consensus.csp2shTime = 0x5C67FB40; // 2019-02-16 12:00:00
consensus.smsg_fee_time = 0x5C67FB40; // 2019-02-16 12:00:00
consensus.bulletproof_time = 0x5C67FB40; // 2019-02-16 12:00:00
consensus.rct_time = 0;
consensus.smsg_difficulty_time = 0xFFFFFFFF; // 2106 TODO: lower
consensus.smsg_difficulty_time = 0x5D19F5C0; // 2019-07-01 12:00:00

consensus.smsg_fee_period = 5040;
consensus.smsg_fee_funding_tx_per_k = 200000;
Expand Down Expand Up @@ -652,10 +652,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("0x0000000000000000000000000000000000000000000000052d7ac846115e40be");
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000057289703e5c3616e7");

// By default assume that the signatures in ancestors of this block are valid.
consensus.defaultAssumeValid = uint256S("0x088c8e6110e8fbfc393b6f2d7518da70e3f4337807c13d3e26545566e3aea675"); // 414518
consensus.defaultAssumeValid = uint256S("0x08bbc92c831b864c809b575901e37aaa9aa2b2e38212594aedf2712a87267da9"); // 428386

consensus.nMinRCTOutputDepth = 12;

Expand Down Expand Up @@ -734,15 +734,15 @@ class CTestNetParams : public CChainParams {
{259290, uint256S("0x58267bdf935a2e0716cb910d055b8cdaa019089a5f71c3db90765dc7101dc5dc")},
{312860, uint256S("0xaba2e3b2dcf1970b53b67c869325c5eefd3a107e62518fa4640ddcfadf88760d")},
{375987, uint256S("0x96bb6bb7085d0fdb85757069af7b1513c6a86b476ba531a67af6e9dd21385255")},
{414518, uint256S("0x088c8e6110e8fbfc393b6f2d7518da70e3f4337807c13d3e26545566e3aea675")},
{428386, uint256S("0x08bbc92c831b864c809b575901e37aaa9aa2b2e38212594aedf2712a87267da9")},
}
};

chainTxData = ChainTxData{
// Data from rpc: getchaintxstats 4096 088c8e6110e8fbfc393b6f2d7518da70e3f4337807c13d3e26545566e3aea675
/* nTime */ 1559593904,
/* nTxCount */ 448109,
/* dTxRate */ 0.007
// Data from rpc: getchaintxstats 4096 08bbc92c831b864c809b575901e37aaa9aa2b2e38212594aedf2712a87267da9
/* nTime */ 1561384112,
/* nTxCount */ 464434,
/* dTxRate */ 0.008
};

/* enable fallback fee on testnet */
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* network protocol versioning
*/

static const int PROTOCOL_VERSION = 90008;
static const int PROTOCOL_VERSION = 90009;
static const int MIN_PARTICL_VERSION = 90004;

//! initial proto version, to be increased after version/verack negotiation
Expand Down

0 comments on commit 1106835

Please sign in to comment.