Merge branch 'dev' into jl777

src/ac/dion

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=DION $1 $2 $3 $4 $5 $6

src/ac/kmdice

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=KMDICE $1 $2 $3 $4 $5 $6

src/assetchains.json

@@ -168,12 +168,23 @@
       "142.93.27.180"
     ]
   },
-{
+  {
     "ac_name": "PGT",
     "ac_supply": "10000000",
     "ac_end": "1",
     "addnode": [
       "190.114.254.104"
     ]
+  },
+  {
+    "ac_name": "DION",
+    "ac_supply": "3900000000",
+    "ac_reward": "22260000000",
+    "ac_staked": "100",
+    "ac_cc": "1",
+    "ac_end": "4300000000",
+    "addnode": [
+      "51.75.124.34"
+    ]
   }
 ]

src/assetchains.old

@@ -42,3 +42,5 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=PIRATE -ac_supply=0 -ac_reward=25600000000 -ac_halving=77777 -ac_private=1 -addnode=136.243.102.225 &
 ./komodod -pubkey=$pubkey -ac_name=MGNX -ac_supply=12465003 -ac_staked=90 -ac_reward=2000000000 -ac_halving=525960 -ac_cc=2 -ac_end=2629800 -addnode=142.93.27.180 &
 ./komodod -pubkey=$pubkey -ac_name=PGT -ac_supply=10000000 -ac_end=1 -addnode=190.114.254.104 &
+./komodod -pubkey=$pubkey -ac_name=KMDICE -ac_supply=10500000 -ac_reward=2500000000 -ac_halving=210000 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=144.76.217.232 &
+./komodod -pubkey=$pubkey -ac_name=DION -ac_supply=3900000000 -ac_reward=22260000000 -ac_staked=100 -ac_cc=1 -ac_end=4300000000 -addnode=51.75.124.34 &

src/fiat/dion

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=DION $1 $2 $3 $4 $5 $6

src/fiat/kmdice

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=KMDICE $1 $2 $3 $4 $5 $6

src/main.h

@@ -916,6 +916,8 @@ extern CBlockTreeDB *pblocktree;
  */
 int GetSpendHeight(const CCoinsViewCache& inputs);
 
+uint64_t CalculateCurrentUsage();
+
 /** Return a CMutableTransaction with contextual default values based on set of consensus rules at height */
 CMutableTransaction CreateNewContextualCMutableTransaction(const Consensus::Params& consensusParams, int nHeight);
 

src/rpcblockchain.cpp

@@ -1273,6 +1273,7 @@ void NetworkUpgradeDescPushBack(
     }
 }
 
+
 UniValue getblockchaininfo(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 0)
@@ -1290,6 +1291,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
             "  \"difficulty\": xxxxxx,     (numeric) the current difficulty\n"
             "  \"verificationprogress\": xxxx, (numeric) estimate of verification progress [0..1]\n"
             "  \"chainwork\": \"xxxx\"     (string) total amount of work in active chain, in hexadecimal\n"
+            "  \"size_on_disk\": xxxxxx,       (numeric) the estimated size of the block and undo files on disk\n"
             "  \"commitments\": xxxxxx,    (numeric) the current number of note commitments in the commitment tree\n"
             "  \"softforks\": [            (array) status of softforks in progress\n"
             "     {\n"
@@ -1339,6 +1341,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("verificationprogress",  progress));
     obj.push_back(Pair("chainwork",             chainActive.LastTip()->nChainWork.GetHex()));
     obj.push_back(Pair("pruned",                fPruneMode));
+    obj.push_back(Pair("size_on_disk",          CalculateCurrentUsage()));
 
     ZCIncrementalMerkleTree tree;
     pcoinsTip->GetAnchorAt(pcoinsTip->GetBestAnchor(), tree);