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

Jump to bottom

fix(sync) initial block height when getting state #764

Closed
wants to merge 5 commits into from
Closed

fix(sync) initial block height when getting state #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6c98b4
Use height 1 instead of 0 when getting height state
zale144 May 1, 2024
4c41a7f
changelog
zale144 May 1, 2024
9db1a84
Make it more elegant
zale144 May 1, 2024
20a5cf9
Merge 9db1a842099216a310df4b0a1681e2eb8f5c82cb into 43e2d965f2b505751…
zale144 May 1, 2024
805aa8c
Update CHANGELOG.md [skip ci]
invalid-email-address May 1, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* **p2p:** validate block before applying and not before caching in p2p gossiping ([#723](https://github.com/dymensionxyz/dymint/issues/723)) ([98371b5](https://github.com/dymensionxyz/dymint/commit/98371b5220613e70f3274fab5593e02ba532f7db))
* **produce loop:** handle unauthenticated error in settlement layer ([#726](https://github.com/dymensionxyz/dymint/issues/726)) ([33e78d1](https://github.com/dymensionxyz/dymint/commit/33e78d116b5f14b91b8b3bda2b6cbfee9040e2d3))
* **rpc:** nil panic in rpc/json/handler.go WriteError ([#750](https://github.com/dymensionxyz/dymint/issues/750)) ([e09709b](https://github.com/dymensionxyz/dymint/commit/e09709b428a33da002defb9f13178fa19b81a69b))
* **sync:** make sure we use a latest state index as a start point ([#760](https://github.com/dymensionxyz/dymint/issues/760)) ([43e2d96](https://github.com/dymensionxyz/dymint/commit/43e2d965f2b505751f8e5260549e909c976141ee))



Expand Down
12 changes: 10 additions & 2 deletions block/retriever.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/avast/retry-go/v4"

"code.cloudfoundry.org/go-diodes"

"github.com/dymensionxyz/dymint/da"
)

Expand Down Expand Up @@ -45,7 +46,9 @@ func (m *Manager) syncUntilTarget(syncTarget uint64) error {
}

var stateIndex uint64
h := m.Store.Height()
// If height is 0, `GetHeightState` returns the latest state index instead of the first
h := max(currentHeight, 1)

err := retry.Do(
func() error {
res, err := m.SLClient.GetHeightState(h)
Expand All @@ -64,7 +67,12 @@ func (m *Manager) syncUntilTarget(syncTarget uint64) error {
if err != nil {
return fmt.Errorf("get height state: %w", err)
}
m.updateStateIndex(stateIndex - 1)

err = m.updateStateIndex(stateIndex - 1)
if err != nil {
return fmt.Errorf("update state index: %w", err)
}

m.logger.Debug("Sync until target: updated state index pre loop", "stateIndex", stateIndex, "height", h, "syncTarget", syncTarget)

for currentHeight < syncTarget {
Expand Down