Skip to content

Commit

Permalink
v2.0.0 push
Browse files Browse the repository at this point in the history
  • Loading branch information
@idchain
idchain committed Sep 3, 2019
1 parent 2b4fb3b commit 76f8d08
Show file tree
Hide file tree
Showing 12 changed files with 93 additions and 87 deletions.
14 changes: 11 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ The IDC-Core Project is a decentralized peer-to-peer banking financial platform,
| PoS Reward | `10 IDC` |
| Stake Time | `48 hours` |
| Masternode Requirement | `20,000 IDC` |
| Masternode Reward | `35%/35% PoW/PoS` |
| Masternode Reward | `35%/60% PoW/PoS` |
| Port | `31569` |
| RPC Port | `40896` |
| Masternode Port | `31569` |
| IDC legacy address start with | `D` |
| Segwit | `yes` |
| Segwit address ticker | `idc` |
| Segwit activation | `september 2019` |
| Segwit activation | `January, 20 2020` |
| Premine | `1 million IDC` |


Expand All @@ -63,8 +63,16 @@ POS Block rewards distribution

| **Subsidy** | **Block** | **Reward split** <br> MN/ POS| **Notes** |
|:------------|:----------|:-----------------|:----------|
| 10 IDC | 144841 | 35/65%% | After POS start block time will be decreased
| 10 IDC | 99999 | 35/65%% | After POS start block time will be decreased |
| 10 IDC | 100000 | 60/40%% | On 100000 Block we are going to change reward |

## Rewards changes

Here is 2 charts which are show you rewards changes in IDC 2.0:

![Block to size defenition](repos/block_reward_size_defenition.png)

![Block to reward type defenition](repos/block_reward_type_defenition.png)


Instructions
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 3)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2019)
Expand Down
Binary file added repos/block_reward_size_defenition.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added repos/block_reward_type_defenition.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 13 additions & 13 deletions src/chainparams.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@ static void convertSeed6(std::vector<CAddress>& vSeedsOut, const SeedSpec6* data
static Checkpoints::MapCheckpoints mapCheckpoints =
boost::assign::map_list_of
(0, uint256("0x000004ea898d3118b36547cbc2c779e635bca5ff5951f41788ae4495f4c55c4b"))
(17500, uint256("00000000000229b6af9e428eb0ba72fcda7ed2510c90e5ac6d60ba820ef46ff3"));
(17500, uint256("00000000000229b6af9e428eb0ba72fcda7ed2510c90e5ac6d60ba820ef46ff3"))
(54500, uint256("000000000015226797d18f10baa243359d2420f1d3c46dd364089aa09850024c"));

static const Checkpoints::CCheckpointData data = {
&mapCheckpoints,
1562757410,// * UNIX timestamp of last checkpoint block
19137, // * total number of transactions between genesis and last checkpoint
1567501477,// * UNIX timestamp of last checkpoint block
75784, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
2000 // * estimated number of transactions per day after checkpoint
};
Expand Down Expand Up @@ -113,9 +114,9 @@ class CMainParams : public CChainParams {
nTargetTimespan = 1 * 120; // IDChain: 2 minutes
nTargetSpacingSlowLaunch = 10 * 60; // IDChain: 10 minutes (Slow launch - Block 2000)
nTargetSpacing = 1 * 120; // IDChain: 2min after block 300
nLastPOWBlock = 144840;
nLastPOWBlockOld = 144840; // 1 year
nLastSeeSawBlock = 155000; // last block for seesaw rewards
nLastPOWBlock = 100400;
nLastPOWBlockOld = 100400; // 1 November 2019
nLastSeeSawBlock = 150400; // last block for seesaw rewards
nRampToBlock = 2000; // Slow start, ramp linearly to this block
nMaturity = 60; // 120 Minutes
nMasternodeCountDrift = 4;
Expand Down Expand Up @@ -157,13 +158,12 @@ class CMainParams : public CChainParams {

vSeeds.push_back(CDNSSeedData("dseed1.id-chain.org", "dseed1.id-chain.org")); // France (ONLINE.net)
vSeeds.push_back(CDNSSeedData("dseed2.id-chain.org", "dseed2.id-chain.org")); // France (ONLINE.net)
vSeeds.push_back(CDNSSeedData("dseed3.id-chain.org", "dseed3.id-chain.org")); // Germany (VULTR)
vSeeds.push_back(CDNSSeedData("dseed4.id-chain.org", "dseed4.id-chain.org")); // USA Silicon Valley (VULTR)
vSeeds.push_back(CDNSSeedData("dseed5.id-chain.org", "dseed5.id-chain.org")); // Australia (VULTR)
vSeeds.push_back(CDNSSeedData("dseed6.id-chain.org", "dseed6.id-chain.org")); // Singapore (VULTR)
vSeeds.push_back(CDNSSeedData("dseed7.id-chain.org", "dseed7.id-chain.org")); // Russia (Dedibox)
vSeeds.push_back(CDNSSeedData("dseed8.id-chain.org", "dseed8.id-chain.org")); // Canada (DigitalOcean)
vSeeds.push_back(CDNSSeedData("dseed9.id-chain.org", "dseed9.id-chain.org")); // Bangalore (DigitalOcean)
vSeeds.push_back(CDNSSeedData("dseed3.id-chain.org", "dseed3.id-chain.org")); // Lithuania (UAB Esnet)
vSeeds.push_back(CDNSSeedData("dseed4.id-chain.org", "dseed4.id-chain.org")); // Russia (Spaceweb)
vSeeds.push_back(CDNSSeedData("dseed5.id-chain.org", "dseed5.id-chain.org")); // Bangalore (Digital Ocean)
vSeeds.push_back(CDNSSeedData("dseed6.id-chain.org", "dseed6.id-chain.org")); // Canada (Digital Ocean)
vSeeds.push_back(CDNSSeedData("dseed7.id-chain.org", "dseed7.id-chain.org")); // US, San Francisco (Digital Ocean)


base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1, 30); // D
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1, 5);
Expand Down
16 changes: 7 additions & 9 deletions src/chainparamsseeds.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
* IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
*/
static SeedSpec6 pnSeed6_main[] = {
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0x2a,0xd8}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0x2a,0xe2}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xf0,0x1e,0xac}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x1c,0xc0,0xa6}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0x94,0x57,0x3b}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x2a,0x36,0x51}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xde,0x3c,0xc5}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xd1,0x9c,0x1b}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa5,0x16,0xe7,0xd3}, 31569}
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0x2a,0xd8}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0x2a,0xe2}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x50,0x81,0x52}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xde,0x3c,0xc5}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xd1,0x9c,0x1b}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa5,0x16,0xe7,0xd3}, 31569},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xf8,0x43,0xc6}, 31569}
};

static SeedSpec6 pnSeed6_test[] = {
Expand Down
4 changes: 2 additions & 2 deletions src/clientversion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*/

//! These need to be macros, as clientversion.cpp's and idchain*-res.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MAJOR 2
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 3
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0

//! Set to true for release, false for prerelease or test build
Expand Down
42 changes: 21 additions & 21 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2138,51 +2138,51 @@ int64_t GetBlockValue(int nHeight) {
} else if (nHeight <= 172800 && nHeight >= 86400) { // Keep reward schedule.
nSubsidy = 10 * COIN;
} else if (nHeight <= 259199 && nHeight > 172800) {
nSubsidy = 10 * COIN;
nSubsidy = 9.375 * COIN;
} else if (nHeight <= 345599 && nHeight >= 259200) {
nSubsidy = 10 * COIN;
nSubsidy = 9 * COIN;

// POS Year 1
} else if (nHeight <= 431999 && nHeight >= 345600) {
nSubsidy = 10 * COIN;
nSubsidy = 8.9 * COIN;
} else if (nHeight <= 518399 && nHeight >= 432000) {
nSubsidy = 21.875 * COIN;
nSubsidy = 8.5 * COIN;
} else if (nHeight <= 604799 && nHeight >= 518400) {
nSubsidy = 18.750 * COIN;
nSubsidy = 8 * COIN;
} else if (nHeight <= 691199 && nHeight >= 604800) {
nSubsidy = 15.625 * COIN;
nSubsidy = 7 * COIN;

// POS Year 2
} else if (nHeight <= 777599 && nHeight >= 691200) {
nSubsidy = 12.50 * COIN;
nSubsidy = 6 * COIN;
} else if (nHeight <= 863999 && nHeight >= 777600) {
nSubsidy = 10.938 * COIN;
nSubsidy = 5 * COIN;
} else if (nHeight <= 950399 && nHeight >= 864000) {
nSubsidy = 9.375 * COIN;
nSubsidy = 4 * COIN;
} else if (nHeight <= 1036799 && nHeight >= 950400) {
nSubsidy = 7.812 * COIN;
nSubsidy = 3 * COIN;

// POS Year 3
} else if (nHeight <= 1123199 && nHeight >= 1036800) {
nSubsidy = 6.250 * COIN;
nSubsidy = 2 * COIN;
} else if (nHeight <= 1209599 && nHeight >= 1123200) {
nSubsidy = 5.469 * COIN;
nSubsidy = 1 * COIN;
} else if (nHeight <= 1295999 && nHeight >= 1209600) {
nSubsidy = 4.688 * COIN;
nSubsidy = 1 * COIN;
} else if (nHeight <= 1382399 && nHeight >= 1296000) {
nSubsidy = 3.906 * COIN;
nSubsidy = 1 * COIN;

// POS Year 4
} else if (nHeight <= 1468799 && nHeight >= 1382400) {
nSubsidy = 3.125 * COIN;
nSubsidy = 1 * COIN;
} else if (nHeight <= 1555199 && nHeight >= 1468800) {
nSubsidy = 2.734 * COIN;
nSubsidy = 1 * COIN;
} else if (nHeight <= 1641599 && nHeight >= 1555200) {
nSubsidy = 2.344 * COIN;
nSubsidy = 1 * COIN;
} else if (nHeight <= 1727999 && nHeight >= 1641600) {
nSubsidy = 1.953 * COIN;
nSubsidy = 1 * COIN;
} else if (nHeight > 1728000) {
nSubsidy = 1.625 * COIN;
nSubsidy = 1 * COIN;
} else {
nSubsidy = 0 * COIN;
}
Expand Down Expand Up @@ -2420,8 +2420,8 @@ int64_t GetMasternodePayment(int nHeight, int64_t blockValue, int nMasternodeCou
ret = blockValue * 0.35;
} else if (nHeight <= 86399 && nHeight >= 57600) {
ret = blockValue * 0.35;
} else if (nHeight <= nLastPOWBlock && nHeight >= 86400) {
ret = blockValue * 0.35;
} else if (nHeight <= nLastPOWBlock && nHeight >= 100000) {
ret = blockValue * 0.65;
} else if (nHeight > nLastPOWBlock) {
// if a mn count is inserted into the function we are looking for a
// specific result for a masternode count.
Expand Down
Loading

0 comments on commit 76f8d08

Please sign in to comment.