Round change according to duty start time

go.mod

@@ -16,12 +16,16 @@ require (
 	github.com/stretchr/testify v1.8.4
 )
 
+require (
+	github.com/google/go-cmp v0.5.9
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
+)
+
 require (
 	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
 	github.com/holiman/uint256 v1.2.2 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect

go.sum

@@ -177,6 +177,7 @@ golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU
 golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
 golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=

qbft/spectest/all_tests.go

@@ -14,6 +14,7 @@ import (
 	"github.com/bloxapp/ssv-spec/qbft/spectest/tests/roundchange"
 	"github.com/bloxapp/ssv-spec/qbft/spectest/tests/startinstance"
 	"github.com/bloxapp/ssv-spec/qbft/spectest/tests/timeout"
+	"github.com/bloxapp/ssv-spec/qbft/spectest/tests/timeout/timeoutduration"
 )
 
 var AllTests = []tests.TestF{
@@ -23,6 +24,17 @@ var AllTests = []tests.TestF{
 	timeout.Round5,
 	timeout.Round15,
 
+	timeoutduration.Round1Duration,
+	timeoutduration.Round3Duration,
+	timeoutduration.Round6Duration,
+	timeoutduration.Round7Duration,
+	timeoutduration.Round13Duration,
+	timeoutduration.Round1DurationFutureCurrentTime,
+	timeoutduration.Round3DurationOnDutyStartTime,
+	timeoutduration.Round5DurationOnRound3Time,
+	timeoutduration.Round7DurationOnDutyStartTime,
+	timeoutduration.Round13DurationOnRound12Time,
+
 	decided.Valid,
 	decided.HasQuorum,
 	decided.LateDecided,

qbft/spectest/run_test.go

@@ -3,6 +3,7 @@ package spectest
 import (
 	"encoding/json"
 	"github.com/bloxapp/ssv-spec/qbft/spectest/tests/timeout"
+	"github.com/bloxapp/ssv-spec/qbft/spectest/tests/timeout/timeoutduration"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -96,10 +97,25 @@ func TestJson(t *testing.T) {
 
 				tests[testName] = typedTest
 				typedTest.Run(t)
-			case reflect.TypeOf(&timeout.SpecTest{}).String():
+			case reflect.TypeOf(&timeoutduration.MultiSpecTest{}).String():
 				byts, err := json.Marshal(test)
 				require.NoError(t, err)
-				typedTest := &timeout.SpecTest{}
+				typedTest := timeoutduration.MultiSpecTest{}
+				require.NoError(t, json.Unmarshal(byts, &typedTest))
+
+				typedTest.Run(t)
+			case reflect.TypeOf(timeoutduration.TimeoutDurationTest{}).String():
+				byts, err := json.Marshal(test)
+				require.NoError(t, err)
+				typedTest := &timeoutduration.TimeoutDurationTest{}
+				require.NoError(t, json.Unmarshal(byts, &typedTest))
+
+				tests[testName] = typedTest
+				typedTest.Run(t)
+			case reflect.TypeOf(&timeout.UponTimeoutTest{}).String():
+				byts, err := json.Marshal(test)
+				require.NoError(t, err)
+				typedTest := &timeout.UponTimeoutTest{}
 				require.NoError(t, json.Unmarshal(byts, &typedTest))
 
 				// a little trick we do to instantiate all the internal instance params

qbft/spectest/tests/timeout/round_1.go

@@ -16,7 +16,7 @@ func Round1() tests.SpecTest {
 	pre := testingutils.BaseInstance()
 	pre.State.ProposalAcceptedForCurrentRound = testingutils.TestingProposalMessage(ks.Shares[1], types.OperatorID(1))
 
-	return &SpecTest{
+	return &UponTimeoutTest{
 		Name:      "round 1",
 		Pre:       pre,
 		PostRoot:  sc.Root(),

qbft/spectest/tests/timeout/round_15.go

@@ -17,7 +17,7 @@ func Round15() tests.SpecTest {
 	pre.State.ProposalAcceptedForCurrentRound = testingutils.TestingProposalMessageWithRound(ks.Shares[1],
 		types.OperatorID(1), 15)
 
-	return &SpecTest{
+	return &UponTimeoutTest{
 		Name:      "round 15",
 		Pre:       pre,
 		PostRoot:  sc.Root(),

qbft/spectest/tests/timeout/round_2.go

@@ -17,7 +17,7 @@ func Round2() tests.SpecTest {
 	pre.State.Round = 2
 	pre.State.ProposalAcceptedForCurrentRound = testingutils.TestingProposalMessageWithRound(ks.Shares[1], types.OperatorID(1), 2)
 
-	return &SpecTest{
+	return &UponTimeoutTest{
 		Name:      "round 2",
 		Pre:       pre,
 		PostRoot:  sc.Root(),

qbft/spectest/tests/timeout/round_3.go

@@ -17,7 +17,7 @@ func Round3() tests.SpecTest {
 	pre.State.Round = 3
 	pre.State.ProposalAcceptedForCurrentRound = testingutils.TestingProposalMessageWithRound(ks.Shares[1], types.OperatorID(1), 3)
 
-	return &SpecTest{
+	return &UponTimeoutTest{
 		Name:      "round 3",
 		Pre:       pre,
 		PostRoot:  sc.Root(),

qbft/spectest/tests/timeout/round_5.go

@@ -17,7 +17,7 @@ func Round5() tests.SpecTest {
 	pre.State.Round = 5
 	pre.State.ProposalAcceptedForCurrentRound = testingutils.TestingProposalMessageWithRound(ks.Shares[1], types.OperatorID(1), 5)
 
-	return &SpecTest{
+	return &UponTimeoutTest{
 		Name:      "round 5",
 		Pre:       pre,
 		PostRoot:  sc.Root(),

qbft/spectest/tests/timeout/test.go

@@ -13,7 +13,7 @@ import (
 	typescomparable "github.com/bloxapp/ssv-spec/types/testingutils/comparable"
 )
 
-type SpecTest struct {
+type UponTimeoutTest struct {
 	Name               string
 	Pre                *qbft.Instance
 	PostRoot           string
@@ -23,11 +23,11 @@ type SpecTest struct {
 	ExpectedError      string
 }
 
-func (test *SpecTest) TestName() string {
-	return "qbft timeout " + test.Name
+func (test *UponTimeoutTest) TestName() string {
+	return "qbft upon timeout " + test.Name
 }
 
-func (test *SpecTest) Run(t *testing.T) {
+func (test *UponTimeoutTest) Run(t *testing.T) {
 	err := test.Pre.UponRoundTimeout()
 
 	if len(test.ExpectedError) != 0 {
@@ -66,6 +66,6 @@ func (test *SpecTest) Run(t *testing.T) {
 	}
 }
 
-func (test *SpecTest) GetPostState() (interface{}, error) {
+func (test *UponTimeoutTest) GetPostState() (interface{}, error) {
 	return nil, nil
 }

qbft/spectest/tests/timeout/timeoutduration/multi_spectest.go

@@ -0,0 +1,26 @@
+package timeoutduration
+
+import (
+	"testing"
+)
+
+type MultiSpecTest struct {
+	Name  string
+	Tests []*TimeoutDurationTest
+}
+
+func (test *MultiSpecTest) GetPostState() (interface{}, error) {
+	return nil, nil
+}
+
+func (test *MultiSpecTest) TestName() string {
+	return test.Name
+}
+
+func (test *MultiSpecTest) Run(t *testing.T) {
+	for _, test := range test.Tests {
+		t.Run(test.TestName(), func(t *testing.T) {
+			test.Run(t)
+		})
+	}
+}

qbft/spectest/tests/timeout/timeoutduration/round_13_duration.go

@@ -0,0 +1,68 @@
+package timeoutduration
+
+import (
+	"github.com/attestantio/go-eth2-client/spec/phase0"
+	"github.com/bloxapp/ssv-spec/qbft"
+	"github.com/bloxapp/ssv-spec/qbft/spectest/tests"
+	"github.com/bloxapp/ssv-spec/types"
+)
+
+// Round13Duration tests timeout duration for round 13 where the current time is the expected start of the round
+func Round13Duration() tests.SpecTest {
+	testingNetwork := types.HoleskyNetwork
+	height := qbft.Height(40)
+	var round qbft.Round = 13
+	dutyStartTime := testingNetwork.EstimatedTimeAtSlot(phase0.Slot(height))
+
+	return &MultiSpecTest{
+		Name: "round 13 duration",
+		Tests: []*TimeoutDurationTest{
+			{
+				Name:             "sync committee",
+				Role:             types.BNRoleSyncCommittee,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 16 + 6*120,
+				ExpectedDuration: 120,
+			},
+			{
+				Name:             "sync committee contribution",
+				Role:             types.BNRoleSyncCommitteeContribution,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 20 + 6*120,
+				ExpectedDuration: 120,
+			},
+			{
+				Name:             "attester",
+				Role:             types.BNRoleAttester,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 16 + 6*120,
+				ExpectedDuration: 120,
+			},
+			{
+				Name:             "aggregator",
+				Role:             types.BNRoleAggregator,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 20 + 6*120,
+				ExpectedDuration: 120,
+			},
+			{
+				Name:             "block proposer",
+				Role:             types.BNRoleProposer,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 12 + 6*120,
+				ExpectedDuration: 120,
+			},
+		},
+	}
+
+}

qbft/spectest/tests/timeout/timeoutduration/round_13_duration_on_round_12_time.go

@@ -0,0 +1,69 @@
+package timeoutduration
+
+import (
+	"github.com/attestantio/go-eth2-client/spec/phase0"
+	"github.com/bloxapp/ssv-spec/qbft"
+	"github.com/bloxapp/ssv-spec/qbft/spectest/tests"
+	"github.com/bloxapp/ssv-spec/types"
+)
+
+// Round13DurationOnRound12Time tests timeout duration for round 13 where the current time is the expected start of
+// round 12
+func Round13DurationOnRound12Time() tests.SpecTest {
+	testingNetwork := types.HoleskyNetwork
+	height := qbft.Height(40)
+	var round qbft.Round = 13
+	dutyStartTime := testingNetwork.EstimatedTimeAtSlot(phase0.Slot(height))
+
+	return &MultiSpecTest{
+		Name: "round 13 duration on round 12 time",
+		Tests: []*TimeoutDurationTest{
+			{
+				Name:             "sync committee",
+				Role:             types.BNRoleSyncCommittee,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 16 + 5*120,
+				ExpectedDuration: 240,
+			},
+			{
+				Name:             "sync committee contribution",
+				Role:             types.BNRoleSyncCommitteeContribution,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 20 + 5*120,
+				ExpectedDuration: 240,
+			},
+			{
+				Name:             "attester",
+				Role:             types.BNRoleAttester,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 16 + 5*120,
+				ExpectedDuration: 240,
+			},
+			{
+				Name:             "aggregator",
+				Role:             types.BNRoleAggregator,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 20 + 5*120,
+				ExpectedDuration: 240,
+			},
+			{
+				Name:             "block proposer",
+				Role:             types.BNRoleProposer,
+				Height:           height,
+				Round:            round,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime + 12 + 5*120,
+				ExpectedDuration: 120,
+			},
+		},
+	}
+
+}

qbft/spectest/tests/timeout/timeoutduration/round_1_duration.go

@@ -0,0 +1,68 @@
+package timeoutduration
+
+import (
+	"github.com/attestantio/go-eth2-client/spec/phase0"
+	"github.com/bloxapp/ssv-spec/qbft"
+	"github.com/bloxapp/ssv-spec/qbft/spectest/tests"
+
+	"github.com/bloxapp/ssv-spec/types"
+)
+
+// Round1Duration tests timeout duration for round 1
+func Round1Duration() tests.SpecTest {
+	var testingNetwork = types.HoleskyNetwork
+	height := qbft.FirstHeight
+	dutyStartTime := testingNetwork.EstimatedTimeAtSlot(phase0.Slot(height))
+
+	return &MultiSpecTest{
+		Name: "round 1",
+		Tests: []*TimeoutDurationTest{
+			{
+				Name:             "sync committee",
+				Role:             types.BNRoleSyncCommittee,
+				Height:           0,
+				Round:            qbft.FirstRound,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime,
+				ExpectedDuration: 6,
+			},
+			{
+				Name:             "sync committee contribution",
+				Role:             types.BNRoleSyncCommitteeContribution,
+				Height:           0,
+				Round:            qbft.FirstRound,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime,
+				ExpectedDuration: 10,
+			},
+			{
+				Name:             "attester",
+				Role:             types.BNRoleAttester,
+				Height:           0,
+				Round:            qbft.FirstRound,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime,
+				ExpectedDuration: 6,
+			},
+			{
+				Name:             "aggregator",
+				Role:             types.BNRoleAggregator,
+				Height:           0,
+				Round:            qbft.FirstRound,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime,
+				ExpectedDuration: 10,
+			},
+			{
+				Name:             "block proposer",
+				Role:             types.BNRoleProposer,
+				Height:           0,
+				Round:            qbft.FirstRound,
+				Network:          testingNetwork,
+				CurrentTime:      dutyStartTime,
+				ExpectedDuration: 2,
+			},
+		},
+	}
+
+}