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

Merge branch 'FSM' of https://github.com/jl777/komodo into ac_import

Browse Source
This commit is contained in:
blackjok3r
2019-01-02 23:29:52 +08:00
parent 91b6694c71 f7b88823c7
commit e93fd95815
258 changed files with 3440 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/importcoin.cpp
View File

@@ -1,3 +1,18 @@
/******************************************************************************
* Copyright © 2014-2019 The SuperNET Developers. *
* *
* See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at *
* the top-level directory of this distribution for the individual copyright *
* holder information and the developer policies on copyright and licensing. *
* *
* Unless otherwise agreed in a custom licensing agreement, no part of the *
* SuperNET software, including this file may be copied, modified, propagated *
* or distributed except according to the terms contained in the LICENSE file *
* *
* Removal or modification of this copyright notice is prohibited. *
* *
******************************************************************************/
#include "crosschain.h"
#include "importcoin.h"
#include "cc/utils.h"
@@ -24,11 +39,14 @@ CTransaction MakeImportCoinTransaction(const TxProof proof, const CTransaction b
return CTransaction(mtx);
}
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)
{
std::vector<uint8_t> opret = E_MARSHAL(ss << VARINT(targetCCid);
ss << targetSymbol;
ss << SerializeHash(payouts));
std::vector<uint8_t> opret;
opret = E_MARSHAL(ss << VARINT(targetCCid);
ss << targetSymbol;
ss << SerializeHash(payouts);
ss << rawproof);
return CTxOut(value, CScript() << OP_RETURN << opret);
}
@@ -46,14 +64,16 @@ bool UnmarshalImportTx(const CTransaction &importTx, TxProof &proof, CTransactio
}
bool UnmarshalBurnTx(const CTransaction &burnTx, std::string &targetSymbol, uint32_t *targetCCid, uint256 &payoutsHash)
bool UnmarshalBurnTx(const CTransaction &burnTx, std::string &targetSymbol, uint32_t *targetCCid, uint256 &payoutsHash,std::vector<uint8_t>&rawproof)
{
std::vector<uint8_t> burnOpret;
std::vector<uint8_t> burnOpret; uint32_t ccid = 0;
if (burnTx.vout.size() == 0) return false;
GetOpReturnData(burnTx.vout.back().scriptPubKey, burnOpret);
E_UNMARSHAL(burnOpret, ss >> VARINT(ccid));
return E_UNMARSHAL(burnOpret, ss >> VARINT(*targetCCid);
ss >> targetSymbol;
ss >> payoutsHash);
ss >> targetSymbol;
ss >> payoutsHash;
ss >> rawproof);
}
@@ -105,9 +125,10 @@ bool VerifyCoinImport(const CScript& scriptSig, TransactionSignatureChecker& che
void AddImportTombstone(const CTransaction &importTx, CCoinsViewCache &inputs, int nHeight)
{
uint256 burnHash = importTx.vin[0].prevout.hash;
//fprintf(stderr,"add tombstone.(%s)\n",burnHash.GetHex().c_str());
CCoinsModifier modifier = inputs.ModifyCoins(burnHash);
modifier->nHeight = nHeight;
modifier->nVersion = 4;
modifier->nVersion = 4;//1;
modifier->vout.push_back(CTxOut(0, CScript() << OP_0));
}
@@ -115,6 +136,7 @@ void AddImportTombstone(const CTransaction &importTx, CCoinsViewCache &inputs, i
void RemoveImportTombstone(const CTransaction &importTx, CCoinsViewCache &inputs)
{
uint256 burnHash = importTx.vin[0].prevout.hash;
//fprintf(stderr,"remove tombstone.(%s)\n",burnHash.GetHex().c_str());
inputs.ModifyCoins(burnHash)->Clear();
}
@@ -122,5 +144,6 @@ void RemoveImportTombstone(const CTransaction &importTx, CCoinsViewCache &inputs
int ExistsImportTombstone(const CTransaction &importTx, const CCoinsViewCache &inputs)
{
uint256 burnHash = importTx.vin[0].prevout.hash;
//fprintf(stderr,"check tombstone.(%s) in %s\n",burnHash.GetHex().c_str(),importTx.GetHash().GetHex().c_str());
return inputs.HaveCoins(burnHash);
}