Merge branch 'debug/allowtosend'

Author: ulope

rolling-shutter/keyper/fx/messagesender.go

@@ -7,7 +7,6 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"fmt"
-	"sync/atomic"
 
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
@@ -47,10 +46,9 @@ type MessageSender interface {
 
 // RPCMessageSender signs messages and sends them via RPC to shuttermint.
 type RPCMessageSender struct {
-	rpcclient     client.Client
-	chainID       string
-	signingKey    *ecdsa.PrivateKey
-	AllowedToSend *atomic.Bool
+	rpcclient  client.Client
+	chainID    string
+	signingKey *ecdsa.PrivateKey
 }
 
 var _ MessageSender = &RPCMessageSender{}
@@ -67,21 +65,15 @@ var mockMessageSenderBufferSize = 0x10000
 // NewRPCMessageSender creates a new RPCMessageSender.
 func NewRPCMessageSender(cl client.Client, signingKey *ecdsa.PrivateKey) RPCMessageSender {
 	ms := RPCMessageSender{
-		rpcclient:     cl,
-		chainID:       "",
-		signingKey:    signingKey,
-		AllowedToSend: new(atomic.Bool),
+		rpcclient:  cl,
+		chainID:    "",
+		signingKey: signingKey,
 	}
-	ms.AllowedToSend.Store(false)
 	return ms
 }
 
 // SendMessage signs the given shmsg.Message and sends the message to shuttermint.
 func (ms *RPCMessageSender) SendMessage(ctx context.Context, msg *shmsg.Message) error {
-	if !ms.AllowedToSend.Load() {
-		log.Info().Str("msg", msg.String()).Msg("not allowed to send")
-		return nil
-	}
 	if err := ms.maybeFetchChainID(ctx); err != nil {
 		return err
 	}

rolling-shutter/keyper/fx/send.go

@@ -35,7 +35,7 @@ func SendShutterMessages(
 				log.Err(err).Str("msg", msg.String()).Msg("sending non-retrieable msg failed")
 				return err
 			}
-			log.Info().Str("msg", msg.String()).Msg("msg not accepted, will be retried")
+			log.Warn().Err(err).Str("msg", msg.String()).Msg("msg not accepted, will be retried")
 			return nil
 		}
 		log.Info().Int32("id", outgoing.ID).

rolling-shutter/keyper/keyper.go

@@ -365,9 +365,6 @@ func (kpr *KeyperCore) operateShuttermint(ctx context.Context, _ service.Runner)
 		if err != nil {
 			return err
 		}
-		if !kpr.messageSender.AllowedToSend.Load() {
-			allowSendIfInKeyperSet(ctx, database.New(kpr.dbpool), syncBlockNumber, kpr)
-		}
 		err = fx.SendShutterMessages(ctx, database.New(kpr.dbpool), &kpr.messageSender)
 		if err != nil {
 			return err
@@ -379,18 +376,3 @@ func (kpr *KeyperCore) operateShuttermint(ctx context.Context, _ service.Runner)
 		}
 	}
 }
-
-func allowSendIfInKeyperSet(ctx context.Context, queries *database.Queries, syncBlockNumber uint64, kpr *KeyperCore) {
-	count, err := queries.CountBatchConfigsInBlockRangeWithKeyper(ctx,
-		database.CountBatchConfigsInBlockRangeWithKeyperParams{
-			KeyperAddress: []string{kpr.config.GetAddress().String()},
-			StartBlock:    0,
-			EndBlock:      int64(syncBlockNumber),
-		})
-	if err != nil {
-		log.Err(err).Msg("could not query if in keyper set")
-	}
-	if count > 0 {
-		kpr.messageSender.AllowedToSend.Store(true)
-	}
-}

rolling-shutter/keyperimpl/optimism/bootstrap/bootstrap.go

@@ -34,7 +34,6 @@ func BootstrapValidators(config *Config) error {
 	}
 
 	ms := fx.NewRPCMessageSender(shmcl, config.SigningKey.Key)
-	ms.AllowedToSend.Store(true)
 	batchConfigMsg := shmsg.NewBatchConfig(
 		ks.ActivationBlock,
 		ks.Members,