feat: EigenDA failover - fix AnyTrust failover bug

Layr-Labs · Nov 7, 2024 · 9bb2e70 · 9bb2e70
1 parent dfa809a
commit 9bb2e70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/arbnode/batch_poster.go b/arbnode/batch_poster.go
@@ -150,7 +150,7 @@ type BatchPosterDangerousConfig struct {
 type BatchPosterConfig struct {
 	Enable                             bool `koanf:"enable"`
 	DisableDapFallbackStoreDataOnChain bool `koanf:"disable-dap-fallback-store-data-on-chain" reload:"hot"`
-	EnableEigenDAFailover              bool `koanf:"enable-eigenda-failover" reload:"hot"`
+	EnableEigenDAFailover              bool `koanf:"eigenda-failover" reload:"hot"`
 	// Max batch size.
 	MaxSize int `koanf:"max-size" reload:"hot"`
 	// Maximum 4844 blob enabled batch size.
@@ -217,7 +217,7 @@ type BatchPosterConfigFetcher func() *BatchPosterConfig
 func BatchPosterConfigAddOptions(prefix string, f *pflag.FlagSet) {
 	f.Bool(prefix+".enable", DefaultBatchPosterConfig.Enable, "enable posting batches to l1")
 	f.Bool(prefix+".disable-dap-fallback-store-data-on-chain", DefaultBatchPosterConfig.DisableDapFallbackStoreDataOnChain, "If unable to batch to DA provider, disable fallback storing data on chain")
-	f.Bool(prefix+".enable-eigenda-failover", DefaultBatchPosterConfig.EnableEigenDAFailover, "If EigenDA fails, failover to AnyTrust (if enabled) or native ETH DA")
+	f.Bool(prefix+".eigenda-failover", DefaultBatchPosterConfig.EnableEigenDAFailover, "If EigenDA fails, failover to AnyTrust (if enabled) or native ETH DA")
 	f.Int(prefix+".max-size", DefaultBatchPosterConfig.MaxSize, "maximum batch size")
 	f.Int(prefix+".max-4844-batch-size", DefaultBatchPosterConfig.Max4844BatchSize, "maximum 4844 blob enabled batch size")
 	f.Int(prefix+".max-eigenda-batch-size", DefaultBatchPosterConfig.MaxEigenDABatchSize, "maximum EigenDA blob enabled batch size")
@@ -1502,12 +1502,11 @@ func (b *BatchPoster) maybePostSequencerBatch(ctx context.Context) (bool, error)
 
 		}
 
-		if err != nil {
+		if err != nil && !failOver {
 			batchPosterDAFailureCounter.Inc(1)
 			return false, err
-		}
 
-		if failOver {
+		} else if failOver {
 			batchPosterDAFailoverCount.Inc(1)
 		} else {
 			batchPosterDASuccessCounter.Inc(1)

diff --git a/system_tests/eigenda_test.go b/system_tests/eigenda_test.go
@@ -102,7 +102,6 @@ func TestEigenDAProxyFailOverToETHDA(t *testing.T) {
 		// 1 - Ensure that batches can be submitted and read via EigenDA batch posting
 		checkEigenDABatchPosting(t, ctx, builder.L1.Client, builder.L2.Client, builder.L1Info, builder.L2Info, big.NewInt(1e12), l2B.Client)
 
-		// time.Sleep(time.Second * 2)
 		// 2 - Cause EigenDA to fail and ensure that the system falls back to anytrust in the presence of 503 eigenda-proxy errors
 		builder.L2.ConsensusNode.BatchPoster.SetEigenDAClientMock()
 		checkBatchPosting(t, ctx, builder.L1.Client, builder.L2.Client, builder.L1Info, builder.L2Info, big.NewInt(2000000000000), l2B.Client)