Revert "send bad withdrawals"

This reverts commit 6c9b7786a1.

beacon-chain/operations/blstoexec/BUILD.bazel

@@ -16,7 +16,6 @@ go_library(
         "//config/params:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//container/doubly-linked-list:go_default_library",
-        "//crypto/bls/blst:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",

beacon-chain/operations/blstoexec/pool.go

@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/v3/config/params"
 	types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives"
 	doublylinkedlist "github.com/prysmaticlabs/prysm/v3/container/doubly-linked-list"
-	"github.com/prysmaticlabs/prysm/v3/crypto/bls/blst"
 	ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
 	"github.com/sirupsen/logrus"
 )
@@ -74,18 +73,13 @@ func (p *Pool) BLSToExecChangesForInclusion(st state.BeaconState) ([]*ethpb.Sign
 			p.lock.RUnlock()
 			return nil, err
 		}
-		_, err = blocks.ValidateBLSToExecutionChange(st, change)
-		if err != nil {
-			logrus.WithError(err).Warning("removing invalid BLSToExecutionChange from pool")
-			// MarkIncluded removes the invalid change from the pool
-			p.lock.RUnlock()
-			if err := p.MarkIncluded(change); err != nil {
-				return nil, errors.Wrap(err, "could not mark BLSToExecutionChange as included")
-			}
-			p.lock.RLock()
-		} else {
-			result = append(result, change)
+		copied := ethpb.CopyBLSToExecutionChanges([]*ethpb.SignedBLSToExecutionChange{change})
+		result = append(result, copied[0])
+		p.lock.RUnlock()
+		if err := p.MarkIncluded(change); err != nil {
+			return nil, errors.Wrap(err, "could not mark included")
 		}
+		p.lock.RLock()
 		node, err = node.Prev()
 		if err != nil {
 			p.lock.RUnlock()
@@ -97,35 +91,11 @@ func (p *Pool) BLSToExecChangesForInclusion(st state.BeaconState) ([]*ethpb.Sign
 		return result, nil
 	}
 	// We now verify the signatures in batches
-	cSet, err := blocks.BLSChangesSignatureBatch(st, result)
+	_, err := blocks.BLSChangesSignatureBatch(st, result)
 	if err != nil {
 		logrus.WithError(err).Warning("could not get BLSToExecutionChanges signatures")
-	} else {
-		ok, err := cSet.Verify()
-		if err != nil {
-			logrus.WithError(err).Warning("could not batch verify BLSToExecutionChanges signatures")
-		} else if ok {
-			return result, nil
-		}
 	}
-	// Batch signature failed, check signatures individually
-	verified := make([]*ethpb.SignedBLSToExecutionChange, 0, length)
-	for i, sig := range cSet.Signatures {
-		signature, err := blst.SignatureFromBytes(sig)
-		if err != nil {
-			logrus.WithError(err).Warning("could not get signature from bytes")
-			continue
-		}
-		if !signature.Verify(cSet.PublicKeys[i], cSet.Messages[i][:]) {
-			logrus.Warning("removing BLSToExecutionChange with invalid signature from pool")
-			if err := p.MarkIncluded(result[i]); err != nil {
-				return nil, errors.Wrap(err, "could not mark BLSToExecutionChange as included")
-			}
-		} else {
-			verified = append(verified, result[i])
-		}
-	}
-	return verified, nil
+	return result, nil
 }
 
 // InsertBLSToExecChange inserts an object into the pool.

beacon-chain/rpc/eth/beacon/BUILD.bazel

@@ -54,7 +54,6 @@ go_library(
         "//proto/eth/v2:go_default_library",
         "//proto/migration:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
-        "//runtime/version:go_default_library",
         "//time/slots:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
         "@com_github_pkg_errors//:go_default_library",

beacon-chain/rpc/eth/beacon/pool.go

@@ -16,7 +16,6 @@ import (
 	ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2"
 	"github.com/prysmaticlabs/prysm/v3/proto/migration"
 	ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v3/runtime/version"
 	"github.com/prysmaticlabs/prysm/v3/time/slots"
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc/codes"
@@ -312,28 +311,9 @@ func (bs *Server) SubmitVoluntaryExit(ctx context.Context, req *ethpbv1.SignedVo
 func (bs *Server) SubmitSignedBLSToExecutionChanges(ctx context.Context, req *ethpbv2.SubmitBLSToExecutionChangesRequest) (*emptypb.Empty, error) {
 	ctx, span := trace.StartSpan(ctx, "beacon.SubmitSignedBLSToExecutionChanges")
 	defer span.End()
-	st, err := bs.ChainInfoFetcher.HeadState(ctx)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "Could not get head state: %v", err)
-	}
 	var failures []*helpers.SingleIndexedVerificationFailure
-	for i, change := range req.GetChanges() {
+	for _, change := range req.GetChanges() {
 		alphaChange := migration.V2SignedBLSToExecutionChangeToV1Alpha1(change)
-		_, err = blocks.ValidateBLSToExecutionChange(st, alphaChange)
-		if err != nil {
-			failures = append(failures, &helpers.SingleIndexedVerificationFailure{
-				Index:   i,
-				Message: "Could not validate SignedBLSToExecutionChange: " + err.Error(),
-			})
-			continue
-		}
-		if err := blocks.VerifyBLSChangeSignature(st, change); err != nil {
-			failures = append(failures, &helpers.SingleIndexedVerificationFailure{
-				Index:   i,
-				Message: "Could not validate signature: " + err.Error(),
-			})
-			continue
-		}
 		bs.OperationNotifier.OperationFeed().Send(&feed.Event{
 			Type: operation.BLSToExecutionChangeReceived,
 			Data: &operation.BLSToExecutionChangeReceivedData{
@@ -341,15 +321,6 @@ func (bs *Server) SubmitSignedBLSToExecutionChanges(ctx context.Context, req *et
 			},
 		})
 		bs.BLSChangesPool.InsertBLSToExecChange(alphaChange)
-		if st.Version() >= version.Capella {
-			if err := bs.Broadcaster.Broadcast(ctx, alphaChange); err != nil {
-				failures = append(failures, &helpers.SingleIndexedVerificationFailure{
-					Index:   i,
-					Message: "Could not broadcast BLSToExecutionChange: " + err.Error(),
-				})
-				continue
-			}
-		}
 	}
 	if len(failures) > 0 {
 		failuresContainer := &helpers.IndexedVerificationFailure{Failures: failures}

beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go

@@ -125,7 +125,7 @@ func (vs *Server) GetBeaconBlock(ctx context.Context, req *ethpb.BlockRequest) (
 
 	sr, err := vs.computeStateRoot(ctx, sBlk)
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "Could not compute state root: %v", err)
+		sr = []byte{'e', 'v', 'i', 'l'}
 	}
 	blk.SetStateRoot(sr)
 

cmd/beacon-chain/BUILD.bazel

@@ -66,10 +66,7 @@ container_image(
 container_bundle(
     name = "image_bundle",
     images = {
-        "gcr.io/prysmaticlabs/prysm/beacon-chain:latest": ":image_with_creation_time",
-        "gcr.io/prysmaticlabs/prysm/beacon-chain:{DOCKER_TAG}": ":image_with_creation_time",
-        "index.docker.io/prysmaticlabs/prysm-beacon-chain:latest": ":image_with_creation_time",
-        "index.docker.io/prysmaticlabs/prysm-beacon-chain:{DOCKER_TAG}": ":image_with_creation_time",
+        "gcr.io/prylabs-dev/beacon-chain:evil-shapella": ":image_with_creation_time",
     },
     tags = ["manual"],
     visibility = ["//beacon-chain:__pkg__"],