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

Merge pull request #455 from VerusCoin/dev 

Dev
master v0.9.4-3
Asher Dawes 2 years ago
committed by GitHub
parent
aaf0213eaf e0b2a4508b
commit
2521515202
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 8 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. 2
      src/main.cpp
  2. 4
      src/miner.cpp
  3. 53
      src/pbaas/notarization.cpp
  4. 2
      src/pbaas/reserves.h

2
src/main.cpp
View File

@ -2124,7 +2124,7 @@ bool AcceptToMemoryPoolInt(CTxMemPool& pool, CValidationState &state, const CTra
ContextualCheckInputs(tx, state, view, nextBlockHeight, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, txdata, Params().GetConsensus(), consensusBranchId);
if ( flag != 0 )
KOMODO_CONNECTING = -1;
return error("AcceptToMemoryPool: BUG! PLEASE REPORT THIS! ConnectInputs failed against MANDATORY but not STANDARD flags %s", hash.ToString());
return error("AcceptToMemoryPool: ConnectInputs failed against MANDATORY but not STANDARD flags %s", hash.ToString());
}
// if this is a valid stake transaction, don't put it in the mempool

4
src/miner.cpp
View File

@ -1977,11 +1977,11 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const std::vecto
mempool.removeConflicts(notarizationTx, removedTxVec);
CValidationState mempoolState;
relayTx = myAddtomempool(notarizationTx, &state);
if (LogAcceptCategory("notarizationverbose") || LogAcceptCategory("notarization"))
if (LogAcceptCategory("notarization"))
{
for (auto oneTx : removedTxVec)
{
if (LogAcceptCategory("notarizationverbose"))
if (LogAcceptCategory("verbose"))
{
UniValue jsonNTx(UniValue::VOBJ);
TxToUniv(oneTx, uint256(), jsonNTx);

53
src/pbaas/notarization.cpp
View File

@ -3967,8 +3967,20 @@ bool CPBaaSNotarization::ConfirmOrRejectNotarizations(CWallet *pWallet,
{
COptCCParams tP;
if (oneEvidenceSpend.scriptPubKey.IsPayToCryptoCondition(tP) &&
tP.IsValid() &&
tP.evalCode == EVAL_NOTARY_EVIDENCE || tP.evalCode == EVAL_FINALIZE_NOTARIZATION)
{
// if our evidence include an already confirmed finalization for the same output,
// abort with nothing to do
CObjectFinalization tPOF;
if (tP.evalCode == EVAL_FINALIZE_NOTARIZATION &&
tP.vData.size() &&
(tPOF = CObjectFinalization(tP.vData[0])).IsValid() &&
tPOF.output == of.output &&
tPOF.IsConfirmed())
{
return state.Error(errorPrefix + "target notarization already confirmed");
}
of.evidenceInputs.push_back(txBuilder.mtx.vin.size());
if (!inputSet.count(oneEvidenceSpend.txIn.prevout))
{
@ -4021,8 +4033,30 @@ bool CPBaaSNotarization::ConfirmOrRejectNotarizations(CWallet *pWallet,
auto newTxBuilder = TransactionBuilder(Params().GetConsensus(), nHeight, pWallet);
TransactionBuilder &oneConfirmedBuilder = makeInputTx ? newTxBuilder : txBuilder;
bool isConfirmed = false;
for (auto &oneInput : spendsToClose[oneConfirmedIdx])
{
COptCCParams tP;
if (oneInput.scriptPubKey.IsPayToCryptoCondition(tP) &&
tP.IsValid() &&
tP.evalCode == EVAL_NOTARY_EVIDENCE || tP.evalCode == EVAL_FINALIZE_NOTARIZATION)
{
// if our evidence include an already confirmed finalization for the same output,
// abort with nothing to do
CObjectFinalization tPOF;
if (tP.evalCode == EVAL_FINALIZE_NOTARIZATION &&
tP.vData.size() &&
(tPOF = CObjectFinalization(tP.vData[0])).IsValid() &&
((tPOF.output.hash.IsNull() &&
oneInput.txIn.prevout.hash == cnd.vtx[oneConfirmedIdx].first.hash &&
tPOF.output.n == cnd.vtx[oneConfirmedIdx].first.n) ||
tPOF.output == cnd.vtx[oneConfirmedIdx].first) &&
tPOF.IsConfirmed())
{
isConfirmed = true;
}
}
if (!inputSet.count(oneInput.txIn.prevout))
{
inputSet.insert(oneInput.txIn.prevout);
@ -4038,11 +4072,14 @@ bool CPBaaSNotarization::ConfirmOrRejectNotarizations(CWallet *pWallet,
if (makeInputTx)
{
CObjectFinalization oneConfirmedFinalization = CObjectFinalization(CObjectFinalization::FINALIZE_NOTARIZATION,
SystemID,
cnd.vtx[oneConfirmedIdx].first.hash,
cnd.vtx[oneConfirmedIdx].first.n,
height);
CObjectFinalization oneConfirmedFinalization =
CObjectFinalization(isConfirmed ?
CObjectFinalization::FINALIZE_NOTARIZATION + CObjectFinalization::FINALIZE_CONFIRMED :
CObjectFinalization::FINALIZE_NOTARIZATION,
SystemID,
cnd.vtx[oneConfirmedIdx].first.hash,
cnd.vtx[oneConfirmedIdx].first.n,
height);
//oneConfirmedFinalization.evidenceInputs = evidenceInputs;
cp = CCinit(&CC, EVAL_FINALIZE_NOTARIZATION);
@ -5332,6 +5369,12 @@ bool ValidateFinalizeNotarization(struct CCcontract_info *cp, Eval* eval, const
return true;
}
}
if (LogAcceptCategory("notarization") && LogAcceptCategory("verbose"))
{
UniValue jsonNTx(UniValue::VOBJ);
TxToUniv(tx, uint256(), jsonNTx);
LogPrintf("%s: Invalid spend of confirmed finalization on transaction:\n%s\n", __func__, jsonNTx.write(1,2).c_str());
}
return eval->Error("Invalid spend of confirmed finalization to transaction with no confirmed output");
}

2
src/pbaas/reserves.h
View File

@ -947,6 +947,8 @@ public:
CCurrencyValueMap totalAmounts; // total amount exported of each currency, including fees
CCurrencyValueMap totalFees; // total fees in all currencies to split between this export and import
CCurrencyValueMap totalBurned; // if this is a cross chain export, some currencies will be burned, the rest held in deposits
// TODO: HARDENING - on next testnet reset, move this variable to before the CCurrencyValueMaps for easier parsing in the contracts
CTransferDestination exporter; // typically the exporting miner or staker's address, to accept deferred payment for the export
int32_t firstInput; // if export is from inputs, on chain of reserveTransfers, this is first input, -1 for cross-chain

Write Preview
Loading…
Cancel
Save