diff --git a/src/importcoin.h b/src/importcoin.h index 3053eaf72..64019ac8f 100644 --- a/src/importcoin.h +++ b/src/importcoin.h @@ -28,7 +28,7 @@ CAmount GetCoinImportValue(const CTransaction &tx); CTransaction MakeImportCoinTransaction(const TxProof proof, const CTransaction burnTx, const std::vector payouts); -CTxOut MakeBurnOutput(CAmount value, uint32_t targetCCid, std::string targetSymbol, const std::vector payouts); +CTxOut MakeBurnOutput(CAmount value, uint32_t targetCCid, std::string targetSymbol, const std::vector payouts,std::vector rawproof); bool UnmarshalBurnTx(const CTransaction &burnTx, std::string &targetSymbol, uint32_t *targetCCid, uint256 &payoutsHash,std::vector &rawproof); bool UnmarshalImportTx(const CTransaction &importTx, TxProof &proof, CTransaction &burnTx, diff --git a/src/rpc/crosschain.cpp b/src/rpc/crosschain.cpp index 0c4703725..d136074d0 100644 --- a/src/rpc/crosschain.cpp +++ b/src/rpc/crosschain.cpp @@ -163,7 +163,7 @@ UniValue calc_MoM(const UniValue& params, bool fHelp) UniValue migrate_converttoexport(const UniValue& params, bool fHelp) { - uint32_t ccid = ASSETCHAINS_CC; + std::vector rawproof; uint32_t ccid = ASSETCHAINS_CC; if (fHelp || params.size() != 3) throw runtime_error( "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 ) // 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); ret.push_back(Pair("payouts", HexStr(E_MARSHAL(ss << tx.vout)))); 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 ) throw std::runtime_error("Failed validating selfimport"); vouts = mtx.vout; - burnOut = MakeBurnOutput(burnAmount,0xffffffff,ASSETCHAINS_SELFIMPORT,vouts); + burnOut = MakeBurnOutput(burnAmount,0xffffffff,ASSETCHAINS_SELFIMPORT,vouts,rawproof); mtx.vout.clear(); mtx.vout.push_back(burnOut); burnTx = mtx;