Merge pull request #305 from graft-project/fix/hf15-disable-non-bp

disallow non-bulletproof txes in next hf
graft-project · May 31, 2019 · 33f0484 · 33f0484
2 parents 7a274c2 + 9d8a346
commit 33f0484
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -125,6 +125,8 @@ static const struct {
   { 13, 308460, 0, 1553090400 },
   // hf 14 Bullet proof, ~2019-06-06T15:00:00+00
   { 14, 364590, 0, 1559833200 },
+  // hf 15 disable non-bulletproof, ~2019-06-07T15:00:00+00
+  { 15, 365310, 0, 1559919600 },
 };
 // static const uint64_t mainnet_hard_fork_version_1_till = 1009826;
 static const uint64_t mainnet_hard_fork_version_1_till = 1;
@@ -165,6 +167,8 @@ static const struct {
   { 13, 287770, 0, 1552626000 },
   // hf 14 Bullet proof
   { 14, 336400, 0, 1558504800 },
+  // hf 15 disable non-bulletproof
+  { 15, 343750, 0, 1559401200 },
 };
 
 // static const uint64_t testnet_hard_fork_version_1_till = 624633;
@@ -2441,8 +2445,8 @@ bool Blockchain::check_tx_outputs(const transaction& tx, tx_verification_context
     }
   }
 
-  // from v14, forbid borromean range proofs
-  if (hf_version >= HF_VERSION_MONERO_13) {
+  // from v15, forbid borromean range proofs
+  if (hf_version > HF_VERSION_MONERO_13) {
     if (tx.version >= 2) {
       const bool borromean = rct::is_rct_borromean(tx.rct_signatures.type);
       if (borromean)

diff --git a/src/version.cpp.in b/src/version.cpp.in
@@ -1,5 +1,5 @@
 #define DEF_GRAFT_VERSION_TAG "@VERSIONTAG@"
-#define DEF_GRAFT_VERSION "1.8.0"
+#define DEF_GRAFT_VERSION "1.8.1"
 #define DEF_GRAFT_RELEASE_NAME "Vela Pulsar"
 #define DEF_GRAFT_VERSION_FULL DEF_GRAFT_VERSION "-" DEF_GRAFT_VERSION_TAG