Merge pull request #486 from shutter-network/fix/use-keyper-index

Use msg.eon in messaging middleware `interceptDecryptionKeys()`

Author: fredo

rolling-shutter/keyperimpl/gnosis/handlers.go

@@ -316,6 +316,27 @@ func (h *DecryptionKeysHandler) HandleMessage(ctx context.Context, msg p2pmsg.Me
 	if err != nil {
 		return []p2pmsg.Message{}, errors.Wrap(err, "failed to set tx pointer")
 	}
+
+	identityPreimages := []identitypreimage.IdentityPreimage{}
+	for _, key := range keys.Keys {
+		identityPreimage := identitypreimage.IdentityPreimage(key.Identity)
+		identityPreimages = append(identityPreimages, identityPreimage)
+	}
+	identitiesHash := computeIdentitiesHash(identityPreimages)
+	for i, keyperIndex := range extra.SignerIndices {
+		err = gnosisDB.InsertSlotDecryptionSignature(ctx, database.InsertSlotDecryptionSignatureParams{
+			Eon:            int64(keys.Eon),
+			Slot:           int64(extra.Slot),
+			KeyperIndex:    int64(keyperIndex),
+			TxPointer:      int64(extra.TxPointer),
+			IdentitiesHash: identitiesHash,
+			Signature:      extra.Signatures[i],
+		})
+		if err != nil {
+			return []p2pmsg.Message{}, errors.Wrap(err, "failed to insert slot decryption signature")
+		}
+	}
+
 	eonString := fmt.Sprint(keys.Eon)
 	metricsTxPointer.WithLabelValues(eonString).Set(float64(newTxPointer))
 	metricsTxPointerAge.WithLabelValues(eonString).Set(0)

rolling-shutter/keyperimpl/gnosis/messagingmiddleware.go

@@ -15,7 +15,6 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
-	corekeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/gnosisssztypes"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
@@ -206,7 +205,6 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
 	}
 
 	gnosisDB := database.New(i.dbpool)
-	keyperCoreDB := corekeyperdatabase.New(i.dbpool)
 	obsKeyperDB := obskeyperdatabase.New(i.dbpool)
 
 	trigger, err := gnosisDB.GetCurrentDecryptionTrigger(ctx, int64(originalMsg.Eon))
@@ -220,11 +218,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
 		return nil, errors.Wrapf(err, "failed to get current decryption trigger for eon %d", originalMsg.Eon)
 	}
 
-	eonData, err := keyperCoreDB.GetEon(ctx, int64(originalMsg.Eon))
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get eon data from database for eon %d", originalMsg.Eon)
-	}
-	keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, eonData.KeyperConfigIndex)
+	keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(originalMsg.Eon))
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get keyper set from database for eon %d", originalMsg.Eon)
 	}