Clean up some LABS related code, remove un-used/needed stuff.

Adds actual working and feild tested wallet filter. Can set any amount 
of whitelist address's, in conf file or commandline args. 
fix daemon deadlock, when doing z_mergetoaddress and mining at same time 
(needs more testing on staking chains) 
Set z_mergtoaddress to use a 0 expiry height when not doing z-tx's. They 
were failing and peers were getting banned trying to broadcast them.
This commit is contained in:
blackjok3r
2019-04-09 18:53:32 +08:00
parent e101aa3f9b
commit 237f115594
10 changed files with 40 additions and 112 deletions

View File

@@ -5151,7 +5151,9 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
boost::optional<TransactionBuilder> builder;
if (isToSaplingZaddr || saplingNoteInputs.size() > 0) {
builder = TransactionBuilder(Params().GetConsensus(), nextBlockHeight, pwalletMain);
}
} else
contextualTx.nExpiryHeight = 0; // set non z-tx to have no expiry height.
// Create operation and add to global queue
std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
std::shared_ptr<AsyncRPCOperation> operation(