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

Revert "Raw transaction updates"

Browse Source 
This reverts commit 1f1e2ebf04.
This commit is contained in:
Duke Leto
2020-01-24 07:29:49 -05:00
parent 1f1e2ebf04
commit c6de8f850c
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/primitives/transaction.h
View File

@@ -45,9 +45,8 @@
#include "zcash/JoinSplit.hpp" #include "zcash/JoinSplit.hpp"
#include "zcash/Proof.hpp" #include "zcash/Proof.hpp"
#define JOINSPLIT_SIZE GetSerializeSize(JSDescription(), SER_NETWORK, PROTOCOL_VERSION) extern uint32_t ASSETCHAINS_MAGIC;
#define OUTPUTDESCRIPTION_SIZE GetSerializeSize(OutputDescription(), SER_NETWORK, PROTOCOL_VERSION) extern std::string ASSETCHAINS_SELFIMPORT;
#define SPENDDESCRIPTION_SIZE GetSerializeSize(SpendDescription(), SER_NETWORK, PROTOCOL_VERSION)
// Overwinter transaction version // Overwinter transaction version
static const int32_t OVERWINTER_TX_VERSION = 3; static const int32_t OVERWINTER_TX_VERSION = 3;
@@ -253,6 +252,7 @@ public:
JSDescription(): vpub_old(0), vpub_new(0) { } JSDescription(): vpub_old(0), vpub_new(0) { }
JSDescription( JSDescription(
bool makeGrothProof,
ZCJoinSplit& params, ZCJoinSplit& params,
const uint256& joinSplitPubKey, const uint256& joinSplitPubKey,
const uint256& rt, const uint256& rt,
@@ -265,6 +265,7 @@ public:
); );
static JSDescription Randomized( static JSDescription Randomized(
bool makeGrothProof,
ZCJoinSplit& params, ZCJoinSplit& params,
const uint256& joinSplitPubKey, const uint256& joinSplitPubKey,
const uint256& rt, const uint256& rt,
@@ -578,7 +579,7 @@ public:
const CAmount valueBalance; const CAmount valueBalance;
const std::vector<SpendDescription> vShieldedSpend; const std::vector<SpendDescription> vShieldedSpend;
const std::vector<OutputDescription> vShieldedOutput; const std::vector<OutputDescription> vShieldedOutput;
const std::vector<JSDescription> vJoinSplit; const std::vector<JSDescription> vjoinsplit;
const uint256 joinSplitPubKey; const uint256 joinSplitPubKey;
const joinsplit_sig_t joinSplitSig = {{0}}; const joinsplit_sig_t joinSplitSig = {{0}};
const binding_sig_t bindingSig = {{0}}; const binding_sig_t bindingSig = {{0}};
@@ -635,8 +636,8 @@ public:
} }
if (nVersion >= 2) { if (nVersion >= 2) {
auto os = WithVersion(&s, static_cast<int>(header)); auto os = WithVersion(&s, static_cast<int>(header));
::SerReadWrite(os, *const_cast<std::vector<JSDescription>*>(&vJoinSplit), ser_action); ::SerReadWrite(os, *const_cast<std::vector<JSDescription>*>(&vjoinsplit), ser_action);
if (vJoinSplit.size() > 0) { if (vjoinsplit.size() > 0) {
READWRITE(*const_cast<uint256*>(&joinSplitPubKey)); READWRITE(*const_cast<uint256*>(&joinSplitPubKey));
READWRITE(*const_cast<joinsplit_sig_t*>(&joinSplitSig)); READWRITE(*const_cast<joinsplit_sig_t*>(&joinSplitSig));
} }
@@ -743,7 +744,7 @@ struct CMutableTransaction
CAmount valueBalance; CAmount valueBalance;
std::vector<SpendDescription> vShieldedSpend; std::vector<SpendDescription> vShieldedSpend;
std::vector<OutputDescription> vShieldedOutput; std::vector<OutputDescription> vShieldedOutput;
std::vector<JSDescription> vJoinSplit; std::vector<JSDescription> vjoinsplit;
uint256 joinSplitPubKey; uint256 joinSplitPubKey;
CTransaction::joinsplit_sig_t joinSplitSig = {{0}}; CTransaction::joinsplit_sig_t joinSplitSig = {{0}};
CTransaction::binding_sig_t bindingSig = {{0}}; CTransaction::binding_sig_t bindingSig = {{0}};
@@ -799,8 +800,8 @@ struct CMutableTransaction
} }
if (nVersion >= 2) { if (nVersion >= 2) {
auto os = WithVersion(&s, static_cast<int>(header)); auto os = WithVersion(&s, static_cast<int>(header));
::SerReadWrite(os, vJoinSplit, ser_action); ::SerReadWrite(os, vjoinsplit, ser_action);
if (vJoinSplit.size() > 0) { if (vjoinsplit.size() > 0) {
READWRITE(joinSplitPubKey); READWRITE(joinSplitPubKey);
READWRITE(joinSplitSig); READWRITE(joinSplitSig);
} }