DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix zrpcunsafe logging and log valueBalance when final_check fails

Browse Source
This commit is contained in:
Duke Leto
2020-04-07 00:11:53 -04:00
parent 6e6e6e8e18
commit 6cdf4dd765
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.cpp
View File

@@ -1327,6 +1327,7 @@ bool ContextualCheckTransaction(int32_t slowflag,const CBlock *block, CBlockInde
)) ))
{ {
librustzcash_sapling_verification_ctx_free(ctx); librustzcash_sapling_verification_ctx_free(ctx);
fprintf(stderr,"%s: valueBalance=%li\n", __func__, tx.valueBalance );
return state.DoS(100, error("ContextualCheckTransaction(): Sapling binding signature invalid"), return state.DoS(100, error("ContextualCheckTransaction(): Sapling binding signature invalid"),
REJECT_INVALID, "bad-txns-sapling-binding-signature-invalid"); REJECT_INVALID, "bad-txns-sapling-binding-signature-invalid");
} }

12
src/wallet/asyncrpcoperation_saplingconsolidation.cpp
View File

@@ -186,7 +186,7 @@ bool AsyncRPCOperation_saplingconsolidation::main_impl() {
// Add the actual consolidation tx // Add the actual consolidation tx
builder.AddSaplingOutput(extsk.expsk.ovk, addr, amountToSend - fConsolidationTxFee); builder.AddSaplingOutput(extsk.expsk.ovk, addr, amountToSend - fConsolidationTxFee);
LogPrint("zrpcunsafe", "%s: Added consolidation output %s", opid, addr.GetHash().ToString().c_str() ); LogPrint("zrpcunsafe", "%s: Added consolidation output %s\n", opid, addr.GetHash().ToString().c_str() );
// Add sietch zouts // Add sietch zouts
@@ -194,27 +194,27 @@ bool AsyncRPCOperation_saplingconsolidation::main_impl() {
for(size_t i = 0; i < MIN_ZOUTS; i++) { for(size_t i = 0; i < MIN_ZOUTS; i++) {
// In Privacy Zdust We Trust -- Duke // In Privacy Zdust We Trust -- Duke
string zdust = randomSietchZaddr(); string zdust = randomSietchZaddr();
LogPrint("zrpcunsafe", "%s: random zdust=%s", opid, zdust); LogPrint("zrpcunsafe", "%s: random zdust=%s\n", opid, zdust);
auto zaddr = DecodePaymentAddress(zdust); auto zaddr = DecodePaymentAddress(zdust);
if (IsValidPaymentAddress(zaddr)) { if (IsValidPaymentAddress(zaddr)) {
auto sietchZoutput = boost::get<libzcash::SaplingPaymentAddress>(zaddr); auto sietchZoutput = boost::get<libzcash::SaplingPaymentAddress>(zaddr);
LogPrint("zrpcunsafe", "%s: Adding OLD sietch output %d %s", opid, i, sietchZoutput.GetHash().ToString().c_str() ); LogPrint("zrpcunsafe", "%s: Adding OLD sietch output %d %s\n", opid, i, sietchZoutput.GetHash().ToString().c_str() );
CAmount amount=0; CAmount amount=0;
// actually add our sietch zoutput, the new way // actually add our sietch zoutput, the new way
builder.AddSaplingOutput(extsk.expsk.ovk, sietchZoutput, amount); builder.AddSaplingOutput(extsk.expsk.ovk, sietchZoutput, amount);
} else { } else {
LogPrint("zrpcunsafe", "%s: Invalid payment address! Stopping.", opid); LogPrint("zrpcunsafe", "%s: Invalid payment address! Stopping.\n", opid);
status = false; status = false;
break; break;
} }
} }
LogPrint("zrpcunsafe", "%s: Done adding %d sietch zouts", opid, MIN_ZOUTS); LogPrint("zrpcunsafe", "%s: Done adding %d sietch zouts\n", opid, MIN_ZOUTS);
//CTransaction tx = builder.Build(); //CTransaction tx = builder.Build();
auto maybe_tx = builder.Build(); auto maybe_tx = builder.Build();
if (!maybe_tx) { if (!maybe_tx) {
LogPrint("zrpcunsafe", "%s: Failed to build transaction.",opid); LogPrint("zrpcunsafe", "%s: Failed to build transaction.\n",opid);
status=false; status=false;
break; break;
} }