Revert "core duplicate vote and jail" (#10815)

pkg/core/db/sql/reads.sql

@@ -117,6 +117,3 @@ select * from core_tx_results where block_id = $1 order by created_at desc;
 
 -- name: GetBlock :one
 select * from core_blocks where height = $1;
-
--- name: GetJailedNodes :many
-select * from core_validators where jailed = true;

pkg/core/db/sql/writes.sql

@@ -34,14 +34,3 @@ returning id;
 insert into core_tx_stats (tx_type, tx_hash, block_height, created_at)
 values ($1, $2, $3, $4)
 on conflict (tx_hash) do nothing;
-
--- name: AddJailedNode :exec
-update core_validators
-set jailed = true, jailed_until = $2
-where comet_address = $1;
-
--- name: UnjailNode :exec
-update core_validators
-set jailed = false, jailed_until = 0
-where comet_address = $1;
-

pkg/core/server/abci.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"bytes"
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
@@ -12,7 +11,6 @@ import (
 	"github.com/AudiusProject/audius-protocol/pkg/core/common"
 	"github.com/AudiusProject/audius-protocol/pkg/core/db"
 	"github.com/AudiusProject/audius-protocol/pkg/core/gen/core_proto"
-	"github.com/cometbft/cometbft/abci/types"
 	abcitypes "github.com/cometbft/cometbft/abci/types"
 	cfg "github.com/cometbft/cometbft/config"
 	"github.com/cometbft/cometbft/crypto/ed25519"
@@ -181,18 +179,6 @@ func (s *Server) FinalizeBlock(ctx context.Context, req *abcitypes.FinalizeBlock
 	var validatorUpdates = abcitypes.ValidatorUpdates{}
 	var validatorUpdatesMap = map[string]bool{}
 
-	// update jailed validators in validator updates map so they get skipped if they try to re-register
-	jailedValidators, err := s.handleDuplicateVoteEvidence(ctx, req)
-	if err != nil {
-		s.logger.Errorf("could not handle duplicate vote evidence: %v", err)
-	} else {
-		validatorUpdates = append(validatorUpdates, jailedValidators...)
-		for _, jailed := range jailedValidators {
-			vrPubKey := ed25519.PubKey(jailed.PubKeyBytes)
-			validatorUpdatesMap[vrPubKey.Address().String()] = true
-		}
-	}
-
 	// open in progres pg transaction
 	s.startInProgressTx(ctx)
 	for i, tx := range req.Txs {
@@ -429,53 +415,6 @@ func (s *Server) persistTxStat(ctx context.Context, tx proto.Message, txhash str
 	return nil
 }
 
-func (s *Server) handleDuplicateVoteEvidence(ctx context.Context, req *abcitypes.FinalizeBlockRequest) (abcitypes.ValidatorUpdates, error) {
-	jailedValidators := abcitypes.ValidatorUpdates{}
-	jailedValidatorAddrs := []string{}
-
-	page := int(1)
-	amountPerPage := int(500)
-	currentValidators, err := s.rpc.Validators(ctx, &req.Height, &page, &amountPerPage)
-	if err != nil {
-		s.logger.Errorf("could not get validators: %v", err)
-		return jailedValidators, err
-	}
-
-	// if misbehavior found, set power to 0 to remove
-	for _, misbehavior := range req.Misbehavior {
-		if misbehavior.Type == types.MISBEHAVIOR_TYPE_DUPLICATE_VOTE {
-			for _, validator := range currentValidators.Validators {
-				if bytes.Equal(misbehavior.Validator.Address, validator.Address) {
-					jailedValidators = append(
-						jailedValidators,
-						abcitypes.ValidatorUpdate{
-							Power:       0,
-							PubKeyBytes: validator.PubKey.Bytes(),
-							PubKeyType:  "ed25519",
-						},
-					)
-					jailedValidatorAddrs = append(jailedValidatorAddrs, validator.Address.String())
-				}
-			}
-		}
-	}
-
-	qtx := s.getDb()
-	for _, jailedValidatorAddr := range jailedValidatorAddrs {
-		if err := qtx.AddJailedNode(ctx, db.AddJailedNodeParams{
-			CometAddress: jailedValidatorAddr,
-			JailedUntil: pgtype.Int8{
-				Int64: req.Height + 1000,
-				Valid: true,
-			},
-		}); err != nil {
-			return jailedValidators, fmt.Errorf("could not add jailed node: %v", err)
-		}
-	}
-
-	return jailedValidators, nil
-}
-
 func (s *Server) serializeAppState(prevHash []byte, txs [][]byte) []byte {
 	var combinedHash []byte
 

pkg/core/server/grpc.go

@@ -37,10 +37,7 @@ func GetProtoTypeName(msg proto.Message) string {
 }
 
 func (s *Server) SendTransaction(ctx context.Context, req *core_proto.SendTransactionRequest) (*core_proto.TransactionResponse, error) {
-	if err := s.validateTxGRPC(req.GetTransaction()); err != nil {
-		return nil, fmt.Errorf("validation error: %v", err)
-	}
-
+	// TODO: do validation check
 	txhash, err := common.ToTxHash(req.GetTransaction())
 	if err != nil {
 		return nil, fmt.Errorf("could not get tx hash of signed tx: %v", err)
@@ -87,9 +84,7 @@ func (s *Server) SendTransaction(ctx context.Context, req *core_proto.SendTransa
 func (s *Server) ForwardTransaction(ctx context.Context, req *core_proto.ForwardTransactionRequest) (*core_proto.ForwardTransactionResponse, error) {
 	// TODO: check signature from known node
 
-	if err := s.validateTxGRPC(req.GetTransaction()); err != nil {
-		return nil, fmt.Errorf("validation error: %v", err)
-	}
+	// TODO: validate transaction in same way as send transaction
 
 	mempoolKey, err := common.ToTxHash(req.GetTransaction())
 	if err != nil {

pkg/core/server/registry_bridge.go

@@ -306,30 +306,9 @@ func (s *Server) registerSelfOnEth() error {
 	return nil
 }
 
-func (s *Server) validateNotJailed(tx *core_proto.SignedTransaction_ValidatorRegistration) error {
-	db := s.db
-
-	cometAddr := tx.ValidatorRegistration.CometAddress
-
-	node, err := db.GetRegisteredNodeByCometAddress(context.Background(), cometAddr)
-	if err != nil {
-		if !errors.Is(err, pgx.ErrNoRows) {
-			return nil
-		}
-		return fmt.Errorf("validation db fail: %v", err)
-	}
-
-	jailed := node.Jailed
-	if jailed.Bool {
-		return fmt.Errorf("node %s is jailed and can't be re-registered", cometAddr)
-	}
-
-	return nil
-}
-
 // checks if the register node tx is valid
 // calls ethereum mainnet and validates signature to confirm node should be a validator
-func (s *Server) isValidRegisterNodeTx(_ctx context.Context, tx *core_proto.SignedTransaction) error {
+func (s *Server) isValidRegisterNodeTx(ctx context.Context, tx *core_proto.SignedTransaction) error {
 	sig := tx.GetSignature()
 	if sig == "" {
 		return fmt.Errorf("no signature provided for registration tx: %v", tx)