avoid sharedPool effects on other modules

bnb-chain · Mar 21, 2022 · 5c2222a · 5c2222a
1 parent 63edb9d
commit 5c2222a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -2101,7 +2101,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, er
 		if parent == nil {
 			parent = bc.GetHeader(block.ParentHash(), block.NumberU64()-1)
 		}
-		statedb, err := state.New(parent.Root, bc.stateCache, bc.snaps)
+		statedb, err := state.NewWithSharedPool(parent.Root, bc.stateCache, bc.snaps)
 		if err != nil {
 			return it.index, err
 		}

diff --git a/core/state/state_object.go b/core/state/state_object.go
@@ -124,8 +124,9 @@ func newObject(db *StateDB, address common.Address, data Account) *StateObject {
 		data.Root = emptyRoot
 	}
 	var storageMap *sync.Map
+	storageMap = nil
 	// Check whether the storage exist in pool, new originStorage if not exist
-	if db != nil {
+	if db != nil && db.sharedStorage != nil {
 		storageMap = db.GetOrInsertStorage(address)
 	}
 
@@ -209,11 +210,14 @@ func (s *StateObject) getStorageKey(key common.Hash) (common.Hash, bool) {
 		return value, true
 	}
 	// if L1 cache miss, try to get it from shared pool
-	val, ok := s.sharedOriginMap.Load(key)
-	if !ok {
-		return common.Hash{}, false
+	if s.sharedOriginMap != nil {
+		val, ok := s.sharedOriginMap.Load(key)
+		if !ok {
+			return common.Hash{}, false
+		}
+		return val.(common.Hash), ok
 	}
-	return val.(common.Hash), ok
+	return common.Hash{}, false
 }
 
 func (s *StateObject) setStorgeKey(key common.Hash, value common.Hash) {

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -150,6 +150,16 @@ func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error)
 	return newStateDB(root, db, snaps)
 }
 
+// NewWithSharedPool creates a new state with sharedStorge on layer 1.5
+func NewWithSharedPool(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error) {
+	statedb, err := newStateDB(root, db, snaps)
+	if err != nil {
+		return nil, err
+	}
+	statedb.sharedStorage = NewSharedStorage()
+	return statedb, nil
+}
+
 func newStateDB(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error) {
 	sdb := &StateDB{
 		db:                  db,
@@ -158,7 +168,7 @@ func newStateDB(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB,
 		stateObjects:        make(map[common.Address]*StateObject, defaultNumOfSlots),
 		stateObjectsPending: make(map[common.Address]struct{}, defaultNumOfSlots),
 		stateObjectsDirty:   make(map[common.Address]struct{}, defaultNumOfSlots),
-		sharedStorage:       NewSharedStorage(),
+		sharedStorage:       nil,
 		isPrefetchDb:        false,
 		logs:                make(map[common.Hash][]*types.Log, defaultNumOfSlots),
 		preimages:           make(map[common.Hash][]byte),