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

Auto merge of #3239 - str4d:sapling-default-tx-version, r=str4d

Browse Source 
Update CreateNewContextualCMutableTransaction for Sapling

Part of #3063.
This commit is contained in:
Homu
2018-05-07 12:27:47 -07:00
parent 265eca3f47 e1d41f21f3
commit 1d4235dce7
5 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet/rpcwallet.cpp
View File

@@ -3701,9 +3701,6 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
if (contextualTx.nVersion == 1 && isShielded) {
contextualTx.nVersion = 2; // Tx format should support vjoinsplits
}
if (NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) {
contextualTx.nExpiryHeight = nextBlockHeight + expiryDelta;
}
// Create operation and add to global queue
std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
@@ -3902,9 +3899,6 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
if (contextualTx.nVersion == 1) {
contextualTx.nVersion = 2; // Tx format should support vjoinsplits
}
if (overwinterActive) {
contextualTx.nExpiryHeight = nextBlockHeight + expiryDelta;
}
// Create operation and add to global queue
std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
@@ -4244,9 +4238,6 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
if (contextualTx.nVersion == 1 && isShielded) {
contextualTx.nVersion = 2; // Tx format should support vjoinsplit
}
if (overwinterActive) {
contextualTx.nExpiryHeight = nextBlockHeight + expiryDelta;
}
// Create operation and add to global queue
std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();