fix order polling pagination restart

eibc/order_client.go

@@ -46,8 +46,6 @@ func NewOrderClient(cfg config.Config, logger *zap.Logger) (*orderClient, error)
 		return nil, fmt.Errorf("failed to parse min operator fee share: %w", err)
 	}
 
-	var poller orderPoller
-
 	oc := &orderClient{
 		config:     cfg,
 		fulfillers: make(map[string]*orderFulfiller),
@@ -62,7 +60,7 @@ func NewOrderClient(cfg config.Config, logger *zap.Logger) (*orderClient, error)
 			orderCh,
 			cfg.OrderPolling.Interval, // we can use the same interval for order polling and LP balance checking
 			cfg.Validation.Interval,
-			poller.resetOrderPolling,
+			nil, // set below
 			logger,
 		),
 		logger: logger,
@@ -75,6 +73,7 @@ func NewOrderClient(cfg config.Config, logger *zap.Logger) (*orderClient, error)
 			cfg.OrderPolling,
 			logger,
 		)
+		oc.orderTracker.resetPoller = oc.orderPoller.resetOrderPolling
 	}
 
 	oc.orderEventer = newOrderEventer(

eibc/order_poller.go

@@ -8,6 +8,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -25,7 +26,7 @@ type orderPoller struct {
 
 	getOrders       func() ([]Order, error)
 	orderTracker    *orderTracker
-	lastBlockHeight uint64
+	lastBlockHeight atomic.Uint64
 }
 
 func newOrderPoller(
@@ -101,8 +102,8 @@ func (p *orderPoller) pollPendingDemandOrders() error {
 			p.logger.Error("failed to parse block height", zap.Error(err))
 			continue
 		}
-		if blockHeight > p.lastBlockHeight {
-			p.lastBlockHeight = blockHeight
+		if blockHeight > p.lastBlockHeight.Load() {
+			p.lastBlockHeight.Store(blockHeight)
 		}
 		demandOrders = append(demandOrders, order)
 	}
@@ -209,7 +210,7 @@ func (p *orderPoller) convertOrders(demandOrders []Order) (orders []*demandOrder
 }
 
 func (p *orderPoller) getDemandOrdersFromIndexer() ([]Order, error) {
-	queryStr := fmt.Sprintf(ordersQuery, p.chainID, fmt.Sprint(p.lastBlockHeight))
+	queryStr := fmt.Sprintf(ordersQuery, p.chainID, fmt.Sprint(p.lastBlockHeight.Load()))
 	body := strings.NewReader(queryStr)
 
 	resp, err := p.indexerClient.Post(p.indexerURL, "application/json", body)
@@ -230,5 +231,5 @@ func (p *orderPoller) getDemandOrdersFromIndexer() ([]Order, error) {
 }
 
 func (p *orderPoller) resetOrderPolling() {
-	p.lastBlockHeight = 0
+	p.lastBlockHeight.Store(0)
 }