From 30df2e00045e4d2c5122e2c78b6e48153da92d99 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 26 Oct 2016 10:46:20 -0300 Subject: [PATCH] test --- src/komodo.h | 12 ++++++------ src/komodo_bitcoind.h | 2 +- src/komodo_gateway.h | 5 ++--- src/komodo_notary.h | 2 +- src/komodo_pax.h | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 9b81bcb64..73aa18753 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -23,7 +23,7 @@ #include #include -void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t kheight,uint8_t *opretbuf,uint16_t opretlen); +void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t kheight,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen); void komodo_init(); int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *notarized_desttxidp); char *komodo_issuemethod(char *method,char *params,uint16_t port); @@ -41,7 +41,7 @@ char KMDUSERPASS[1024]; uint16_t BITCOIND_PORT = 7771; #include "komodo_notary.h" #include "komodo_gateway.h" -void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint8_t *opretbuf,uint16_t opretlen) +void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen) { static FILE *fp; static int32_t errs; char fname[512]; int32_t ht,func; uint8_t num,pubkeys[64][33]; #ifdef WIN32 @@ -161,7 +161,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar fputc('O',fp); if ( fwrite(&height,1,sizeof(height),fp) != sizeof(height) ) errs++; - if ( fwrite(&value,1,sizeof(value),fp) != sizeof(value) ) + if ( fwrite(&opretvalue,1,sizeof(opretvalue),fp) != sizeof(opretvalue) ) errs++; if ( fwrite(opretbuf,1,opretlen,fp) != opretlen ) errs++; @@ -283,7 +283,7 @@ int32_t komodo_voutupdate(int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen, NOTARIZED_HEIGHT = *notarizedheightp; NOTARIZED_HASH = kmdtxid; NOTARIZED_DESTTXID = desttxid; - komodo_stateupdate(height,0,0,0,zero,0,0,0,0,0,0,0); + komodo_stateupdate(height,0,0,0,zero,0,0,0,0,0,0,0,0); } else printf("reject ht.%d NOTARIZED.%d %s.%s DESTTXID.%s (%s)\n",height,*notarizedheightp,KOMODO_SOURCE,kmdtxid.ToString().c_str(),desttxid.ToString().c_str(),(char *)&scriptbuf[len]); } #ifdef KOMODO_PAX @@ -349,7 +349,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) } if ( i != 0 && notaryid >= 0 && notaryid < 64 && voutmask != 0 ) { - komodo_stateupdate(height,0,0,notaryid,txhash,voutmask,numvouts,0,0,0,0,0); + komodo_stateupdate(height,0,0,notaryid,txhash,voutmask,numvouts,0,0,0,0,0,0); //komodo_nutxoadd(height,notaryid,txhash,voutmask,numvouts); } signedmask = 0; @@ -390,7 +390,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) if ( komodo_isratify(1,numvalid) > 13 ) { memset(&txhash,0,sizeof(txhash)); - komodo_stateupdate(height,pubkeys,numvalid,0,txhash,0,0,0,0,0,0,0); + komodo_stateupdate(height,pubkeys,numvalid,0,txhash,0,0,0,0,0,0,0,0); } printf("new notaries.%d newheight.%d from height.%d\n",numvouts-1,KOMODO_PUBKEYS_HEIGHT(height),height); } diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 58b41299b..d46c4eca0 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -367,7 +367,7 @@ void komodo_disconnect(CBlockIndex *pindex,CBlock& block) //uint256 zero; //printf("disconnect ht.%d\n",pindex->nHeight); //memset(&zero,0,sizeof(zero)); - //komodo_stateupdate(-pindex->nHeight,0,0,0,zero,0,0,0,0,0,0); + //komodo_stateupdate(-pindex->nHeight,0,0,0,zero,0,0,0,0,0,0,0); } int32_t komodo_block2height(CBlock *block) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index dac5edd7d..56351fe5b 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -58,8 +58,7 @@ void komodo_gateway_voutupdate(char *symbol,int32_t height,int32_t txi,int32_t v else { printf("offset.%d opretlen.%d\n",offset,opretlen); - typestr = komodo_opreturn(height,value,&script[offset],opretlen); - komodo_stateupdate(0,0,0,0,zero,0,0,0,0,0,&script[offset],opretlen); + komodo_stateupdate(0,0,0,0,zero,0,0,0,0,0,value,&script[offset],opretlen); } } } @@ -163,7 +162,7 @@ void komodo_gateway_iteration(char *symbol) { fprintf(stderr,"%s.%d ",symbol,KMDHEIGHT); memset(&zero,0,sizeof(zero)); - komodo_stateupdate(0,0,0,0,zero,0,0,0,0,KMDHEIGHT,0,0); + komodo_stateupdate(0,0,0,0,zero,0,0,0,0,KMDHEIGHT,0,0,0); } if ( komodo_gateway_block(symbol,KMDHEIGHT,port) < 0 ) break; diff --git a/src/komodo_notary.h b/src/komodo_notary.h index 7b89927c4..c1c24d2b3 100644 --- a/src/komodo_notary.h +++ b/src/komodo_notary.h @@ -209,6 +209,6 @@ void komodo_init() } komodo_notarysinit(0,pubkeys,k); memset(&zero,0,sizeof(zero)); - komodo_stateupdate(0,0,0,0,zero,0,0,0,0,0,0,0); + komodo_stateupdate(0,0,0,0,zero,0,0,0,0,0,0,0,0); } } diff --git a/src/komodo_pax.h b/src/komodo_pax.h index ea8132588..5d73ad053 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -303,7 +303,7 @@ void komodo_paxpricefeed(int32_t height,uint8_t *pricefeed,int32_t opretlen) double KMDBTC,BTCUSD,CNYUSD; uint32_t numpvals,timestamp,pvals[128]; uint256 zero; numpvals = dpow_readprices(pricefeed,×tamp,&KMDBTC,&BTCUSD,&CNYUSD,pvals); memset(&zero,0,sizeof(zero)); - komodo_stateupdate(height,0,0,0,zero,0,0,pvals,numpvals,0,0,0); + komodo_stateupdate(height,0,0,0,zero,0,0,pvals,numpvals,0,0,0,0); printf("komodo_paxpricefeed vout OP_RETURN.%d prices numpvals.%d opretlen.%d\n",height,numpvals,opretlen); }