Merge pull request #207 from jl777/dev

sync dev

Author: ca333

src/cc/cclib.cpp

@@ -570,7 +570,7 @@ std::string Faucet2Fund(struct CCcontract_info *cp,uint64_t txfee,int64_t funds)
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     cclibpk = GetUnspendable(cp,0);
-    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
+    if ( AddNormalinputs2(mtx,funds+txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeCC1vout(cp->evalcode,funds,cclibpk));
         return(FinalizeCCTx(0,cp,mtx,mypk,txfee,opret));

src/cc/customcc.cpp

@@ -62,7 +62,7 @@ UniValue custom_func1(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
     if ( txfee == 0 )
         txfee = CUSTOM_TXFEE;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,COIN+txfee,64) >= COIN+txfee ) // add utxo to mtx
+    if ( AddNormalinputs2(mtx,COIN+txfee,64) >= COIN+txfee ) // add utxo to mtx
     {
         // make op_return payload as normal. 
         CScript opret = custom_opret('1',mypk);

src/wallet/rpcwallet.cpp

@@ -53,7 +53,7 @@
 #include <stdint.h>
 
 #include <boost/assign/list_of.hpp>
-#include <utf8.h>
+//#include <utf8.h>
 
 #include <univalue.h>
 
@@ -4123,7 +4123,7 @@ UniValue z_gettotalbalance(const UniValue& params, bool fHelp, const CPubKey& my
 }
 
 // got bored and copied str4d's work - thanks dude/dudette :)
-UniValue z_viewtransaction(const UniValue& params, bool fHelp)
+UniValue z_viewtransaction(const UniValue& params, bool fHelp, const CPubKey& mypk)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
@@ -4242,7 +4242,8 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
         if (memo[0] <= 0xf4) {
             auto end = std::find_if(memo.rbegin(), memo.rend(), [](unsigned char v) { return v != 0; });
             std::string memoStr(memo.begin(), end.base());
-            if (utf8::is_valid(memoStr)) {
+            //if (utf8::is_valid(memoStr))
+            {
                 entry.push_back(Pair("memoStr", memoStr));
             }
         }
@@ -4320,7 +4321,8 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
         if (memo[0] <= 0xf4) {
             auto end = std::find_if(memo.rbegin(), memo.rend(), [](unsigned char v) { return v != 0; });
             std::string memoStr(memo.begin(), end.base());
-            if (utf8::is_valid(memoStr)) {
+            //if (utf8::is_valid(memoStr))
+            {
                 entry.push_back(Pair("memoStr", memoStr));
             }
         }
@@ -4334,7 +4336,7 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
 }
 
 
-UniValue z_getoperationresult(const UniValue& params, bool fHelp)
+UniValue z_getoperationresult(const UniValue& params, bool fHelp, const CPubKey& mypk)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;