more improvements

dymensionxyz · Feb 12, 2025 · 57093b9 · 57093b9
1 parent 942e9b7
commit 57093b9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/eibc/order_fulfiller.go b/eibc/order_fulfiller.go
@@ -124,7 +124,7 @@ func (ol *orderFulfiller) processBatch(orders []*demandOrder) error {
 		return true
 	})
 
-	ol.logger.Info("orders fulfilled", zap.Strings("ids", idsDone), zap.Strings("failed", idsFail), zap.Strings("lps", lpsDone))
+	ol.logger.Info("orders processed", zap.Strings("ids", idsDone), zap.Strings("failed", idsFail), zap.Strings("lps", lpsDone))
 	ol.processedCh <- orders
 
 	return nil

diff --git a/eibc/order_poller.go b/eibc/order_poller.go
@@ -144,10 +144,6 @@ func (p *orderPoller) pollPendingDemandOrders(ctx context.Context) error {
 
 func (p *orderPoller) convertOrders(demandOrders []Order) (orders []*demandOrder) {
 	for _, order := range demandOrders {
-		if _, ok := p.noLPOrders[order.EibcOrderId]; ok {
-			continue
-		}
-
 		if order.Fee == "" {
 			continue
 		}
@@ -266,11 +262,19 @@ func (p *orderPoller) getDemandOrdersFromRPC(ctx context.Context) ([]Order, erro
 		demandOrders = append(demandOrders, orders...)
 	}
 
-	if len(demandOrders) > 0 {
-		p.logger.Debug("got demand orders", zap.Int("count", len(demandOrders)))
+	var orders []Order
+	for _, order := range demandOrders {
+		if _, ok := p.noLPOrders[order.EibcOrderId]; ok {
+			continue
+		}
+		orders = append(orders, order)
 	}
 
-	return demandOrders, nil
+	if len(orders) > 0 {
+		p.logger.Debug("got demand orders", zap.Int("count", len(orders)))
+	}
+
+	return orders, nil
 }
 
 func (p *orderPoller) getRollappDemandOrdersFromRPC(ctx context.Context, rollappId string, typ eibc.RollappPacket_Type) ([]Order, error) {
@@ -308,13 +312,18 @@ func (p *orderPoller) getRollappDemandOrdersFromRPC(ctx context.Context, rollapp
 		var proofHeight uint64
 
 		proofHeightEndian := strings.Split(order.TrackingPacketKey, "/")[2]
-		if len(proofHeightEndian) == 8 {
+		func() {
+			defer func() {
+				if r := recover(); r != nil {
+					p.logger.Error("failed to parse proof height", zap.String("proof_height", proofHeightEndian))
+				}
+			}()
+
 			proofHeight = sdk.BigEndianToUint64([]byte(proofHeightEndian))
-			if proofHeight <= lastFinalizedHeight {
-				continue
-			}
-		} else {
-			fmt.Println("wtf?")
+		}()
+
+		if proofHeight <= lastFinalizedHeight {
+			continue
 		}
 
 		orders = append(orders, Order{