aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-03 20:43:46 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-03 20:44:48 +0000
commit34a85e0cc395a9e8995ab46100fe5c6e5f9f1fd8 (patch)
tree106fc937dcd919f2de3eb00b6923f8e2aa86f376
parentMerge pull request #4485 (diff)
downloadmonero-34a85e0cc395a9e8995ab46100fe5c6e5f9f1fd8.tar.xz
wallet2: disable height based segregation
It can still be enable via DNS if a key reusing fork pops up
-rw-r--r--src/wallet/wallet2.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index e6ab10756..5bdc75b13 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -114,9 +114,9 @@ using namespace cryptonote;
#define OUTPUT_EXPORT_FILE_MAGIC "Monero output export\003"
-#define SEGREGATION_FORK_HEIGHT 1546000
-#define TESTNET_SEGREGATION_FORK_HEIGHT 1000000
-#define STAGENET_SEGREGATION_FORK_HEIGHT 1000000
+#define SEGREGATION_FORK_HEIGHT 99999999
+#define TESTNET_SEGREGATION_FORK_HEIGHT 99999999
+#define STAGENET_SEGREGATION_FORK_HEIGHT 99999999
#define SEGREGATION_FORK_VICINITY 1500 /* blocks */
#define FIRST_REFRESH_GRANULARITY 1024