From 9398ac98c83e6bd544b3e9908fdb96babd2d7306 Mon Sep 17 00:00:00 2001
From: ohashi3d <katsumi.ohashi@ohashi3d.jp>
Date: Mon, 11 Jan 2021 00:42:23 +0900
Subject: [PATCH] BIP16Height fixed

---
 configure.ac        | 4 ++--
 src/chainparams.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index e5939fec..ab679f92 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,10 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2020)
+define(_COPYRIGHT_YEAR, 2021)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Yenten Core]])
 AC_INIT([Yenten Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/yentencoin/yenten/issues],[yenten],[https://yentencoin.info/])
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 7241e4da..f0384e57 100755
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -76,7 +76,7 @@ class CMainParams : public CChainParams {
     CMainParams() {
         strNetworkID = "main";
         consensus.nSubsidyHalvingInterval = 800000;
-      //consensus.BIP16Height = 0;
+        consensus.BIP16Height = 0; // fixed
         consensus.BIP34Height = 700000;
 //		consensus.BIP34Height = 17;
 //        consensus.BIP34Hash = uint256();
@@ -190,7 +190,7 @@ class CTestNetParams : public CChainParams {
     CTestNetParams() {
         strNetworkID = "test";
         consensus.nSubsidyHalvingInterval = 800000;
-        //consensus.BIP16Height = 0;
+        consensus.BIP16Height = 0; // fixed
         consensus.BIP34Height = 0;
         consensus.BIP34Hash = uint256S("0x00002a66f0c687f619934409d376c52fe721833f05940e4c20deaaa0122d7fb8");
         consensus.BIP65Height = 12720;
@@ -282,7 +282,7 @@ class CRegTestParams : public CChainParams {
     CRegTestParams() {
         strNetworkID = "regtest";
         consensus.nSubsidyHalvingInterval = 150;
-        //consensus.BIP16Height = 0;
+        consensus.BIP16Height = 0; // fixed
         consensus.BIP34Height = 100000000; // BIP34 has not activated on regtest (far in the future so block v1 are not rejected in tests)
         consensus.BIP34Hash = uint256();
         consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in rpc activation tests)