Merge pull request #478 from shutter-network/fix-eon-key-publishing

Fix eon key publishing

Author: jannikluhn

rolling-shutter/eonkeypublisher/eonkeypublisher.go

@@ -30,29 +30,29 @@ const (
 
 // EonKeyPublisher is a service that publishes eon keys via a eon key publisher contract.
 type EonKeyPublisher struct {
-	dbpool     *pgxpool.Pool
-	client     *ethclient.Client
-	contract   *bindings.EonKeyPublish
-	privateKey *ecdsa.PrivateKey
+	dbpool           *pgxpool.Pool
+	client           *ethclient.Client
+	keyperSetManager *bindings.KeyperSetManager
+	privateKey       *ecdsa.PrivateKey
 
 	keys chan keyper.EonPublicKey
 }
 
 func NewEonKeyPublisher(
 	dbpool *pgxpool.Pool,
 	client *ethclient.Client,
-	eonKeyPublishAddress common.Address,
+	keyperSetManagerAddress common.Address,
 	privateKey *ecdsa.PrivateKey,
 ) (*EonKeyPublisher, error) {
-	contract, err := bindings.NewEonKeyPublish(eonKeyPublishAddress, client)
+	keyperSetManager, err := bindings.NewKeyperSetManager(keyperSetManagerAddress, client)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to instantiate eon key publisher contract")
+		return nil, errors.Wrapf(err, "failed to instantiate keyper set manager contract at address %s", keyperSetManagerAddress.Hex())
 	}
 	return &EonKeyPublisher{
-		dbpool:     dbpool,
-		client:     client,
-		contract:   contract,
-		privateKey: privateKey,
+		dbpool:           dbpool,
+		client:           client,
+		keyperSetManager: keyperSetManager,
+		privateKey:       privateKey,
 
 		keys: make(chan keyper.EonPublicKey, eonKeyChannelSize),
 	}, nil
@@ -83,7 +83,7 @@ func (p *EonKeyPublisher) Publish(key keyper.EonPublicKey) {
 // set, unless the key is already confirmed or the keyper has already voted on it.
 func (p *EonKeyPublisher) publishIfResponsible(ctx context.Context, key keyper.EonPublicKey) {
 	db := obskeyperdb.New(p.dbpool)
-	keyperSet, err := db.GetKeyperSetByKeyperConfigIndex(ctx, int64(key.Eon))
+	keyperSet, err := db.GetKeyperSetByKeyperConfigIndex(ctx, int64(key.KeyperConfigIndex))
 	if err != nil {
 		log.Error().
 			Err(err).
@@ -121,11 +121,21 @@ func (p *EonKeyPublisher) publishOldKeys(ctx context.Context) {
 		}
 		dkgResult, err := shdb.DecodePureDKGResult(dkgResultDB.PureResult)
 		if err != nil {
-			err := errors.Wrapf(err, "failed to decode DKG result of eon %d", dkgResultDB.Eon)
-			log.Error().Err(err).Msg("failed to publish old eon keys")
+			log.Error().
+				Err(err).
+				Int64("eon", dkgResultDB.Eon).
+				Msg("failed to decode DKG result to publish old eon key")
 			continue
 		}
-		p.publish(ctx, dkgResult.PublicKey.Marshal(), dkgResult.Eon, dkgResult.Keyper)
+		eon, err := db.GetEon(ctx, dkgResultDB.Eon)
+		if err != nil {
+			log.Error().
+				Err(err).
+				Int64("eon", dkgResultDB.Eon).
+				Msg("failed to fetch eon to publish old eon public key")
+			continue
+		}
+		p.publish(ctx, dkgResult.PublicKey.Marshal(), uint64(eon.KeyperConfigIndex), dkgResult.Keyper)
 	}
 }
 
@@ -145,8 +155,12 @@ func (p *EonKeyPublisher) publish(ctx context.Context, key []byte, keyperSetInde
 }
 
 func (p *EonKeyPublisher) tryPublish(ctx context.Context, key []byte, keyperSetIndex uint64, keyperIndex uint64) error {
+	contract, err := p.getEonKeyPublisherContract(keyperSetIndex)
+	if err != nil {
+		return err
+	}
 	keyperAddress := ethcrypto.PubkeyToAddress(p.privateKey.PublicKey)
-	hasAlreadyVoted, err := p.contract.HasKeyperVoted(&bind.CallOpts{}, keyperAddress)
+	hasAlreadyVoted, err := contract.HasKeyperVoted(&bind.CallOpts{}, keyperAddress)
 	if err != nil {
 		return errors.Wrap(err, "failed to query eon key publisher contract if keyper has already voted")
 	}
@@ -158,7 +172,7 @@ func (p *EonKeyPublisher) tryPublish(ctx context.Context, key []byte, keyperSetI
 			Msg("not publishing eon key as keyper has already voted")
 		return nil
 	}
-	isAlreadyConfirmed, err := p.contract.EonKeyConfirmed(&bind.CallOpts{}, key)
+	isAlreadyConfirmed, err := contract.EonKeyConfirmed(&bind.CallOpts{}, key)
 	if err != nil {
 		return errors.Wrap(err, "failed to query eon key publisher contract if eon key is confirmed")
 	}
@@ -178,7 +192,7 @@ func (p *EonKeyPublisher) tryPublish(ctx context.Context, key []byte, keyperSetI
 	if err != nil {
 		return errors.Wrap(err, "failed to construct tx opts")
 	}
-	tx, err := p.contract.PublishEonKey(opts, key, keyperIndex)
+	tx, err := contract.PublishEonKey(opts, key, keyperIndex)
 	if err != nil {
 		return errors.Wrap(err, "failed to send publish eon key tx")
 	}
@@ -206,3 +220,24 @@ func (p *EonKeyPublisher) tryPublish(ctx context.Context, key []byte, keyperSetI
 		Msg("successfully published eon key")
 	return nil
 }
+
+func (p *EonKeyPublisher) getEonKeyPublisherContract(keyperSetIndex uint64) (*bindings.EonKeyPublish, error) {
+	opts := &bind.CallOpts{}
+	keyperSetAddress, err := p.keyperSetManager.GetKeyperSetAddress(opts, keyperSetIndex)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to get keyper set address from manager for index %d", keyperSetIndex)
+	}
+	keyperSet, err := bindings.NewKeyperSet(keyperSetAddress, p.client)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to instantiate keyper set contract at address %s", keyperSetAddress.Hex())
+	}
+	eonKeyPublisherAddress, err := keyperSet.GetPublisher(opts)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to get eon key publisher contract from keyper set at address %s", keyperSetAddress.Hex())
+	}
+	eonKeyPublisher, err := bindings.NewEonKeyPublish(eonKeyPublisherAddress, p.client)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to instantiate eon key publisher contract at address %s", eonKeyPublisherAddress.Hex())
+	}
+	return eonKeyPublisher, nil
+}

rolling-shutter/keyperimpl/gnosis/config.go

@@ -166,7 +166,6 @@ func (c *GnosisConfig) TOMLWriteHeader(_ io.Writer) (int, error) {
 type GnosisContractsConfig struct {
 	KeyperSetManager     common.Address `shconfig:",required"`
 	KeyBroadcastContract common.Address `shconfig:",required"`
-	EonKeyPublish        common.Address `shconfig:",required"`
 	Sequencer            common.Address `shconfig:",required"`
 	ValidatorRegistry    common.Address `shconfig:",required"`
 }
@@ -175,7 +174,6 @@ func NewGnosisContractsConfig() *GnosisContractsConfig {
 	return &GnosisContractsConfig{
 		KeyperSetManager:     common.Address{},
 		KeyBroadcastContract: common.Address{},
-		EonKeyPublish:        common.Address{},
 		Sequencer:            common.Address{},
 		ValidatorRegistry:    common.Address{},
 	}

rolling-shutter/keyperimpl/gnosis/keyper.go

@@ -128,7 +128,7 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 	kpr.eonKeyPublisher, err = eonkeypublisher.NewEonKeyPublisher(
 		kpr.dbpool,
 		eonKeyPublisherClient,
-		kpr.config.Gnosis.Contracts.EonKeyPublish,
+		kpr.config.Gnosis.Contracts.KeyperSetManager,
 		kpr.config.Gnosis.Node.PrivateKey.Key,
 	)
 	if err != nil {