feat: force starting period (#32)

Author: mpetrun5

chains/evm/config/config.go

@@ -23,6 +23,7 @@ type EVMConfig struct {
 	RetryInterval         uint64  `default:"12" split_words:"true"`
 	CommitteePeriodLength uint64  `default:"256" split_words:"true"`
 	StartingPeriod        uint64  `required:"true" split_words:"true"`
+	ForcePeriod           bool    `default:"false" split_words:"true"`
 }
 
 // LoadEVMConfig loads EVM config from the environment and validates the fields

chains/evm/config/config_test.go

@@ -64,6 +64,7 @@ func (s *EVMConfigTestSuite) Test_LoadEVMConfig_SuccessfulLoad_DefaultValues() {
 		CommitteePeriodLength: 256,
 		BeaconEndpoint:        "endpoint",
 		StartingPeriod:        500,
+		ForcePeriod:           false,
 	})
 }
 
@@ -82,6 +83,7 @@ func (s *EVMConfigTestSuite) Test_LoadEVMConfig_SuccessfulLoad() {
 	os.Setenv("SPECTRE_DOMAINS_1_COMMITTEE_PERIOD_LENGTH", "128")
 	os.Setenv("SPECTRE_DOMAINS_2_ROUTER", "invalid")
 	os.Setenv("SPECTRE_DOMAINS_1_STARTING_PERIOD", "500")
+	os.Setenv("SPECTRE_DOMAINS_1_FORCE_PERIOD", "true")
 
 	c, err := config.LoadEVMConfig(1)
 
@@ -102,5 +104,6 @@ func (s *EVMConfigTestSuite) Test_LoadEVMConfig_SuccessfulLoad() {
 		CommitteePeriodLength: 128,
 		BeaconEndpoint:        "endpoint",
 		StartingPeriod:        500,
+		ForcePeriod:           true,
 	})
 }

chains/evm/listener/handlers/rotate.go

@@ -44,19 +44,8 @@ func NewRotateHandler(
 	domainID uint8,
 	domains []uint8,
 	committeePeriodLenght uint64,
-	startingPeriod uint64,
-) (*RotateHandler, error) {
-	storedPeriod, err := periodStorer.Period(domainID)
-	if err != nil {
-		return nil, err
-	}
-
-	var latestPeriod *big.Int
-	if storedPeriod.Uint64() >= startingPeriod {
-		latestPeriod = storedPeriod
-	} else {
-		latestPeriod = big.NewInt(int64(startingPeriod))
-	}
+	latestPeriod *big.Int,
+) *RotateHandler {
 	return &RotateHandler{
 		prover:                prover,
 		periodStorer:          periodStorer,
@@ -65,7 +54,7 @@ func NewRotateHandler(
 		msgChan:               msgChan,
 		committeePeriodLength: committeePeriodLenght,
 		latestPeriod:          latestPeriod,
-	}, err
+	}
 }
 
 // HandleEvents checks if the current period is newer than the last stored

chains/evm/listener/handlers/rotate_test.go

@@ -48,15 +48,14 @@ func (s *RotateHandlerTestSuite) SetupTest() {
 	s.mockProver = mock.NewMockProver(ctrl)
 	s.mockPeriodStorer = mock.NewMockPeriodStorer(ctrl)
 	s.msgChan = make(chan []*message.Message, 2)
-	s.mockPeriodStorer.EXPECT().Period(uint8(1)).Return(big.NewInt(2), nil)
-	s.handler, _ = handlers.NewRotateHandler(
+	s.handler = handlers.NewRotateHandler(
 		s.msgChan,
 		s.mockPeriodStorer,
 		s.mockProver,
 		1,
 		[]uint8{2, 3},
 		256,
-		3,
+		big.NewInt(3),
 	)
 }
 

main.go

@@ -116,14 +116,22 @@ func main() {
 				}
 				beaconProvider := beaconClient.(*http.Service)
 
+				storedPeriod, err := periodStore.Period(id)
+				if err != nil {
+					panic(err)
+				}
+				var latestPeriod *big.Int
+				if (storedPeriod.Uint64() >= config.StartingPeriod) && !config.ForcePeriod {
+					latestPeriod = storedPeriod
+				} else {
+					latestPeriod = big.NewInt(int64(config.StartingPeriod))
+				}
+
 				lightClient := lightclient.NewLightClient(config.BeaconEndpoint)
 				p := prover.NewProver(proverClient, beaconProvider, lightClient, prover.Spec(config.Spec))
 				routerAddress := common.HexToAddress(config.Router)
 				stepHandler := handlers.NewStepEventHandler(msgChan, client, beaconProvider, p, routerAddress, id, domains, config.BlockInterval)
-				rotateHandler, err := handlers.NewRotateHandler(msgChan, periodStore, p, id, domains, config.CommitteePeriodLength, config.StartingPeriod)
-				if err != nil {
-					panic(err)
-				}
+				rotateHandler := handlers.NewRotateHandler(msgChan, periodStore, p, id, domains, config.CommitteePeriodLength, latestPeriod)
 				listener := listener.NewEVMListener(beaconProvider, []listener.EventHandler{rotateHandler, stepHandler}, id, time.Duration(config.RetryInterval)*time.Second)
 
 				messageHandler := message.NewMessageHandler()