Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions rolling-shutter/keyperimpl/shutterservice/newblock.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ func (kpr *Keyper) createTriggersFromIdentityRegisteredEvents(
if identityPreimages[event.Eon] == nil {
identityPreimages[event.Eon] = make([]identitypreimage.IdentityPreimage, 0)
}
identityPreimages[event.Eon] = append(identityPreimages[event.Eon], identitypreimage.IdentityPreimage(event.Identity))
identityPreimages[event.Eon] = append(identityPreimages[event.Eon],
identitypreimage.IdentityPreimage(event.Identity))

if _, exists := lastEonBlock[event.Eon]; !exists {
lastEonBlock[event.Eon] = eon.ActivationBlockNumber
Expand Down Expand Up @@ -269,19 +270,15 @@ func (kpr *Keyper) prepareEventBasedTriggers(ctx context.Context) ([]epochkghand
continue
}

identities := []identitypreimage.IdentityPreimage{}
// issue 698: here we "unbatch" all event based decryption triggers and create one broker event per identity
for _, firedTrigger := range firedTriggers {
identities = append(identities, firedTrigger.Identity)
identityPreimage := []identitypreimage.IdentityPreimage{firedTrigger.Identity}
decryptionTrigger := epochkghandler.DecryptionTrigger{
BlockNumber: uint64(eonStruct.ActivationBlockNumber),
IdentityPreimages: identityPreimage,
}
decryptionTriggers = append(decryptionTriggers, decryptionTrigger)
}

sortedIdentityPreimages := sortIdentityPreimages(identities)

decryptionTrigger := epochkghandler.DecryptionTrigger{
BlockNumber: uint64(eonStruct.ActivationBlockNumber),
IdentityPreimages: sortedIdentityPreimages,
}

decryptionTriggers = append(decryptionTriggers, decryptionTrigger)
}
return decryptionTriggers, nil
}
Expand Down