Merge branch 'dev' into FSM

src/assetchains

@@ -11,7 +11,7 @@ if [ -z "$delay" ]; then delay=20; fi
 ./listassetchainparams | while read args; do
   gen=""
   if [ $[RANDOM % 10] == 1 ]; then
-      gen=" -gen"
+      gen=" -gen -genproclimit=1"
   fi
 
   ./komodod $gen $args $overide_args -pubkey=$pubkey -addnode=$seed_ip &

src/rpc/misc.cpp

@@ -56,7 +56,7 @@ extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 uint32_t komodo_segid32(char *coinaddr);
 int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height);
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
-#define KOMODO_VERSION "0.3.0"
+#define KOMODO_VERSION "0.3.1"
 #define VERUS_VERSION "0.4.0g"
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
 extern uint32_t ASSETCHAINS_CC;