Skip to content
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

fix: nodes keep out of sync when missing gossiped block (issue #284) #540

Merged
merged 15 commits into from
Dec 28, 2023
Merged

fix: nodes keep out of sync when missing gossiped block (issue #284) #540

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
28e0b95
replace for go-libp2p-pubsub repo pointing to dymension repo instead …
srene Dec 20, 2023
5c0d60d
updating versions of required go-libp2p-pubsub dependencies
srene Dec 20, 2023
712e50f
removing reference to libp2p old libraries (go-libp2p-core)
srene Dec 20, 2023
f741746
removing references to deprecated peer id Pretty function
srene Dec 20, 2023
08f36ec
caching blocks to apply them later when received out-of-order
srene Dec 20, 2023
9b42765
increasing gossipsub cache size
srene Dec 20, 2023
cab1d26
downgrading libp2p to be compatible with go 1.19
srene Dec 20, 2023
88666b1
checking error after applying block
srene Dec 20, 2023
1895c79
wrong checks after syncing from da
srene Dec 27, 2023
849431e
setting gossipsub cache size from config parameters
srene Dec 27, 2023
735a31e
refactoring caching blocks with new function checkPrevCachedBlocks
srene Dec 28, 2023
5773d82
removing commented code
srene Dec 28, 2023
a951998
adding missing error check
srene Dec 28, 2023
b0029b5
applying cached blocks in all cases + minor edits
srene Dec 28, 2023
4b4a6e0
caching blocks only when higher than store height
srene Dec 28, 2023
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
Prev Previous commit
Next Next commit
caching blocks to apply them later when received out-of-order
  • Loading branch information
@srene
srene committed Dec 20, 2023
commit 08f36ec175e7ea78c7cda4b005325c45c25cfb6c
17 changes: 17 additions & 0 deletions block/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import (
func (m *Manager) applyBlock(ctx context.Context, block *types.Block, commit *types.Commit, blockMetaData blockMetaData) error {
if block.Header.Height != m.store.Height()+1 {
// We crashed after the commit and before updating the store height.
m.prevBlock[block.Header.Height] = block
m.prevCommit[block.Header.Height] = commit
m.prevMetaData[block.Header.Height] = blockMetaData
return nil
}

Expand Down Expand Up @@ -109,6 +112,20 @@ func (m *Manager) applyBlock(ctx context.Context, block *types.Block, commit *ty

m.store.SetHeight(block.Header.Height)

cachedBlock, exists := m.prevBlock[m.store.Height()+1]

if exists {
m.applyBlock(ctx, cachedBlock, m.prevCommit[m.store.Height()+1], m.prevMetaData[m.store.Height()+1])
}

for k := range m.prevBlock {
if k <= block.Header.Height {
delete(m.prevBlock, k)
delete(m.prevCommit, k)
delete(m.prevMetaData, k)
}
}

return nil
}

Expand Down
7 changes: 7 additions & 0 deletions block/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ type Manager struct {
syncCache map[uint64]*types.Block

logger log.Logger

prevBlock map[uint64]*types.Block
prevCommit map[uint64]*types.Commit
prevMetaData map[uint64]blockMetaData
}

// getInitialState tries to load lastState from Store, and if it's not available it reads GenesisDoc.
Expand Down Expand Up @@ -168,6 +172,9 @@ func NewManager(
shouldProduceBlocksCh: make(chan bool, 1),
produceEmptyBlockCh: make(chan bool, 1),
logger: logger,
prevBlock: make(map[uint64]*types.Block),
prevCommit: make(map[uint64]*types.Commit),
prevMetaData: make(map[uint64]blockMetaData),
}

return agg, nil
Expand Down