diff options
author | Riccardo Spagni <ric@spagni.net> | 2018-04-12 13:24:07 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2018-04-12 13:24:07 +0200 |
commit | e89f33634d71ac7f424b69d2467e1bf6c09e7dc2 (patch) | |
tree | 25ecb3c2a814fba6eaec6efb7048e6bcf008c1ba /src | |
parent | Merge pull request #3535 (diff) | |
parent | wallet2: move segregation height to v7 (diff) | |
download | monero-e89f33634d71ac7f424b69d2467e1bf6c09e7dc2.tar.xz |
Merge pull request #3556
d400b4d3 wallet2: move segregation height to v7 (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 0568f1c29..5283f3bc0 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 */ |