diff --git a/src/komodo_nSPV_wallet.h b/src/komodo_nSPV_wallet.h index ba70a3b8a..5c34bcb14 100644 --- a/src/komodo_nSPV_wallet.h +++ b/src/komodo_nSPV_wallet.h @@ -40,15 +40,23 @@ struct NSPV_ntzsproofresp int32_t NSPV_validatehdrs(struct NSPV_ntzsproofresp *ptr) { - int32_t i; - // verify nextntz is valid notarization - // validate blockhash of lasthdr with nextntz value, and height + /* int32_t i,height,txidht; CTransaction tx; uint256 blockhash,txid,desttxid; + if ( NSPV_txextract(tx,ptr->nextntz,ptr->nexttxlen) < 0 ) + return(-1); + else if ( NSPV_notarizationextract(&height,&blockhash,&txid,&txidht,&desttxid) < 0 ) + return(-2); + else if ( NSPV_doublesha256(&ptr->common.hdrs[ptr->common.numhdrs-1],sizeof(*ptr->common.hdrs)) != blockhash ) + return(-3); for (i=ptr->common.numhdrs-1; i>0; i--) { // make sure the hash of i-1 matches the prevBlockhash of i } // verify prevntz is valid notarization // verify blockhash of first hdr with prevntz value and height + if ( NSPV_txextract(tx,ptr->prevntz,ptr->prevtxlen) < 0 ) + return(-1); + else if ( NSPV_notarizationextract(&height,&blockhash,&txid,&txidht,&desttxid) < 0 ) + return(-2);*/ return(0); } diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 43cb4f420..d5bc66209 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -1068,6 +1068,7 @@ UniValue nspv_spend(const UniValue& params, bool fHelp) if ( NSPV_address.size() == 0 ) throw runtime_error("to nspv_send you need an active nspv_login\n"); satoshis = atof(params[1].get_str().c_str())*COIN + 0.0000000049; + fprintf(stderr,"satoshis.%lld from %.8f\n",(long long)satoshis,atof(params[1].get_str().c_str())); if ( satoshis < 1000 ) throw runtime_error("amount too small\n"); return(NSPV_spend((char *)NSPV_address.c_str(),(char *)params[0].get_str().c_str(),satoshis));