implemented deleting of scheduled batch-config msg when handling same msg from shuttermint

Author: blockchainluffy

rolling-shutter/keyper/database/keyper.sqlc.gen.go

@@ -121,6 +121,9 @@ LIMIT 1;
 -- name: DeleteShutterMessage :exec
 DELETE FROM tendermint_outgoing_messages WHERE id=$1;
 
+-- name: DeleteShutterMessageByDesc :exec
+DELETE FROM tendermint_outgoing_messages WHERE description=$1;
+
 -- name: InsertEon :exec
 INSERT INTO eons (eon, height, activation_block_number, keyper_config_index)
 VALUES ($1, $2, $3, $4);

rolling-shutter/keyper/database/sql/queries/keyper.sql

@@ -274,7 +274,7 @@ func (st *ShuttermintState) handleBatchConfig(
 		keypers = append(keypers, shdb.EncodeAddress(k))
 	}
 	keypermetrics.MetricsKeyperBatchConfigInfo.WithLabelValues(strconv.FormatUint(e.KeyperConfigIndex, 10), strings.Join(keypers, ",")).Set(1)
-	return queries.InsertBatchConfig(
+	if err := queries.InsertBatchConfig(
 		ctx,
 		database.InsertBatchConfigParams{
 			KeyperConfigIndex:     int32(e.KeyperConfigIndex),
@@ -284,7 +284,12 @@ func (st *ShuttermintState) handleBatchConfig(
 			Started:               e.Started,
 			ActivationBlockNumber: int64(e.ActivationBlockNumber),
 		},
-	)
+	); err != nil {
+		return err
+	}
+
+	return queries.DeleteShutterMessageByDesc(ctx, fmt.Sprintf("new batch config (activation-block-number=%d, config-index=%d)",
+		e.ActivationBlockNumber, e.KeyperConfigIndex))
 }
 
 func (st *ShuttermintState) handleBatchConfigStarted(