Merge pull request #2522 from OffchainLabs/fix-das-sync-default-reten…

…tion-period Fix DAS sync default retention period
OffchainLabs · Jul 25, 2024 · 13c988d · 13c988d
2 parents 6223915 + 5789f19
commit 13c988d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/arbnode/batch_poster.go b/arbnode/batch_poster.go
@@ -238,7 +238,7 @@ var DefaultBatchPosterConfig = BatchPosterConfig{
 	MaxDelay:                       time.Hour,
 	WaitForMaxDelay:                false,
 	CompressionLevel:               brotli.BestCompression,
-	DASRetentionPeriod:             time.Hour * 24 * 15,
+	DASRetentionPeriod:             daprovider.DefaultDASRetentionPeriod,
 	GasRefunderAddress:             "",
 	ExtraBatchGas:                  50_000,
 	Post4844Blobs:                  false,
@@ -270,7 +270,7 @@ var TestBatchPosterConfig = BatchPosterConfig{
 	MaxDelay:                       0,
 	WaitForMaxDelay:                false,
 	CompressionLevel:               2,
-	DASRetentionPeriod:             time.Hour * 24 * 15,
+	DASRetentionPeriod:             daprovider.DefaultDASRetentionPeriod,
 	GasRefunderAddress:             "",
 	ExtraBatchGas:                  10_000,
 	Post4844Blobs:                  true,

diff --git a/arbstate/daprovider/util.go b/arbstate/daprovider/util.go
@@ -11,6 +11,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -34,6 +35,8 @@ type DASWriter interface {
 	fmt.Stringer
 }
 
+var DefaultDASRetentionPeriod time.Duration = time.Hour * 24 * 15
+
 type DASKeysetFetcher interface {
 	GetKeysetByHash(context.Context, common.Hash) ([]byte, error)
 }

diff --git a/das/syncing_fallback_storage.go b/das/syncing_fallback_storage.go
@@ -68,7 +68,7 @@ type SyncToStorageConfig struct {
 var DefaultSyncToStorageConfig = SyncToStorageConfig{
 	Eager:                    false,
 	EagerLowerBoundBlock:     0,
-	RetentionPeriod:          defaultStorageRetention,
+	RetentionPeriod:          daprovider.DefaultDASRetentionPeriod,
 	DelayOnError:             time.Second,
 	IgnoreWriteErrors:        true,
 	ParentChainBlocksPerRead: 100,