diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-05 23:13:15 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-05 23:13:15 +0200 |
| commit | c9fc61dbb56cca442c775faa2554a7460879b637 (patch) | |
| tree | 121f6c633a58c148bc116fc2bb730ec6e77db2fc /src | |
| parent | Merge pull request #4499 (diff) | |
| parent | wallet2: disable height based segregation (diff) | |
| download | monero-c9fc61dbb56cca442c775faa2554a7460879b637.tar.xz | |
Merge pull request #4495
34a85e0c wallet2: disable height based segregation (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet2.cpp | 6 |
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 |