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.

Sign up for GitHub

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

Guard DUSD loops with Changi Intermediate 2 #2100

Merged
merged 2 commits into from
Jun 21, 2023
Merged

Guard DUSD loops with Changi Intermediate 2 #2100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bc4b03
Guard DUSD loops with Changi Intermediate 3
Bushstar Jun 21, 2023
e90fdaa
Use Changi2
Bushstar Jun 21, 2023
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
5 changes: 5 additions & 0 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ class CMainParams : public CChainParams {
consensus.GrandCentralEpilogueHeight = 2574000; // Jan 10th, 2023.
consensus.NextNetworkUpgradeHeight = std::numeric_limits<int>::max();
consensus.ChangiIntermediateHeight = std::numeric_limits<int>::max();
consensus.ChangiIntermediateHeight2 = std::numeric_limits<int>::max();

consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
// consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
Expand Down Expand Up @@ -418,6 +419,7 @@ class CTestNetParams : public CChainParams {
consensus.GrandCentralEpilogueHeight = 1438200;
consensus.NextNetworkUpgradeHeight = std::numeric_limits<int>::max();
consensus.ChangiIntermediateHeight = std::numeric_limits<int>::max();
consensus.ChangiIntermediateHeight2 = std::numeric_limits<int>::max();

consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
// consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
Expand Down Expand Up @@ -855,6 +857,7 @@ class CDevNetParams : public CChainParams {
consensus.GrandCentralEpilogueHeight = 1438200;
consensus.NextNetworkUpgradeHeight = 1586750;
consensus.ChangiIntermediateHeight = std::numeric_limits<int>::max();
consensus.ChangiIntermediateHeight2 = std::numeric_limits<int>::max();

consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
consensus.pos.nTargetTimespan = 5 * 60; // 5 min == 10 blocks
Expand Down Expand Up @@ -1075,6 +1078,7 @@ class CRegTestParams : public CChainParams {
consensus.GrandCentralEpilogueHeight = 10000000;
consensus.NextNetworkUpgradeHeight = 10000000;
consensus.ChangiIntermediateHeight = 10000000;
consensus.ChangiIntermediateHeight2 = 10000000;

consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
Expand Down Expand Up @@ -1322,6 +1326,7 @@ void SetupCommonArgActivationParams(Consensus::Params &consensus) {
UpdateHeightValidation("Grand Central Epilogue", "-grandcentralepilogueheight", consensus.GrandCentralEpilogueHeight);
UpdateHeightValidation("Next Network Upgrade", "-nextnetworkupgradeheight", consensus.NextNetworkUpgradeHeight);
UpdateHeightValidation("Changi Intermediate", "-changiintermediateheight", consensus.ChangiIntermediateHeight);
UpdateHeightValidation("Changi Intermediate2", "-changiintermediate2height", consensus.ChangiIntermediateHeight2);

if (gArgs.GetBoolArg("-simulatemainnet", false)) {
consensus.pos.nTargetTimespan = 5 * 60; // 5 min == 10 blocks
Expand Down
1 change: 1 addition & 0 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ void SetupServerArgs()
gArgs.AddArg("-grandcentralepilogueheight", "Grand Central Epilogue fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
gArgs.AddArg("-nextnetworkupgradeheight", "Next Network Upgrade fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
gArgs.AddArg("-changiintermediateheight", "Changi Intermediate fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
gArgs.AddArg("-changiintermediate2height", "Changi Intermediate2 fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
gArgs.AddArg("-jellyfish_regtest", "Configure the regtest network for jellyfish testing", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS);
gArgs.AddArg("-regtest-skip-loan-collateral-validation", "Skip loan collateral check for jellyfish testing", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS);
gArgs.AddArg("-regtest-minttoken-simulate-mainnet", "Simulate mainnet for minttokens on regtest - default behavior on regtest is to allow anyone to mint mintable tokens for ease of testing", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS);
Expand Down
2 changes: 1 addition & 1 deletion src/masternodes/mn_checks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3036,7 +3036,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
auto isPostFCE = static_cast<int>(height) >= consensus.FortCanningEpilogueHeight;
auto isPostFCR = static_cast<int>(height) >= consensus.FortCanningRoadHeight;
auto isPostGC = static_cast<int>(height) >= consensus.GrandCentralHeight;
auto isPostNext = static_cast<int>(height) >= consensus.NextNetworkUpgradeHeight;
auto isPostNext = static_cast<int>(height) >= consensus.ChangiIntermediateHeight2; // Change to NextNetworkUpgradeHeight on mainnet release

if(isPostNext) {
const CDataStructureV0 enabledKey{AttributeTypes::Param, ParamIDs::Feature, DFIPKeys::AllowDUSDLoops};
Expand Down
1 change: 0 additions & 1 deletion src/rpc/blockchain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,6 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
BuriedForkDescPushBack(softforks, "grandcentral", consensusParams.GrandCentralHeight);
BuriedForkDescPushBack(softforks, "grandcentralepilogue", consensusParams.GrandCentralEpilogueHeight);
BuriedForkDescPushBack(softforks, "nextnetworkupgrade", consensusParams.NextNetworkUpgradeHeight);
BuriedForkDescPushBack(softforks, "changiintermediate", consensusParams.ChangiIntermediateHeight);
BIP9SoftForkDescPushBack(softforks, "testdummy", consensusParams, Consensus::DEPLOYMENT_TESTDUMMY);
obj.pushKV("softforks", softforks);

Expand Down
35 changes: 17 additions & 18 deletions test/functional/feature_dusd_loans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ class DUSDLoanTests(DefiTestFramework):
def set_test_params(self):
self.num_nodes = 1
self.setup_clean_chain = True
self.fortcanninghillheight = 1000
self.fortcanningroadheight = 2000
self.fortcanninggreatworldheight = 3000
self.fortcanningepilogueheight = 4000
self.grandcentralheight = 4500
self.grandcentralepilogueheight = 5000
self.nextnetworkupgradeheight = 6000
self.fortcanninghillheight = 200
self.fortcanningroadheight = 300
self.fortcanninggreatworldheight = 400
self.fortcanningepilogueheight = 500
self.grandcentralheight = 600
self.grandcentralepilogueheight = 700
self.nextnetworkupgradeheight = 800

self.extra_args = [
['-txnotokens=0',
Expand All @@ -50,6 +50,7 @@ def set_test_params(self):
f'-grandcentralheight={self.grandcentralheight}',
f'-grandcentralepilogueheight={self.grandcentralepilogueheight}',
f'-nextnetworkupgradeheight={self.nextnetworkupgradeheight}',
f'-changiintermediate2height={self.nextnetworkupgradeheight}', # Remove this line on mainnet release

'-jellyfish_regtest=1', '-txindex=1', '-simulatemainnet=1']
]
Expand Down Expand Up @@ -152,13 +153,13 @@ def create_tokens(self):
'token': self.idDFI,
'factor': 1,
'fixedIntervalPriceId': "DFI/USD"})
self.nodes[0].generate(120)
self.nodes[0].generate(1)

self.nodes[0].setcollateraltoken({
'token': self.symbolBTC,
'factor': 1,
'fixedIntervalPriceId': "BTC/USD"})
self.nodes[0].generate(120)
self.nodes[0].generate(1)
self.idBTC = list(self.nodes[0].gettoken(self.symbolBTC).keys())[0]

self.nodes[0].setloantoken({
Expand All @@ -167,14 +168,14 @@ def create_tokens(self):
'fixedIntervalPriceId': "DUSD/USD",
'mintable': True,
'interest': 0})
self.nodes[0].generate(120)
self.nodes[0].generate(1)
self.iddUSD = list(self.nodes[0].gettoken(self.symboldUSD).keys())[0]

self.nodes[0].setcollateraltoken({
'token': self.iddUSD,
'factor': 0.99,
'fixedIntervalPriceId': "DUSD/USD"})
self.nodes[0].generate(120)
self.nodes[0].generate(1)

self.nodes[0].setloantoken({
'symbol': self.symbolTSLA,
Expand Down Expand Up @@ -221,18 +222,16 @@ def create_oracles(self):
# feed oracle
timestamp = calendar.timegm(time.gmtime())
self.nodes[0].setoracledata(self.oracle_id2, timestamp, oracle_prices)
self.nodes[0].generate(120)
self.nodes[0].generate(11)

def update_oracle_price(self, add_time=3000):
def update_oracle_price(self):
oracle_prices = [{"currency": "USD", "tokenAmount": "10@TSLA"},
{"currency": "USD", "tokenAmount": "1@DUSD"},
{"currency": "USD", "tokenAmount": "1@BTC"},
{"currency": "USD", "tokenAmount": "10@DFI"}]

mock_time = int(time.time() + add_time)
self.nodes[0].setmocktime(mock_time)
self.nodes[0].setoracledata(self.oracle_id1, mock_time, oracle_prices)
self.nodes[0].generate(120)
self.nodes[0].setoracledata(self.oracle_id1, int(time.time()), oracle_prices)
self.nodes[0].generate(10)

def create_pool_pairs(self):
self.nodes[0].createpoolpair({
Expand Down Expand Up @@ -558,7 +557,7 @@ def check_looped_dusd(self):
self.nodes[0].generate(1)

# not sure why this is needed like this. but it works
self.update_oracle_price(13000)
self.update_oracle_price()
#also fails with other crypto in
self.nodes[0].deposittovault(vault_id, self.account0, "100.00000000@BTC")
self.nodes[0].generate(1)
Expand Down
1 change: 0 additions & 1 deletion test/functional/rpc_blockchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ def _test_getblockchaininfo(self):
'grandcentral': {'type': 'buried', 'active': False, 'height': 10000000},
'grandcentralepilogue': {'type': 'buried', 'active': False, 'height': 10000000},
'nextnetworkupgrade': {'type': 'buried', 'active': False, 'height': 10000000},
'changiintermediate': {'type': 'buried', 'active': False, 'height': 10000000},
'testdummy': {
'type': 'bip9',
'bip9': {
Expand Down