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

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
11 changes: 7 additions & 4 deletions block/retriever.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,22 @@ func (m *Manager) syncUntilTarget(ctx context.Context, syncTarget uint64) error
return err
}

if settlementBatch.StartHeight != currentHeight+1 {
//code commented out because it may be the case the start height from the da batch is not exactly the next block from the last received
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can simply delete the entire lines. no need for leaving it with comments.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

/*if settlementBatch.StartHeight != currentHeight+1 {
return fmt.Errorf("settlement batch start height (%d) on index (%d) is not the expected", settlementBatch.StartHeight, currStateIdx)
}
}*/

err = m.processNextDABatch(ctx, settlementBatch.MetaData.DA.Height)
if err != nil {
return err
}

currentHeight = m.store.Height()
if currentHeight != settlementBatch.EndHeight {

//code commented out because it may be the case the current height is higher than da height after applying pending blocks, in case of missing blocks
/*if currentHeight != settlementBatch.EndHeight {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can simply delete the entire lines. no need for leaving it with comments.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

return fmt.Errorf("after applying state index (%d), the height (%d) is not as expected (%d)", currStateIdx, currentHeight, settlementBatch.EndHeight)
}
}*/

err = m.updateStateIndex(settlementBatch.StateIndex)
if err != nil {
Expand Down
Loading