Replace eon with keyper set index in shares msg

Author: jannikluhn

rolling-shutter/keyper/epochkghandler/sendkeyshare.go

@@ -122,7 +122,7 @@ func (ksh *KeyShareHandler) ConstructDecryptionKeyShares(
 		})
 	}
 
-	eonUint, err := medley.Int64ToUint64Safe(eon.Eon)
+	keyperSetIndexUint, err := medley.Int64ToUint64Safe(eon.Eon)
 	if err != nil {
 		return nil, err
 	}
@@ -132,7 +132,7 @@ func (ksh *KeyShareHandler) ConstructDecryptionKeyShares(
 	}
 	msg := &p2pmsg.DecryptionKeyShares{
 		InstanceID:  ksh.InstanceID,
-		Eon:         eonUint,
+		Eon:         keyperSetIndexUint,
 		KeyperIndex: keyperIndexUint,
 		Shares:      shares,
 	}

rolling-shutter/keyperimpl/gnosis/handlers.go

@@ -223,13 +223,8 @@ func (h *DecryptionKeysHandler) ValidateMessage(ctx context.Context, msg p2pmsg.
 		return pubsub.ValidationReject, errors.New("msg does not contain any keys")
 	}
 
-	keyperCoreDB := corekeyperdatabase.New(h.dbpool)
 	obsKeyperDB := obskeyperdatabase.New(h.dbpool)
-	eonData, err := keyperCoreDB.GetEon(ctx, int64(keys.Eon))
-	if err != nil {
-		return pubsub.ValidationReject, errors.Wrapf(err, "failed to get eon data from database for eon %d", keys.Eon)
-	}
-	keyperSet, err := obsKeyperDB.GetKeyperSet(ctx, eonData.ActivationBlockNumber)
+	keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(keys.Eon))
 	if err != nil {
 		return pubsub.ValidationReject, errors.Wrapf(err, "failed to get keyper set from database for eon %d", keys.Eon)
 	}

rolling-shutter/medley/chainsync/syncer/keyperset.go

@@ -160,7 +160,7 @@ func (s *KeyperSetSyncer) GetKeyperSetForBlock(ctx context.Context, opts *bind.C
 
 	idx, err := s.Contract.GetKeyperSetIndexByBlock(opts, atBlock)
 	if err != nil {
-		return nil, errors.Wrap(err, "could not retrieve keyper set index")
+		return nil, errors.Wrapf(err, "could not retrieve keyper set index at block %d", atBlock)
 	}
 	return s.GetKeyperSetByIndex(ctx, opts, idx)
 }