diff --git a/node/pkg/watchers/solana/client.go b/node/pkg/watchers/solana/client.go index 14b695cc7b..0ce5eb4735 100644 --- a/node/pkg/watchers/solana/client.go +++ b/node/pkg/watchers/solana/client.go @@ -490,7 +490,6 @@ func (s *SolanaWatcher) fetchBlock(ctx context.Context, logger *zap.Logger, slot s.updateLatestBlock(slot) -OUTER: for txNum, txRpc := range out.Transactions { if txRpc.Meta.Err != nil { logger.Debug("Transaction failed, skipping it", @@ -561,10 +560,12 @@ OUTER: zap.Uint64("slot", slot), zap.String("commitment", string(s.commitment)), zap.Binary("data", inst.Data)) - continue OUTER - } - if found { - continue OUTER + } else if found { + logger.Debug("found a Wormhole instruction", + zap.Int("idx", i), + zap.Stringer("signature", signature), + zap.Uint64("slot", slot), + zap.String("commitment", string(s.commitment))) } } @@ -598,7 +599,7 @@ OUTER: for _, inner := range tr.Meta.InnerInstructions { for i, inst := range inner.Instructions { - _, err = s.processInstruction(ctx, logger, slot, inst, programIndex, tx, signature, i, isReobservation) + found, err := s.processInstruction(ctx, logger, slot, inst, programIndex, tx, signature, i, isReobservation) if err != nil { logger.Error("malformed Wormhole instruction", zap.Error(err), @@ -606,6 +607,12 @@ OUTER: zap.Stringer("signature", signature), zap.Uint64("slot", slot), zap.String("commitment", string(s.commitment))) + } else if found { + logger.Debug("found an inner Wormhole instruction", + zap.Int("idx", i), + zap.Stringer("signature", signature), + zap.Uint64("slot", slot), + zap.String("commitment", string(s.commitment))) } } }