Merge pull request #3555

0b26c4d5 wallet2: move segregation height to v7 (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-04-12 13:47:39 +02:00
commit 3b8704b0fa
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -110,7 +110,7 @@ using namespace cryptonote;
#define MULTISIG_EXPORT_FILE_MAGIC "Monero multisig export\001" #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 TESTNET_SEGREGATION_FORK_HEIGHT 1000000
#define STAGENET_SEGREGATION_FORK_HEIGHT 1000000 #define STAGENET_SEGREGATION_FORK_HEIGHT 1000000
#define SEGREGATION_FORK_VICINITY 1500 /* blocks */ #define SEGREGATION_FORK_VICINITY 1500 /* blocks */