Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'develop'

Browse source
This commit is contained in:
crypro.zoidberg 2019-05-08 21:00:33 +02:00
commit a2ffe1b9f6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/currency_core/currency_config.h
View file

@ -8,7 +8,7 @@
#define CURRENCY_FORMATION_VERSION 84
#define CURRENCY_GENESIS_NONCE (CURRENCY_FORMATION_VERSION + some_number_here)// <-- will be changed to another nightmare*/; //bender's nightmare
#define CURRENCY_GENESIS_NONCE (CURRENCY_FORMATION_VERSION + 101011010121)// <-- will be changed to another nightmare*/; //bender's nightmare
#define CURRENCY_MAX_BLOCK_NUMBER 500000000
@ -100,7 +100,7 @@
#define CURRENCY_MEMPOOL_TX_LIVETIME 345600 //seconds, 4 days
#ifndef TESTNET
#define P2P_DEFAULT_PORT ---
#define P2P_DEFAULT_PORT 11121
#define RPC_DEFAULT_PORT 11211
#define STRATUM_DEFAULT_PORT 11777
#define P2P_NETWORK_ID_TESTNET_FLAG 0

2
src/gui/qt-daemon/html/assets/i18n/en.json
View file

@ -46,7 +46,7 @@
"COMPLETE": "Completion",
"SYNCING": "Syncing blockchain",
"LOADING": "Loading blockchain data",
"TESTNET": "(testnet)"
"TESTNET": ""
}
},
"MAIN": {