Merge branch 'dev' into devmerge

# Conflicts:
#	src/init.cpp
#	src/komodo_bitcoind.h
#	src/komodo_events.h
#	src/komodo_notary.h
#	src/komodo_structs.h
#	src/main.cpp
#	src/pow.cpp
#	src/rpcblockchain.cpp

src/Makefile.am

@@ -105,10 +105,10 @@ TESTS =
 #endif
 
 if BUILD_BITCOIN_UTILS
-	bin_PROGRAMS += komodo-cli komodo-tx
-	if ENABLE_WALLET
-		bin_PROGRAMS += wallet-utility
-	endif
+  bin_PROGRAMS += komodo-cli komodo-tx
+endif
+if ENABLE_WALLET
+  bin_PROGRAMS += wallet-utility
 endif
 
 LIBZCASH_H = \

src/komodo_globals.h

@@ -47,13 +47,16 @@ int COINBASE_MATURITY = _COINBASE_MATURITY;//100;
 
 int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,KOMODO_EXTERNAL_NOTARIES,KOMODO_PASSPORT_INITDONE,KOMODO_PAX,KOMODO_EXCHANGEWALLET,KOMODO_REWIND;
 int32_t KOMODO_LASTMINED,prevKOMODO_LASTMINED,JUMBLR_PAUSE;
+<<<<<<< HEAD
 uint32_t ASSETCHAINS_CC;
+=======
+>>>>>>> dev
 std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY;
 uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33];
 
 char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN],ASSETCHAINS_USERPASS[4096];
 uint16_t ASSETCHAINS_PORT;
-uint32_t ASSETCHAIN_INIT;
+uint32_t ASSETCHAIN_INIT,ASSETCHAINS_CC;
 uint32_t ASSETCHAINS_MAGIC = 2387029918;
 uint64_t ASSETCHAINS_ENDSUBSIDY,ASSETCHAINS_REWARD,ASSETCHAINS_HALVING,ASSETCHAINS_DECAY,ASSETCHAINS_COMMISSION,ASSETCHAINS_STAKED,ASSETCHAINS_SUPPLY = 10;
 

src/miner.cpp

@@ -916,6 +916,12 @@ void static BitcoinMiner()
                         //     fprintf(stderr," missed target\n");
                         return false;
                     }
+                    CValidationState state;
+                    if ( !TestBlockValidity(state, *pblock, chainActive.Tip(), true, false))
+                    {
+                        fprintf(stderr,"Invalid block mined, try again\n");
+                        return(false);
+                    }
                     if ( ASSETCHAINS_STAKED == 0 )
                     {
                         if ( Mining_start != 0 && time(NULL) < Mining_start+roundrobin_delay )
@@ -933,12 +939,6 @@ void static BitcoinMiner()
                     }
                     else
                     {
-                        CValidationState state;
-                        if ( !TestBlockValidity(state, *pblock, chainActive.Tip(), true, false))
-                        {
-                            fprintf(stderr,"Invalid block mined, try again\n");
-                            return(false);
-                        }
                         if ( NOTARY_PUBKEY33[0] != 0 )
                         {
                             printf("need to wait %d seconds to submit\n",(int32_t)(pblock->nTime - GetAdjustedTime()));

src/wallet-utility.cpp

@@ -8,6 +8,14 @@
 #include "wallet/crypter.h"
 #include <boost/foreach.hpp>
 
+#include "komodo_defs.h"
+char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
+int64_t MAX_MONEY = 200000000 * 100000000LL;
+uint64_t ASSETCHAINS_SUPPLY;
+uint16_t BITCOIND_PORT = 7771;
+uint16_t ASSETCHAINS_PORT;
+uint32_t ASSETCHAIN_INIT,ASSETCHAINS_CC;
+uint32_t ASSETCHAINS_MAGIC = 2387029918;
 
 void show_help()
 {
@@ -336,4 +344,4 @@ int main(int argc, char* argv[])
         return 0;
     else
         return -1;
-}
+}

src/zcash/JoinSplit.cpp

@@ -17,6 +17,7 @@
 #include "tinyformat.h"
 #include "sync.h"
 #include "amount.h"
+extern int64_t MAX_MONEY;
 
 using namespace libsnark;