Merge pull request #114 from graft-project/fix/ftl-decreased

Updated version, reverted DIFFICULTY_BLOCKS_COUNT_V8
graft-project · Apr 22, 2018 · 7ed9c01 · 7ed9c01
2 parents 846dc16 + 4952c8b
commit 7ed9c01
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ Dates are provided in the format YYYY-MM-DD.
 | ----------------- | ----------------- | ---------------------- | -------------------------- | ------------------ |
 | 2018-01-18        | v7                | 1.0.0                | 1.0.1                    | First release      |
 | 2018-04-10        | v8                | 1.1.0                | 1.1.2                    | Anti-ASIC change from Monero (Cryptonight variant 1), Improved Difficulty Adjustment Algorithm (new algorithm based on the LWMA difficulty algorithm)      |
-| 2018-04-21        | v9                | 1.2.0                | 1.2.0                    | Fix for Difficulty Adjustment Algorithm      |
+| 2018-04-23        | v9                | 1.2.0                | 1.2.1                    | Fix for Difficulty Adjustment Algorithm      |
 
 ## Installing Graft Network from a Package
 

diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
@@ -83,7 +83,7 @@
 #define DIFFICULTY_BLOCKS_COUNT                         DIFFICULTY_WINDOW + DIFFICULTY_LAG
 
 #define DIFFICULTY_WINDOW_V8                            60
-#define DIFFICULTY_BLOCKS_COUNT_V8                      DIFFICULTY_WINDOW_V8 + 1
+#define DIFFICULTY_BLOCKS_COUNT_V8                      DIFFICULTY_WINDOW_V8
 
 #define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V1   DIFFICULTY_TARGET_V1 * CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS
 #define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V2   DIFFICULTY_TARGET_V2 * CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -109,7 +109,7 @@ static const struct {
   // GRAFT: start hardfork v7 from 1st block
   { 7, 1, 0, 1503046577 } ,
   // GRAFT: updated v8 hf block
-  { 8, 64445, 0, 1523570400 },
+  { 8, 64445, 0, 1523570400},
   { 9, 68000, 0, 1524229900}
 };
 // static const uint64_t mainnet_hard_fork_version_1_till = 1009826;
@@ -139,7 +139,7 @@ static const struct {
   { 7, 1, 0, 1501709789 },
   // GRAFT: public testnet hardfork v8 from block 57640
   { 8, 57780, 0, 1522838800 },
-  { 9, 67300, 0, 1524229900 },
+  { 9, 67350, 0, 1524229900 },
 };
 // static const uint64_t testnet_hard_fork_version_1_till = 624633;
 static const uint64_t testnet_hard_fork_version_1_till = 1;

diff --git a/src/version.h.in b/src/version.h.in
@@ -1,4 +1,4 @@
 #define GRAFT_VERSION_TAG "@VERSIONTAG@"
-#define GRAFT_VERSION "1.2.0"
+#define GRAFT_VERSION "1.2.1"
 #define GRAFT_RELEASE_NAME "Beta Lyrae"
 #define GRAFT_VERSION_FULL GRAFT_VERSION "-" GRAFT_VERSION_TAG