Remove AccountStateDB (#2368)

* Remove AccountStateDB AccountStateDB should no longer be used. It's usage have been reduce to read only operations. Replace it with LedgerRef to reduce maintenance burden. * remove extra spaces Co-authored-by: tersec <[email protected]> --------- Co-authored-by: tersec <[email protected]>
status-im · Jun 16, 2024 · 69044dd · 69044dd
1 parent a36aa95
commit 69044dd
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 452 deletions.
diff --git a/nimbus/db/core_db/core_apps.nim b/nimbus/db/core_db/core_apps.nim
@@ -988,7 +988,7 @@ proc finalizedHeaderHash*(db: CoreDbRef, headerHash: Hash256) =
 proc safeHeader*(
  db: CoreDbRef;
  ): BlockHeader
- {.gcsafe, raises: [RlpError,BlockNotFound].} =
+ {.gcsafe, raises: [BlockNotFound].} =
  db.getBlockHeader(db.safeHeaderHash)
 
 proc finalizedHeader*(

diff --git a/nimbus/db/ledger/accounts_ledger.nim b/nimbus/db/ledger/accounts_ledger.nim
@@ -152,8 +152,8 @@ proc init*(x: typedesc[AccountsLedgerRef], db: CoreDbRef,
  result.witnessCache = Table[EthAddress, WitnessData]()
  discard result.beginSavepoint
 
-proc init*(x: typedesc[AccountsLedgerRef], db: CoreDbRef, pruneTrie = true): AccountsLedgerRef =
- init(x, db, EMPTY_ROOT_HASH, pruneTrie)
+proc init*(x: typedesc[AccountsLedgerRef], db: CoreDbRef): AccountsLedgerRef =
+ init(x, db, EMPTY_ROOT_HASH)
 
 # Renamed `rootHash()` => `state()`
 proc state*(ac: AccountsLedgerRef): KeccakHash =
@@ -784,6 +784,17 @@ func getAccessList*(ac: AccountsLedgerRef): common.AccessList =
  doAssert(ac.savePoint.parentSavepoint.isNil)
  ac.savePoint.accessList.getAccessList()
 
+proc getEthAccount*(ac: AccountsLedgerRef, address: EthAddress): Account =
+ let acc = ac.getAccount(address, false)
+ if acc.isNil:
+ return emptyEthAccount
+
+ ## Convert to legacy object, will throw an assert if that fails
+ let rc = acc.statement.recast()
+ if rc.isErr:
+ raiseAssert "getAccount(): cannot convert account: " & $$rc.error
+ rc.value
+
 proc state*(db: ReadOnlyStateDB): KeccakHash {.borrow.}
 proc getCodeHash*(db: ReadOnlyStateDB, address: EthAddress): Hash256 {.borrow.}
 proc getStorageRoot*(db: ReadOnlyStateDB, address: EthAddress): Hash256 {.borrow.}

diff --git a/nimbus/db/ledger/base.nim b/nimbus/db/ledger/base.nim
@@ -356,6 +356,11 @@ proc getMpt*(ldg: LedgerRef): CoreDxMptRef =
  result = ldg.ac.rawTrie.CoreDxAccRef.getMpt
  ldg.ifTrackApi: debug apiTxt, api, elapsed, result
 
+proc getEthAccount*(ldg: LedgerRef, eAddr: EthAddress): Account =
+ ldg.beginTrackApi LdgGetAthAccountFn
+ result = ldg.ac.getEthAccount(eAddr)
+ ldg.ifTrackApi: debug apiTxt, api, elapsed, result
+
 # ------------------------------------------------------------------------------
 # Public virtual read-only methods
 # ------------------------------------------------------------------------------

diff --git a/nimbus/db/ledger/base/api_tracking.nim b/nimbus/db/ledger/base/api_tracking.nim
@@ -50,6 +50,7 @@ type
  LdgGetStorageFn = "getStorage"
  LdgGetStorageRootFn = "getStorageRoot"
  LdgGetTransientStorageFn = "getTransientStorage"
+ LdgGetAthAccountFn = "getEthAccount"
  LdgInAccessListFn = "inAccessList"
  LdgIncNonceFn = "incNonce"
  LdgIsDeadAccountFn = "isDeadAccount"

diff --git a/nimbus/db/state_db.nim b/nimbus/db/state_db.nim