feat(op): allow to retrieve keyperset by index for op-bootstrap

Author: ezdac

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

@@ -19,15 +19,16 @@ func NewConfig() *Config {
 
 func (c *Config) Init() {
 	c.SigningKey = &keys.ECDSAPrivate{}
-	c.ActivationBlockNumber = number.NewBlockNumber()
+	c.ByActivationBlockNumber = number.NewBlockNumber()
 }
 
 type Config struct {
 	InstanceID uint64 `shconfig:",required"`
 
-	JSONRPCURL            string `                     comment:"The op-geth JSON RPC endpoint"`
-	ActivationBlockNumber *number.BlockNumber
-	KeyperSetFilePath     string
+	JSONRPCURL              string `                     comment:"The op-geth JSON RPC endpoint"`
+	ByActivationBlockNumber *number.BlockNumber
+	ByIndex                 *uint64
+	KeyperSetFilePath       string
 
 	ShuttermintURL string
 	SigningKey     *keys.ECDSAPrivate `shconfig:",required"`
@@ -45,7 +46,9 @@ func (c *Config) SetDefaultValues() error {
 	c.JSONRPCURL = "http://localhost:8545"
 	c.ShuttermintURL = "http://localhost:26657"
 	c.KeyperSetFilePath = "keyperset.json"
-	c.ActivationBlockNumber = number.LatestBlock
+	c.ByActivationBlockNumber = nil
+	i := uint64(1)
+	c.ByIndex = &i
 	return nil
 }
 

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

@@ -3,9 +3,11 @@ package bootstrap
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"os"
 
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/optimism/sync"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/optimism/sync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
 )
 
@@ -17,7 +19,19 @@ func GetKeyperSet(ctx context.Context, config *Config) error {
 	if err != nil {
 		return err
 	}
-	keyperSet, err := sl2.GetKeyperSetForBlock(ctx, number.LatestBlock)
+	var keyperSet *event.KeyperSet
+	switch {
+	case config.ByIndex == nil && config.ByActivationBlockNumber == nil:
+		keyperSet, err = sl2.GetKeyperSetForBlock(ctx, number.LatestBlock)
+	case config.ByIndex == nil && config.ByActivationBlockNumber != nil:
+		keyperSet, err = sl2.GetKeyperSetForBlock(ctx, config.ByActivationBlockNumber)
+	case config.ByIndex != nil && config.ByActivationBlockNumber == nil:
+		keyperSet, err = sl2.GetKeyperSetByIndex(ctx, *config.ByIndex)
+	case config.ByIndex != nil && config.ByActivationBlockNumber != nil:
+		return errors.New("can only retrieve keyper set by either index or activation-blocknumber")
+	default:
+		return nil
+	}
 	if err != nil {
 		return err
 	}

rolling-shutter/keyperimpl/optimism/sync/client.go

@@ -104,6 +104,16 @@ func (s *ShutterL2Client) GetShutterState(ctx context.Context) (*event.ShutterSt
 	return s.sssync.GetShutterState(ctx, opts)
 }
 
+func (s *ShutterL2Client) GetKeyperSetByIndex(ctx context.Context, index uint64) (*event.KeyperSet, error) {
+	if s.kssync == nil {
+		return nil, errors.Wrap(ErrServiceNotInstantiated, "KeyperSetSyncer service not instantiated")
+	}
+	opts := &bind.CallOpts{
+		Context: ctx,
+	}
+	return s.kssync.GetKeyperSetByIndex(ctx, opts, index)
+}
+
 func (s *ShutterL2Client) GetKeyperSetForBlock(ctx context.Context, b *number.BlockNumber) (*event.KeyperSet, error) {
 	if s.kssync == nil {
 		return nil, errors.Wrap(ErrServiceNotInstantiated, "KeyperSetSyncer service not instantiated")

rolling-shutter/keyperimpl/optimism/sync/syncer/keyperset.go

@@ -55,6 +55,23 @@ func (s *KeyperSetSyncer) Start(ctx context.Context, runner service.Runner) erro
 	return nil
 }
 
+func (s *KeyperSetSyncer) GetKeyperSetByIndex(ctx context.Context, opts *bind.CallOpts, index uint64) (*event.KeyperSet, error) {
+	if opts == nil {
+		opts = &bind.CallOpts{
+			Context: ctx,
+		}
+	}
+	actBl, err := s.Contract.GetKeyperSetActivationBlock(opts, index)
+	if err != nil {
+		return nil, errors.Wrap(err, "could not retrieve keyper set activation block")
+	}
+	addr, err := s.Contract.GetKeyperSetAddress(opts, index)
+	if err != nil {
+		return nil, errors.Wrap(err, "could not retrieve keyper set address")
+	}
+	return s.newEvent(ctx, opts, addr, actBl)
+}
+
 func (s *KeyperSetSyncer) GetKeyperSetForBlock(ctx context.Context, opts *bind.CallOpts, b *number.BlockNumber) (*event.KeyperSet, error) {
 	if b.Equal(number.LatestBlock) {
 		latestBlock, err := s.Client.BlockNumber(ctx)
@@ -73,15 +90,7 @@ func (s *KeyperSetSyncer) GetKeyperSetForBlock(ctx context.Context, opts *bind.C
 	if err != nil {
 		return nil, errors.Wrap(err, "could not retrieve keyper set index")
 	}
-	actBl, err := s.Contract.GetKeyperSetActivationBlock(opts, idx)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not retrieve keyper set activation block")
-	}
-	addr, err := s.Contract.GetKeyperSetAddress(opts, idx)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not retrieve keyper set address")
-	}
-	return s.newEvent(ctx, opts, addr, actBl)
+	return s.GetKeyperSetByIndex(ctx, opts, idx)
 }
 
 func (s *KeyperSetSyncer) newEvent(