From b92995fafafcbc990907ed4205aab91210a0667f Mon Sep 17 00:00:00 2001
From: Igor Mandrigin <i@mandrigin.ru>
Date: Wed, 17 Mar 2021 23:04:44 +0100
Subject: [PATCH] fix one issue in TestEIP2718Transition

---
 core/state/database.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/state/database.go b/core/state/database.go
index 83fd54c3a6f..d0763f1ea07 100644
--- 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 {