Skip to content

Commit f20f46c

Browse files
committed
Consensus tightening - forbid pool id mismatch; some cleanup
1 parent fe0d7b0 commit f20f46c

15 files changed

Lines changed: 594 additions & 78 deletions

File tree

chainstate/src/detail/ban_score.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,7 @@ impl BanScore for ConsensusPoSError {
476476
ConsensusPoSError::EmptyTimespan => 100,
477477
ConsensusPoSError::FailedToCalculateCappedBalance => 100,
478478
ConsensusPoSError::InvalidOutputTypeInStakeKernel(_) => 100,
479+
ConsensusPoSError::PoolIdsInKernelUtxoAndPoSDataMismatch { .. } => 100,
479480
}
480481
}
481482
}

chainstate/src/detail/error_classification.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,8 @@ impl BlockProcessingErrorClassification for ConsensusPoSError {
663663
| ConsensusPoSError::FiniteTotalSupplyIsRequired
664664
| ConsensusPoSError::UnsupportedConsensusVersion
665665
| ConsensusPoSError::FailedToCalculateCappedBalance
666-
| ConsensusPoSError::InvalidOutputTypeInStakeKernel(_) => {
666+
| ConsensusPoSError::InvalidOutputTypeInStakeKernel(_)
667+
| ConsensusPoSError::PoolIdsInKernelUtxoAndPoSDataMismatch { .. } => {
667668
BlockProcessingErrorClass::BadBlock
668669
}
669670

chainstate/src/detail/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub use self::{
8686
median_time::calculate_median_time_past_from_blocktimestamps,
8787
};
8888
pub use chainstate_types::Locator;
89-
pub use chainstateref::NonZeroPoolBalances;
89+
pub use chainstateref::{EpochSealError, NonZeroPoolBalances};
9090
pub use error::{
9191
BlockError, CheckBlockError, CheckBlockTransactionsError, DbCommittingContext,
9292
InitializationError, OrphanCheckError, StorageCompatibilityCheckError,

chainstate/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ pub use crate::{
3939
detail::{
4040
BlockError, BlockProcessingErrorClass, BlockProcessingErrorClassification, BlockSource,
4141
ChainInfo, CheckBlockError, CheckBlockTransactionsError, ConnectTransactionError,
42-
IOPolicyError, InitializationError, Locator, MEDIAN_TIME_SPAN, NonZeroPoolBalances,
43-
OrphanCheckError, SpendStakeError, StorageCompatibilityCheckError, TokenIssuanceError,
44-
TokensError, TransactionVerifierStorageError, ban_score,
42+
EpochSealError, IOPolicyError, InitializationError, Locator, MEDIAN_TIME_SPAN,
43+
NonZeroPoolBalances, OrphanCheckError, SpendStakeError, StorageCompatibilityCheckError,
44+
TokenIssuanceError, TokensError, TransactionVerifierStorageError, ban_score,
4545
block_invalidation::BlockInvalidatorError, bootstrap::BootstrapError,
4646
calculate_median_time_past, calculate_median_time_past_from_blocktimestamps,
4747
},

0 commit comments

Comments
 (0)