Don't save every state on archive node

arbnode/execution/blockchain.go

@@ -25,15 +25,17 @@ import (
 )
 
 type CachingConfig struct {
-	Archive               bool          `koanf:"archive"`
-	BlockCount            uint64        `koanf:"block-count"`
-	BlockAge              time.Duration `koanf:"block-age"`
-	TrieTimeLimit         time.Duration `koanf:"trie-time-limit"`
-	TrieDirtyCache        int           `koanf:"trie-dirty-cache"`
-	TrieCleanCache        int           `koanf:"trie-clean-cache"`
-	SnapshotCache         int           `koanf:"snapshot-cache"`
-	DatabaseCache         int           `koanf:"database-cache"`
-	SnapshotRestoreMaxGas uint64        `koanf:"snapshot-restore-gas-limit"`
+	Archive                            bool          `koanf:"archive"`
+	BlockCount                         uint64        `koanf:"block-count"`
+	BlockAge                           time.Duration `koanf:"block-age"`
+	TrieTimeLimit                      time.Duration `koanf:"trie-time-limit"`
+	TrieDirtyCache                     int           `koanf:"trie-dirty-cache"`
+	TrieCleanCache                     int           `koanf:"trie-clean-cache"`
+	SnapshotCache                      int           `koanf:"snapshot-cache"`
+	DatabaseCache                      int           `koanf:"database-cache"`
+	SnapshotRestoreMaxGas              uint64        `koanf:"snapshot-restore-gas-limit"`
+	MaxNumberOfBlocksToSkipStateSaving uint32        `koanf:"max-number-of-blocks-to-skip-state-saving"`
+	MaxAmountOfGasToSkipStateSaving    uint64        `koanf:"max-amount-of-gas-to-skip-state-saving"`
 }
 
 func CachingConfigAddOptions(prefix string, f *flag.FlagSet) {
@@ -46,18 +48,22 @@ func CachingConfigAddOptions(prefix string, f *flag.FlagSet) {
 	f.Int(prefix+".snapshot-cache", DefaultCachingConfig.SnapshotCache, "amount of memory in megabytes to cache state snapshots with")
 	f.Int(prefix+".database-cache", DefaultCachingConfig.DatabaseCache, "amount of memory in megabytes to cache database contents with")
 	f.Uint64(prefix+".snapshot-restore-gas-limit", DefaultCachingConfig.SnapshotRestoreMaxGas, "maximum gas rolled back to recover snapshot")
+	f.Uint32(prefix+".max-number-of-blocks-to-skip-state-saving", DefaultCachingConfig.MaxNumberOfBlocksToSkipStateSaving, "maximum number of blocks to skip state saving to persistent storage (archive node only)")
+	f.Uint64(prefix+".max-amount-of-gas-to-skip-state-saving", DefaultCachingConfig.MaxAmountOfGasToSkipStateSaving, "maximum amount of gas in blocks to skip saving state to Persistent storage (archive node only)")
 }
 
 var DefaultCachingConfig = CachingConfig{
-	Archive:               false,
-	BlockCount:            128,
-	BlockAge:              30 * time.Minute,
-	TrieTimeLimit:         time.Hour,
-	TrieDirtyCache:        1024,
-	TrieCleanCache:        600,
-	SnapshotCache:         400,
-	DatabaseCache:         2048,
-	SnapshotRestoreMaxGas: 300_000_000_000,
+	Archive:                            false,
+	BlockCount:                         128,
+	BlockAge:                           30 * time.Minute,
+	TrieTimeLimit:                      time.Hour,
+	TrieDirtyCache:                     1024,
+	TrieCleanCache:                     600,
+	SnapshotCache:                      400,
+	DatabaseCache:                      2048,
+	SnapshotRestoreMaxGas:              300_000_000_000,
+	MaxNumberOfBlocksToSkipStateSaving: 127,
+	MaxAmountOfGasToSkipStateSaving:    15 * 1000 * 1000,
 }
 
 func DefaultCacheConfigFor(stack *node.Node, cachingConfig *CachingConfig) *core.CacheConfig {
@@ -67,18 +73,20 @@ func DefaultCacheConfigFor(stack *node.Node, cachingConfig *CachingConfig) *core
 	}
 
 	return &core.CacheConfig{
-		TrieCleanLimit:        cachingConfig.TrieCleanCache,
-		TrieCleanJournal:      stack.ResolvePath(baseConf.TrieCleanCacheJournal),
-		TrieCleanRejournal:    baseConf.TrieCleanCacheRejournal,
-		TrieCleanNoPrefetch:   baseConf.NoPrefetch,
-		TrieDirtyLimit:        cachingConfig.TrieDirtyCache,
-		TrieDirtyDisabled:     cachingConfig.Archive,
-		TrieTimeLimit:         cachingConfig.TrieTimeLimit,
-		TriesInMemory:         cachingConfig.BlockCount,
-		TrieRetention:         cachingConfig.BlockAge,
-		SnapshotLimit:         cachingConfig.SnapshotCache,
-		Preimages:             baseConf.Preimages,
-		SnapshotRestoreMaxGas: cachingConfig.SnapshotRestoreMaxGas,
+		TrieCleanLimit:                     cachingConfig.TrieCleanCache,
+		TrieCleanJournal:                   stack.ResolvePath(baseConf.TrieCleanCacheJournal),
+		TrieCleanRejournal:                 baseConf.TrieCleanCacheRejournal,
+		TrieCleanNoPrefetch:                baseConf.NoPrefetch,
+		TrieDirtyLimit:                     cachingConfig.TrieDirtyCache,
+		TrieDirtyDisabled:                  cachingConfig.Archive,
+		TrieTimeLimit:                      cachingConfig.TrieTimeLimit,
+		TriesInMemory:                      cachingConfig.BlockCount,
+		TrieRetention:                      cachingConfig.BlockAge,
+		SnapshotLimit:                      cachingConfig.SnapshotCache,
+		Preimages:                          baseConf.Preimages,
+		SnapshotRestoreMaxGas:              cachingConfig.SnapshotRestoreMaxGas,
+		MaxNumberOfBlocksToSkipStateSaving: cachingConfig.MaxNumberOfBlocksToSkipStateSaving,
+		MaxAmountOfGasToSkipStateSaving:    cachingConfig.MaxAmountOfGasToSkipStateSaving,
 	}
 }
 

system_tests/common_test.go

@@ -281,7 +281,7 @@ func createTestL1BlockChain(t *testing.T, l1info info) (info, *ethclient.Client,
 	return createTestL1BlockChainWithConfig(t, l1info, nil)
 }
 
-func stackConfigForTest(t *testing.T) *node.Config {
+func stackConfigForTest(t *testing.T, dataDir string) *node.Config {
 	stackConfig := node.DefaultConfig
 	stackConfig.HTTPPort = 0
 	stackConfig.WSPort = 0
@@ -290,7 +290,11 @@ func stackConfigForTest(t *testing.T) *node.Config {
 	stackConfig.P2P.NoDial = true
 	stackConfig.P2P.NoDiscovery = true
 	stackConfig.P2P.NAT = nil
-	stackConfig.DataDir = t.TempDir()
+	if dataDir != "" {
+		stackConfig.DataDir = dataDir
+	} else {
+		stackConfig.DataDir = t.TempDir()
+	}
 	return &stackConfig
 }
 
@@ -381,7 +385,7 @@ func createTestL1BlockChainWithConfig(t *testing.T, l1info info, stackConfig *no
 		l1info = NewL1TestInfo(t)
 	}
 	if stackConfig == nil {
-		stackConfig = stackConfigForTest(t)
+		stackConfig = stackConfigForTest(t, "")
 	}
 	l1info.GenerateAccount("Faucet")
 
@@ -699,7 +703,7 @@ func Create2ndNodeWithConfig(
 	l1client := ethclient.NewClient(l1rpcClient)
 
 	if stackConfig == nil {
-		stackConfig = stackConfigForTest(t)
+		stackConfig = stackConfigForTest(t, "")
 	}
 	l2stack, err := node.New(stackConfig)
 	Require(t, err)

system_tests/forwarder_test.go

@@ -34,7 +34,7 @@ func TestStaticForwarder(t *testing.T) {
 	ipcPath := filepath.Join(t.TempDir(), "test.ipc")
 	ipcConfig := genericconf.IPCConfigDefault
 	ipcConfig.Path = ipcPath
-	stackConfig := stackConfigForTest(t)
+	stackConfig := stackConfigForTest(t, "")
 	ipcConfig.Apply(stackConfig)
 	nodeConfigA := arbnode.ConfigDefaultL1Test()
 	nodeConfigA.BatchPoster.Enable = false
@@ -96,7 +96,7 @@ func fallbackSequencer(
 	ctx context.Context, t *testing.T, opts *fallbackSequencerOpts,
 ) (l2info info, currentNode *arbnode.Node, l2client *ethclient.Client,
 	l1info info, l1backend *eth.Ethereum, l1client *ethclient.Client, l1stack *node.Node) {
-	stackConfig := stackConfigForTest(t)
+	stackConfig := stackConfigForTest(t, "")
 	ipcConfig := genericconf.IPCConfigDefault
 	ipcConfig.Path = opts.ipcPath
 	ipcConfig.Apply(stackConfig)
@@ -117,7 +117,7 @@ func createForwardingNode(
 	redisUrl string,
 	fallbackPath string,
 ) (*ethclient.Client, *arbnode.Node) {
-	stackConfig := stackConfigForTest(t)
+	stackConfig := stackConfigForTest(t, "")
 	if ipcPath != "" {
 		ipcConfig := genericconf.IPCConfigDefault
 		ipcConfig.Path = ipcPath
@@ -142,7 +142,7 @@ func createSequencer(
 	ipcPath string,
 	redisUrl string,
 ) (*ethclient.Client, *arbnode.Node) {
-	stackConfig := stackConfigForTest(t)
+	stackConfig := stackConfigForTest(t, "")
 	ipcConfig := genericconf.IPCConfigDefault
 	ipcConfig.Path = ipcPath
 	ipcConfig.Apply(stackConfig)

system_tests/ipc_test.go

@@ -18,7 +18,7 @@ func TestIpcRpc(t *testing.T) {
 	ipcConfig := genericconf.IPCConfigDefault
 	ipcConfig.Path = ipcPath
 
-	stackConf := stackConfigForTest(t)
+	stackConf := stackConfigForTest(t, "")
 	ipcConfig.Apply(stackConf)
 
 	ctx, cancel := context.WithCancel(context.Background())