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

Add some debug

Browse Source
This commit is contained in:
Duke Leto
2020-03-16 07:58:12 -04:00
parent 707d50e894
commit 2e51538df8
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/transaction_builder.cpp
View File

@@ -153,6 +153,7 @@ boost::optional<CTransaction> TransactionBuilder::Build()
// Send change to the specified change address. If no change address // Send change to the specified change address. If no change address
// was set, send change to the first Sapling address given as input. // was set, send change to the first Sapling address given as input.
if (zChangeAddr) { if (zChangeAddr) {
LogPrintf("%s: Adding specified Sapling change output: %s\n", __FUNCTION__, zChangeAddr->second.GetHash().ToString().c_str());
AddSaplingOutput(zChangeAddr->first, zChangeAddr->second, change); AddSaplingOutput(zChangeAddr->first, zChangeAddr->second, change);
} else if (tChangeAddr) { } else if (tChangeAddr) {
// tChangeAddr has already been validated. // tChangeAddr has already been validated.
@@ -162,6 +163,7 @@ boost::optional<CTransaction> TransactionBuilder::Build()
auto note = spends[0].note; auto note = spends[0].note;
libzcash::SaplingPaymentAddress changeAddr(note.d, note.pk_d); libzcash::SaplingPaymentAddress changeAddr(note.d, note.pk_d);
AddSaplingOutput(fvk.ovk, changeAddr, change); AddSaplingOutput(fvk.ovk, changeAddr, change);
LogPrintf("%s: Adding Sapling change output from first zinput: %s\n", __FUNCTION__, changeAddr.GetHash().ToString().c_str() );
} else { } else {
return boost::none; return boost::none;
} }

3
src/wallet/asyncrpcoperation_saplingconsolidation.cpp
View File

@@ -189,7 +189,7 @@ 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();
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 sietch output %s", getId(), sietchZoutput.GetHash().ToString().c_str() ); LogPrint("zrpcunsafe", "%s: Adding sietch output %s", getId(), sietchZoutput.GetHash().ToString().c_str() );
@@ -200,6 +200,7 @@ bool AsyncRPCOperation_saplingconsolidation::main_impl() {
break; break;
} }
} }
LogPrint("zrpcunsafe", "%s: Done adding sietch zouts", getId());
//CTransaction tx = builder.Build(); //CTransaction tx = builder.Build();
auto maybe_tx = builder.Build(); auto maybe_tx = builder.Build();

1
src/wallet/wallet.cpp
View File

@@ -640,6 +640,7 @@ void CWallet::RunSaplingConsolidation(int blockHeight) {
bool CWallet::CommitConsolidationTx(const CTransaction& tx) { bool CWallet::CommitConsolidationTx(const CTransaction& tx) {
CWalletTx wtx(this, tx); CWalletTx wtx(this, tx);
CReserveKey reservekey(pwalletMain); CReserveKey reservekey(pwalletMain);
fprintf(stderr,"%s: %s\n",__func__,tx.ToString().c_str());
return CommitTransaction(wtx, reservekey); return CommitTransaction(wtx, reservekey);
} }