GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 18fadbafcc into merged_master (Elements PR #863)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:21 +00:00
commit cf039bc4dd
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/confidential_validation.cpp
View file

@ -33,9 +33,12 @@ bool HasValidFee(const CTransaction& tx) {
if (fee == 0 || !MoneyRange(fee))
return false;
totalFee[tx.vout[i].nAsset.GetAsset()] += fee;
if (!MoneyRange(totalFee)) {
return false;
}
}
}
return MoneyRange(totalFee);
return true;
}
CAmountMap GetFeeMap(const CTransaction& tx) {

3
src/consensus/tx_verify.cpp
View file

@ -246,6 +246,9 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state,
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-in-ne-out", "value in != value out");
}
fee_map += GetFeeMap(tx);
if (!MoneyRange(fee_map)) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-block-total-fee-outofrange");
}
} else {
const CAmount value_out = tx.GetValueOutMap()[CAsset()];
if (nValueIn < value_out) {