update submitted height from batch events

dymensionxyz · Sep 16, 2024 · aefb982 · aefb982
1 parent 2da988f
commit aefb982
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/block/manager.go b/block/manager.go
@@ -174,6 +174,9 @@ func (m *Manager) Start(ctx context.Context) error {
  go uevent.MustSubscribe(ctx, m.Pubsub, "applyGossipedBlocksLoop", p2p.EventQueryNewGossipedBlock, m.onReceivedBlock, m.logger)
  go uevent.MustSubscribe(ctx, m.Pubsub, "applyBlockSyncBlocksLoop", p2p.EventQueryNewBlockSyncBlock, m.onReceivedBlock, m.logger)
  return nil
+ } else {
+ // Subscribe to batch events, to update last submitted height in case batch confirmation was lost (e.g. on restart)
+ go uevent.MustSubscribe(ctx, m.Pubsub, "updateSubmittedHeightLoop", settlement.EventQueryNewSettlementBatchAccepted, m.UpdateLastSubmittedHeight, m.logger)
  }
 
  /* ----------------------------- sequencer mode ----------------------------- */

diff --git a/block/submit.go b/block/submit.go
@@ -8,9 +8,11 @@ import (
  "time"
 
  "github.com/dymensionxyz/gerr-cosmos/gerrc"
+ "github.com/tendermint/tendermint/libs/pubsub"
  "golang.org/x/sync/errgroup"
 
  "github.com/dymensionxyz/dymint/da"
+ "github.com/dymensionxyz/dymint/settlement"
  "github.com/dymensionxyz/dymint/types"
  uatomic "github.com/dymensionxyz/dymint/utils/atomic"
  uchannel "github.com/dymensionxyz/dymint/utils/channel"
@@ -263,3 +265,17 @@ func (m *Manager) GetUnsubmittedBytes() int {
 func (m *Manager) GetUnsubmittedBlocks() uint64 {
  return m.State.Height() - m.LastSubmittedHeight.Load()
 }
+
+// UpdateLastSubmittedHeight will update last height submitted, in case necessary to avoid edge case issues
+func (m *Manager) UpdateLastSubmittedHeight(event pubsub.Message) {
+ eventData, ok := event.Data().(*settlement.EventDataNewBatchAccepted)
+ if !ok {
+ m.logger.Error("onReceivedBatch", "err", "wrong event data received")
+ return
+ }
+ h := eventData.EndHeight
+ if m.LastSubmittedHeight.Load() < h {
+ m.LastSubmittedHeight.Store(h)
+ }
+
+}
diff --git a/settlement/dymension/dymension.go b/settlement/dymension/dymension.go
@@ -154,7 +154,6 @@ func (c *Client) SubmitBatch(batch *types.Batch, daClient da.Client, daResult *d
  // this could happen if we timed-out waiting for acceptance in the previous iteration, but the batch was indeed submitted
  if errors.Is(err, gerrc.ErrAlreadyExists) {
  c.logger.Debug("Batch already accepted", "startHeight", batch.StartHeight(), "endHeight", batch.EndHeight())
- return nil
  }
  return fmt.Errorf("broadcast batch: %w", err)
  }