Collateral increases in value and should be able to be withdrawn

src/chainparams.cpp

@@ -128,6 +128,7 @@ class CMainParams : public CChainParams {
         consensus.EunosPayaHeight = 1072000; // Aug 05, 2021.
         consensus.FortCanningHeight = 1367000; // Nov 15, 2021.
         consensus.FortCanningMuseumHeight = 1430640;
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 //        consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -348,6 +349,7 @@ class CTestNetParams : public CChainParams {
         consensus.EunosPayaHeight = 463300;
         consensus.FortCanningHeight = 686200;
         consensus.FortCanningMuseumHeight = 724000;
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 //        consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -530,6 +532,7 @@ class CDevNetParams : public CChainParams {
         consensus.EunosPayaHeight = 300;
         consensus.FortCanningHeight = std::numeric_limits<int>::max();
         consensus.FortCanningMuseumHeight = std::numeric_limits<int>::max();
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.pos.nTargetTimespan = 5 * 60; // 5 min == 10 blocks
@@ -704,6 +707,7 @@ class CRegTestParams : public CChainParams {
         consensus.EunosPayaHeight = 10000000;
         consensus.FortCanningHeight = 10000000;
         consensus.FortCanningMuseumHeight = 10000000;
+        consensus.FortCanningHillHeight = 10000000;
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -915,8 +919,9 @@ void CRegTestParams::UpdateActivationParametersFromArgs(const ArgsManager& args)
         consensus.EunosKampungHeight = static_cast<int>(eunosHeight.get());
     }
     UpdateHeightValidation("Eunos Paya", "-eunospayaheight", consensus.EunosPayaHeight);
-    UpdateHeightValidation("Fork canning", "-fortcanningheight", consensus.FortCanningHeight);
-    UpdateHeightValidation("Fork canning museum", "-fortcanningmuseumheight", consensus.FortCanningMuseumHeight);
+    UpdateHeightValidation("Fort canning", "-fortcanningheight", consensus.FortCanningHeight);
+    UpdateHeightValidation("Fort canning museum", "-fortcanningmuseumheight", consensus.FortCanningMuseumHeight);
+    UpdateHeightValidation("Fort canning hill", "-fortcanninghillheight", consensus.FortCanningHillHeight);
 
     if (!args.IsArgSet("-vbparams")) return;
 

src/consensus/params.h

@@ -91,6 +91,7 @@ struct Params {
     int EunosPayaHeight;
     int FortCanningHeight;
     int FortCanningMuseumHeight;
+    int FortCanningHillHeight;
 
     /** Foundation share after AMK, normalized to COIN = 100% */
     CAmount foundationShareDFIP1;

src/init.cpp

@@ -473,6 +473,7 @@ void SetupServerArgs()
     gArgs.AddArg("-eunospayaheight", "EunosPaya fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-fortcanningheight", "Fort Canning fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-fortcanningmuseumheight", "Fort Canning Museum fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
+    gArgs.AddArg("-fortcanninghillheight", "Fort Canning Hill fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-jellyfish_regtest", "Configure the regtest network for jellyfish testing", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #ifdef USE_UPNP
 #if USE_UPNP

src/masternodes/mn_checks.cpp

@@ -2505,8 +2505,13 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
                         if (col.nTokenId == DCT_ID{0})
                             totalDFI += col.nValue;
 
-                    if (totalDFI < collateralsLoans.val->totalCollaterals / 2)
-                        return Res::Err("At least 50%% of the vault must be in DFI");
+                    if (static_cast<int>(height) < consensus.FortCanningHillHeight) {
+                        if (totalDFI < collateralsLoans.val->totalCollaterals / 2)
+                            return Res::Err("At least 50%% of the vault must be in DFI");
+                    } else {
+                        if (MultiplyAmounts(totalDFI, 100) < MultiplyAmounts(collateralsLoans.val->totalLoans, scheme->ratio) / 2)
+                            return Res::Err("At least 50%% of the vault must be in DFI");
+                    }
 
                     if (collateralsLoans.val->ratio() < scheme->ratio)
                         return Res::Err("Vault does not have enough collateralization ratio defined by loan scheme - %d < %d", collateralsLoans.val->ratio(), scheme->ratio);
@@ -2611,8 +2616,13 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
                 if (col.nTokenId == DCT_ID{0})
                     totalDFI += col.nValue;
 
-            if (totalDFI < collateralsLoans.val->totalCollaterals / 2)
-                return Res::Err("At least 50%% of the vault must be in DFI when taking a loan");
+            if (static_cast<int>(height) < consensus.FortCanningHillHeight) {
+                if (totalDFI < collateralsLoans.val->totalCollaterals / 2)
+                    return Res::Err("At least 50%% of the vault must be in DFI when taking a loan.");
+            } else {
+                if (MultiplyAmounts(totalDFI, 100) < MultiplyAmounts(collateralsLoans.val->totalLoans, scheme->ratio) / 2)
+                    return Res::Err("At least 50%% of the vault must be in DFI when taking a loan.");
+            }
 
             if (collateralsLoans.val->ratio() < scheme->ratio)
                 return Res::Err("Vault does not have enough collateralization ratio defined by loan scheme - %d < %d", collateralsLoans.val->ratio(), scheme->ratio);

src/rpc/blockchain.cpp

@@ -1362,6 +1362,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     BuriedForkDescPushBack(softforks, "eunospaya", consensusParams.EunosPayaHeight);
     BuriedForkDescPushBack(softforks, "fortcanning", consensusParams.FortCanningHeight);
     BuriedForkDescPushBack(softforks, "fortcanningmuseum", consensusParams.FortCanningMuseumHeight);
+    BuriedForkDescPushBack(softforks, "fortcanninghill", consensusParams.FortCanningHillHeight);
     BIP9SoftForkDescPushBack(softforks, "testdummy", consensusParams, Consensus::DEPLOYMENT_TESTDUMMY);
     obj.pushKV("softforks",             softforks);
 

test/functional/feature_loan_vault.py

@@ -18,8 +18,8 @@ def set_test_params(self):
         self.num_nodes = 2
         self.setup_clean_chain = True
         self.extra_args = [
-                ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-eunosheight=1', '-txindex=1', '-fortcanningheight=1'],
-                ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-eunosheight=1', '-txindex=1', '-fortcanningheight=1']
+                ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-bayfrontgardensheight=1', '-eunosheight=1', '-txindex=1', '-fortcanningheight=1', '-fortcanninghillheight=1'],
+                ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-bayfrontgardensheight=1', '-eunosheight=1', '-txindex=1', '-fortcanningheight=1', '-fortcanninghillheight=1']
             ]
 
     def run_test(self):
@@ -424,28 +424,24 @@ def run_test(self):
             estimatevault = self.nodes[0].estimatevault('3.00000000@DFI', '3.00000000@TSLAA')
         except JSONRPCException as e:
             errorString = e.error['message']
-            print("errorString", errorString)
         assert("Invalid Defi token: TSLAA" in errorString)
         # Invalid collateral token
         try:
             estimatevault = self.nodes[0].estimatevault('3.00000000@DFII', '3.00000000@TSLA')
         except JSONRPCException as e:
             errorString = e.error['message']
-            print("errorString", errorString)
         assert("Invalid Defi token: DFII" in errorString)
         # Token not set as a collateral
         try:
             estimatevault = self.nodes[0].estimatevault('3.00000000@TSLA', '3.00000000@TSLA')
         except JSONRPCException as e:
             errorString = e.error['message']
-            print("errorString", errorString)
         assert("Token with id (2) is not a valid collateral!" in errorString)
         # Token not set as loan token
         try:
             estimatevault = self.nodes[0].estimatevault('3.00000000@DFI', '3.00000000@DFI')
         except JSONRPCException as e:
             errorString = e.error['message']
-            print("errorString", errorString)
         assert("Token with id (0) is not a loan token!" in errorString)
 
         vault = self.nodes[0].getvault(vaultId2)
@@ -455,5 +451,61 @@ def run_test(self):
         assert_equal(estimatevault["informativeRatio"], vault["informativeRatio"])
         assert_equal(estimatevault["collateralRatio"], vault["collateralRatio"])
 
+
+        # Test BTC price increase and remove some BTC from collateral
+
+        # Reset price
+        oracle1_prices = [{"currency": "USD", "tokenAmount": "1@DFI"}, {"currency": "USD", "tokenAmount": "1@TSLA"}, {"currency": "USD", "tokenAmount": "1@BTC"}]
+        timestamp = calendar.timegm(time.gmtime())
+        self.nodes[0].setoracledata(oracle_id1, timestamp, oracle1_prices)
+        self.nodes[0].generate(11)
+
+        # Deposit collaterals. 50% of BTC
+        address = self.nodes[0].getnewaddress()
+        self.nodes[1].sendtokenstoaddress({}, { address: '1.50@BTC'})
+        self.nodes[1].generate(1)
+        self.sync_all()
+        vaultId4 = self.nodes[0].createvault(address, 'LOAN000A')
+        self.nodes[0].generate(1)
+        self.nodes[0].deposittovault(vaultId4, address, '1.25@BTC') # 1.25@BTC as collateral factor 0.8
+        self.nodes[0].deposittovault(vaultId4, accountDFI, '1@DFI')
+        self.nodes[0].generate(1)
+
+        self.nodes[0].takeloan({
+                        'vaultId': vaultId4,
+                        'amounts': "1@TSLA"
+                    })
+        self.nodes[0].generate(1)
+
+        self.nodes[0].deposittovault(vaultId4, address, '0.2@BTC')
+        self.nodes[0].generate(1)
+
+        # Should be able to withdraw extra BTC
+        self.nodes[0].withdrawfromvault(vaultId4, address, "0.1@BTC")
+        self.nodes[0].generate(1)
+
+        # BTC doubles in price
+        oracle1_prices = [{"currency": "USD", "tokenAmount": "1@DFI"}, {"currency": "USD", "tokenAmount": "1@TSLA"}, {"currency": "USD", "tokenAmount": "2@BTC"}]
+        timestamp = calendar.timegm(time.gmtime())
+        self.nodes[0].setoracledata(oracle_id1, timestamp, oracle1_prices)
+        self.nodes[0].generate(20)
+
+        # Should be able to withdraw part of BTC after BTC appreciation in price
+        self.nodes[0].withdrawfromvault(vaultId4, address, "0.5@BTC")
+        self.nodes[0].generate(1)
+
+        # Should not be able to withdraw if DFI lower than 50% of collateralized loan value
+        try:
+            self.nodes[0].withdrawfromvault(vaultId4, accountDFI, "0.26@DFI")
+        except JSONRPCException as e:
+            errorString = e.error['message']
+        assert("At least 50% of the vault must be in DFI" in errorString)
+
+        # Should be able to take 0.33@TSLA and respect 50% DFI ratio
+        self.nodes[0].takeloan({
+            'vaultId': vaultId4,
+            'amounts': "0.33@TSLA"
+        })
+
 if __name__ == '__main__':
     VaultTest().main()

test/functional/rpc_blockchain.py

@@ -133,6 +133,7 @@ def _test_getblockchaininfo(self):
             'eunospaya': {'type': 'buried', 'active': False, 'height': 10000000},
             'fortcanning': {'type': 'buried', 'active': False, 'height': 10000000},
             'fortcanningmuseum': {'type': 'buried', 'active': False, 'height': 10000000},
+            'fortcanninghill': {'type': 'buried', 'active': False, 'height': 10000000},
             'testdummy': {
                 'type': 'bip9',
                 'bip9': {