diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b02ec2896e..d37684b238 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,4 +80,4 @@ set_property(TARGET SimpleWallet PROPERTY OUTPUT_NAME "simplewallet") set_property(TARGET PaymentGateService PROPERTY OUTPUT_NAME "walletd") set_property(TARGET Miner PROPERTY OUTPUT_NAME "miner") #TODO Specify the name of daemon for your currency -set_property(TARGET Daemon PROPERTY OUTPUT_NAME "cryptonoted") +set_property(TARGET Daemon PROPERTY OUTPUT_NAME "shacoind") diff --git a/src/CryptoNoteConfig.h b/src/CryptoNoteConfig.h index 4506f667c9..1e1b6f9273 100644 --- a/src/CryptoNoteConfig.h +++ b/src/CryptoNoteConfig.h @@ -24,8 +24,8 @@ const size_t BLOCKCHAIN_TIMESTAMP_CHECK_WINDOW = 60; //TODO Specify total number of available coins //TODO ((uint64_t)(-1)) equals to 18446744073709551616 coins //TODO or you can define number explicitly UINT64_C(858986905600000000) -const uint64_t MONEY_SUPPLY = ; -const unsigned EMISSION_SPEED_FACTOR = 18; +const uint64_t MONEY_SUPPLY = (uint64_t)(-1); +const unsigned EMISSION_SPEED_FACTOR = 21; static_assert(EMISSION_SPEED_FACTOR <= 8 * sizeof(uint64_t), "Bad EMISSION_SPEED_FACTOR"); //TODO Define number of blocks for block size median calculation @@ -35,11 +35,11 @@ const size_t CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE = 600; //TODO Define number of digits const size_t CRYPTONOTE_DISPLAY_DECIMAL_POINT = 8; //TODO Define minimum fee for transactions -const uint64_t MINIMUM_FEE = ; +const uint64_t MINIMUM_FEE = 100000; const uint64_t DEFAULT_DUST_THRESHOLD = MINIMUM_FEE; //TODO Define preferred block's target time -const uint64_t DIFFICULTY_TARGET = 120; // seconds +const uint64_t DIFFICULTY_TARGET = 91; // seconds const uint64_t EXPECTED_NUMBER_OF_BLOCKS_PER_DAY = 24 * 60 * 60 / DIFFICULTY_TARGET; //TODO There are options to tune CryptoNote's difficulty retargeting function. //TODO We recommend not to change it. @@ -73,7 +73,7 @@ const char MINER_CONFIG_FILE_NAME[] = "miner_conf.json" } // parameters //TODO Put here the name of your currency -const char CRYPTONOTE_NAME[] = ""; +const char CRYPTONOTE_NAME[] = "shacoin"; const char GENESIS_COINBASE_TX_HEX[] = ""; const uint8_t CURRENT_TRANSACTION_VERSION = 1; @@ -83,11 +83,12 @@ const uint8_t BLOCK_MINOR_VERSION_0 = 0; const size_t BLOCKS_IDS_SYNCHRONIZING_DEFAULT_COUNT = 10000; //by default, blocks ids count in synchronizing const size_t BLOCKS_SYNCHRONIZING_DEFAULT_COUNT = 200; //by default, blocks count in blocks downloading const size_t COMMAND_RPC_GET_BLOCKS_FAST_MAX_COUNT = 1000; +const uint64_t CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 0x2b; //TODO This port will be used by the daemon to establish connections with p2p network -const int P2P_DEFAULT_PORT = ; +const int P2P_DEFAULT_PORT = 17236; //TODO This port will be used by the daemon to interact with simlewallet -const int RPC_DEFAULT_PORT = ; +const int RPC_DEFAULT_PORT = 18236; const size_t P2P_LOCAL_WHITE_PEERLIST_LIMIT = 1000; const size_t P2P_LOCAL_GRAY_PEERLIST_LIMIT = 5000; @@ -106,7 +107,7 @@ const char P2P_STAT_TRUSTED_PUB_KEY[] = "8f80f9a5a434a9f1 //TODO Add here your network seed nodes const std::initializer_list SEED_NODES = { - //"your_seed_ip1.com:8080", + "172.24.55.86:17236", //"your_seed_ip2.com:8080", };