update bold

OffchainLabs · Oct 23, 2023 · 2211540 · 2211540
1 parent f47efd8
commit 2211540
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/bold b/bold
diff --git a/staker/state_provider.go b/staker/state_provider.go
@@ -339,7 +339,7 @@ func (s *StateManager) CollectMachineHashes(
 		MessageHeight:  protocol.Height(messageNum),
 		StepHeights:    cfg.StepHeights,
 	}
-	if s.historyCache != nil && !cfg.DisableCache {
+	if s.historyCache != nil {
 		cachedRoots, err := s.historyCache.Get(cacheKey, cfg.NumDesiredHashes)
 		switch {
 		case err == nil:
@@ -365,16 +365,13 @@ func (s *StateManager) CollectMachineHashes(
 		return nil, err
 	}
 	expectedEnding := &expectedEndingGlobalState
-	if cfg.DisableFinalStateModify {
-		expectedEnding = nil
-	}
 	stepLeaves := execRun.GetLeavesWithStepSize(uint64(cfg.MachineStartIndex), uint64(cfg.StepSize), cfg.NumDesiredHashes, expectedEnding)
 	result, err := stepLeaves.Await(ctx)
 	if err != nil {
 		return nil, err
 	}
 	// Do not save a history commitment of length 1 to the cache.
-	if len(result) > 1 && s.historyCache != nil && !cfg.DisableCache {
+	if len(result) > 1 && s.historyCache != nil {
 		if err := s.historyCache.Put(cacheKey, result); err != nil {
 			if !errors.Is(err, challengecache.ErrFileAlreadyExists) {
 				return nil, err
+2 −0		assertions/BUILD.bazel
+5 −5		assertions/poster.go
+4 −2		assertions/poster_test.go
+10 −5		assertions/scanner.go
+18 −20		assertions/scanner_test.go
+1 −1		chain-abstraction/sol-implementation/BUILD.bazel
+19 −11		chain-abstraction/sol-implementation/edge_challenge_manager.go
+2 −0		challenge-manager/challenge-tree/tree.go
+0 −5		challenge-manager/challenges.go
+1 −1		contracts/src/challengeV2/libraries/EdgeChallengeManagerLib.sol
+0 −7		contracts/src/challengeV2/libraries/MerkleTreeLib.sol
+6 −29		layer2-state-provider/history_commitment_provider.go
+0 −4		layer2-state-provider/provider.go
+2 −2		solgen/go/assertionStakingPoolgen/assertionStakingPoolgen.go
+1 −1		solgen/go/bridgegen/bridgegen.go
+1 −1		solgen/go/challengeV2gen/challengeV2gen.go
+3 −3		solgen/go/mocksgen/mocksgen.go
+9 −9		solgen/go/rollupgen/rollupgen.go
+8 −8		testing/endtoend/basic_local_test.go
+3 −3		testing/setup/rollup_stack.go