merge dev; tests broken, need to use wallet for block rewards

diff --cc src/chainparams.cpp
index cd8c2b451a60b40fa029a887281b273aeaee687c,d78e1351ba40fc72a2e4e708c96b7f33735a1114..e36cb56138d1103a2320234f5ef4c5535fa0524a
--- 1/src/chainparams.cpp
--- 2/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@@ -532,16 -532,13 +532,15 @@@ public
          BOOST_STATIC_ASSERT(equihash_parameters_acceptable(N, K));
          nEquihashN = N;
          nEquihashK = K;
 -
 +        
-         
          genesis = CreateGenesisBlock(
              1296688602,
              uint256S("0x0000000000000000000000000000000000000000000000000000000000000009"),
              ParseHex("01936b7db1eb4ac39f151b8704642d0a8bda13ec547d54cd5e43ba142fc6d8877cab07b3"),
-             0x200f0f0f, 4, 0);
 +
-         consensus.hashGenesisBlock = genesis.GetHash();
 +
+             KOMODO_MINDIFF_NBITS, 4, 0);
+         consensus.hashGenesisBlock = genesis.GetHash();
          assert(consensus.hashGenesisBlock == uint256S("0x029f11d80ef9765602235e1bc9727e3eb6ba20839319f761fee920d63401e327"));
          assert(genesis.hashMerkleRoot == uint256S("0xc4eaa58879081de3c24a7b117ed2b28300e7ec4c4c1dff1d3f1268b7857a4ddb"));
  

diff --cc src/coins.cpp
Simple merge

diff --cc src/komodo_bitcoind.h
Simple merge

diff --cc src/komodo_notary.h
Simple merge

diff --cc src/main.cpp
index 2e73f2af0f47a97f7fd5e544258c89313521459d,119967a46830b57a0f8d9a76c650ed839171d674..47f9fbf3d174930596367b69531a7cf3d5d1b549
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -2727,12 -2681,13 +2727,13 @@@ bool ConnectBlock(const CBlock& block, 
              return state.DoS(100, error("ConnectBlock(): too many sigops"),
                               REJECT_INVALID, "bad-blk-sigops");
          //fprintf(stderr,"ht.%d vout0 t%u\n",pindex->nHeight,tx.nLockTime);
 -        if (!tx.IsCoinBase())
 +        if (!tx.IsMint())
          {
              if (!view.HaveInputs(tx))
+             {
                  return state.DoS(100, error("ConnectBlock(): inputs missing/spent"),
                                   REJECT_INVALID, "bad-txns-inputs-missingorspent");
-             
+             }
              // are the JoinSplit's requirements met?
              if (!view.HaveJoinSplitRequirements(tx))
                  return state.DoS(100, error("ConnectBlock(): JoinSplit requirements not met"),

diff --cc src/miner.cpp
Simple merge

diff --cc src/rpcblockchain.cpp
index 7f191a2b374369bb13ac6c7d007997d1c237a454,fc6092e03f722c33e28618c3718573e9d26be42c..cd3b45e117a18a36760bc13d9c582d4994e23d0f
--- 1/src/rpcblockchain.cpp
--- 2/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@@ -758,9 -756,12 +757,8 @@@ uint64_t komodo_paxprice(uint64_t *seed
  int32_t komodo_paxprices(int32_t *heights,uint64_t *prices,int32_t max,char *base,char *rel);
  int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp);
  char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len);
- //uint32_t komodo_interest_args(int32_t *txheightp,uint32_t *tiptimep,uint64_t *valuep,uint256 hash,int32_t n);
  int32_t komodo_minerids(uint8_t *minerids,int32_t height,int32_t width);
  int32_t komodo_kvsearch(uint256 *refpubkeyp,int32_t current_height,uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen);
 -int32_t komodo_MoM(int32_t *notarized_htp,uint256 *MoMp,uint256 *kmdtxidp,int32_t nHeight,uint256 *MoMoMp,int32_t *MoMoMoffsetp,int32_t *MoMoMdepthp,int32_t *kmdstartip,int32_t *kmdendip);
 -int32_t komodo_MoMoMdata(char *hexstr,int32_t hexsize,struct komodo_ccdataMoMoM *mdata,char *symbol,int32_t kmdheight,int32_t notarized_height);
 -struct komodo_ccdata_entry *komodo_allMoMs(int32_t *nump,uint256 *MoMoMp,int32_t kmdstarti,int32_t kmdendi);
 -uint256 komodo_calcMoM(int32_t height,int32_t MoMdepth);
  
  UniValue kvsearch(const UniValue& params, bool fHelp)
  {

diff --cc src/rpcserver.cpp
Simple merge

diff --cc src/txmempool.cpp
Simple merge