TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

core: ensure data logged is from persistent store

Browse source 
Using bc.dao here is wrong, it can contain unpersisted data.
This commit is contained in:
Roman Khimov 2021-08-02 16:03:53 +03:00
parent 8277b7a19a
commit f8174ca64c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/core/blockchain.go
View file

@ -98,9 +98,13 @@ type Blockchain struct {
// with the only writer being the block addition logic. // with the only writer being the block addition logic.
lock sync.RWMutex lock sync.RWMutex
// Data access object for CRUD operations around storage. // Data access object for CRUD operations around storage. It's write-cached.
dao *dao.Simple dao *dao.Simple
// persistent is the same DB as dao, but we never write to it, so all reads
// are directly from underlying persistent store.
persistent *dao.Simple
// Current index/height of the highest block. // Current index/height of the highest block.
// Read access should always be called by BlockHeight(). // Read access should always be called by BlockHeight().
// Write access should only happen in storeBlock(). // Write access should only happen in storeBlock().
@ -215,6 +219,7 @@ func NewBlockchain(s storage.Store, cfg config.ProtocolConfiguration, log *zap.L
bc := &Blockchain{ bc := &Blockchain{
config: cfg, config: cfg,
dao: dao.NewSimple(s, cfg.StateRootInHeader), dao: dao.NewSimple(s, cfg.StateRootInHeader),
persistent: dao.NewSimple(s, cfg.StateRootInHeader),
stopCh: make(chan struct{}), stopCh: make(chan struct{}),
runToExitCh: make(chan struct{}), runToExitCh: make(chan struct{}),
memPool: mempool.New(cfg.MemPoolSize, 0, false), memPool: mempool.New(cfg.MemPoolSize, 0, false),
@ -1190,14 +1195,14 @@ func (bc *Blockchain) persist() (time.Duration, error) {
return 0, err return 0, err
} }
if persisted > 0 { if persisted > 0 {
bHeight, err := bc.dao.GetCurrentBlockHeight() bHeight, err := bc.persistent.GetCurrentBlockHeight()
if err != nil { if err != nil {
return 0, err return 0, err
} }
oldHeight := atomic.SwapUint32(&bc.persistedHeight, bHeight) oldHeight := atomic.SwapUint32(&bc.persistedHeight, bHeight)
diff := bHeight - oldHeight diff := bHeight - oldHeight
storedHeaderHeight, _, err := bc.dao.GetCurrentHeaderHeight() storedHeaderHeight, _, err := bc.persistent.GetCurrentHeaderHeight()
if err != nil { if err != nil {
return 0, err return 0, err
} }