Merge pull request #69 from StakedChain/ac_import

try to fix invalid burntx decode error
This commit is contained in:
blackjok3rtt
2019-01-03 09:57:08 +08:00
committed by GitHub

View File

@@ -69,20 +69,20 @@ bool UnmarshalBurnTx(const CTransaction &burnTx, std::string &targetSymbol, uint
std::vector<uint8_t> burnOpret; uint32_t ccid = 0; std::vector<uint8_t> burnOpret; uint32_t ccid = 0;
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);
E_UNMARSHAL(burnOpret, ss >> VARINT(ccid)); //E_UNMARSHAL(burnOpret, ss >> VARINT(ccid));
if ( ccid != 0xffffffff ) /*if ( ccid != 0xffffffff )
{ {
return E_UNMARSHAL(burnOpret, ss >> VARINT(*targetCCid); return E_UNMARSHAL(burnOpret, ss >> VARINT(*targetCCid);
ss >> targetSymbol; ss >> targetSymbol;
ss >> payoutsHash); ss >> payoutsHash);
} }
else else
{ {*/
return E_UNMARSHAL(burnOpret, ss >> VARINT(*targetCCid); return E_UNMARSHAL(burnOpret, ss >> VARINT(*targetCCid);
ss >> targetSymbol; ss >> targetSymbol;
ss >> payoutsHash; ss >> payoutsHash;
ss >> rawproof); ss >> rawproof);
} //}
} }