Merge pull request #6704 from spacemeshos/node-split-merge-develop

merge develop

Author: poszu

activation/activation.go

@@ -91,7 +91,6 @@ type Builder struct {
 	layerClock        layerClock
 	syncer            Syncer
 	logger            *zap.Logger
-	parentCtx         context.Context
 	poets             []PoetService
 	poetCfg           PoetConfig
 	poetRetryInterval time.Duration
@@ -135,14 +134,6 @@ func WithPoetRetryInterval(interval time.Duration) BuilderOption {
 	}
 }
 
-// WithContext modifies parent context for background job.
-func WithContext(ctx context.Context) BuilderOption {
-	return func(b *Builder) {
-		// TODO(mafa): fix this
-		b.parentCtx = ctx // nolint:fatcontext
-	}
-}
-
 // WithPoetConfig sets the poet config.
 func WithPoetConfig(c PoetConfig) BuilderOption {
 	return func(b *Builder) {
@@ -189,7 +180,6 @@ func NewBuilder(
 	opts ...BuilderOption,
 ) *Builder {
 	b := &Builder{
-		parentCtx:         context.Background(),
 		signers:           make(map[types.NodeID]*signing.EdSigner),
 		conf:              conf,
 		localDB:           localDB,
@@ -229,7 +219,13 @@ func (b *Builder) Register(sig *signing.EdSigner) {
 	b.postStates.Set(sig.NodeID(), types.PostStateIdle)
 
 	if b.stop != nil {
-		b.startID(b.parentCtx, sig)
+		ctx, stop := context.WithCancel(context.Background())
+		prevStop := b.stop
+		b.stop = func() {
+			prevStop()
+			stop()
+		}
+		b.startID(ctx, sig)
 	}
 }
 
@@ -269,9 +265,8 @@ func (b *Builder) StartSmeshing(coinbase types.Address) error {
 	}
 
 	b.coinbaseAccount = coinbase
-	ctx, stop := context.WithCancel(b.parentCtx)
+	ctx, stop := context.WithCancel(context.Background())
 	b.stop = stop
-
 	for _, sig := range b.signers {
 		b.startID(ctx, sig)
 	}

activation/handler_v1.go

@@ -27,6 +27,7 @@ import (
 	"github.com/spacemeshos/go-spacemesh/sql"
 	"github.com/spacemeshos/go-spacemesh/sql/atxs"
 	"github.com/spacemeshos/go-spacemesh/sql/identities"
+	"github.com/spacemeshos/go-spacemesh/sql/malfeasance"
 	"github.com/spacemeshos/go-spacemesh/system"
 )
 
@@ -222,12 +223,12 @@ func (h *HandlerV1) syntacticallyValidateDeps(
 		watx.NumUnits,
 		PostSubset([]byte(h.local)), // use the local peer ID as seed for random subset
 	)
-	var invalidIdx *verifying.ErrInvalidIndex
-	if errors.As(err, &invalidIdx) {
+	var errInvalidIdx *verifying.ErrInvalidIndex
+	if errors.As(err, &errInvalidIdx) {
 		h.logger.Debug("ATX with invalid post index",
 			log.ZContext(ctx),
 			zap.Stringer("atx_id", watx.ID()),
-			zap.Int("index", invalidIdx.Index),
+			zap.Int("index", errInvalidIdx.Index),
 		)
 		malicious, err := identities.IsMalicious(h.cdb, watx.SmesherID)
 		if err != nil {
@@ -236,13 +237,20 @@ func (h *HandlerV1) syntacticallyValidateDeps(
 		if malicious {
 			return nil, fmt.Errorf("smesher %s is known malfeasant", watx.SmesherID.ShortString())
 		}
+		malicious, err = malfeasance.IsMalicious(h.cdb, watx.SmesherID)
+		if err != nil {
+			return nil, fmt.Errorf("check if smesher is malicious: %w", err)
+		}
+		if malicious {
+			return nil, fmt.Errorf("smesher %s is known malfeasant", watx.SmesherID.ShortString())
+		}
 		proof := &mwire.MalfeasanceProof{
 			Layer: watx.PublishEpoch.FirstLayer(),
 			Proof: mwire.Proof{
 				Type: mwire.InvalidPostIndex,
 				Data: &mwire.InvalidPostIndexProof{
 					Atx:        *watx,
-					InvalidIdx: uint32(invalidIdx.Index),
+					InvalidIdx: uint32(errInvalidIdx.Index),
 				},
 			},
 		}
@@ -489,6 +497,11 @@ func (h *HandlerV1) storeAtx(ctx context.Context, atx *types.ActivationTx, watx
 		if err != nil {
 			return fmt.Errorf("check if node is malicious: %w", err)
 		}
+		malicious2, err := malfeasance.IsMalicious(tx, atx.SmesherID)
+		if err != nil {
+			return fmt.Errorf("check if node is malicious: %w", err)
+		}
+		malicious = malicious || malicious2
 		if !malicious {
 			malicious, err = h.checkMalicious(ctx, tx, watx)
 			if err != nil {