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

Fix

Browse Source
This commit is contained in:
jl777
2019-01-01 23:37:43 -11:00
parent e090330823
commit a5c38d8f9c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/importcoin.h
View File

@@ -28,7 +28,7 @@ CAmount GetCoinImportValue(const CTransaction &tx);
CTransaction MakeImportCoinTransaction(const TxProof proof, CTransaction MakeImportCoinTransaction(const TxProof proof,
const CTransaction burnTx, const std::vector<CTxOut> payouts); const CTransaction burnTx, const std::vector<CTxOut> payouts);
CTxOut MakeBurnOutput(CAmount value, uint32_t targetCCid, std::string targetSymbol, const std::vector<CTxOut> payouts); CTxOut MakeBurnOutput(CAmount value, uint32_t targetCCid, std::string targetSymbol, const std::vector<CTxOut> payouts,std::vector<uint8_t> rawproof);
bool UnmarshalBurnTx(const CTransaction &burnTx, std::string &targetSymbol, uint32_t *targetCCid, uint256 &payoutsHash,std::vector<uint8_t> &rawproof); bool UnmarshalBurnTx(const CTransaction &burnTx, std::string &targetSymbol, uint32_t *targetCCid, uint256 &payoutsHash,std::vector<uint8_t> &rawproof);
bool UnmarshalImportTx(const CTransaction &importTx, TxProof &proof, CTransaction &burnTx, bool UnmarshalImportTx(const CTransaction &importTx, TxProof &proof, CTransaction &burnTx,

6
src/rpc/crosschain.cpp
View File

@@ -163,7 +163,7 @@ UniValue calc_MoM(const UniValue& params, bool fHelp)
UniValue migrate_converttoexport(const UniValue& params, bool fHelp) UniValue migrate_converttoexport(const UniValue& params, bool fHelp)
{ {
uint32_t ccid = ASSETCHAINS_CC; std::vector<uint8_t> rawproof; uint32_t ccid = ASSETCHAINS_CC;
if (fHelp || params.size() != 3) if (fHelp || params.size() != 3)
throw runtime_error( throw runtime_error(
"migrate_converttoexport rawTx dest_symbol export_amount\n" "migrate_converttoexport rawTx dest_symbol export_amount\n"
@@ -201,7 +201,7 @@ UniValue migrate_converttoexport(const UniValue& params, bool fHelp)
} }
//if ( ASSETCHAINS_SELFIMPORT.size() > 0 ) //if ( ASSETCHAINS_SELFIMPORT.size() > 0 )
// throw runtime_error("self-import chains cant be fungible"); // throw runtime_error("self-import chains cant be fungible");
CTxOut burnOut = MakeBurnOutput(burnAmount, ccid, targetSymbol, tx.vout); CTxOut burnOut = MakeBurnOutput(burnAmount, ccid, targetSymbol, tx.vout,rawproof);
UniValue ret(UniValue::VOBJ); UniValue ret(UniValue::VOBJ);
ret.push_back(Pair("payouts", HexStr(E_MARSHAL(ss << tx.vout)))); ret.push_back(Pair("payouts", HexStr(E_MARSHAL(ss << tx.vout))));
tx.vout.clear(); tx.vout.clear();
@@ -297,7 +297,7 @@ UniValue selfimport(const UniValue& params, bool fHelp)
if ( GetSelfimportProof(source,mtx,scriptPubKey,proof,burnAmount,rawtx,txid,rawproof) < 0 ) if ( GetSelfimportProof(source,mtx,scriptPubKey,proof,burnAmount,rawtx,txid,rawproof) < 0 )
throw std::runtime_error("Failed validating selfimport"); throw std::runtime_error("Failed validating selfimport");
vouts = mtx.vout; vouts = mtx.vout;
burnOut = MakeBurnOutput(burnAmount,0xffffffff,ASSETCHAINS_SELFIMPORT,vouts); burnOut = MakeBurnOutput(burnAmount,0xffffffff,ASSETCHAINS_SELFIMPORT,vouts,rawproof);
mtx.vout.clear(); mtx.vout.clear();
mtx.vout.push_back(burnOut); mtx.vout.push_back(burnOut);
burnTx = mtx; burnTx = mtx;