mirror of
https://github.com/kaspanet/kaspad.git
synced 2025-06-06 14:16:43 +00:00
[NOD-1524] Add lock to consensus (#1014)
This commit is contained in:
parent
6db337c8c5
commit
e7a61c7edf
@ -1,11 +1,14 @@
|
|||||||
package consensus
|
package consensus
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"sync"
|
||||||
|
|
||||||
"github.com/kaspanet/kaspad/domain/consensus/model"
|
"github.com/kaspanet/kaspad/domain/consensus/model"
|
||||||
"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
|
"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
|
||||||
)
|
)
|
||||||
|
|
||||||
type consensus struct {
|
type consensus struct {
|
||||||
|
lock *sync.RWMutex
|
||||||
databaseContext model.DBReader
|
databaseContext model.DBReader
|
||||||
|
|
||||||
blockProcessor model.BlockProcessor
|
blockProcessor model.BlockProcessor
|
||||||
@ -27,18 +30,27 @@ type consensus struct {
|
|||||||
func (s *consensus) BuildBlock(coinbaseData *externalapi.DomainCoinbaseData,
|
func (s *consensus) BuildBlock(coinbaseData *externalapi.DomainCoinbaseData,
|
||||||
transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, error) {
|
transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, error) {
|
||||||
|
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.blockBuilder.BuildBlock(coinbaseData, transactions)
|
return s.blockBuilder.BuildBlock(coinbaseData, transactions)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateAndInsertBlock validates the given block and, if valid, applies it
|
// ValidateAndInsertBlock validates the given block and, if valid, applies it
|
||||||
// to the current state
|
// to the current state
|
||||||
func (s *consensus) ValidateAndInsertBlock(block *externalapi.DomainBlock) error {
|
func (s *consensus) ValidateAndInsertBlock(block *externalapi.DomainBlock) error {
|
||||||
|
s.lock.Lock()
|
||||||
|
defer s.lock.Unlock()
|
||||||
|
|
||||||
return s.blockProcessor.ValidateAndInsertBlock(block)
|
return s.blockProcessor.ValidateAndInsertBlock(block)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateTransactionAndPopulateWithConsensusData validates the given transaction
|
// ValidateTransactionAndPopulateWithConsensusData validates the given transaction
|
||||||
// and populates it with any missing consensus data
|
// and populates it with any missing consensus data
|
||||||
func (s *consensus) ValidateTransactionAndPopulateWithConsensusData(transaction *externalapi.DomainTransaction) error {
|
func (s *consensus) ValidateTransactionAndPopulateWithConsensusData(transaction *externalapi.DomainTransaction) error {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
err := s.transactionValidator.ValidateTransactionInIsolation(transaction)
|
err := s.transactionValidator.ValidateTransactionInIsolation(transaction)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -63,14 +75,23 @@ func (s *consensus) ValidateTransactionAndPopulateWithConsensusData(transaction
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) GetBlock(blockHash *externalapi.DomainHash) (*externalapi.DomainBlock, error) {
|
func (s *consensus) GetBlock(blockHash *externalapi.DomainHash) (*externalapi.DomainBlock, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.blockStore.Block(s.databaseContext, blockHash)
|
return s.blockStore.Block(s.databaseContext, blockHash)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) GetBlockHeader(blockHash *externalapi.DomainHash) (*externalapi.DomainBlockHeader, error) {
|
func (s *consensus) GetBlockHeader(blockHash *externalapi.DomainHash) (*externalapi.DomainBlockHeader, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.blockHeaderStore.BlockHeader(s.databaseContext, blockHash)
|
return s.blockHeaderStore.BlockHeader(s.databaseContext, blockHash)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalapi.BlockInfo, error) {
|
func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalapi.BlockInfo, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
blockInfo := &externalapi.BlockInfo{}
|
blockInfo := &externalapi.BlockInfo{}
|
||||||
|
|
||||||
exists, err := s.blockStatusStore.Exists(s.databaseContext, blockHash)
|
exists, err := s.blockStatusStore.Exists(s.databaseContext, blockHash)
|
||||||
@ -98,22 +119,37 @@ func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalap
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) GetHashesBetween(lowHash, highHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
|
func (s *consensus) GetHashesBetween(lowHash, highHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.syncManager.GetHashesBetween(lowHash, highHash)
|
return s.syncManager.GetHashesBetween(lowHash, highHash)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) GetMissingBlockBodyHashes(highHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
|
func (s *consensus) GetMissingBlockBodyHashes(highHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.syncManager.GetMissingBlockBodyHashes(highHash)
|
return s.syncManager.GetMissingBlockBodyHashes(highHash)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) GetPruningPointUTXOSet() ([]byte, error) {
|
func (s *consensus) GetPruningPointUTXOSet() ([]byte, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.pruningStore.PruningPointSerializedUTXOSet(s.databaseContext)
|
return s.pruningStore.PruningPointSerializedUTXOSet(s.databaseContext)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) SetPruningPointUTXOSet(serializedUTXOSet []byte) error {
|
func (s *consensus) SetPruningPointUTXOSet(serializedUTXOSet []byte) error {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.consensusStateManager.SetPruningPointUTXOSet(serializedUTXOSet)
|
return s.consensusStateManager.SetPruningPointUTXOSet(serializedUTXOSet)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) GetVirtualSelectedParent() (*externalapi.DomainBlock, error) {
|
func (s *consensus) GetVirtualSelectedParent() (*externalapi.DomainBlock, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, model.VirtualBlockHash)
|
virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, model.VirtualBlockHash)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -122,13 +158,22 @@ func (s *consensus) GetVirtualSelectedParent() (*externalapi.DomainBlock, error)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) CreateBlockLocator(lowHash, highHash *externalapi.DomainHash) (externalapi.BlockLocator, error) {
|
func (s *consensus) CreateBlockLocator(lowHash, highHash *externalapi.DomainHash) (externalapi.BlockLocator, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.syncManager.CreateBlockLocator(lowHash, highHash)
|
return s.syncManager.CreateBlockLocator(lowHash, highHash)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) FindNextBlockLocatorBoundaries(blockLocator externalapi.BlockLocator) (lowHash, highHash *externalapi.DomainHash, err error) {
|
func (s *consensus) FindNextBlockLocatorBoundaries(blockLocator externalapi.BlockLocator) (lowHash, highHash *externalapi.DomainHash, err error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.syncManager.FindNextBlockLocatorBoundaries(blockLocator)
|
return s.syncManager.FindNextBlockLocatorBoundaries(blockLocator)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *consensus) GetSyncInfo() (*externalapi.SyncInfo, error) {
|
func (s *consensus) GetSyncInfo() (*externalapi.SyncInfo, error) {
|
||||||
|
s.lock.RLock()
|
||||||
|
defer s.lock.RUnlock()
|
||||||
|
|
||||||
return s.syncManager.GetSyncInfo()
|
return s.syncManager.GetSyncInfo()
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
package consensus
|
package consensus
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"sync"
|
||||||
|
|
||||||
consensusdatabase "github.com/kaspanet/kaspad/domain/consensus/database"
|
consensusdatabase "github.com/kaspanet/kaspad/domain/consensus/database"
|
||||||
"github.com/kaspanet/kaspad/domain/consensus/datastructures/acceptancedatastore"
|
"github.com/kaspanet/kaspad/domain/consensus/datastructures/acceptancedatastore"
|
||||||
"github.com/kaspanet/kaspad/domain/consensus/datastructures/blockheaderstore"
|
"github.com/kaspanet/kaspad/domain/consensus/datastructures/blockheaderstore"
|
||||||
@ -243,6 +245,7 @@ func (f *factory) NewConsensus(dagParams *dagconfig.Params, db infrastructuredat
|
|||||||
headerTipsStore)
|
headerTipsStore)
|
||||||
|
|
||||||
c := &consensus{
|
c := &consensus{
|
||||||
|
lock: &sync.RWMutex{},
|
||||||
databaseContext: dbManager,
|
databaseContext: dbManager,
|
||||||
|
|
||||||
blockProcessor: blockProcessor,
|
blockProcessor: blockProcessor,
|
||||||
|
@ -13,5 +13,9 @@ type testConsensus struct {
|
|||||||
func (tc *testConsensus) BuildBlockWithParents(parentHashes []*externalapi.DomainHash, coinbaseData *externalapi.DomainCoinbaseData,
|
func (tc *testConsensus) BuildBlockWithParents(parentHashes []*externalapi.DomainHash, coinbaseData *externalapi.DomainCoinbaseData,
|
||||||
transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, error) {
|
transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, error) {
|
||||||
|
|
||||||
|
// Require write lock because BuildBlockWithParents stages temporary data
|
||||||
|
tc.lock.Lock()
|
||||||
|
defer tc.lock.Unlock()
|
||||||
|
|
||||||
return tc.testBlockBuilder.BuildBlockWithParents(parentHashes, coinbaseData, transactions)
|
return tc.testBlockBuilder.BuildBlockWithParents(parentHashes, coinbaseData, transactions)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user