Trigger decryption based on slots not blocks

Author: jannikluhn

rolling-shutter/keyperimpl/gnosis/config.go

@@ -2,15 +2,22 @@ package gnosis
 
 import (
 	"io"
+	"math"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/pkg/errors"
 
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/kprconfig"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/metricsserver"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
 )
 
+const (
+	maxSecondsPerSlot = 60 * 60
+	maxChainAge       = 100 * 365 * 24 * 60 * 60
+)
+
 var _ configuration.Config = &Config{}
 
 func NewConfig() *Config {
@@ -38,9 +45,12 @@ type Config struct {
 	Shuttermint *kprconfig.ShuttermintConfig
 	Metrics     *metricsserver.MetricsConfig
 
+	// TODO: put these in a child config
 	GnosisContracts      *GnosisContracts `shconfig:",required"`
 	EncryptedGasLimit    uint64           `shconfig:",required"`
 	MinGasPerTransaction uint64           `shconfig:",required"`
+	SecondsPerSlot       uint64           `shconfig:",required"`
+	GenesisSlotTimestamp uint64           `shconfig:",required"`
 }
 
 type GnosisContracts struct {
@@ -50,6 +60,13 @@ type GnosisContracts struct {
 }
 
 func (c *Config) Validate() error {
+	if c.SecondsPerSlot > maxSecondsPerSlot {
+		return errors.Errorf("seconds per slot is too big (%d > %d)", c.SecondsPerSlot, maxSecondsPerSlot)
+	}
+	maxGenesisSlotTime := uint64(math.MaxInt64 - maxChainAge)
+	if c.GenesisSlotTimestamp > maxGenesisSlotTime {
+		return errors.Errorf("genesis slot timestamp is too big (%d > %d)", c.GenesisSlotTimestamp, maxGenesisSlotTime)
+	}
 	return nil
 }
 

rolling-shutter/keyperimpl/gnosis/database/gnosiskeyper.sqlc.gen.go

@@ -20,12 +20,12 @@ ORDER BY index ASC
 LIMIT $3;
 
 -- name: SetTransactionSubmittedEventsSyncedUntil :exec
-INSERT INTO transaction_submitted_events_synced_until (block_number) VALUES ($1)
+INSERT INTO transaction_submitted_events_synced_until (block_hash, block_number, slot) VALUES ($1, $2, $3)
 ON CONFLICT (enforce_one_row) DO UPDATE
-SET block_number = $1;
+SET block_hash = $1, block_number = $2, slot = $3;
 
 -- name: GetTransactionSubmittedEventsSyncedUntil :one
-SELECT block_number FROM transaction_submitted_events_synced_until LIMIT 1;
+SELECT * FROM transaction_submitted_events_synced_until LIMIT 1;
 
 -- name: SetTransactionSubmittedEventCount :exec
 INSERT INTO transaction_submitted_event_count (eon, event_count)
@@ -54,21 +54,21 @@ ON CONFLICT (eon) DO UPDATE
 SET block = $2, value = $3;
 
 -- name: SetCurrentDecryptionTrigger :exec
-INSERT INTO current_decryption_trigger (eon, block, tx_pointer, identities_hash)
+INSERT INTO current_decryption_trigger (eon, slot, tx_pointer, identities_hash)
 VALUES ($1, $2, $3, $4)
 ON CONFLICT (eon) DO UPDATE
-SET block = $2, tx_pointer = $3, identities_hash = $4;
+SET slot = $2, tx_pointer = $3, identities_hash = $4;
 
 -- name: GetCurrentDecryptionTrigger :one
 SELECT * FROM current_decryption_trigger
 WHERE eon = $1;
 
 -- name: InsertSlotDecryptionSignature :exec
-INSERT INTO slot_decryption_signatures (eon, block, keyper_index, tx_pointer, identities_hash, signature)
+INSERT INTO slot_decryption_signatures (eon, slot, keyper_index, tx_pointer, identities_hash, signature)
 VALUES ($1, $2, $3, $4, $5, $6);
 
 -- name: GetSlotDecryptionSignatures :many
 SELECT * FROM slot_decryption_signatures
-WHERE eon = $1 AND block = $2 AND tx_pointer = $3 AND identities_hash = $4
+WHERE eon = $1 AND slot = $2 AND tx_pointer = $3 AND identities_hash = $4
 ORDER BY keyper_index ASC
 LIMIT $5;

rolling-shutter/keyperimpl/gnosis/database/models.sqlc.gen.go

@@ -17,7 +17,9 @@ CREATE TABLE transaction_submitted_event (
 
 CREATE TABLE transaction_submitted_events_synced_until(
     enforce_one_row bool PRIMARY KEY DEFAULT true,
-    block_number bigint NOT NULL CHECK (block_number >= 0)
+    block_hash bytea NOT NULL,
+    block_number bigint NOT NULL CHECK (block_number >= 0),
+    slot bigint NOT NULL CHECK (slot >= 0)
 );
 
 CREATE TABLE transaction_submitted_event_count(
@@ -33,17 +35,17 @@ CREATE TABLE tx_pointer(
 
 CREATE TABLE current_decryption_trigger(
     eon bigint PRIMARY KEY CHECK (eon >= 0),
-    block bigint NOT NULL CHECK (block >= 0),
+    slot bigint NOT NULL CHECK (slot >= 0),
     tx_pointer bigint NOT NULL CHECK (tx_pointer >= 0),
     identities_hash bytea NOT NULL
 );
 
 CREATE TABLE slot_decryption_signatures(
     eon bigint NOT NULL CHECK (eon >= 0),
-    block bigint NOT NULL CHECK (block >= 0),
+    slot bigint NOT NULL CHECK (slot >= 0),
     keyper_index bigint NOT NULL,
     tx_pointer bigint NOT NULL CHECK (tx_pointer >= 0),
     identities_hash bytea NOT NULL,
     signature bytea NOT NULL,
-    PRIMARY KEY (eon, block, keyper_index)
+    PRIMARY KEY (eon, slot, keyper_index)
 );

rolling-shutter/keyperimpl/gnosis/database/sql/queries/gnosiskeyper.sql

@@ -106,7 +106,7 @@ func (h *DecryptionKeySharesHandler) HandleMessage(ctx context.Context, msg p2pm
 	identitiesHash := computeIdentitiesHashFromShares(keyShares.Shares)
 	err := gnosisDB.InsertSlotDecryptionSignature(ctx, database.InsertSlotDecryptionSignatureParams{
 		Eon:            int64(keyShares.Eon),
-		Block:          int64(extra.Slot),
+		Slot:           int64(extra.Slot),
 		KeyperIndex:    int64(keyShares.KeyperIndex),
 		TxPointer:      int64(extra.TxPointer),
 		IdentitiesHash: identitiesHash,
@@ -127,7 +127,7 @@ func (h *DecryptionKeySharesHandler) HandleMessage(ctx context.Context, msg p2pm
 
 	signaturesDB, err := gnosisDB.GetSlotDecryptionSignatures(ctx, database.GetSlotDecryptionSignaturesParams{
 		Eon:            int64(keyShares.Eon),
-		Block:          int64(extra.Slot),
+		Slot:           int64(extra.Slot),
 		TxPointer:      int64(extra.TxPointer),
 		IdentitiesHash: identitiesHash,
 		Limit:          keyperSet.Threshold,