Skip to content

Only compute BMF for PoS #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Parent: feature/proof-of-stake
wants to merge 1 commit into
base: feature/proof-of-stake
Choose a base branch
from
Open

Only compute BMF for PoS #1349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions lib/block_view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4376,6 +4376,7 @@ func (bav *UtxoView) ConnectBlock(
var totalFees uint64
utxoOps := [][]*UtxoOperation{}
var maxUtilityFee uint64
computeMaxUtilityFee := bav.Params.IsPoSBlockHeight(blockHeight)
for txIndex, txn := range desoBlock.Txns {
txHash := txHashes[txIndex]

Expand Down Expand Up @@ -4414,8 +4415,19 @@ func (bav *UtxoView) ConnectBlock(

if includeFeesInBlockReward {
if txn.TxnMeta.GetTxnType() != TxnTypeAtomicTxnsWrapper {
// Compute the BMF given the current fees paid in the block.
_, utilityFee = computeBMF(currentFees)
if computeMaxUtilityFee {
// Compute the BMF given the current fees paid in the block.
_, utilityFee = computeBMF(currentFees)

// For PoS, the maximum block reward is based on the maximum utility fee.
// Add the utility fees to the max utility fees. If any overflow
// occurs mark the block as invalid and return a rule error.
maxUtilityFee, err = SafeUint64().Add(maxUtilityFee, utilityFee)
if err != nil {
return nil, errors.Wrapf(RuleErrorPoSBlockRewardWithInvalidAmount,
"ConnectBlock: error computing maxUtilityFee: %v", err)
}
}

// Add the fees from this txn to the total fees. If any overflow occurs
// mark the block as invalid and return a rule error. Note that block reward
Expand All @@ -4425,14 +4437,6 @@ func (bav *UtxoView) ConnectBlock(
}
totalFees += currentFees

// For PoS, the maximum block reward is based on the maximum utility fee.
// Add the utility fees to the max utility fees. If any overflow
// occurs mark the block as invalid and return a rule error.
maxUtilityFee, err = SafeUint64().Add(maxUtilityFee, utilityFee)
if err != nil {
return nil, errors.Wrapf(RuleErrorPoSBlockRewardWithInvalidAmount,
"ConnectBlock: error computing maxUtilityFee: %v", err)
}
} else {
txnMeta, ok := txn.TxnMeta.(*AtomicTxnsWrapperMetadata)
if !ok {
Expand All @@ -4448,11 +4452,13 @@ func (bav *UtxoView) ConnectBlock(
return nil, errors.Wrap(
err, "ConnectBlock: error adding non-block-reward recipient fees from atomic transaction")
}
_, utilityFee = computeBMF(nonBlockRewardRecipientFees)
maxUtilityFee, err = SafeUint64().Add(maxUtilityFee, utilityFee)
if err != nil {
return nil, errors.Wrap(err,
"ConnectBlock: error computing maxUtilityFee: %v")
if computeMaxUtilityFee {
_, utilityFee = computeBMF(nonBlockRewardRecipientFees)
maxUtilityFee, err = SafeUint64().Add(maxUtilityFee, utilityFee)
if err != nil {
return nil, errors.Wrap(err,
"ConnectBlock: error computing maxUtilityFee: %v")
}
}
}
}
Expand Down