Monitor main chain in gnosis keyper

Author: jannikluhn

rolling-shutter/contract/deployment/deployment.go

@@ -334,7 +334,8 @@ func LoadChainID(dir string) (uint64, error) {
 		return 0, errors.Wrapf(err, "failed to load chain id file at %s", path)
 	}
 
-	chainID, err := strconv.ParseInt(string(data), 10, 64)
+	chainIDStr := strings.TrimSpace(string(data))
+	chainID, err := strconv.ParseInt(chainIDStr, 10, 64)
 	if err != nil {
 		return 0, errors.Wrapf(err, "failed to parse chain id in %s", path)
 	}

rolling-shutter/keyperimpl/gnosis/config.go

@@ -37,6 +37,14 @@ type Config struct {
 	Gnosis      *configuration.EthnodeConfig
 	Shuttermint *kprconfig.ShuttermintConfig
 	Metrics     *metricsserver.MetricsConfig
+
+	GnosisContracts *GnosisContracts `shconfig:",required"`
+}
+
+type GnosisContracts struct {
+	KeyperSetManager     common.Address `shconfig:",required"`
+	KeyBroadcastContract common.Address `shconfig:",required"`
+	Sequencer            common.Address `shconfig:",required"`
 }
 
 func (c *Config) Validate() error {
@@ -50,6 +58,11 @@ func (c *Config) Name() string {
 func (c *Config) SetDefaultValues() error {
 	c.HTTPEnabled = false
 	c.HTTPListenAddress = ":3000"
+	c.GnosisContracts = &GnosisContracts{
+		KeyperSetManager:     common.Address{},
+		KeyBroadcastContract: common.Address{},
+		Sequencer:            common.Address{},
+	}
 	return nil
 }
 
@@ -60,6 +73,7 @@ func (c *Config) SetExampleValues() error {
 	}
 	c.InstanceID = 42
 	c.DatabaseURL = "postgres://pguser:pgpassword@localhost:5432/shutter"
+
 	return nil
 }
 

rolling-shutter/keyperimpl/gnosis/keyper.go

@@ -2,21 +2,34 @@ package gnosis
 
 import (
 	"context"
+	"fmt"
 
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
 
+	obskeyper "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/epochkghandler"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/kprconfig"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
+	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
 )
 
+var ErrParseKeyperSet = errors.New("can't parse KeyperSet")
+
 type Keyper struct {
-	core   *keyper.KeyperCore
-	config *Config
+	core            *keyper.KeyperCore
+	config          *Config
+	dbpool          *pgxpool.Pool
+	chainSyncClient *chainsync.Client
 }
 
 func New(c *Config) *Keyper {
@@ -26,10 +39,12 @@ func New(c *Config) *Keyper {
 }
 
 func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
+	var err error
+
 	decrTrigChan := make(chan *broker.Event[*epochkghandler.DecryptionTrigger])
 	runner.Defer(func() { close(decrTrigChan) })
 
-	dbpool, err := db.Connect(ctx, runner, kpr.config.DatabaseURL, database.Definition.Name())
+	kpr.dbpool, err = db.Connect(ctx, runner, kpr.config.DatabaseURL, database.Definition.Name())
 	if err != nil {
 		return errors.Wrap(err, "failed to connect to database")
 	}
@@ -46,11 +61,74 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 			Metrics:           kpr.config.Metrics,
 		},
 		decrTrigChan,
-		keyper.WithDBPool(dbpool),
+		keyper.WithDBPool(kpr.dbpool),
+		keyper.NoBroadcastEonPublicKey(),
+		keyper.WithEonPublicKeyHandler(kpr.newEonPublicKey),
 	)
 	if err != nil {
 		return errors.Wrap(err, "can't instantiate keyper core")
 	}
 
-	return runner.StartService(kpr.core)
+	kpr.chainSyncClient, err = chainsync.NewClient(
+		ctx,
+		chainsync.WithClientURL(kpr.config.Gnosis.EthereumURL),
+		chainsync.WithKeyperSetManager(kpr.config.GnosisContracts.KeyperSetManager),
+		chainsync.WithKeyBroadcastContract(kpr.config.GnosisContracts.KeyBroadcastContract),
+		chainsync.WithSyncNewBlock(kpr.newBlock),
+		chainsync.WithSyncNewKeyperSet(kpr.newKeyperSet),
+		chainsync.WithPrivateKey(kpr.config.Gnosis.PrivateKey.Key),
+	)
+	if err != nil {
+		return err
+	}
+
+	return runner.StartService(kpr.core, kpr.chainSyncClient)
+}
+
+func (kpr *Keyper) newBlock(_ context.Context, ev *syncevent.LatestBlock) error {
+	log.Info().
+		Uint64("number", ev.Number.Uint64()).
+		Str("hash", ev.BlockHash.Hex()).
+		Msg("new latest block")
+	return nil
+}
+
+func (kpr *Keyper) newKeyperSet(ctx context.Context, ev *syncevent.KeyperSet) error {
+	log.Info().
+		Uint64("activation-block", ev.ActivationBlock).
+		Uint64("eon", ev.Eon).
+		Msg("new keyper set added")
+	fmt.Printf("%+v\n", ev.Members)
+
+	return kpr.dbpool.BeginFunc(ctx, func(tx pgx.Tx) error {
+		obskeyperdb := obskeyper.New(tx)
+
+		keyperConfigIndex, err := medley.Uint64ToInt64Safe(ev.Eon)
+		if err != nil {
+			return errors.Wrap(err, ErrParseKeyperSet.Error())
+		}
+		activationBlockNumber, err := medley.Uint64ToInt64Safe(ev.ActivationBlock)
+		if err != nil {
+			return errors.Wrap(err, ErrParseKeyperSet.Error())
+		}
+		threshold, err := medley.Uint64ToInt64Safe(ev.Threshold)
+		if err != nil {
+			return errors.Wrap(err, ErrParseKeyperSet.Error())
+		}
+
+		return obskeyperdb.InsertKeyperSet(ctx, obskeyper.InsertKeyperSetParams{
+			KeyperConfigIndex:     keyperConfigIndex,
+			ActivationBlockNumber: activationBlockNumber,
+			Keypers:               shdb.EncodeAddresses(ev.Members),
+			Threshold:             int32(threshold),
+		})
+	})
+}
+
+func (kpr *Keyper) newEonPublicKey(_ context.Context, pubKey keyper.EonPublicKey) error {
+	log.Info().
+		Uint64("eon", pubKey.Eon).
+		Uint64("activation-block", pubKey.ActivationBlock).
+		Msg("new eon pk")
+	return nil
 }

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

@@ -4,6 +4,8 @@ import (
 	"crypto/rand"
 	"io"
 
+	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/keys"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
@@ -27,6 +29,7 @@ type Config struct {
 
 	JSONRPCURL              string `                     comment:"The op-geth JSON RPC endpoint"`
 	ByActivationBlockNumber *number.BlockNumber
+	KeyperSetManager        common.Address
 	ByIndex                 *uint64
 	KeyperSetFilePath       string
 

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

@@ -15,6 +15,7 @@ func GetKeyperSet(ctx context.Context, config *Config) error {
 	sl2, err := chainsync.NewClient(
 		ctx,
 		chainsync.WithClientURL(config.JSONRPCURL),
+		chainsync.WithKeyperSetManager(config.KeyperSetManager),
 	)
 	if err != nil {
 		return err