Merge pull request #373 from VerusCoin/dev

Dev

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 ########################################################################################################################
 variables:
 
-  VERSION: 0.9.0-2
+  VERSION: 0.9.0-3
 
   VERUS_CLI_ARM64_LINUX: Verus-CLI-Linux-v${VERSION}-arm64.tar.gz
   VERUS_CLI_LINUX_X86_64: Verus-CLI-Linux-v${VERSION}-x86_64.tar.gz

README.md

@@ -1,5 +1,5 @@
 
-## VerusCoin version 0.9.0-2
+## VerusCoin version 0.9.0-3
 
 Arguably the world's most advanced technology, zero knowledge privacy-centric blockchain, Verus Coin brings Sapling performance and zero knowledge features to an intelligent system with interchain smart contracts and a completely original, combined proof of stake/proof of work consensus algorithm that solves the nothing at stake problem. With this and its approach towards CPU mining and ASICs, Verus Coin strives to be one of the most naturally decentralizing and attack resistant blockchains in existence.
 

doc/man/verus-cli/linux/README.txt

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.0-2
+VerusCoin Command Line Tools v0.9.0-3
 
 Contents:
 verusd - VerusCoin daemon

doc/man/verus-cli/mac/README.txt

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.0-2
+VerusCoin Command Line Tools v0.9.0-3
 
 Contents:
 verusd - VerusCoin daemon.

doc/man/verus-cli/windows/README.txt

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.0-2
+VerusCoin Command Line Tools v0.9.0-3
 
 Contents:
 verusd.exe - VerusCoin daemon

src/deprecation.h

@@ -9,7 +9,7 @@
 // * Shut down 20 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
 
-static const int APPROX_RELEASE_HEIGHT = 1796000;
+static const int APPROX_RELEASE_HEIGHT = 1800000;
 
 static const int WEEKS_UNTIL_DEPRECATION = 20;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 60 * 24);

src/rpc/client.cpp

@@ -1608,7 +1608,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "z_shieldcoinbase", 3},
     { "z_getoperationstatus", 0},
     { "z_getoperationresult", 0},
-    { "z_importkey", 1 },
+    //{ "z_importkey", 1 },
     { "paxprice", 4 },
     { "paxprices", 3 },
     { "paxpending", 0 },

src/rpc/pbaasrpc.cpp

@@ -3624,7 +3624,8 @@ bool GetOpRetChainOffer(const CTransaction &postedTx,
     {
         return true;
     }
-    else if (getExpired && 
+    else if (getExpired &&
+             !(offerTxProof.IsValid() && !isPartial && offerTx.nExpiryHeight > height) &&
              p.IsValid() &&
              p.evalCode == EVAL_IDENTITY_COMMITMENT &&
              postedTx.vout[0].nValue >= DEFAULT_TRANSACTION_FEE &&
@@ -5994,11 +5995,15 @@ UniValue closeoffers(const UniValue& params, bool fHelp)
         throw runtime_error(
             "closeoffers ('[\"offer1_txid\", \"offer2_txid\", ...]') (transparentorprivatefundsdestination) (privatefundsdestination)\n"
             "\nCloses all offers listed, if they are still valid and belong to this wallet.\n"
-            "\nAlways closes expired offers, even if no parameters are given\n\n"
+            "Always closes expired offers, even if no parameters are given\n\n"
 
             "\nArguments\n"
+            "  [\"offer1_txid\", \"offer2_txid\", ...]      (array, optional) array of hex tx ids of offers to close\n"
+            "  transparentorprivatefundsdestination         (transparent or private address, optional) destination for closing funds\n"
+            "  privatefundsdestination                      (private address, optional) destination for native funds only\n"
 
             "\nResult\n"
+            "  null return\n"
         );
     }
     CheckVerusVaultAPIsValid();
@@ -6108,8 +6113,11 @@ UniValue listopenoffers(const UniValue& params, bool fHelp)
             "\nShows offers outstanding in this wallet\n"
 
             "\nArguments\n"
+            "  unexpired                (bool, optional) default=true, list those offers in the wallet which are not expired\n"
+            "  expired                  (bool, optional) default=true, list those offers in the wallet which are expired\n"
 
             "\nResult\n"
+            "  all open offers\n"
         );
     }
     CheckVerusVaultAPIsValid();
@@ -9396,9 +9404,9 @@ UniValue setidentitytimelock(const UniValue& params, bool fHelp)
     CheckIdentityAPIsValid();
 
     bool returnTx = false;
-    if (params.size() > 1)
+    if (params.size() > 2)
     {
-        returnTx = uni_get_bool(params[1], false);
+        returnTx = uni_get_bool(params[2], false);
     }
 
     std::string idString = uni_get_str(params[0]);
@@ -9411,7 +9419,7 @@ UniValue setidentitytimelock(const UniValue& params, bool fHelp)
     UniValue unlockDelayUni = find_value(params[1], "setunlockdelay");
     UniValue absoluteUnlockUni = find_value(params[1], "unlockatblock");
 
-    if ((!unlockDelayUni.isNull() && !absoluteUnlockUni.isNull()) || (unlockDelayUni.isNull() && !absoluteUnlockUni.isNull()))
+    if ((!unlockDelayUni.isNull() && !absoluteUnlockUni.isNull()) || (unlockDelayUni.isNull() && absoluteUnlockUni.isNull()))
     {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Either \"setunlockdelay\" or \"unlockatblock\" must have a non-zero value and not both");
     }
@@ -9437,7 +9445,6 @@ UniValue setidentitytimelock(const UniValue& params, bool fHelp)
 
     UniValue newParams(UniValue::VARR);
 
-    newParams.push_back(EncodeDestination(CIdentityID(oldIdentity.GetID())));
     newParams.push_back(oldIdentity.ToUniValue());
     if (params.size() > 2)
     {

src/script/serverchecker.cpp

@@ -135,6 +135,8 @@ std::map<uint160, std::pair<int, std::vector<std::vector<unsigned char>>>> Serve
                         }
                         if (id.IsValidUnrevoked() && (isStake || sourceIsSelf || !id.IsLocked(spendHeight)))
                         {
+                            // TODO: HARDENING - in next upgrade, consider adding limits on what can be modified in an ID
+
                             std::vector<std::vector<unsigned char>> idAddrBytes;
                             for (auto &oneAddr : id.primaryAddresses)
                             {

src/version.h

@@ -35,6 +35,6 @@ static const int MEMPOOL_GD_VERSION = 60002;
 static const int NO_BLOOM_VERSION = 170004;
 
 #define KOMODO_VERSION "0.2.1"
-#define VERUS_VERSION "0.9.0-2"
+#define VERUS_VERSION "0.9.0-3"
 
 #endif // BITCOIN_VERSION_H