Skip to content
This repository was archived by the owner on Apr 2, 2019. It is now read-only.

Commit e698d4c

Browse files
renuzitrenuzit
committed
2 parents edc7fd4 + 0b774f3 commit e698d4c

File tree

12 files changed

+32
-21
lines changed

12 files changed

+32
-21
lines changed

‎configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 1)
4-
define(_CLIENT_VERSION_MINOR, 3)
4+
define(_CLIENT_VERSION_MINOR, 4)
55
define(_CLIENT_VERSION_REVISION, 0)
6-
define(_CLIENT_VERSION_BUILD, 50)
6+
define(_CLIENT_VERSION_BUILD, 51)
77
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
88
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
99
define(_CLIENT_VERSION_IS_RELEASE, true)

‎contrib/debian/changelog

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
bitcoinz (1.3.0) stable; urgency=medium
1+
bitcoinz (1.4.0) stable; urgency=high
22

3-
* 1.3.0 release.
3+
* 1.4.0 release.
44

5-
-- The BitcoinZ Community <[email protected]> Sat, 10 June 2018 00:15:00 +0100
5+
-- The BitcoinZ Community <[email protected]> Fri, 15 June 2018 00:15:00 +0100

‎contrib/debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Vcs-Git: https://github.com/btcz/bitcoinz.git
1111
Vcs-Browser: https://github.com/btcz
1212

1313
Package: bitcoinz
14-
Version: 1.3.0
14+
Version: 1.4.0
1515
Depends: ${shlibs:Depends}
1616
Architecture: all
1717
Description: BitcoinZ is a decentralized community project based on the Bitcoin and Zcash codebase.

‎contrib/gitian-descriptors/gitian-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoinz-1.3.0"
2+
name: "bitcoinz-1.4.0"
33
enable_cache: true
44
distro: "debian"
55
suites:

‎doc/man/bitcoinz-cli.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
2-
.TH BITCOINZ-CLI "1" "June 2018" "bitcoinz-cli v1.3.0" "User Commands"
2+
.TH BITCOINZ-CLI "1" "June 2018" "bitcoinz-cli v1.4.0" "User Commands"
33
.SH NAME
4-
bitcoinz-cli \- manual page for bitcoinz-cli v1.3.0
4+
bitcoinz-cli \- manual page for bitcoinz-cli v1.4.0
55
.SH DESCRIPTION
6-
BitcoinZ RPC client version v1.3.0
6+
BitcoinZ RPC client version v1.4.0
77
.PP
88
In order to ensure you are adequately protecting your privacy when using
99
BitcoinZ, please see <https://z.cash/support/security/index.html>.

‎doc/man/bitcoinz-tx.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
2-
.TH BITCOINZ-TX "1" "June 2018" "bitcoinz-tx v1.3.0" "User Commands"
2+
.TH BITCOINZ-TX "1" "June 2018" "bitcoinz-tx v1.4.0" "User Commands"
33
.SH NAME
4-
bitcoinz-tx \- manual page for bitcoinz-tx v1.3.0
4+
bitcoinz-tx \- manual page for bitcoinz-tx v1.4.0
55
.SH DESCRIPTION
6-
BitcoinZ bitcoinz\-tx utility version v1.3.0
6+
BitcoinZ bitcoinz\-tx utility version v1.4.0
77
.SS "Usage:"
88
.TP
99
bitcoinz\-tx [options] <hex\-tx> [commands]

‎doc/man/bitcoinzd.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
2-
.TH BITCOINZD "1" "June 2018" "bitcoinzd v1.3.0" "User Commands"
2+
.TH BITCOINZD "1" "June 2018" "bitcoinzd v1.4.0" "User Commands"
33
.SH NAME
4-
bitcoinzd \- manual page for bitcoinzd v1.3.0
4+
bitcoinzd \- manual page for bitcoinzd v1.4.0
55
.SH DESCRIPTION
6-
BitcoinZ Daemon version v1.3.0
6+
BitcoinZ Daemon version v1.4.0
77
.PP
88
In order to ensure you are adequately protecting your privacy when using
99
BitcoinZ, please see <https://z.cash/support/security/>.

‎src/chainparams.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ class CMainParams : public CChainParams {
6161
nDefaultPort = 1989;
6262
nMaxTipAge = 24 * 60 * 60;
6363
nPruneAfterHeight = 100000;
64+
newTimeRule = 159300;
6465
eh_epoch_1 = eh200_9;
6566
eh_epoch_2 = eh144_5;
6667
eh_epoch_1_endblock = 160010;

‎src/chainparams.h

+2
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ class CChainParams
102102
std::string GetFoundersRewardAddressAtIndex(int i) const;
103103
/** Enforce coinbase consensus rule in regtest mode */
104104
void SetRegTestCoinbaseMustBeProtected() { consensus.fCoinbaseMustBeProtected = true; }
105+
int GetNewTimeRule() const { return newTimeRule; }
105106
protected:
106107
CChainParams() {}
107108

@@ -129,6 +130,7 @@ class CChainParams
129130
bool fTestnetToBeDeprecatedFieldRPC = false;
130131
Checkpoints::CCheckpointData checkpointData;
131132
std::vector<std::string> vFoundersRewardAddress;
133+
int newTimeRule;
132134
};
133135

134136
/**

‎src/clientversion.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
//! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
1919
#define CLIENT_VERSION_MAJOR 1
20-
#define CLIENT_VERSION_MINOR 3
20+
#define CLIENT_VERSION_MINOR 4
2121
#define CLIENT_VERSION_REVISION 0
22-
#define CLIENT_VERSION_BUILD 50
22+
#define CLIENT_VERSION_BUILD 51
2323

2424
//! Set to true for release, false for prerelease or test build
2525
#define CLIENT_VERSION_IS_RELEASE true

‎src/main.cpp

+10-2
Original file line numberDiff line numberDiff line change
@@ -3002,8 +3002,16 @@ bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, bool f
30023002
return state.DoS(50, error("CheckBlockHeader(): proof of work failed"),
30033003
REJECT_INVALID, "high-hash");
30043004

3005-
// Check timestamp
3006-
if (block.GetBlockTime() > GetAdjustedTime() + 2 * 60 * 60)
3005+
unsigned int nHeight = chainActive.Height();
3006+
const CChainParams& chainParams = Params();
3007+
3008+
// Check timestamp (old)
3009+
if (nHeight < chainParams.GetNewTimeRule() && block.GetBlockTime() > GetAdjustedTime() + 2 * 60 * 60)
3010+
return state.Invalid(error("CheckBlockHeader(): block timestamp too far in the future"),
3011+
REJECT_INVALID, "time-too-new");
3012+
3013+
// starting at height 159300, decrease to 30 minute window to decrease effectiveness of timewarp attack.
3014+
else if (nHeight >= chainParams.GetNewTimeRule() && block.GetBlockTime() > GetAdjustedTime() + 30 * 60)
30073015
return state.Invalid(error("CheckBlockHeader(): block timestamp too far in the future"),
30083016
REJECT_INVALID, "time-too-new");
30093017

‎src/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* network protocol versioning
1010
*/
1111

12-
static const int PROTOCOL_VERSION = 770004;
12+
static const int PROTOCOL_VERSION = 770005;
1313

1414
//! initial proto version, to be increased after version/verack negotiation
1515
static const int INIT_PROTO_VERSION = 209;

0 commit comments

Comments
 (0)