improve log output

Author: johnsaigle

node/pkg/watchers/algorand/watcher.go

@@ -181,7 +181,14 @@ func lookAtTxn(e *Watcher, t types.SignedTxnInBlock, b types.Block, logger *zap.
 	for _, obs := range observations {
 		timestamp, err := vaa.TimeFromUnix(b.TimeStamp)
 		if err != nil {
-			logger.Error("invalid block timestamp", zap.Error(err), zap.Int64("timestamp", b.TimeStamp))
+			logger.Error("invalid block timestamp",
+				zap.Error(err),
+				zap.Int64("timestamp", b.TimeStamp),
+				zap.String("txHash", hex.EncodeToString(txHash.Bytes())),
+				zap.Uint64("nonce", uint64(obs.nonce)),
+				zap.Uint64("sequence", obs.sequence),
+				zap.String("emitter", hex.EncodeToString(obs.emitterAddress[:])),
+			)
 			return
 		}
 

node/pkg/watchers/aptos/watcher.go

@@ -556,7 +556,15 @@ func (e *Watcher) observeData(logger *zap.Logger, data gjson.Result, nativeSeq u
 	}
 	timestamp, err := vaa.TimeFromUnix(ts.Uint())
 	if err != nil {
-		logger.Error("invalid timestamp", zap.Error(err), zap.Uint64("timestamp", ts.Uint()))
+		logger.Error("invalid timestamp",
+			zap.Error(err),
+			zap.Uint64("timestamp", ts.Uint()),
+			zap.String("txHash", txHash.Hex()),
+			zap.Uint64("nonce", nonce.Uint()),
+			zap.Uint64("sequence", sequence.Uint()),
+			zap.Stringer("emitter", a),
+			zap.Stringer("chainID", e.chainID),
+		)
 		return
 	}
 

node/pkg/watchers/evm/by_transaction.go

@@ -94,7 +94,8 @@ func MessageEventsForTransaction(
 		}
 		timestamp, err := vaa.TimeFromUnix(blockTime)
 		if err != nil {
-			return nil, 0, nil, fmt.Errorf("invalid block timestamp: %w", err)
+			return nil, 0, nil, fmt.Errorf("invalid block timestamp for tx %s at block %d (time %d): %w",
+				tx.Hex(), ev.Raw.BlockNumber, blockTime, err)
 		}
 
 		message := &common.MessagePublication{

node/pkg/watchers/near/tx_processing.go

@@ -236,7 +236,8 @@ func (e *Watcher) processWormholeLog(logger *zap.Logger, _ context.Context, job
 	ts := outcomeBlockHeader.Timestamp
 	timestamp, err := vaa.TimeFromUnix(ts)
 	if err != nil {
-		return fmt.Errorf("invalid block timestamp: %w", err)
+		return fmt.Errorf("invalid block timestamp for tx %s (block %d, time %d, seq %d): %w",
+			job.txHash, outcomeBlockHeader.Height, ts, pubEvent.Seq, err)
 	}
 
 	observation := &common.MessagePublication{

node/pkg/watchers/solana/shim.go

@@ -359,7 +359,8 @@ func (s *SolanaWatcher) shimProcessRest(
 	}
 	timestamp, err := vaa.TimeFromUnix(messageEvent.Timestamp)
 	if err != nil {
-		return fmt.Errorf("invalid shim message timestamp: %w", err)
+		return fmt.Errorf("invalid shim message timestamp for tx %s shim idx %d (seq %d, time %d): %w",
+			tx.Signatures[0].String(), outerIdx, messageEvent.Sequence, messageEvent.Timestamp, err)
 	}
 
 	observation := &common.MessagePublication{

node/pkg/watchers/sui/watcher.go

@@ -190,7 +190,8 @@ func (e *Watcher) processEvent(ctx context.Context, logger *zap.Logger, event su
 	txHashEthFormat := eth_common.BytesToHash(txHashBytes)
 	timestamp, err := vaa.TimeFromUnix(msg.Timestamp)
 	if err != nil {
-		return fmt.Errorf("processEvent failed to parse timestamp: %w", err)
+		return fmt.Errorf("processEvent failed to parse timestamp for tx %s (nonce %d, seq %d, time %d): %w",
+			txDigest, msg.Nonce, msg.Sequence, msg.Timestamp, err)
 	}
 
 	observation := &common.MessagePublication{