2.31.1 edits (#309)

* handle mixed txDigest

* update error log in coin manager

* disable hexToArray length check

* edits

Author: faisal-chainlink

relayer/chainreader/indexer/events_indexer.go

@@ -243,16 +243,26 @@ func (eIndexer *EventsIndexer) SyncEvent(ctx context.Context, selector *client.E
 		}
 
 		if dbOffsetCursor != nil {
-			txDigestBytes, err := hex.DecodeString(strings.TrimPrefix(dbOffsetCursor.TxDigest, "0x"))
-			if err != nil {
-				eIndexer.cursorMutex.RUnlock()
-				eIndexer.logger.Errorw("syncEvent: failed to decode tx digest", "error", err, "txDigest", dbOffsetCursor.TxDigest)
-				return err
-			}
-			// convert the db offset cursor digest from hex (the format stored in the DB) to base58 (the format expected by the client)
-			cursor = &models.EventId{
-				TxDigest: base58.Encode(txDigestBytes),
-				EventSeq: dbOffsetCursor.EventSeq,
+			// Some DB records have hex formatted txDigest while newer entries have base58 formatted txDigest.
+			// We check if the txDigest is hex formatted and decode it if needed for backwards compatibility.
+			if strings.ToLower(dbOffsetCursor.TxDigest[:2]) == "0x" {
+				txDigestBytes, err := hex.DecodeString(dbOffsetCursor.TxDigest[2:])
+				if err != nil {
+					eIndexer.cursorMutex.RUnlock()
+					eIndexer.logger.Errorw("syncEvent: failed to decode tx digest", "error", err, "txDigest", dbOffsetCursor.TxDigest)
+					return fmt.Errorf("syncEvent: failed to decode tx digest: %w", err)
+				}
+				// convert the db offset cursor digest from hex (the format stored in the DB) to base58 (the format expected by the client)
+				cursor = &models.EventId{
+					TxDigest: base58.Encode(txDigestBytes),
+					EventSeq: dbOffsetCursor.EventSeq,
+				}
+			} else {
+				// DB already has base58
+				cursor = &models.EventId{
+					TxDigest: dbOffsetCursor.TxDigest,
+					EventSeq: dbOffsetCursor.EventSeq,
+				}
 			}
 
 			totalCount = dbTotalCount

relayer/codec/type_converters.go

@@ -376,9 +376,11 @@ func (tc *TypeConverter) hexToArray(from, to reflect.Type, data any) (any, error
 	byteSlice := bytes.([]byte)
 	out := make([]uint8, to.Len())
 
-	if len(byteSlice) != to.Len() {
-		return nil, fmt.Errorf("hex to array: byte slice length %d is not equal to output array length %d", len(byteSlice), to.Len())
-	}
+	// Re-enable this check once we can guarantee that responses are always the same length as the target array length.
+	// Disabling for now to avoid breaking changes to core.
+	// if len(byteSlice) != to.Len() {
+	// 	return nil, fmt.Errorf("hex to array: byte slice length %d is not equal to output array length %d", len(byteSlice), to.Len())
+	// }
 
 	copy(out, byteSlice)
 

relayer/txm/gas_coin_manager.go

@@ -50,7 +50,7 @@ func (m *SuiGasCoinManager) TryReserveCoins(
 ) error {
 	for _, coin := range coinIDs {
 		if m.IsCoinReserved(coin.ObjectId) {
-			return fmt.Errorf("coin %s is already reserved", coin.ObjectId)
+			return fmt.Errorf("coin %s is already reserved", hex.EncodeToString(coin.ObjectId[:]))
 		}
 
 		coinID := hex.EncodeToString(coin.ObjectId[:])