Merge pull request #4495

34a85e0c wallet2: disable height based segregation (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-05 23:13:15 +02:00
commit c9fc61dbb5
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -114,9 +114,9 @@ using namespace cryptonote;
#define OUTPUT_EXPORT_FILE_MAGIC "Monero output export\003" #define OUTPUT_EXPORT_FILE_MAGIC "Monero output export\003"
#define SEGREGATION_FORK_HEIGHT 1546000 #define SEGREGATION_FORK_HEIGHT 99999999
#define TESTNET_SEGREGATION_FORK_HEIGHT 1000000 #define TESTNET_SEGREGATION_FORK_HEIGHT 99999999
#define STAGENET_SEGREGATION_FORK_HEIGHT 1000000 #define STAGENET_SEGREGATION_FORK_HEIGHT 99999999
#define SEGREGATION_FORK_VICINITY 1500 /* blocks */ #define SEGREGATION_FORK_VICINITY 1500 /* blocks */
#define FIRST_REFRESH_GRANULARITY 1024 #define FIRST_REFRESH_GRANULARITY 1024