Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ft/asset rip01 testnet #368

Merged
merged 3 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ jobs:

- name: Install Required Packages
run: |
brew install automake libtool pkg-config miniupnpc librsvg libnatpmp zeromq python
brew install automake libtool pkg-config librsvg libnatpmp python
pip3 install ds_store mac_alias
pip3 install -U pip setuptools

Expand Down
6 changes: 3 additions & 3 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
snapshot-version=1.4.18.99-SNAPSHOT
release-version=1.4.18.00
candidate-version=1.4.18.00-candidate
snapshot-version=2.0.0.99-SNAPSHOT
release-version=2.0.0.00
candidate-version=2.0.0.00-candidate
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 4)
define(_CLIENT_VERSION_REVISION, 18)
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 00)
define(_CLIENT_VERSION_BUILD, 99)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2022)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2024)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Raptoreum Core]])
AC_INIT([Raptoreum Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/Raptor3um/raptoreum/issues],[raptoreumcore],[https://raptoreum.com/])
Expand Down
38 changes: 23 additions & 15 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,20 @@ class CTestNetParams : public CChainParams {
(
Update(EUpdate::DEPLOYMENT_V17, std::string("v17"), 0, 10, 0, 10, 100, 10, false, VoteThreshold(95, 95, 5), VoteThreshold(0, 0, 1))
);
//updateManager.Add
//(
//bit 1, 720 block/round, voting start at block 10080, 7 rounds to lock-in and 7 rounds off grace period
// Update(EUpdate::ROUND_VOTING, std::string("Round Voting"), 1, 720, 10080, 7, 720, 7, false, VoteThreshold(85, 85, 1), VoteThreshold(0, 0, 1))
//);
updateManager.Add
(
// bit 1, 720 block/round, voting start at block 10080, 7 rounds to lock-in and 7 rounds off grace period
Update(EUpdate::ROUND_VOTING, std::string("Round Voting"),
1, //bit
1440, //roundSize
21600, // startHeight
7, //votingPeriod
365, //votingMaxRounds
7, // gracePeriod
false, // forceUpdate
VoteThreshold(85, 85, 1), //minerThreshold
VoteThreshold(0, 0, 1)) //nodeThreshold
);

// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0x0"); // 0
Expand All @@ -390,14 +399,14 @@ class CTestNetParams : public CChainParams {
pchMessageStart[1] = 0x72; //r
pchMessageStart[2] = 0x74; //t
pchMessageStart[3] = 0x6d; //m
nDefaultPort = 10229;
nDefaultPort = 10230;
nPruneAfterHeight = 1000;
genesis = CreateGenesisBlock(1668574674, 352, 0x20001fff, 4, 5000 * COIN);
genesis = CreateGenesisBlock(1711078237, 971, 0x20001fff, 4, 5000 * COIN);
VerifyGenesisPOW(genesis);

consensus.hashGenesisBlock = genesis.GetHash();
assert(consensus.hashGenesisBlock ==
uint256S("0x16b418c4e84599ba61836085c5b780c199f90c207f7de189cbb56803e87529eb"));
uint256S("0xbbab22066081d3b466abd734de914e8092abf4e959bcd0fff978297c41591b23"));
assert(genesis.hashMerkleRoot ==
uint256S("0x87a48bc22468acdd72ee540aab7c086a5bbcddc12b51c6ac925717a74c269453"));

Expand All @@ -406,8 +415,8 @@ class CTestNetParams : public CChainParams {

vSeeds.clear();
// nodes with support for servicebits filtering should be at the top
vSeeds.emplace_back("47.155.87.132");
vSeeds.emplace_back("lbdn.raptoreum.com");
vSeeds.emplace_back("47.151.9.131");
vSeeds.emplace_back("lbtn.raptoreum.com");

// Testnet Raptoreum addresses start with 'r'
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1, 123);
Expand Down Expand Up @@ -441,7 +450,7 @@ class CTestNetParams : public CChainParams {
consensus.nFutureRewardShare = Consensus::FutureRewardShare(0.8, 0.2, 0.0);

std::vector <FounderRewardStructure> rewardStructures = {{INT_MAX, 5}};// 5% founder/dev fee forever
consensus.nFounderPayment = FounderPayment(rewardStructures, 272200, "rghjACzPtVAN2wydgDbn9Jq1agREu6rH1e");
consensus.nFounderPayment = FounderPayment(rewardStructures, 100, "rghjACzPtVAN2wydgDbn9Jq1agREu6rH1e");

fDefaultConsistencyChecks = false;
fRequireStandard = false;
Expand Down Expand Up @@ -469,10 +478,9 @@ class CTestNetParams : public CChainParams {
};

chainTxData = ChainTxData{
1645942755, // * UNIX timestamp of last known number of transactions (Block 213054)
0, // * total number of transactions between genesis and that timestamp
// (the tx=... number in the SetBestChain debug.log lines)
0.01 // * estimated number of transactions per second after that timestamp
1712153599, // * UNIX timestamp of last known number of transactions (Block 17670)
22643, // * total number of transactions between genesis and that timestamp
0.02108492915974094 // * estimated number of transactions per second after that timestamp
};

}
Expand Down
2 changes: 1 addition & 1 deletion src/chainparamsbase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ std::unique_ptr <CBaseChainParams> CreateBaseChainParams(const std::string &chai
if (chain == CBaseChainParams::MAIN)
return MakeUnique<CBaseChainParams>("", 10225);
else if (chain == CBaseChainParams::TESTNET)
return MakeUnique<CBaseChainParams>("nodetest", 10230);
return MakeUnique<CBaseChainParams>("rip01-testnet", 10231);
else if (chain == CBaseChainParams::DEVNET)
return MakeUnique<CBaseChainParams>(gArgs.GetDevNetName(), 19798);
else if (chain == CBaseChainParams::REGTEST)
Expand Down
2 changes: 1 addition & 1 deletion src/validation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ GetBlockSubsidy(int nPrevBits, int nPrevHeight, const Consensus::Params &consens
int multiplier; // integer number of owlings
int tempHeight; // number of blocks since last anchor
if (nPrevHeight < 720) {
nSubsidy = 4;
nSubsidy = Params().NetworkIDString().compare("test") == 0 ? 20000 : 4;
} else if ((nPrevHeight > 553531) && (nPrevHeight < 2105657)) {
tempHeight = nPrevHeight - 553532;
multiplier = tempHeight / owlings;
Expand Down
Loading