DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2019-01-20 00:00:51 -11:00
parent 1cf8cec018
commit 887f6cb2ab
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cc/CCinclude.h
View File

@@ -50,6 +50,7 @@ one other technical note is that komodod has the insight-explorer extensions bui
#include "../komodo_defs.h" #include "../komodo_defs.h"
#include "../utlist.h" #include "../utlist.h"
#include "../uthash.h" #include "../uthash.h"
#include "../cJSON.h"
extern int32_t KOMODO_CONNECTING,KOMODO_CCACTIVATE,KOMODO_DEALERNODE; extern int32_t KOMODO_CONNECTING,KOMODO_CCACTIVATE,KOMODO_DEALERNODE;
extern uint32_t ASSETCHAINS_CC; extern uint32_t ASSETCHAINS_CC;

10
src/cc/cclib.cpp
View File

@@ -43,7 +43,7 @@ CClib_methods[] =
std::string MYCCLIBNAME = (char *)"faucet2"; std::string MYCCLIBNAME = (char *)"faucet2";
char *CClib_name() { return(MYCCLIBNAME.c_str()); } char *CClib_name() { return((char *)MYCCLIBNAME.c_str()); }
std::string CClib_rawtxgen(struct CCcontract_info *cp,uint8_t funcid,cJSON *params); std::string CClib_rawtxgen(struct CCcontract_info *cp,uint8_t funcid,cJSON *params);
@@ -170,7 +170,7 @@ bool CClib_validate(struct CCcontract_info *cp,Eval *eval,const CTransaction tx,
else else
{ {
preventCCvouts = 1; preventCCvouts = 1;
if ( IsFaucetvout(cp,tx,0) != 0 ) if ( IsCClibvout(cp,tx,0) != 0 )
{ {
preventCCvouts++; preventCCvouts++;
i = 1; i = 1;
@@ -251,7 +251,7 @@ std::string Faucet2Fund(struct CCcontract_info *cp,uint64_t txfee,int64_t funds)
return(""); return("");
} }
UniValue FaucetInfo() /*UniValue FaucetInfo()
{ {
UniValue result(UniValue::VOBJ); char numstr[64]; UniValue result(UniValue::VOBJ); char numstr[64];
CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
@@ -264,12 +264,12 @@ UniValue FaucetInfo()
sprintf(numstr,"%.8f",(double)funding/COIN); sprintf(numstr,"%.8f",(double)funding/COIN);
result.push_back(Pair("funding",numstr)); result.push_back(Pair("funding",numstr));
return(result); return(result);
} }*/
std::string CClib_rawtxgen(struct CCcontract_info *cp,uint8_t funcid,cJSON *params) std::string CClib_rawtxgen(struct CCcontract_info *cp,uint8_t funcid,cJSON *params)
{ {
CMutableTransaction tmpmtx,mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); CMutableTransaction tmpmtx,mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
CPubKey mypk,cclibpk; int64_t funds,txfee=0,inputs,CCchange=0,nValue=FAUCET2SIZE; struct CCcontract_info *cp,C; std::string rawhex; uint32_t j; int32_t i,len; uint8_t buf[32768]; bits256 hash; CPubKey mypk,cclibpk; int64_t funds,txfee=0,inputs,CCchange=0,nValue=FAUCET2SIZE; std::string rawhex; uint32_t j; int32_t i,len; uint8_t buf[32768]; bits256 hash;
if ( txfee == 0 ) if ( txfee == 0 )
txfee = 10000; txfee = 10000;
if ( funcid == 'F' ) if ( funcid == 'F' )