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

fix MoMoM transaction version.

Browse Source
This commit is contained in:
blackjok3r
2018-12-29 20:08:48 +08:00
parent 19335b2c62
commit 045afa5dd7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/importcoin.cpp
View File

@@ -10,7 +10,7 @@
CTransaction MakeImportCoinTransaction(const TxProof proof, const CTransaction burnTx, const std::vector<CTxOut> payouts) CTransaction MakeImportCoinTransaction(const TxProof proof, const CTransaction burnTx, const std::vector<CTxOut> payouts)
{ {
std::vector<uint8_t> payload = E_MARSHAL(ss << EVAL_IMPORTCOIN); std::vector<uint8_t> payload = E_MARSHAL(ss << EVAL_IMPORTCOIN);
CMutableTransaction mtx; CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
mtx.vin.push_back(CTxIn(COutPoint(burnTx.GetHash(), 10e8), CScript() << payload)); mtx.vin.push_back(CTxIn(COutPoint(burnTx.GetHash(), 10e8), CScript() << payload));
mtx.vout = payouts; mtx.vout = payouts;
auto importData = E_MARSHAL(ss << proof; ss << burnTx); auto importData = E_MARSHAL(ss << proof; ss << burnTx);
@@ -47,7 +47,7 @@ bool UnmarshalBurnTx(const CTransaction &burnTx, std::string &targetSymbol, uint
if (burnTx.vout.size() == 0) return false; if (burnTx.vout.size() == 0) return false;
GetOpReturnData(burnTx.vout.back().scriptPubKey, burnOpret); GetOpReturnData(burnTx.vout.back().scriptPubKey, burnOpret);
return E_UNMARSHAL(burnOpret, ss >> VARINT(*targetCCid); return E_UNMARSHAL(burnOpret, ss >> VARINT(*targetCCid);
ss >> targetSymbol; ss >> targetSymbol;
ss >> payoutsHash); ss >> payoutsHash);
} }
@@ -76,7 +76,7 @@ bool VerifyCoinImport(const CScript& scriptSig, TransactionSignatureChecker& che
auto pc = scriptSig.begin(); auto pc = scriptSig.begin();
opcodetype opcode; opcodetype opcode;
std::vector<uint8_t> evalScript; std::vector<uint8_t> evalScript;
auto f = [&] () { auto f = [&] () {
if (!scriptSig.GetOp(pc, opcode, evalScript)) if (!scriptSig.GetOp(pc, opcode, evalScript))
return false; return false;