chore: rename V1MessageEnabled->EnableAggregateValidatorRegistrationV1

Author: blockchainluffy

rolling-shutter/keyperimpl/gnosis/config.go

@@ -100,32 +100,32 @@ func (c *Config) GetAddress() common.Address {
 }
 
 type GnosisConfig struct {
-	Node                      *configuration.EthnodeConfig `shconfig:",required"`
-	Contracts                 *GnosisContractsConfig       `shconfig:",required"`
-	EncryptedGasLimit         uint64                       `shconfig:",required"`
-	MinGasPerTransaction      uint64                       `shconfig:",required"`
-	MaxTxPointerAge           uint64                       `shconfig:",required"`
-	SecondsPerSlot            uint64                       `shconfig:",required"`
-	SlotsPerEpoch             uint64                       `shconfig:",required"`
-	GenesisSlotTimestamp      uint64                       `shconfig:",required"`
-	SyncStartBlockNumber      uint64                       `shconfig:",required"`
-	SyncMonitorCheckInterval  uint64                       `shconfig:",required"`
-	V1ValidatorMessageEnabled bool                         `shconfig:",required"`
+	Node                                   *configuration.EthnodeConfig `shconfig:",required"`
+	Contracts                              *GnosisContractsConfig       `shconfig:",required"`
+	EncryptedGasLimit                      uint64                       `shconfig:",required"`
+	MinGasPerTransaction                   uint64                       `shconfig:",required"`
+	MaxTxPointerAge                        uint64                       `shconfig:",required"`
+	SecondsPerSlot                         uint64                       `shconfig:",required"`
+	SlotsPerEpoch                          uint64                       `shconfig:",required"`
+	GenesisSlotTimestamp                   uint64                       `shconfig:",required"`
+	SyncStartBlockNumber                   uint64                       `shconfig:",required"`
+	SyncMonitorCheckInterval               uint64                       `shconfig:",required"`
+	EnableAggregateValidatorRegistrationV1 bool                         `shconfig:",required"`
 }
 
 func NewGnosisConfig() *GnosisConfig {
 	c := &GnosisConfig{
-		Node:                      configuration.NewEthnodeConfig(),
-		Contracts:                 NewGnosisContractsConfig(),
-		EncryptedGasLimit:         0,
-		MinGasPerTransaction:      0,
-		MaxTxPointerAge:           0,
-		SecondsPerSlot:            0,
-		SlotsPerEpoch:             0,
-		GenesisSlotTimestamp:      0,
-		SyncStartBlockNumber:      0,
-		SyncMonitorCheckInterval:  0,
-		V1ValidatorMessageEnabled: false,
+		Node:                                   configuration.NewEthnodeConfig(),
+		Contracts:                              NewGnosisContractsConfig(),
+		EncryptedGasLimit:                      0,
+		MinGasPerTransaction:                   0,
+		MaxTxPointerAge:                        0,
+		SecondsPerSlot:                         0,
+		SlotsPerEpoch:                          0,
+		GenesisSlotTimestamp:                   0,
+		SyncStartBlockNumber:                   0,
+		SyncMonitorCheckInterval:               0,
+		EnableAggregateValidatorRegistrationV1: false,
 	}
 	c.Init()
 	return c
@@ -163,7 +163,7 @@ func (c *GnosisConfig) SetExampleValues() error {
 	c.GenesisSlotTimestamp = 1665410700
 	c.SyncStartBlockNumber = 0
 	c.SyncMonitorCheckInterval = 30
-	c.V1ValidatorMessageEnabled = false
+	c.EnableAggregateValidatorRegistrationV1 = false
 	return nil
 }
 

rolling-shutter/keyperimpl/gnosis/keyper.go

@@ -248,13 +248,13 @@ func (kpr *Keyper) initValidatorSyncer(ctx context.Context) error {
 		return errors.Wrap(err, "failed to instantiate validator registry contract")
 	}
 	kpr.validatorSyncer = &ValidatorSyncer{
-		Contract:             validatorRegistryContract,
-		DBPool:               kpr.dbpool,
-		BeaconAPIClient:      kpr.beaconAPIClient,
-		ExecutionClient:      validatorSyncerClient,
-		ChainID:              chainID.Uint64(),
-		SyncStartBlockNumber: kpr.config.Gnosis.SyncStartBlockNumber,
-		V1MessageEnabled:     kpr.config.Gnosis.V1ValidatorMessageEnabled,
+		Contract:                               validatorRegistryContract,
+		DBPool:                                 kpr.dbpool,
+		BeaconAPIClient:                        kpr.beaconAPIClient,
+		ExecutionClient:                        validatorSyncerClient,
+		ChainID:                                chainID.Uint64(),
+		SyncStartBlockNumber:                   kpr.config.Gnosis.SyncStartBlockNumber,
+		EnableAggregateValidatorRegistrationV1: kpr.config.Gnosis.EnableAggregateValidatorRegistrationV1,
 	}
 
 	// Perform an initial sync now because it might take some time and doing so during regular

rolling-shutter/keyperimpl/gnosis/validatorsyncer.go

@@ -29,13 +29,13 @@ const (
 )
 
 type ValidatorSyncer struct {
-	Contract             *validatorRegistryBindings.Validatorregistry
-	DBPool               *pgxpool.Pool
-	BeaconAPIClient      *beaconapiclient.Client
-	ExecutionClient      *ethclient.Client
-	ChainID              uint64
-	SyncStartBlockNumber uint64
-	V1MessageEnabled     bool
+	Contract                               *validatorRegistryBindings.Validatorregistry
+	DBPool                                 *pgxpool.Pool
+	BeaconAPIClient                        *beaconapiclient.Client
+	ExecutionClient                        *ethclient.Client
+	ChainID                                uint64
+	SyncStartBlockNumber                   uint64
+	EnableAggregateValidatorRegistrationV1 bool
 }
 
 func (v *ValidatorSyncer) Sync(ctx context.Context, header *types.Header) error {
@@ -227,7 +227,7 @@ func (v *ValidatorSyncer) filterEvents(
 				evLog.Warn().Msg("ignoring registration message with invalid signature")
 				continue
 			}
-		} else if v.V1MessageEnabled && msg.Version == validatorregistry.AggregateValidatorRegistrationMessageVersion {
+		} else if v.EnableAggregateValidatorRegistrationV1 && msg.Version == validatorregistry.AggregateValidatorRegistrationMessageVersion {
 			if !validatorregistry.VerifyAggregateSignature(sig, pubKeys, msg) {
 				evLog.Warn().Msg("ignoring validator registration message with invalid signature")
 				continue