From 8569d43ba4f0b2580826a9e3bd3d07dd10e7f814 Mon Sep 17 00:00:00 2001
From: Chirantan Ekbote <cekbote@jumptrading.com>
Date: Tue, 11 Oct 2022 14:20:07 +0900
Subject: [PATCH] node: solana: Store `lastSlot` more persistently

When the solana watcher is restarted (due to network errors, for
example) then the `lastSlot` state is lost.  This means that any
transactions in between the last processed slot and the most recent slot
will be lost and require manual re-observation.  Fix this by making the
`lastSlot` state persistent across watcher restarts.
---
 node/pkg/watchers/solana/client.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/node/pkg/watchers/solana/client.go b/node/pkg/watchers/solana/client.go
index 50ad7ba58..134635e67 100644
--- a/node/pkg/watchers/solana/client.go
+++ b/node/pkg/watchers/solana/client.go
@@ -36,6 +36,8 @@ type SolanaWatcher struct {
 	chainID vaa.ChainID
 	// Human readable name of network
 	networkName string
+	// The last slot processed by the watcher.
+	lastSlot uint64
 }
 
 var (
@@ -137,7 +139,6 @@ func (s *SolanaWatcher) Run(ctx context.Context) error {
 
 	logger := supervisor.Logger(ctx)
 	errC := make(chan error)
-	var lastSlot uint64
 
 	go func() {
 		timer := time.NewTicker(time.Second * 1)
@@ -171,6 +172,8 @@ func (s *SolanaWatcher) Run(ctx context.Context) error {
 					errC <- err
 					return
 				}
+
+				lastSlot := s.lastSlot
 				if lastSlot == 0 {
 					lastSlot = slot - 1
 				}
@@ -200,7 +203,7 @@ func (s *SolanaWatcher) Run(ctx context.Context) error {
 					go s.retryFetchBlock(ctx, logger, slot, 0)
 				}
 
-				lastSlot = slot
+				s.lastSlot = slot
 			}
 		}
 	}()