Add src/cc upstream changes

2019-12-12 20:21:06 -05:00
parent 421c069073
commit 8811b8633f
26 changed files with 1852 additions and 1385 deletions
--- a/src/cc/CCfaucet.h
+++ b/src/cc/CCfaucet.h
@@ -25,8 +25,8 @@
 bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);

 // CCcustom
-std::string FaucetFund(uint64_t txfee,int64_t funds);
-std::string FaucetGet(uint64_t txfee);
+UniValue FaucetFund(const CPubKey& mypk,uint64_t txfee,int64_t funds);
+UniValue FaucetGet(const CPubKey& mypk,uint64_t txfee);
 UniValue FaucetInfo();

 #endif