Sync activations on boot and optimize tx pump

spacemeshos · Mar 13, 2024 · 7dd2f2b · 7dd2f2b
1 parent 74018bc
commit 7dd2f2b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/collector/collector.go b/collector/collector.go
@@ -142,6 +142,11 @@ func (c *Collector) Run() error {
 		c.listener.RecalculateEpochStats()
 	}
 
+	err = c.syncActivations()
+	if err != nil {
+		return errors.Join(errors.New("cannot sync activations"), err)
+	}
+
 	g := new(errgroup.Group)
 	g.Go(func() error {
 		err := c.syncStatusPump()

diff --git a/collector/mesh.go b/collector/mesh.go
@@ -236,6 +236,7 @@ func (c *Collector) syncAllRewards() error {
 
 func (c *Collector) syncActivations() error {
 	received := c.listener.GetLastActivationReceived()
+	log.Info("Syncing activations from %d", received)
 
 	err := c.dbClient.GetAtxsReceivedAfter(c.db, received, func(atx *types.VerifiedActivationTx) bool {
 		c.listener.OnActivation(atx)

diff --git a/collector/txs.go b/collector/txs.go
@@ -9,8 +9,12 @@ import (
 )
 
 func (c *Collector) transactionsPump() error {
+	epochNumLayers := c.listener.GetEpochNumLayers()
+	lastLayer := c.listener.GetLastLayer(context.Background())
+	currentEpoch := lastLayer / epochNumLayers
+
 	req := pb.TransactionResultsRequest{
-		Start: 1,
+		Start: (currentEpoch - 2) * epochNumLayers,
 		Watch: true,
 	}