Skip to content

Commit

Permalink
July 1st official launch date!
Browse files Browse the repository at this point in the history
  • Loading branch information
nathan_senn@yahoo.com authored and nathan_senn@yahoo.com committed Jul 1, 2017
1 parent e91c88b commit 144858d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
17 changes: 9 additions & 8 deletions src/cryptonote_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
// COIN - number of smallest units in one coin
#define COIN ((uint64_t)100000000) // pow(10, 12)

#define FEE_PER_KB_OLD ((uint64_t)40000000) // pow(10, 10)
#define FEE_PER_KB ((uint64_t)40000000) // 2 * pow(10, 9)
#define DYNAMIC_FEE_PER_KB_BASE_FEE ((uint64_t)20000000) // 2 * pow(10,9)
#define DYNAMIC_FEE_PER_KB_BASE_BLOCK_REWARD ((uint64_t)100000000000) // 10 * pow(10,12)
#define DYNAMIC_FEE_PER_KB_BASE_FEE_V5 ((uint64_t)20000000 * (uint64_t)CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V2 / CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V5)
#define FEE_PER_KB_OLD ((uint64_t)15000000) // pow(10, 10)
#define FEE_PER_KB ((uint64_t)15000000) // 2 * pow(10, 9)
#define DYNAMIC_FEE_PER_KB_BASE_FEE ((uint64_t)15000000) // 2 * pow(10,9)
#define DYNAMIC_FEE_PER_KB_BASE_BLOCK_REWARD ((uint64_t)1000000000) // 10 * pow(10,12)
#define DYNAMIC_FEE_PER_KB_BASE_FEE_V5 ((uint64_t)15000000 * (uint64_t)CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V2 / CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V5)

#define ORPHANED_BLOCKS_MAX_COUNT 100

Expand Down Expand Up @@ -122,7 +122,7 @@

#define ALLOW_DEBUG_COMMANDS

#define CRYPTONOTE_NAME "Superiorv01031"
#define CRYPTONOTE_NAME "SuperiorCoin"
#define CRYPTONOTE_POOLDATA_FILENAME "poolstate.bin"
#define CRYPTONOTE_BLOCKCHAINDATA_FILENAME "data.mdb"
#define CRYPTONOTE_BLOCKCHAINDATA_LOCK_FILENAME "lock.mdb"
Expand All @@ -148,10 +148,10 @@ namespace config

uint64_t const CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 26;
uint64_t const CRYPTONOTE_PUBLIC_INTEGRATED_ADDRESS_BASE58_PREFIX = 27;
uint16_t const P2P_DEFAULT_PORT = 17139;
uint16_t const P2P_DEFAULT_PORT = 17369;
uint16_t const RPC_DEFAULT_PORT = 16035;
boost::uuids::uuid const NETWORK_ID = { {
0xd7, 0xd7, 0xd7, 0x31, 0x6, 0x19, 0x81, 0x14, 0xe, 0xe, 0xe3, 0x25, 0x2b, 0xe3, 0xe, 0xe
0xd7, 0xd7, 0xd7, 0x31, 0x6, 0x19, 0xd7, 0xd7, 0xd7, 0x31, 0x6, 0x19, 0x2b, 0xe3, 0xe, 0xe
} }; // Bender's nightmare
std::string const GENESIS_TX = "013c01ff0001bce2c886ba8a02029b2e4c0281c0b02e7c53291a94d1d0cbff8883f8024f5142ee494ffbbd0880712101dcd728bd3f8a8631a50a572165f6e40ddf78e871f254d5c70e1d03def3b1af2a";
uint32_t const GENESIS_NONCE = 10000;
Expand All @@ -167,5 +167,6 @@ namespace config
} }; // Bender's daydream
std::string const GENESIS_TX = "013c01ff0001ffffffffffff0f029b2e4c0281c0b02e7c53291a94d1d0cbff8883f8024f5142ee494ffbbd0880712101168d0c4ca86fb55a4cf6a36d31431be1c53a3bd7411bb24e8832410289fa6f3b";
uint32_t const GENESIS_NONCE = 10001;

}
}
8 changes: 4 additions & 4 deletions src/cryptonote_core/blockchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,18 @@ static const struct {
{ 1, 1, 0, 1341378000 },

// version 2 starts from block 1009827, which is on or around the 20th of March, 2016. Fork time finalised on 2015-09-20. No fork voting occurs for the v2 fork.
{ 2, 3500, 0, 1442763710 },
{ 2, 3657, 0, 1442763710 },

// version 3 starts from block 1141317, which is on or around the 24th of September, 2016. Fork time finalised on 2016-03-21.
{ 3, 3600, 0, 1458558528 },
{ 3, 3700, 0, 1458558528 },

// version 4 starts from block 1220516, which is on or around the 5th of January, 2017. Fork time finalised on 2016-09-18.
{ 4, 370000, 0, 1483574400 },
{ 4, 3750, 0, 1483574400 },

// version 5 starts from block 1406997, which is on or around the 20th of September, 2017. Fork time finalised on 2016-09-18.
{ 5, 380000, 0, 1505865600 },
};
static const uint64_t mainnet_hard_fork_version_1_till = 3500;
static const uint64_t mainnet_hard_fork_version_1_till = 3657;

static const struct {
uint8_t version;
Expand Down
7 changes: 3 additions & 4 deletions src/p2p/net_node.inl
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,12 @@ namespace nodetool
std::set<std::string> full_addrs;
if (testnet)
{
full_addrs.insert("52.164.120.113:17139");
full_addrs.insert("52.164.126.27:17139");

}
else
{
full_addrs.insert("52.164.120.113:17139");
full_addrs.insert("52.164.126.27:17139");
full_addrs.insert("52.164.120.113:17369");
full_addrs.insert("52.164.126.27:17369");
}
return full_addrs;
}
Expand Down

0 comments on commit 144858d

Please sign in to comment.