Merge pull request #400 from OffchainLabs/fix_triedb_flush

Fixes mutex in FlushTrieDB
OffchainLabs · Jan 24, 2025 · 23b6a0e · 23b6a0e
2 parents 5a7010a + cbb47d1
commit 23b6a0e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/core/blockchain_arbitrum.go b/core/blockchain_arbitrum.go
@@ -19,7 +19,6 @@ package core
 
 import (
 	"fmt"
-	"sync"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -30,13 +29,15 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
-func (bc *BlockChain) FlushTrieDB(advanceBlockChainMutex *sync.Mutex, capLimit common.StorageSize) error {
+func (bc *BlockChain) FlushTrieDB(capLimit common.StorageSize) error {
 	if bc.triedb.Scheme() == rawdb.PathScheme {
 		return nil
 	}
 
-	advanceBlockChainMutex.Lock()
-	defer advanceBlockChainMutex.Unlock()
+	if !bc.chainmu.TryLock() {
+		return errChainStopped
+	}
+	defer bc.chainmu.Unlock()
 
 	if !bc.triegc.Empty() {
 		_, triegcBlockNumber := bc.triegc.Peek()