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

Raw transaction updates

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

19
src/primitives/transaction.h
View File

@@ -45,8 +45,9 @@
#include "zcash/JoinSplit.hpp" #include "zcash/JoinSplit.hpp"
#include "zcash/Proof.hpp" #include "zcash/Proof.hpp"
extern uint32_t ASSETCHAINS_MAGIC; #define JOINSPLIT_SIZE GetSerializeSize(JSDescription(), SER_NETWORK, PROTOCOL_VERSION)
extern std::string ASSETCHAINS_SELFIMPORT; #define OUTPUTDESCRIPTION_SIZE GetSerializeSize(OutputDescription(), SER_NETWORK, PROTOCOL_VERSION)
#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;
@@ -252,7 +253,6 @@ 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,7 +265,6 @@ 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,
@@ -579,7 +578,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}};
@@ -636,8 +635,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));
} }
@@ -744,7 +743,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}};
@@ -800,8 +799,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);
} }