Merge branch 'FSM' into jl777

# Conflicts:
#	src/rpc/crosschain.cpp

src/wallet/rpcwallet.cpp

@@ -5860,6 +5860,19 @@ UniValue tokenaddress(const UniValue& params, bool fHelp)
     return(CCaddress(cp,(char *)"Tokens", pubkey));
 }
 
+UniValue importgatewayaddress(const UniValue& params, bool fHelp)
+{
+    struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
+    cp = CCinit(&C,EVAL_IMPORTGATEWAY);
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("importgatewayddress [pubkey]\n");
+    if ( ensure_CCrequirements(0) < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    if ( params.size() == 1 )
+        pubkey = ParseHex(params[0].get_str().c_str());
+    return(CCaddress(cp,(char *)"ImportGateway", pubkey));
+}
+
 UniValue marmara_poolpayout(const UniValue& params, bool fHelp)
 {
     int32_t firstheight; double perc; char *jsonstr;
@@ -7996,7 +8009,6 @@ UniValue test_heirmarker(const UniValue& params, bool fHelp)
 	return(FinalizeCCTx(0, cp, mtx, myPubkey, 10000, opret));
 }
 
-
 UniValue test_burntx(const UniValue& params, bool fHelp)
 {
     // make fake token tx: