From ef03c79ab5593a44de99976e36a29b231610ab69 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 15 Aug 2019 16:12:32 +0200 Subject: [PATCH] reset testnet --- src/currency_core/currency_config.h | 13 +++++++++++-- src/currency_core/genesis.cpp | 3 --- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index 8aba9113..e57fa8c0 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -8,7 +8,16 @@ #define CURRENCY_FORMATION_VERSION 84 +#define TESTNET_FORMATION_VERSION 2 + +#ifndef TESTNET #define CURRENCY_GENESIS_NONCE (CURRENCY_FORMATION_VERSION + 101011010121) //bender's nightmare +#else +#define CURRENCY_GENESIS_NONCE (TESTNET_FORMATION_VERSION + CURRENCY_FORMATION_VERSION + 101011010121) +#endif + + + #define CURRENCY_MAX_BLOCK_NUMBER 500000000 @@ -93,7 +102,7 @@ #define STRATUM_DEFAULT_PORT 11777 #define P2P_NETWORK_ID_TESTNET_FLAG 0 #else -#define P2P_DEFAULT_PORT (11112) +#define P2P_DEFAULT_PORT (11112 + TESTNET_FORMATION_VERSION) #define RPC_DEFAULT_PORT 12111 #define STRATUM_DEFAULT_PORT 11888 #define STRARUM_DEFAULT_PORT 51113 @@ -213,7 +222,7 @@ #ifndef TESTNET #define ZANO_HARDFORK_1_AFTER_HEIGHT 166440 #else -#define ZANO_HARDFORK_1_AFTER_HEIGHT 62102 +#define ZANO_HARDFORK_1_AFTER_HEIGHT 1440 #endif diff --git a/src/currency_core/genesis.cpp b/src/currency_core/genesis.cpp index bf9a8671..a58dcb4e 100644 --- a/src/currency_core/genesis.cpp +++ b/src/currency_core/genesis.cpp @@ -15,9 +15,6 @@ namespace currency const genesis_tx_raw_data ggenesis_tx_raw = {{ 0xd880800500000101,0x0301f2ee9fa8ff8a,0xac88983c159856b0,0x6334c7d1b567f262,0x284f7f961a7b1266,0x8c0c68c45bab62fc,0xe1dea6fe84808000,0x337be98b45240311,0xab6cd1e4c66e5a33,0x70e889d98e70fd57,0xb97de43fb09861d4,0xf9f0cde08000d574,0x0270187703048dba,0xcac58027c0851473,0xaa10d864c4c87b46,0x820d371e2ba469e8,0xfea08000fce35acc,0x357903049598bddf,0x15df9e58bd0002aa,0xc940a97b60484e8d,0xf94f171e77d0b2d9,0x80003602c681487a,0x0304c38fbab1f8e0,0xc2529eba91cf7476,0x0bbee139aab295f9,0xf1cb8c58a828a2ca,0xcac8f5469af83932,0x5c8a1027cc160900,0x50bdcc9348baf32a,0xa7bd03751819d9fd,0xd6acc8dbbb0d9b29,0x3730614013368b02,0x3533316236333234,0x6264356431303934,0x6361306339323063,0x3834396335306334,0x3366343363323831,0x3062323366303330,0x6237656561333963,0x1700156335373261,0xce5017baa917a8f0,0x0a0eefcc17975617}, {0x00,0x00}}; - #endif - - }