Merge branch 'master' into large_distance

amsanghi · web-flow · commit 4f60017de53a · 2025-01-06T18:50:06.000+05:30
diff --git a/arbnode/node.go b/arbnode/node.go
@@ -212,6 +212,7 @@ func ConfigDefaultL1NonSequencerTest() *Config {
 	config.Staker = legacystaker.TestL1ValidatorConfig
 	config.Staker.Enable = false
 	config.BlockValidator.ValidationServerConfigs = []rpcclient.ClientConfig{{URL: ""}}
+	config.Bold.MinimumGapToParentAssertion = 0
 
 	return &config
 }
@@ -230,6 +231,7 @@ func ConfigDefaultL2Test() *Config {
 	config.Staker.Enable = false
 	config.BlockValidator.ValidationServerConfigs = []rpcclient.ClientConfig{{URL: ""}}
 	config.TransactionStreamer = DefaultTransactionStreamerConfig
+	config.Bold.MinimumGapToParentAssertion = 0
 
 	return &config
 }
diff --git a/bold b/bold
@@ -1 +1 @@
-Subproject commit d0a87de774aecfa97161efd1b0a924d4d5fbcf74
+Subproject commit cb6922fb4f50d1cdb12af467a18ecee6f1c688a4
diff --git a/staker/bold/bold_staker.go b/staker/bold/bold_staker.go
@@ -57,7 +57,9 @@ type BoldConfig struct {
 	// How often to scan for newly created assertions onchain.
 	AssertionScanningInterval time.Duration `koanf:"assertion-scanning-interval"`
 	// How often to confirm assertions onchain.
-	AssertionConfirmingInterval         time.Duration       `koanf:"assertion-confirming-interval"`
+	AssertionConfirmingInterval time.Duration `koanf:"assertion-confirming-interval"`
+	// How long to wait since parent assertion was created to post a new assertion
+	MinimumGapToParentAssertion         time.Duration       `koanf:"minimum-gap-to-parent-assertion"`
 	API                                 bool                `koanf:"api"`
 	APIHost                             string              `koanf:"api-host"`
 	APIPort                             uint16              `koanf:"api-port"`
@@ -98,6 +100,7 @@ var DefaultBoldConfig = BoldConfig{
 	AssertionPostingInterval:            time.Minute * 15,
 	AssertionScanningInterval:           time.Minute,
 	AssertionConfirmingInterval:         time.Minute,
+	MinimumGapToParentAssertion:         time.Minute, // Correct default?
 	API:                                 false,
 	APIHost:                             "127.0.0.1",
 	APIPort:                             9393,
@@ -121,6 +124,7 @@ func BoldConfigAddOptions(prefix string, f *flag.FlagSet) {
 	f.Duration(prefix+".assertion-posting-interval", DefaultBoldConfig.AssertionPostingInterval, "assertion posting interval")
 	f.Duration(prefix+".assertion-scanning-interval", DefaultBoldConfig.AssertionScanningInterval, "scan assertion interval")
 	f.Duration(prefix+".assertion-confirming-interval", DefaultBoldConfig.AssertionConfirmingInterval, "confirm assertion interval")
+	f.Duration(prefix+".minimum-gap-to-parent-assertion", DefaultBoldConfig.MinimumGapToParentAssertion, "minimum duration to wait since the parent assertion was created to post a new assertion")
 	f.Duration(prefix+".check-staker-switch-interval", DefaultBoldConfig.CheckStakerSwitchInterval, "how often to check if staker can switch to bold")
 	f.Bool(prefix+".api", DefaultBoldConfig.API, "enable api")
 	f.String(prefix+".api-host", DefaultBoldConfig.APIHost, "bold api host")
@@ -455,6 +459,7 @@ func newBOLDChallengeManager(
 		challengemanager.StackWithPollingInterval(scanningInterval),
 		challengemanager.StackWithPostingInterval(postingInterval),
 		challengemanager.StackWithConfirmationInterval(confirmingInterval),
+		challengemanager.StackWithMinimumGapToParentAssertion(config.MinimumGapToParentAssertion),
 		challengemanager.StackWithTrackChallengeParentAssertionHashes(config.TrackChallengeParentAssertionHashes),
 		challengemanager.StackWithHeaderProvider(l1Reader),
 	}
diff --git a/system_tests/bold_challenge_protocol_test.go b/system_tests/bold_challenge_protocol_test.go
@@ -417,6 +417,7 @@ func testChallengeProtocolBOLD(t *testing.T, spawnerOpts ...server_arb.SpawnerOp
 		challengemanager.StackWithMode(modes.MakeMode),
 		challengemanager.StackWithPostingInterval(time.Second * 3),
 		challengemanager.StackWithPollingInterval(time.Second),
+		challengemanager.StackWithMinimumGapToParentAssertion(0),
 		challengemanager.StackWithAverageBlockCreationTime(time.Second),
 	}
 
diff --git a/system_tests/bold_new_challenge_test.go b/system_tests/bold_new_challenge_test.go
@@ -344,6 +344,7 @@ func startBoldChallengeManager(t *testing.T, ctx context.Context, builder *NodeB
 		challengemanager.StackWithPostingInterval(time.Second * 3),
 		challengemanager.StackWithPollingInterval(time.Second),
 		challengemanager.StackWithAverageBlockCreationTime(time.Second),
+		challengemanager.StackWithMinimumGapToParentAssertion(0),
 	}
 
 	challengeManager, err := challengemanager.NewChallengeStack(
diff --git a/system_tests/overflow_assertions_test.go b/system_tests/overflow_assertions_test.go
@@ -224,6 +224,7 @@ func TestOverflowAssertions(t *testing.T) {
 		challengemanager.StackWithPostingInterval(time.Second),
 		challengemanager.StackWithPollingInterval(time.Millisecond * 500),
 		challengemanager.StackWithAverageBlockCreationTime(time.Second),
+		challengemanager.StackWithMinimumGapToParentAssertion(0),
 	}
 
 	manager, err := challengemanager.NewChallengeStack(

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,7 @@ func ConfigDefaultL1NonSequencerTest() *Config {`
`212`	`212`	`config.Staker = legacystaker.TestL1ValidatorConfig`
`213`	`213`	`config.Staker.Enable = false`
`214`	`214`	`config.BlockValidator.ValidationServerConfigs = []rpcclient.ClientConfig{{URL: ""}}`
	`215`	`+ config.Bold.MinimumGapToParentAssertion = 0`
`215`	`216`
`216`	`217`	`return &config`
`217`	`218`	`}`
`@@ -230,6 +231,7 @@ func ConfigDefaultL2Test() *Config {`
`230`	`231`	`config.Staker.Enable = false`
`231`	`232`	`config.BlockValidator.ValidationServerConfigs = []rpcclient.ClientConfig{{URL: ""}}`
`232`	`233`	`config.TransactionStreamer = DefaultTransactionStreamerConfig`
	`234`	`+ config.Bold.MinimumGapToParentAssertion = 0`
`233`	`235`
`234`	`236`	`return &config`
`235`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -417,6 +417,7 @@ func testChallengeProtocolBOLD(t *testing.T, spawnerOpts ...server_arb.SpawnerOp`
`417`	`417`	`challengemanager.StackWithMode(modes.MakeMode),`
`418`	`418`	`challengemanager.StackWithPostingInterval(time.Second * 3),`
`419`	`419`	`challengemanager.StackWithPollingInterval(time.Second),`
	`420`	`+ challengemanager.StackWithMinimumGapToParentAssertion(0),`
`420`	`421`	`challengemanager.StackWithAverageBlockCreationTime(time.Second),`
`421`	`422`	`}`
`422`	`423`
Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,7 @@ func startBoldChallengeManager(t testing.T, ctx context.Context, builder NodeB`
`344`	`344`	`challengemanager.StackWithPostingInterval(time.Second * 3),`
`345`	`345`	`challengemanager.StackWithPollingInterval(time.Second),`
`346`	`346`	`challengemanager.StackWithAverageBlockCreationTime(time.Second),`
	`347`	`+ challengemanager.StackWithMinimumGapToParentAssertion(0),`
`347`	`348`	`}`
`348`	`349`
`349`	`350`	`challengeManager, err := challengemanager.NewChallengeStack(`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,7 @@ func TestOverflowAssertions(t *testing.T) {`
`224`	`224`	`challengemanager.StackWithPostingInterval(time.Second),`
`225`	`225`	`challengemanager.StackWithPollingInterval(time.Millisecond * 500),`
`226`	`226`	`challengemanager.StackWithAverageBlockCreationTime(time.Second),`
	`227`	`+ challengemanager.StackWithMinimumGapToParentAssertion(0),`
`227`	`228`	`}`
`228`	`229`
`229`	`230`	`manager, err := challengemanager.NewChallengeStack(`