duke
/
VerusCoin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Enable more cross-chain destinations and hardening

pull/451/head
miketout 2 years ago
parent
2f9e9b4cb5
commit
ca60fd08a5
1 changed files with 104 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 187
      src/pbaas/reserves.cpp

187
src/pbaas/reserves.cpp
View File

@ -426,107 +426,128 @@ bool CCrossChainImport::GetImportInfo(const CTransaction &importTx,
}
// TODO: HARDENING - review to ensure that if this is skipped an error is thrown when appropriate
if (!isPBaaSDefinitionOrLaunch &&
(pBaseImport->importCurrencyID == ASSETCHAINS_CHAINID ||
(!pBaseImport->importCurrencyID.IsNull() && pBaseImport->importCurrencyID == ConnectedChains.ThisChain().GatewayConverterID())))
// for example, if we are coming in from ETH to the Verus / ETH converter
bool passedCheck = isPBaaSDefinitionOrLaunch;
if (!passedCheck)
{
// next output should be export in evidence output followed by supplemental reserve transfers for the export
evidenceOutStart = importNotarizationOut + 1;
int afterEvidence;
CNotaryEvidence evidence(importTx, evidenceOutStart, afterEvidence, CNotaryEvidence::TYPE_IMPORT_PROOF);
if (!evidence.IsValid())
passedCheck = pBaseImport->importCurrencyID == ASSETCHAINS_CHAINID ||
(!pBaseImport->importCurrencyID.IsNull() && pBaseImport->importCurrencyID == ConnectedChains.ThisChain().GatewayConverterID());
if (!passedCheck && !pBaseImport->importCurrencyID.IsNull())
{
// TODO: remove the line assigning evidence just below, as it is only for debugging
evidence = CNotaryEvidence(importTx, evidenceOutStart, afterEvidence);
return state.Error(strprintf("%s: cannot retrieve export evidence for import", __func__));
for (auto &oneCur : ConnectedChains.notarySystems)
{
if (pBaseImport->importCurrencyID == oneCur.second.notaryChain.chainDefinition.GatewayConverterID() &&
oneCur.second.notaryChain.chainDefinition.systemID == ASSETCHAINS_CHAINID)
{
passedCheck = true;
break;
}
}
}
if (passedCheck)
{
// next output should be export in evidence output followed by supplemental reserve transfers for the export
evidenceOutStart = importNotarizationOut + 1;
int afterEvidence;
CNotaryEvidence evidence(importTx, evidenceOutStart, afterEvidence, CNotaryEvidence::TYPE_IMPORT_PROOF);
std::set<int> validEvidenceTypes;
validEvidenceTypes.insert(CHAINOBJ_TRANSACTION_PROOF);
CNotaryEvidence transactionProof(sysCCITemp.sourceSystemID, evidence.output, evidence.state, evidence.GetSelectEvidence(validEvidenceTypes), CNotaryEvidence::TYPE_IMPORT_PROOF);
if (!evidence.IsValid())
{
// TODO: remove the line assigning evidence just below, as it is only for debugging
evidence = CNotaryEvidence(importTx, evidenceOutStart, afterEvidence);
/*
// reconstruct evidence if necessary
if (evidence.IsPartialTxProof() &&
evidence.evidence.size())
return state.Error(strprintf("%s: cannot retrieve export evidence for import", __func__));
}
// reconstruct multipart evidence if necessary
if (evidence.IsMultipartProof())
{
COptCCParams eP;
CNotaryEvidence supplementalEvidence;
while (importTx.vout.size() > (evidenceOutStart + 1) &&
importTx.vout[evidenceOutStart + 1].scriptPubKey.IsPayToCryptoCondition(eP) &&
eP.IsValid() &&
eP.evalCode == EVAL_NOTARY_EVIDENCE &&
eP.vData.size() &&
(supplementalEvidence = CNotaryEvidence(eP.vData[0])).IsValid() &&
supplementalEvidence.IsPartialTxProof() &&
supplementalEvidence.evidence.size() == 1)
std::set<int> validEvidenceTypes;
validEvidenceTypes.insert(CHAINOBJ_TRANSACTION_PROOF);
CNotaryEvidence transactionProof(sysCCITemp.sourceSystemID, evidence.output, evidence.state, evidence.GetSelectEvidence(validEvidenceTypes), CNotaryEvidence::TYPE_IMPORT_PROOF);
/*
// reconstruct evidence if necessary
if (evidence.IsPartialTxProof() &&
evidence.evidence.size())
// reconstruct multipart evidence if necessary
if (evidence.IsMultipartProof())
{
evidenceOutStart++;
evidence.evidence.push_back(supplementalEvidence.evidence[0]);
COptCCParams eP;
CNotaryEvidence supplementalEvidence;
while (importTx.vout.size() > (evidenceOutStart + 1) &&
importTx.vout[evidenceOutStart + 1].scriptPubKey.IsPayToCryptoCondition(eP) &&
eP.IsValid() &&
eP.evalCode == EVAL_NOTARY_EVIDENCE &&
eP.vData.size() &&
(supplementalEvidence = CNotaryEvidence(eP.vData[0])).IsValid() &&
supplementalEvidence.IsPartialTxProof() &&
supplementalEvidence.evidence.size() == 1)
{
evidenceOutStart++;
evidence.evidence.push_back(supplementalEvidence.evidence[0]);
}
if (!eP.IsValid())
{
return state.Error(strprintf("%s: cannot reconstruct export evidence for import", __func__));
}
evidence.evidence = std::vector<CPartialTransactionProof>({CPartialTransactionProof(evidence.evidence)});
}
if (!eP.IsValid())
*/
CTransaction exportTx;
p = COptCCParams();
if (!(transactionProof.evidence.chainObjects.size() &&
!((CChainObject<CPartialTransactionProof> *)transactionProof.evidence.chainObjects[0])->object.GetPartialTransaction(exportTx).IsNull() &&
((CChainObject<CPartialTransactionProof> *)transactionProof.evidence.chainObjects[0])->object.TransactionHash() == pBaseImport->exportTxId &&
exportTx.vout.size() > pBaseImport->exportTxOutNum &&
exportTx.vout[pBaseImport->exportTxOutNum].scriptPubKey.IsPayToCryptoCondition(p) &&
p.IsValid() &&
p.evalCode == EVAL_CROSSCHAIN_EXPORT &&
p.vData.size() &&
(ccx = CCrossChainExport(p.vData[0])).IsValid()))
{
return state.Error(strprintf("%s: cannot reconstruct export evidence for import", __func__));
return state.Error(strprintf("%s: invalid export evidence for import", __func__));
}
evidence.evidence = std::vector<CPartialTransactionProof>({CPartialTransactionProof(evidence.evidence)});
}
*/
CTransaction exportTx;
p = COptCCParams();
if (!(transactionProof.evidence.chainObjects.size() &&
!((CChainObject<CPartialTransactionProof> *)transactionProof.evidence.chainObjects[0])->object.GetPartialTransaction(exportTx).IsNull() &&
((CChainObject<CPartialTransactionProof> *)transactionProof.evidence.chainObjects[0])->object.TransactionHash() == pBaseImport->exportTxId &&
exportTx.vout.size() > pBaseImport->exportTxOutNum &&
exportTx.vout[pBaseImport->exportTxOutNum].scriptPubKey.IsPayToCryptoCondition(p) &&
p.IsValid() &&
p.evalCode == EVAL_CROSSCHAIN_EXPORT &&
p.vData.size() &&
(ccx = CCrossChainExport(p.vData[0])).IsValid()))
{
return state.Error(strprintf("%s: invalid export evidence for import", __func__));
}
uint160 externalSystemID = ccx.sourceSystemID == ASSETCHAINS_CHAINID ?
((ccx.destSystemID == ASSETCHAINS_CHAINID) ? uint160() : ccx.destSystemID) :
ccx.sourceSystemID;
uint160 externalSystemID = ccx.sourceSystemID == ASSETCHAINS_CHAINID ?
((ccx.destSystemID == ASSETCHAINS_CHAINID) ? uint160() : ccx.destSystemID) :
ccx.sourceSystemID;
std::map<uint160, CProofRoot>::iterator proofIt;
if (!externalSystemID.IsNull() &&
(proofIt = importNotarization.proofRoots.find(externalSystemID)) != importNotarization.proofRoots.end())
{
switch (proofIt->second.type)
std::map<uint160, CProofRoot>::iterator proofIt;
if (!externalSystemID.IsNull() &&
(proofIt = importNotarization.proofRoots.find(externalSystemID)) != importNotarization.proofRoots.end())
{
case CProofRoot::TYPE_ETHEREUM:
switch (proofIt->second.type)
{
hashType = CCurrencyDefinition::EProofProtocol::PROOF_ETHNOTARIZATION;
break;
case CProofRoot::TYPE_ETHEREUM:
{
hashType = CCurrencyDefinition::EProofProtocol::PROOF_ETHNOTARIZATION;
break;
}
}
}
}
else if (!externalSystemID.IsNull())
{
return state.Error(strprintf("%s: no proof root to validate export for external system %s", __func__, EncodeDestination(CIdentityID(externalSystemID)).c_str()));
}
else if (!externalSystemID.IsNull())
{
return state.Error(strprintf("%s: no proof root to validate export for external system %s", __func__, EncodeDestination(CIdentityID(externalSystemID)).c_str()));
}
int32_t nextOutput;
CPBaaSNotarization xNotarization;
int primaryOutNumOut;
if (!ccx.GetExportInfo(importTx, evidenceOutStart, primaryOutNumOut, nextOutput, xNotarization, reserveTransfers, hashType))
{
//UniValue jsonTx(UniValue::VOBJ);
//TxToUniv(importTx, uint256(), jsonTx);
//printf("%s: importTx:\n%s\n", __func__, jsonTx.write(1,2).c_str());
return state.Error(strprintf("%s: invalid export evidence for import 1",__func__));
}
int32_t nextOutput;
CPBaaSNotarization xNotarization;
int primaryOutNumOut;
if (!ccx.GetExportInfo(importTx, evidenceOutStart, primaryOutNumOut, nextOutput, xNotarization, reserveTransfers, hashType))
{
//UniValue jsonTx(UniValue::VOBJ);
//TxToUniv(importTx, uint256(), jsonTx);
//printf("%s: importTx:\n%s\n", __func__, jsonTx.write(1,2).c_str());
return state.Error(strprintf("%s: invalid export evidence for import 1",__func__));
}
// evidence out end points to the last evidence out, not beyond
evidenceOutEnd = nextOutput - 1;
// evidence out end points to the last evidence out, not beyond
evidenceOutEnd = nextOutput - 1;
}
}
if (!passedCheck)
{
return state.Error(strprintf("%s: unable to verify cross-chain export as valid",__func__));
}
}

Write Preview
Loading…
Cancel
Save