Use identity from db instead of recomputing

Author: jannikluhn

rolling-shutter/keyperimpl/shutterservice/database/shutterservice.sqlc.gen.go

@@ -142,6 +142,7 @@ SELECT
    f.log_index,
    e.eon AS eon,
    e.ttl AS ttl,
+   e.identity AS identity,
    e.decrypted AS decrypted
 FROM fired_triggers f
 INNER JOIN event_trigger_registered_event e ON f.identity_prefix = e.identity_prefix AND f.sender = e.sender

rolling-shutter/keyperimpl/shutterservice/database/sql/queries/shutterservice.sql

@@ -1,11 +1,12 @@
 package shutterservice
 
 import (
+	"bytes"
 	"context"
 	"math"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/pkg/errors"
@@ -73,7 +74,6 @@ func (p *EventTriggerRegisteredEventProcessor) ProcessEvents(ctx context.Context
 			Hex("definition", registryEvent.TriggerDefinition).
 			Uint64("ttl", registryEvent.Ttl).
 			Logger()
-		evLog.Debug().Msg("processing event trigger registered event")
 
 		if registryEvent.Eon > math.MaxInt64 {
 			evLog.Info().Msg("skipping event trigger registered event with Eon > math.MaxInt64")
@@ -101,7 +101,7 @@ func (p *EventTriggerRegisteredEventProcessor) ProcessEvents(ctx context.Context
 			Sender:         shdb.EncodeAddress(registryEvent.Sender),
 			Definition:     registryEvent.TriggerDefinition,
 			Ttl:            int64(registryEvent.Ttl),
-			Identity:       computeEventTriggerIdentity(registryEvent.IdentityPrefix, registryEvent.Sender),
+			Identity:       computeEventTriggerIdentity(registryEvent),
 		})
 		if err != nil {
 			return errors.Wrap(err, "failed to insert event trigger registered event into db")
@@ -120,6 +120,9 @@ func (p *EventTriggerRegisteredEventProcessor) RollbackEvents(ctx context.Contex
 	return nil
 }
 
-func computeEventTriggerIdentity(identityPrefix common.Hash, sender common.Address) []byte {
-	return append(identityPrefix[:], sender[:]...)
+func computeEventTriggerIdentity(event *triggerRegistryBindings.ShuttereventtriggerregistryEventTriggerRegistered) []byte {
+	var buf bytes.Buffer
+	buf.Write(event.IdentityPrefix[:])
+	buf.Write(event.Sender.Bytes())
+	return crypto.Keccak256(buf.Bytes())
 }

rolling-shutter/keyperimpl/shutterservice/eventtriggerregisteredprocessor.go

@@ -17,7 +17,6 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker"
 	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/identitypreimage"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
 )
 
 func (kpr *Keyper) processNewBlock(ctx context.Context, ev *syncevent.LatestBlock) error {
@@ -225,11 +224,7 @@ func (kpr *Keyper) prepareEventBasedTriggers(ctx context.Context) ([]epochkghand
 
 		identities := []identitypreimage.IdentityPreimage{}
 		for _, firedTrigger := range firedTriggers {
-			identity, err := computeIdentityForFiredTrigger(&firedTrigger)
-			if err != nil {
-				return nil, errors.Wrapf(err, "failed to compute identity for fired trigger %v", firedTrigger)
-			}
-			identities = append(identities, identity)
+			identities = append(identities, firedTrigger.Identity)
 		}
 
 		decryptionTrigger := epochkghandler.DecryptionTrigger{
@@ -268,16 +263,3 @@ func sortIdentityPreimages(identityPreimages []identitypreimage.IdentityPreimage
 	})
 	return sorted
 }
-
-func computeIdentityForFiredTrigger(
-	firedTrigger *servicedatabase.GetUndecryptedFiredTriggersRow,
-) (identitypreimage.IdentityPreimage, error) {
-	var buf bytes.Buffer
-	buf.Write(firedTrigger.IdentityPrefix)
-	senderAddress, err := shdb.DecodeAddress(firedTrigger.Sender)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to decode sender address %x", firedTrigger.Sender)
-	}
-	buf.Write(senderAddress.Bytes())
-	return buf.Bytes(), nil
-}