diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index 477487390..0b150e6e0 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -281,6 +281,7 @@ int32_t CClib_initcp(struct CCcontract_info *cp,uint8_t evalcode) sprintf(&cp->CChexstr[i*2],"%02x",pub33[i]); cp->CChexstr[i*2] = 0; GetCCaddress(cp,cp->unspendableCCaddr,pk); + printf("evalcode.%d initialized\n",evalcode); return(0); } } diff --git a/src/cc/sudoku.cpp b/src/cc/sudoku.cpp index c5cbc1b31..6f9d2d1d1 100644 --- a/src/cc/sudoku.cpp +++ b/src/cc/sudoku.cpp @@ -483,6 +483,7 @@ UniValue sudoku_txidinfo(struct CCcontract_info *cp,cJSON *params) if ( params != 0 ) printf("params.(%s)\n",jprint(params,0)); result.push_back(Pair("result","success")); + result.push_back(Pair("method","txidinfo")); return(result); } @@ -492,6 +493,7 @@ UniValue sudoku_generate(struct CCcontract_info *cp,cJSON *params) if ( params != 0 ) printf("params.(%s)\n",jprint(params,0)); result.push_back(Pair("result","success")); + result.push_back(Pair("method","gen")); return(result); } @@ -501,6 +503,7 @@ UniValue sudoku_solution(struct CCcontract_info *cp,cJSON *params) if ( params != 0 ) printf("params.(%s)\n",jprint(params,0)); result.push_back(Pair("result","success")); + result.push_back(Pair("method","solution")); return(result); } @@ -510,6 +513,7 @@ UniValue sudoku_pending(struct CCcontract_info *cp,cJSON *params) if ( params != 0 ) printf("params.(%s)\n",jprint(params,0)); result.push_back(Pair("result","success")); + result.push_back(Pair("method","pending")); return(result); } diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index bc10da7bc..c0fe4caa8 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -5361,20 +5361,13 @@ UniValue cclibinfo(const UniValue& params, bool fHelp) throw runtime_error("cclibinfo\n"); if ( ensure_CCrequirements() < 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 ) - { - evalcode = atoi(params[0].get_str().c_str()); - if ( evalcode < EVAL_FIRSTUSER || evalcode > EVAL_LASTUSER ) - throw runtime_error("evalcode not between EVAL_FIRSTUSER and EVAL_LASTUSER\n"); - } cp = CCinit(&C,evalcode); return(CClib_info(cp)); } UniValue cclib(const UniValue& params, bool fHelp) { - struct CCcontract_info *cp,C; char *method; cJSON *jsonparams=0; uint8_t evalcode; - cp = CCinit(&C,EVAL_FIRSTUSER); + struct CCcontract_info *cp,C; char *method; cJSON *jsonparams=0; uint8_t evalcode = EVAL_FIRSTUSER; if ( fHelp || params.size() > 3 ) throw runtime_error("cclib method [evalcode] [JSON params]\n"); if ( ensure_CCrequirements() < 0 ) @@ -5391,6 +5384,7 @@ UniValue cclib(const UniValue& params, bool fHelp) if ( params.size() == 2 ) jsonparams = cJSON_Parse(params[2].get_str().c_str()); } + printf("evalcode.%d\n",evalcode); cp = CCinit(&C,evalcode); return(CClib(cp,method,jsonparams)); }