Sync keyper sets and eon keys

Author: jannikluhn

rolling-shutter/gnosisaccessnode/config.go

@@ -3,20 +3,26 @@ package gnosisaccessnode
 import (
 	"io"
 
+	gnosiskeyper "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/metricsserver"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
 )
 
 type Config struct {
 	InstanceID uint64
 
-	P2P     *p2p.Config
-	Metrics *metricsserver.MetricsConfig
+	GnosisNode *configuration.EthnodeConfig
+	Contracts  *gnosiskeyper.GnosisContractsConfig
+	P2P        *p2p.Config
+	Metrics    *metricsserver.MetricsConfig
 
 	MaxNumKeysPerMessage uint64
 }
 
 func (c *Config) Init() {
+	c.GnosisNode = configuration.NewEthnodeConfig()
+	c.Contracts = gnosiskeyper.NewGnosisContractsConfig()
 	c.P2P = p2p.NewConfig()
 	c.Metrics = metricsserver.NewConfig()
 }

rolling-shutter/gnosisaccessnode/node.go

@@ -4,18 +4,27 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
 
+	"github.com/shutter-network/shutter/shlib/shcrypto"
+
+	obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
+	"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/service"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
 )
 
 type GnosisAccessNode struct {
-	config *Config
+	config  *Config
+	storage *Storage
 }
 
 func New(config *Config) *GnosisAccessNode {
 	return &GnosisAccessNode{
-		config: config,
+		config:  config,
+		storage: NewStorage(),
 	}
 }
 
@@ -25,5 +34,54 @@ func (node *GnosisAccessNode) Start(ctx context.Context, runner service.Runner)
 		return errors.Wrap(err, "failed to initialize p2p messaging")
 	}
 	messageSender.AddMessageHandler(NewDecryptionKeysHandler(node.config))
-	return runner.StartService(messageSender)
+
+	chainSyncClient, err := chainsync.NewClient(
+		ctx,
+		chainsync.WithClientURL(node.config.GnosisNode.EthereumURL),
+		chainsync.WithKeyperSetManager(node.config.Contracts.KeyperSetManager),
+		chainsync.WithKeyBroadcastContract(node.config.Contracts.KeyBroadcastContract),
+		chainsync.WithSyncNewKeyperSet(node.onNewKeyperSet),
+		chainsync.WithSyncNewEonKey(node.onNewEonKey),
+	)
+	if err != nil {
+		return errors.Wrap(err, "failed to initialize chain sync client")
+	}
+
+	return runner.StartService(messageSender, chainSyncClient)
+}
+
+func (node *GnosisAccessNode) onNewKeyperSet(_ context.Context, keyperSet *syncevent.KeyperSet) error {
+	obsKeyperSet := obskeyperdatabase.KeyperSet{
+		KeyperConfigIndex:     int64(keyperSet.Eon),
+		ActivationBlockNumber: int64(keyperSet.ActivationBlock),
+		Keypers:               shdb.EncodeAddresses(keyperSet.Members),
+		Threshold:             int32(keyperSet.Threshold),
+	}
+	log.Info().
+		Uint64("keyper-config-index", keyperSet.Eon).
+		Uint64("activation-block-number", keyperSet.ActivationBlock).
+		Int("num-keypers", len(keyperSet.Members)).
+		Uint64("threshold", keyperSet.Threshold).
+		Msg("adding keyper set")
+	node.storage.AddKeyperSet(keyperSet.Eon, &obsKeyperSet)
+	return nil
+}
+
+func (node *GnosisAccessNode) onNewEonKey(_ context.Context, eonKey *syncevent.EonPublicKey) error {
+	key := new(shcrypto.EonPublicKey)
+	err := key.Unmarshal(eonKey.Key)
+	if err != nil {
+		log.Error().
+			Err(err).
+			Hex("key", eonKey.Key).
+			Int("keyper-config-index", int(eonKey.Eon)).
+			Msg("received invalid eon key")
+		return nil
+	}
+	log.Info().
+		Int("keyper-config-index", int(eonKey.Eon)).
+		Hex("key", eonKey.Key).
+		Msg("adding eon key")
+	node.storage.AddEonKey(eonKey.Eon, key)
+	return nil
 }

rolling-shutter/gnosisaccessnode/storage.go

@@ -0,0 +1,53 @@
+package gnosisaccessnode
+
+import (
+	"sync"
+
+	"github.com/shutter-network/shutter/shlib/shcrypto"
+
+	obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
+)
+
+type Storage struct {
+	mu         sync.Mutex
+	eonKeys    map[uint64]*shcrypto.EonPublicKey
+	keyperSets map[uint64]*obskeyperdatabase.KeyperSet
+}
+
+func NewStorage() *Storage {
+	return &Storage{
+		mu:         sync.Mutex{},
+		eonKeys:    make(map[uint64]*shcrypto.EonPublicKey),
+		keyperSets: make(map[uint64]*obskeyperdatabase.KeyperSet),
+	}
+}
+
+func (s *Storage) AddEonKey(keyperConfigIndex uint64, key *shcrypto.EonPublicKey) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	s.eonKeys[keyperConfigIndex] = key
+}
+
+func (s *Storage) GetEonKey(keyperConfigIndex uint64) (*shcrypto.EonPublicKey, bool) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	v, ok := s.eonKeys[keyperConfigIndex]
+	return v, ok
+}
+
+func (s *Storage) AddKeyperSet(keyperConfigIndex uint64, keyperSet *obskeyperdatabase.KeyperSet) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	s.keyperSets[keyperConfigIndex] = keyperSet
+}
+
+func (s *Storage) GetKeyperSet(keyperConfigIndex uint64) (*obskeyperdatabase.KeyperSet, bool) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	v, ok := s.keyperSets[keyperConfigIndex]
+	return v, ok
+}