Merge branch 'FSM' of https://github.com/jl777/komodo

fix

src/rpc/client.cpp

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

src/rpc/misc.cpp

@@ -58,7 +58,7 @@ 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);
 int8_t StakedNotaryID(std::string &notaryname, char *Raddress);
-#define KOMODO_VERSION "0.3.2"
+#define KOMODO_VERSION "0.3.1"
 #define VERUS_VERSION "0.4.0g"
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
 extern uint32_t ASSETCHAINS_CC;

src/rpc/rawtransaction.cpp

@@ -1167,12 +1167,12 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
         if ( txConst.IsCoinBase() != 0 )
         {
             if ( (txpow & 2) == 0 )
-                txpow == 0;
+                txpow = 0;
         }
         else
         {
             if ( (txpow & 1) == 0 )
-                txpow == 0;
+                txpow = 0;
         }
     }
     while ( 1 )