aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-04-12 13:47:39 +0200
committerRiccardo Spagni <ric@spagni.net>2018-04-12 13:47:39 +0200
commit3b8704b0fa214be89e702eaf61cbc00ef7123fb6 (patch)
tree713f54c9f3b62c5df8311a59866586f12cbf60b8 /src
parentMerge pull request #3534 (diff)
parentwallet2: move segregation height to v7 (diff)
downloadmonero-3b8704b0fa214be89e702eaf61cbc00ef7123fb6.tar.xz
Merge pull request #3555
0b26c4d5 wallet2: move segregation height to v7 (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index d43c37bd2..fd0622b04 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -110,7 +110,7 @@ using namespace cryptonote;
#define MULTISIG_EXPORT_FILE_MAGIC "Monero multisig export\001"
-#define SEGREGATION_FORK_HEIGHT 1564965
+#define SEGREGATION_FORK_HEIGHT 1546000
#define TESTNET_SEGREGATION_FORK_HEIGHT 1000000
#define STAGENET_SEGREGATION_FORK_HEIGHT 1000000
#define SEGREGATION_FORK_VICINITY 1500 /* blocks */