fix one issue in TestEIP2718Transition

contractshark · Mar 17, 2021 · b92995f · b92995f
1 parent 7e7ec69
commit b92995f
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/core/state/database.go b/core/state/database.go
@@ -1012,9 +1012,18 @@ func (tds *TrieDbState) ReadAccountData(address common.Address) (*accounts.Accou
 	}
 	var account *accounts.Account
 	account, err = tds.readAccountDataByHash(addrHash)
-	if err != nil {
+	if err != nil && err != ethdb.ErrKeyNotFound {
+		return nil, err
+	}
+	var a accounts.Account
+	if ok, err := rawdb.PlainReadAccount(tds.db, address, &a); err != nil {
 		return nil, err
+	} else if !ok {
+		return nil, nil
 	}
+
+	account = &a
+
 	if tds.resolveReads {
 		tds.currentBuffer.accountReads[addrHash] = struct{}{}
 		if account != nil {