From 756e9cf756b05bbbc2c0862cc9e05103df537f45 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 4 Sep 2018 08:07:29 -1100 Subject: [PATCH] Test --- src/cc/CCutils.cpp | 2 +- src/cc/dapps/oraclefeed.c | 3 ++- src/cc/oracles.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp index 90d9c3e26..fea8e0ddf 100644 --- a/src/cc/CCutils.cpp +++ b/src/cc/CCutils.cpp @@ -317,7 +317,7 @@ bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector param from_mempool = 1; height &= ((1<<30) - 1); } - fprintf(stderr,"KOMODO_CONNECTING.%d mempool.%d vs CCactive.%d\n",height,from_mempool,KOMODO_CCACTIVATE); + //fprintf(stderr,"KOMODO_CONNECTING.%d mempool.%d vs CCactive.%d\n",height,from_mempool,KOMODO_CCACTIVATE); // there is a chance CC tx is valid in mempool, but invalid when in block, so we cant filter duplicate requests. if any of the vins are spent, for example //txid = ctx.GetHash(); //if ( txid == cp->prevtxid ) diff --git a/src/cc/dapps/oraclefeed.c b/src/cc/dapps/oraclefeed.c index 36192bf74..8168d778c 100644 --- a/src/cc/dapps/oraclefeed.c +++ b/src/cc/dapps/oraclefeed.c @@ -312,7 +312,8 @@ uint64_t get_btcusd() // oraclescreate "BTCUSD" "coindeskpricedata" "L" -> 4895f631316a649e216153aee7a574bd281686265dc4e8d37597f72353facac3 // oraclesregister 4895f631316a649e216153aee7a574bd281686265dc4e8d37597f72353facac3 1000000 -> 11c54d4ab17293217276396e27d86f714576ff55a3300dac34417047825edf93 // oraclessubscribe 4895f631316a649e216153aee7a574bd281686265dc4e8d37597f72353facac3 02ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92 1.5 -> ce4e4afa53765b11a74543dacbd3174a93f33f12bb94cdc080c2c023726b5838 -// oraclesdata 4895f631316a649e216153aee7a574bd281686265dc4e8d37597f72353facac3 000000ff00000000 +// oraclesdata 4895f631316a649e216153aee7a574bd281686265dc4e8d37597f72353facac3 000000ff00000000 -> e8a8c897e97389dcac31d81b617ab73a829110bd5c6f99f9f533b9c0e22700d0 +// oraclessamples 4895f631316a649e216153aee7a574bd281686265dc4e8d37597f72353facac3 1 -> int32_t main(int32_t argc,char **argv) { diff --git a/src/cc/oracles.cpp b/src/cc/oracles.cpp index 8802e1fb7..62f45007f 100644 --- a/src/cc/oracles.cpp +++ b/src/cc/oracles.cpp @@ -208,7 +208,8 @@ int64_t OracleCurrentDatafee(uint256 reforacletxid,char *markeraddr,CPubKey publ { dheight = height; datafee = dfee; - fprintf(stderr,"set datafee %.8f height.%d\n",(double)datafee/COIN,height); + if ( dheight != 0 ) + fprintf(stderr,"set datafee %.8f height.%d\n",(double)datafee/COIN,height); } } }