From d39300e3ff57d38ca0f97fdf4abd3542fa7deda4 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 23 Nov 2018 03:26:18 -1100 Subject: [PATCH] Conditional activate of sapling --- src/komodo_defs.h | 2 +- src/main.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/komodo_defs.h b/src/komodo_defs.h index 169407cfe..fec12c377 100644 --- a/src/komodo_defs.h +++ b/src/komodo_defs.h @@ -11,7 +11,7 @@ #define KOMODO_MAXMEMPOOLTIME 3600 // affects consensus #define CRYPTO777_PUBSECPSTR "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9" #define KOMODO_FIRSTFUNGIBLEID 100 -#define KOMODO_SAPLING_ACTIVATION (1542903704+3600) //1544832000 // Dec 15th, 2018 +#define KOMODO_SAPLING_ACTIVATION 1544832000 // Dec 15th, 2018 #define KOMODO_SAPLING_DEADLINE 1550188800 // Feb 15th, 2019 extern uint8_t ASSETCHAINS_TXPOW; diff --git a/src/main.cpp b/src/main.cpp index 8cf637d52..b29803d52 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3827,7 +3827,9 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex) } if ( activation != 0 ) { - //komodo_setactivation(activation); +#if KOMODO_SAPLING_ACTIVATION != 1544832000 + komodo_setactivation(activation); +#endif fprintf(stderr,"%s sapling activation at %d\n",ASSETCHAINS_SYMBOL,activation); ASSETCHAINS_SAPLING = activation; }