Add parameter for version in GetValidReceive

This commit is contained in:
Eirik Ogilvie-Wigley
2018-07-17 14:21:16 -06:00
committed by Simon
parent e6b0a8b9ee
commit 3a5f66c880
3 changed files with 17 additions and 13 deletions

View File

@@ -10,9 +10,10 @@
CWalletTx GetValidReceive(ZCJoinSplit& params,
const libzcash::SproutSpendingKey& sk, CAmount value,
bool randomInputs) {
bool randomInputs,
int32_t version /* = 2 */) {
CMutableTransaction mtx;
mtx.nVersion = 2; // Enable JoinSplits
mtx.nVersion = version;
mtx.vin.resize(2);
if (randomInputs) {
mtx.vin[0].prevout.hash = GetRandHash();
@@ -46,9 +47,11 @@ CWalletTx GetValidReceive(ZCJoinSplit& params,
inputs, outputs, 2*value, 0, false};
mtx.vjoinsplit.push_back(jsdesc);
// Shielded Output
OutputDescription od;
mtx.vShieldedOutput.push_back(od);
if (version >= 4) {
// Shielded Output
OutputDescription od;
mtx.vShieldedOutput.push_back(od);
}
// Empty output script.
uint32_t consensusBranchId = SPROUT_BRANCH_ID;