Merge pull request #6124 from filecoin-project/feat/invert-validation…

…-switch-checks

Feat/invert validation switch checks

app/submodule/mpool/mpool_submodule.go

@@ -130,6 +130,7 @@ func (mp *MessagePoolSubmodule) Validate(ctx context.Context, pid peer.ID, msg *
 
 	if err := mp.MPool.Add(ctx, m); err != nil {
 		log.Debugf("failed to add message from network to message pool (From: %s, To: %s, Nonce: %d, Value: %s): %s", m.Message.From, m.Message.To, m.Message.Nonce, types.FIL(m.Message.Value), err)
+
 		switch {
 		case errors.Is(err, messagepool.ErrSoftValidationFailure):
 			fallthrough
@@ -139,8 +140,21 @@ func (mp *MessagePoolSubmodule) Validate(ctx context.Context, pid peer.ID, msg *
 			fallthrough
 		case errors.Is(err, messagepool.ErrNonceGap):
 			fallthrough
+		case errors.Is(err, messagepool.ErrGasFeeCapTooLow):
+			fallthrough
 		case errors.Is(err, messagepool.ErrNonceTooLow):
+			fallthrough
+		case errors.Is(err, messagepool.ErrNotEnoughFunds):
+			fallthrough
+		case errors.Is(err, messagepool.ErrExistingNonce):
 			return pubsub.ValidationIgnore
+
+		case errors.Is(err, messagepool.ErrMessageTooBig):
+			fallthrough
+		case errors.Is(err, messagepool.ErrMessageValueTooHigh):
+			fallthrough
+		case errors.Is(err, messagepool.ErrInvalidToAddr):
+			fallthrough
 		default:
 			return pubsub.ValidationReject
 		}

pkg/messagepool/messagepool.go

@@ -93,6 +93,7 @@ var (
 	ErrRBFTooLowPremium       = errors.New("replace by fee has too low GasPremium")
 	ErrTooManyPendingMessages = errors.New("too many pending messages for actor")
 	ErrNonceGap               = errors.New("unfulfilled nonce gap")
+	ErrExistingNonce          = errors.New("message with nonce already exists")
 )
 
 const (
@@ -300,7 +301,7 @@ func (ms *msgSet) add(m *types.SignedMessage, mp *MessagePool, strict, untrusted
 			}
 		} else {
 			return false, fmt.Errorf("message from %s with nonce %d already in mpool: %w",
-				m.Message.From, m.Message.Nonce, ErrSoftValidationFailure)
+				m.Message.From, m.Message.Nonce, ErrExistingNonce)
 		}
 
 		ms.requiredFunds.Sub(ms.requiredFunds, exms.Message.RequiredFunds().Int)
@@ -912,7 +913,7 @@ func (mp *MessagePool) checkBalance(ctx context.Context, m *types.SignedMessage,
 
 	requiredFunds := m.Message.RequiredFunds()
 	if big.Cmp(balance, requiredFunds) < 0 {
-		return fmt.Errorf("not enough funds (required: %s, balance: %s): %v", types.FIL(requiredFunds), types.FIL(balance), ErrNotEnoughFunds)
+		return fmt.Errorf("not enough funds (required: %s, balance: %s): %w", types.FIL(requiredFunds), types.FIL(balance), ErrNotEnoughFunds)
 	}
 
 	// add Value for soft failure check
@@ -944,7 +945,7 @@ func (mp *MessagePool) addTS(ctx context.Context, m *types.SignedMessage, curTS
 	}
 
 	if snonce > m.Message.Nonce {
-		return false, fmt.Errorf("minimum expected nonce is %d: %v", snonce, ErrNonceTooLow)
+		return false, fmt.Errorf("minimum expected nonce is %d: %w", snonce, ErrNonceTooLow)
 	}
 
 	senderAct, err := mp.api.GetActorAfter(ctx, m.Message.From, curTS)