Merge tag '1.2.1'

btcz · Jun 6, 2018 · fc4a2d9 · fc4a2d9
2 parents fe1eb60 + 0670054
commit fc4a2d9
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 34 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 50)
 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)))
 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)))

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,5 +1,5 @@
-bitcoinz (1.2.0) stable; urgency=medium
+bitcoinz (1.2.1) stable; urgency=medium
 
-  * 1.2.0 release.
+  * 1.2.1 release.
 
  -- BitcoinZ team <[email protected]>  Wed, 16 May 2018 2:08:00 +0100
diff --git a/contrib/debian/control b/contrib/debian/control
@@ -11,7 +11,7 @@ Vcs-Git: https://github.com/bitcoinz-pod/bitcoinz.git
 Vcs-Browser: https://github.com/bitcoinz-pod
 
 Package: bitcoinz
-Version: 1.2.0
+Version: 1.2.1
 Depends: ${shlibs:Depends}
 Architecture: all
 Description: Community coin.

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "bitcoinz-1.2.0"
+name: "bitcoinz-1.2.1"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH ZCASH-CLI "1" "October 2017" "zcash-cli v1.2.0" "User Commands"
+.TH ZCASH-CLI "1" "October 2017" "zcash-cli v1.2.1" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v1.2.0
+zcash-cli \- manual page for zcash-cli v1.2.1
 .SH DESCRIPTION
-BitcoinZ RPC client version v1.2.0
+BitcoinZ RPC client version v1.2.1
 .PP
 In order to ensure you are adequately protecting your privacy when using
 BitcoinZ, please see <https://z.cash/support/security/index.html>.

diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH ZCASH-TX "1" "January 2018" "zcash-tx v1.2.0" "User Commands"
+.TH ZCASH-TX "1" "January 2018" "zcash-tx v1.2.1" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v1.2.0
+zcash-tx \- manual page for zcash-tx v1.2.1
 .SH DESCRIPTION
-BitcoinZ zcash\-tx utility version v1.2.0
+BitcoinZ zcash\-tx utility version v1.2.1
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]

diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH ZCASHD "1" "October 2017" "zcashd v1.2.0" "User Commands"
+.TH ZCASHD "1" "October 2017" "zcashd v1.2.1" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v1.2.0
+zcashd \- manual page for zcashd v1.2.1
 .SH DESCRIPTION
-BitcoinZ Daemon version v1.2.0
+BitcoinZ Daemon version v1.2.1
 .PP
 In order to ensure you are adequately protecting your privacy when using
 BitcoinZ, please see <https://z.cash/support/security/>.

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -102,6 +102,9 @@ class CMainParams : public CChainParams {
         vSeeds.push_back(CDNSSeedData("67f534b87f9a2412f845e39102f184e3a48798ed6e2a64d98b915aa12b625e9c.BTCZ", "seed.btcz.life"));
         vSeeds.push_back(CDNSSeedData("acdd520508bbfa96029867cf64b824fa5e41ebe47918bd4b7855d7a186ed795c.BTCZ", "bzseed.secnode.tk"));
         vSeeds.push_back(CDNSSeedData("4437c91da6e4c4edca56b57bd52c2e11a3fd7d8b04bd9dec9584fb5220f54b05.BTCZ", "btzseed.blockhub.info"));
+        vSeeds.push_back(CDNSSeedData("0416c4d89c3c4078f7127b7b482c5c242328306f1706fe2edcdb7c94e2fdad45.BTCZ", "seed.btcz.biz"));
+        vSeeds.push_back(CDNSSeedData("e3dca99ba0e7b1d24cca73458f1d67f4014a60565bcf05e5748271922ce897a0.BTCZ", "btczseed.1ds.us"));
+
 
         // guarantees the first 2 characters, when base58 encoded, are "t1"
         base58Prefixes[PUBKEY_ADDRESS]     = {0x1C,0xB8};
@@ -130,34 +133,20 @@ class CMainParams : public CChainParams {
         checkpointData = (Checkpoints::CCheckpointData) {
             boost::assign::map_list_of
             ( 0, uint256S("0xf499ee3d498b4298ac6a64205b8addb7c43197e2a660229be65db8a4534d75c1"))
-            ( 966, uint256S("0x00000014ee022afd1cafd8cb9e9cb396bf39e68a36e83e3ebc83d206dc1ebacf"))
-            ( 1410, uint256S("0x0000007343c5cdaa4c069b45fc80775ab51f54070792ca10a586f33ad7f5b34e"))
-            ( 1776, uint256S("0x000000f8f364b114704f0dec7c51a4a1f68e8e05425c65261bd7c246e9672006"))
-            ( 1817, uint256S("0x000000c783d9244d884c4208ca83efb71a5ec2127b0410557b0218ce5732619a"))
-            ( 1830, uint256S("0x0000011d4dcd27ce6c4d2810c38d58ee7aaca384fb70b80c6ca5082909cc9464"))
-            ( 1863, uint256S("0x000000e69d7743dfaca51f25e2b9d1829622c9b81f337fd864853bc0f2a2b8ca"))
-            ( 1918, uint256S("0x000000c1c00845a2d23bed939cd1d991f979a7d8637de1e62be097c6588a1872"))
-            ( 1929, uint256S("0x0000009ba74be101085199bfea1e32cffe5f2dc945fa417eafd75ce5ed447081"))
-            ( 1939, uint256S("0x000000fb643c78413d1efbe6889ea6c5a3242df0c4715b845952c4524cfc22ad"))
-            ( 1944, uint256S("0x0000008d240cc7a212c960152f2de6e52bb6724a57b5a41211535ecbe65450c1"))
-            ( 1989, uint256S("0x0000015e8724264b731e81b31052d9aace1b8be89c495702001353b055e8a486"))
-            ( 1995, uint256S("0x00000132a89578398e906e7e15ea2e3b2c43147afd2db0f9acf4978f4940ddc5"))
             ( 2007, uint256S("0x000000215111f83669484439371ced6e3bc48cd7e7d6be8afa18952206304a1b"))
-            ( 2008, uint256S("0x000001877891c7c11f77acf00d35f10b24bac5a7e1f5526ff9adc6c660e233ff"))
-            ( 2011, uint256S("0x00000189d75d3f0a0f2d4bb8d5235b38b28ebafb3f3aca9770a656ed61ec24cc"))
-            ( 2016, uint256S("0x000000dba6dde8505b0dde0e8be0f3f731e3686087dc43f30b2baf2f904ebeac"))
             ( 10000, uint256S("0x00000002ccb858ec2c35fb79ce2079333461efa50f2b59814558b9ae3ce62a40"))
             ( 20675, uint256S("0x00000004804df1618f984fef70c1a210988ade5093b6947c691422fc93013a63")) // Thaddeus Kosciuszko - 200th death anniversary (October 15 2017)
             ( 40000, uint256S("0x00000005a2d9a94e2e16f9c1e578a2eb46cc267ab7a51539d22ff8aa0096140b"))
             ( 56000, uint256S("0x000000026a063927c6746acec6c0957d1f69fa2ab1a59c06ce30d60bbbcea92a"))
             ( 84208, uint256S("0x0000000328e5d0346a78aea2d586154ab3145d51ba3936998253593b0ab2980c"))
-            ( 105841, uint256S("0x000000010305387fd72bc70ce5cc5b512fe513016e7208b9ee61d601fe212991"))  //Mr Hawking, Rest in peace.
-            ( 140000, uint256S("0x0000000155f89d1ededf519c6445d41c9240ee4daa721c91c19eea0faa2f02c8")),
+            ( 105841, uint256S("0x000000010305387fd72bc70ce5cc5b512fe513016e7208b9ee61d601fe212991"))  //Dr Hawking, Rest in peace.
+            ( 140000, uint256S("0x0000000155f89d1ededf519c6445d41c9240ee4daa721c91c19eea0faa2f02c8"))
+            ( 153955, uint256S("0x00000006913d3122f32e60c9d64e87edd8e9a05444447df49713c15fbae6484d")),
 
-            1526168168,     // * UNIX timestamp of last checkpoint block
-            565727,         // * total number of transactions between genesis and last checkpoint
+            1528292585,     // * UNIX timestamp of last checkpoint block
+            616001,         // * total number of transactions between genesis and last checkpoint
                             //   (the tx=... number in the SetBestChain debug.log lines)
-            2327.5625143  // * estimated number of transactions per day after checkpoint
+            2304.6771849  // * estimated number of transactions per day after checkpoint
                             //   total number of tx / (checkpoint block height / (24 * 24))
         };