From d95bcb64858f52ac5e272c5b62686ef2c89cc7aa Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 26 Oct 2016 16:02:50 -0300 Subject: [PATCH] test --- src/komodo.h | 19 ++++++++++--------- src/komodo_gateway.h | 7 +++++-- src/komodo_pax.h | 2 +- src/wallet/rpcwallet.cpp | 10 ++-------- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 854fbbde7..e487bf73d 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -58,7 +58,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar { if ( fread(&ht,1,sizeof(ht),fp) != sizeof(ht) ) errs++; - //printf("func.(%d %c) ht.%d\n",func,func,ht); + printf("fpos.%ld func.(%d %c) ht.%d\n",ftell(fp),func,func,ht); if ( func == 'P' ) { if ( (num= fgetc(fp)) < 64 ) @@ -149,10 +149,11 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar } if ( fp != 0 ) // write out funcid, height, other fields, call side effect function { + printf("fpos.%ld ",ftell(fp)); if ( height < 0 ) { height = -height; - //printf("func D[%d] errs.%d\n",height,errs); + printf("func D[%d] errs.%d\n",height,errs); fputc('D',fp); if ( fwrite(&height,1,sizeof(height),fp) != sizeof(height) ) errs++; @@ -164,6 +165,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar errs++; if ( fwrite(&KMDheight,1,sizeof(KMDheight),fp) != sizeof(KMDheight) ) errs++; + printf("ht.%d K %d\n",height,KMDheight); } else if ( opretbuf != 0 && opretlen > 0 ) { @@ -177,11 +179,12 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar errs++; if ( fwrite(opretbuf,1,olen,fp) != olen ) errs++; + printf("ht.%d R opret[%d]\n",height,olen); komodo_opreturn(height,opretvalue,opretbuf,olen); } else if ( notarypubs != 0 && numnotaries > 0 ) { - //printf("func P[%d] errs.%d\n",numnotaries,errs); + printf("ht.%d func P[%d] errs.%d\n",height,numnotaries,errs); fputc('P',fp); if ( fwrite(&height,1,sizeof(height),fp) != sizeof(height) ) errs++; @@ -192,7 +195,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar } else if ( voutmask != 0 && numvouts > 0 ) { - //printf("func U %d %d errs.%d hashsize.%ld\n",numvouts,notaryid,errs,sizeof(txhash)); + printf("ht.%d func U %d %d errs.%d hashsize.%ld\n",height,numvouts,notaryid,errs,sizeof(txhash)); fputc('U',fp); if ( fwrite(&height,1,sizeof(height),fp) != sizeof(height) ) errs++; @@ -220,13 +223,14 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar if ( fwrite(pvals,sizeof(uint32_t),numpvals,fp) != numpvals ) errs++; komodo_pvals(height,pvals,numpvals); + printf("ht.%d V numpvals[%d]\n",height,numpvals); } //printf("save pvals height.%d numpvals.%d\n",height,numpvals); } //#endif else if ( height != 0 ) { - //printf("func N ht.%d errs.%d\n",NOTARIZED_HEIGHT,errs); + printf("ht.%d func N ht.%d errs.%d\n",height,NOTARIZED_HEIGHT,errs); fputc('N',fp); if ( fwrite(&height,1,sizeof(height),fp) != sizeof(height) ) errs++; @@ -307,10 +311,7 @@ int32_t komodo_voutupdate(int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen, } else if ( i == 0 && j == 1 && opretlen == 149 ) komodo_paxpricefeed(height,&scriptbuf[len],opretlen); - else - { - komodo_stateupdate(height,0,0,0,zero,0,0,0,0,0,value,&scriptbuf[len],opretlen); - } + else komodo_stateupdate(height,0,0,0,zero,0,0,0,0,0,value,&scriptbuf[len],opretlen); } return(notaryid); } diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index f6e762d04..35a6a2869 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -19,18 +19,21 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int32_t opretlen) { - uint8_t rmd160[20],addrtype,shortflag,pubkey33[33]; int32_t i; char base[4],coinaddr[64],destaddr[64]; int64_t fiatoshis,checktoshis; const char *typestr = "unknown"; + uint8_t rmd160[20],addrtype,shortflag,pubkey33[33]; int32_t i,tokomodo=0; char base[4],coinaddr[64],destaddr[64]; int64_t fiatoshis,checktoshis; const char *typestr = "unknown"; printf("komodo_opreturn[%c]: ht.%d %.8f opretlen.%d\n",opretbuf[0],height,dstr(value),opretlen); if ( opretbuf[0] == 'D' ) { if ( opretlen == 34 ) { +#ifdef KOMODO_ISSUER + tokomodo = 1; +#endif PAX_pubkey(0,&opretbuf[1],&addrtype,rmd160,base,&shortflag,&fiatoshis); if ( fiatoshis < 0 ) fiatoshis = -fiatoshis; bitcoin_address(coinaddr,addrtype,rmd160,20); memset(base,0,sizeof(base)); - checktoshis = PAX_fiatdest(destaddr,pubkey33,coinaddr,height,base,fiatoshis); + checktoshis = PAX_fiatdest(tokomodo,destaddr,pubkey33,coinaddr,height,base,fiatoshis); for (i=0; i %s\n",dstr(fiatoshis),shortflag!=0?'-':'+',base,coinaddr); diff --git a/src/komodo_pax.h b/src/komodo_pax.h index 46a2b37d4..319ebe722 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -325,7 +325,7 @@ void komodo_paxpricefeed(int32_t height,uint8_t *pricefeed,int32_t opretlen) printf("komodo_paxpricefeed vout OP_RETURN.%d prices numpvals.%d opretlen.%d\n",height,numpvals,opretlen); } -uint64_t PAX_fiatdest(char *destaddr,uint8_t pubkey33[33],char *coinaddr,int32_t height,char *origbase,int64_t fiatoshis) +uint64_t PAX_fiatdest(int32_t tokomodo,char *destaddr,uint8_t pubkey33[33],char *coinaddr,int32_t height,char *origbase,int64_t fiatoshis) { uint8_t shortflag = 0; char base[4]; int32_t i; uint8_t addrtype,rmd160[20]; uint64_t komodoshis = 0; if ( strcmp(base,(char *)"KMD") == 0 || strcmp(base,(char *)"kmd") == 0 ) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 1149615f1..e245fad37 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -466,7 +466,7 @@ Value sendtoaddress(const Array& params, bool fHelp) return wtx.GetHash().GetHex(); } -uint64_t PAX_fiatdest(char *destaddr,uint8_t pubkey33[33],char *coinaddr,int32_t height,char *base,int64_t fiatoshis); +uint64_t PAX_fiatdest(int32_t tokomodo,char *destaddr,uint8_t pubkey33[33],char *coinaddr,int32_t height,char *base,int64_t fiatoshis); int32_t komodo_opreturnscript(uint8_t *script,uint8_t type,uint8_t *opret,int32_t opretlen); #define CRYPTO777_KMDADDR "RXL3YXG2ceaB6C5hfJcN4fvmLH2C34knhA" @@ -485,7 +485,7 @@ Value paxdeposit(const Array& params, bool fHelp) int64_t fiatoshis = atof(params[1].get_str().c_str()) * COIN; std::string base = params[2].get_str(); std::string dest; - komodoshis = PAX_fiatdest(destaddr,pubkey33,(char *)params[0].get_str().c_str(),chainActive.Tip()->nHeight,(char *)base.c_str(),fiatoshis); + komodoshis = PAX_fiatdest(0,destaddr,pubkey33,(char *)params[0].get_str().c_str(),chainActive.Tip()->nHeight,(char *)base.c_str(),fiatoshis); dest.append(destaddr); CBitcoinAddress destaddress(CRYPTO777_KMDADDR); if (!destaddress.IsValid()) @@ -496,12 +496,6 @@ Value paxdeposit(const Array& params, bool fHelp) printf(" ht.%d srcaddr.(%s) %s fiatoshis.%lld -> dest.(%s) komodoshis.%llu\n",chainActive.Tip()->nHeight,(char *)params[0].get_str().c_str(),(char *)base.c_str(),(long long)fiatoshis,destaddr,(long long)komodoshis); EnsureWalletIsUnlocked(); CWalletTx wtx; - /*std::string account,paxstr,tmp; - account.append((char *)"account"); - paxstr.append(fiatbuf); - tmp.append("PAX"); - wtx.mapValue["PAX"] = paxstr; - pwalletMain->SetAddressBook(destaddress.Get(),account,tmp);*/ uint8_t opretbuf[64]; int32_t opretlen; uint64_t fee = komodoshis / 1000; if ( fee < 10000 ) fee = 10000;