[ETCM-940] remove get transaction location from blockchain (#1016)

* remove unused blockchain parameters

* remove getTransactionLocation from blockchain

it is used only by EthTxService so EthTxService can directly use the storage

* remove getChainWeightByNumber as it is unused

* remove getStateStorage

Author: Aurélien Richez

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala

@@ -189,8 +189,6 @@ class BlockchainMock(genesisHash: ByteString) extends Blockchain {
   override def getAccountStorageAt(rootHash: ByteString, position: BigInt, ethCompatibleStorage: Boolean): ByteString =
     ???
 
-  override def getTransactionLocation(txHash: ByteString): Option[TransactionLocation] = ???
-
   override type S = InMemoryWorldStateProxyStorage
   override type WS = InMemoryWorldStateProxy
 
@@ -220,8 +218,6 @@ class BlockchainMock(genesisHash: ByteString) extends Blockchain {
 
   override def save(block: Block, receipts: Seq[Receipt], weight: ChainWeight, saveAsBestBlock: Boolean): Unit = ???
 
-  override def getStateStorage: StateStorage = ???
-
   override def getLatestCheckpointBlockNumber(): BigInt = ???
 
   override def mptStateSavedKeys(): Observable[Either[RocksDbDataSource.IterationError, NodeHash]] = ???

src/main/scala/io/iohk/ethereum/blockchain/data/GenesisDataLoader.scala

@@ -7,7 +7,7 @@ import io.iohk.ethereum.blockchain.data.GenesisDataLoader.JsonSerializers.{
   UInt256JsonSerializer
 }
 import io.iohk.ethereum.db.dataSource.EphemDataSource
-import io.iohk.ethereum.db.storage.{ArchiveNodeStorage, MptStorage, NodeStorage, SerializingMptStorage}
+import io.iohk.ethereum.db.storage.{ArchiveNodeStorage, MptStorage, NodeStorage, SerializingMptStorage, StateStorage}
 import io.iohk.ethereum.db.storage.StateStorage.GenesisDataLoad
 import io.iohk.ethereum.rlp.RLPList
 import io.iohk.ethereum.utils.BlockchainConfig
@@ -23,7 +23,8 @@ import org.bouncycastle.util.encoders.Hex
 import scala.io.Source
 import scala.util.{Failure, Success, Try}
 
-class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConfig) extends Logger {
+class GenesisDataLoader(blockchain: Blockchain, stateStorage: StateStorage, blockchainConfig: BlockchainConfig)
+    extends Logger {
 
   private val bloomLength = 512
   private val hashLength = 64
@@ -90,7 +91,6 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
   def loadGenesisData(genesisData: GenesisData): Try[Unit] = {
     import MerklePatriciaTrie.defaultByteArraySerializable
 
-    val stateStorage = blockchain.getStateStorage
     val storage = stateStorage.getReadOnlyStorage
     val initalRootHash = MerklePatriciaTrie.EmptyRootHash
 

src/main/scala/io/iohk/ethereum/db/components/StoragesComponent.scala

@@ -34,6 +34,5 @@ trait StoragesComponent {
 
     val pruningMode: PruningMode
 
-    val cachedNodeStorage: CachedNodeStorage
   }
 }

src/main/scala/io/iohk/ethereum/domain/Blockchain.scala

@@ -135,11 +135,6 @@ trait Blockchain {
     */
   def getChainWeightByHash(blockhash: ByteString): Option[ChainWeight]
 
-  def getChainWeightByNumber(blockNumber: BigInt): Option[ChainWeight] =
-    getHashByBlockNumber(blockNumber).flatMap(getChainWeightByHash)
-
-  def getTransactionLocation(txHash: ByteString): Option[TransactionLocation]
-
   def getBestBlockNumber(): BigInt
 
   def getBestBlock(): Option[Block]
@@ -212,8 +207,6 @@ trait Blockchain {
       ethCompatibleStorage: Boolean
   ): WS
 
-  def getStateStorage: StateStorage
-
   def mptStateSavedKeys(): Observable[Either[IterationError, ByteString]]
 
   /**
@@ -237,18 +230,14 @@ class BlockchainImpl(
     protected val blockNumberMappingStorage: BlockNumberMappingStorage,
     protected val receiptStorage: ReceiptStorage,
     protected val evmCodeStorage: EvmCodeStorage,
-    protected val pruningMode: PruningMode,
     protected val nodeStorage: NodeStorage,
-    protected val cachedNodeStorage: CachedNodeStorage,
     protected val chainWeightStorage: ChainWeightStorage,
     protected val transactionMappingStorage: TransactionMappingStorage,
     protected val appStateStorage: AppStateStorage,
     protected val stateStorage: StateStorage
 ) extends Blockchain
     with Logger {
 
-  override def getStateStorage: StateStorage = stateStorage
-
   // There is always only one writer thread (ensured by actor), but can by many readers (api calls)
   // to ensure visibility of writes, needs to be volatile or atomic ref
   // Laziness required for mocking BlockchainImpl on tests
@@ -399,9 +388,6 @@ class BlockchainImpl(
   override def getMptNodeByHash(hash: ByteString): Option[MptNode] =
     stateStorage.getNode(hash)
 
-  override def getTransactionLocation(txHash: ByteString): Option[TransactionLocation] =
-    transactionMappingStorage.get(txHash)
-
   override def storeBlockBody(blockHash: ByteString, blockBody: BlockBody): DataSourceBatchUpdate = {
     blockBodiesStorage.put(blockHash, blockBody).and(saveTxsLocations(blockHash, blockBody))
   }
@@ -625,9 +611,7 @@ object BlockchainImpl {
       blockNumberMappingStorage = storages.blockNumberMappingStorage,
       receiptStorage = storages.receiptStorage,
       evmCodeStorage = storages.evmCodeStorage,
-      pruningMode = storages.pruningMode,
       nodeStorage = storages.nodeStorage,
-      cachedNodeStorage = storages.cachedNodeStorage,
       chainWeightStorage = storages.chainWeightStorage,
       transactionMappingStorage = storages.transactionMappingStorage,
       appStateStorage = storages.appStateStorage,

src/main/scala/io/iohk/ethereum/jsonrpc/EthTxService.scala

@@ -9,13 +9,15 @@ import io.iohk.ethereum.db.storage.TransactionMappingStorage.TransactionLocation
 import io.iohk.ethereum.domain.Block
 import io.iohk.ethereum.domain.Receipt
 import io.iohk.ethereum.transactions.PendingTransactionsManager
+import io.iohk.ethereum.transactions.TransactionPicker
+import io.iohk.ethereum.ledger.Ledger
+import io.iohk.ethereum.db.storage.TransactionMappingStorage
+
 import scala.util.Try
 import scala.util.Success
 import scala.util.Failure
 import akka.actor.ActorRef
 import scala.concurrent.duration.FiniteDuration
-import io.iohk.ethereum.transactions.TransactionPicker
-import io.iohk.ethereum.ledger.Ledger
 
 object EthTxService {
   case class GetTransactionByHashRequest(txHash: ByteString) //rename to match request
@@ -39,7 +41,8 @@ class EthTxService(
     val blockchain: Blockchain,
     val ledger: Ledger,
     val pendingTransactionsManager: ActorRef,
-    val getTransactionFromPoolTimeout: FiniteDuration
+    val getTransactionFromPoolTimeout: FiniteDuration,
+    transactionMappingStorage: TransactionMappingStorage
 ) extends TransactionPicker
     with ResolveBlock {
   import EthTxService._
@@ -90,7 +93,7 @@ class EthTxService(
     maybeTxPendingResponse.map { txPending =>
       txPending.orElse {
         for {
-          TransactionLocation(blockHash, txIndex) <- blockchain.getTransactionLocation(txHash)
+          TransactionLocation(blockHash, txIndex) <- transactionMappingStorage.get(txHash)
           Block(header, body) <- blockchain.getBlockByHash(blockHash)
           stx <- body.transactionList.lift(txIndex)
         } yield TransactionData(stx, Some(header), Some(txIndex))
@@ -101,7 +104,7 @@ class EthTxService(
   def getTransactionReceipt(req: GetTransactionReceiptRequest): ServiceResponse[GetTransactionReceiptResponse] =
     Task {
       val result: Option[TransactionReceiptResponse] = for {
-        TransactionLocation(blockHash, txIndex) <- blockchain.getTransactionLocation(req.txHash)
+        TransactionLocation(blockHash, txIndex) <- transactionMappingStorage.get(req.txHash)
         Block(header, body) <- blockchain.getBlockByHash(blockHash)
         stx <- body.transactionList.lift(txIndex)
         receipts <- blockchain.getReceiptsByHash(blockHash)

src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala

@@ -6,6 +6,7 @@ import io.iohk.ethereum.blockchain.data.{GenesisAccount, GenesisData, GenesisDat
 import io.iohk.ethereum.consensus.ConsensusConfig
 import io.iohk.ethereum.consensus.blocks._
 import io.iohk.ethereum.crypto.kec256
+import io.iohk.ethereum.db.storage.{StateStorage, TransactionMappingStorage}
 import io.iohk.ethereum.{crypto, domain, rlp}
 import io.iohk.ethereum.domain.Block._
 import io.iohk.ethereum.domain.{Account, Address, Block, BlockchainImpl, UInt256}
@@ -110,10 +111,12 @@ object TestService {
 
 class TestService(
     blockchain: BlockchainImpl,
+    stateStorage: StateStorage,
     pendingTransactionsManager: ActorRef,
     consensusConfig: ConsensusConfig,
     testModeComponentsProvider: TestModeComponentsProvider,
     initialConfig: BlockchainConfig,
+    transactionMappingStorage: TransactionMappingStorage,
     preimageCache: collection.concurrent.Map[ByteString, UInt256]
 )(implicit
     scheduler: Scheduler
@@ -155,7 +158,7 @@ class TestService(
     Try(blockchain.removeBlock(blockchain.genesisHeader.hash, withState = false))
 
     // load the new genesis
-    val genesisDataLoader = new GenesisDataLoader(blockchain, currentConfig)
+    val genesisDataLoader = new GenesisDataLoader(blockchain, stateStorage, currentConfig)
     genesisDataLoader.loadGenesisData(genesisData)
 
     //save account codes to world state
@@ -216,7 +219,7 @@ class TestService(
   private def storeGenesisAccountStorageData(accounts: Map[String, GenesisAccount]): Unit = {
     val emptyStorage = domain.EthereumUInt256Mpt.storageMpt(
       Account.EmptyStorageRootHash,
-      blockchain.getStateStorage.getBackingStorage(0)
+      stateStorage.getBackingStorage(0)
     )
     val storagesToPersist = accounts
       .flatMap(pair => pair._2.storage)
@@ -409,7 +412,7 @@ class TestService(
     import io.iohk.ethereum.network.p2p.messages.ETH63.TxLogEntryImplicits.TxLogEntryEnc
 
     val result = for {
-      transactionLocation <- blockchain.getTransactionLocation(request.transactionHash)
+      transactionLocation <- transactionMappingStorage.get(request.transactionHash)
       block <- blockchain.getBlockByHash(transactionLocation.blockHash)
       _ <- block.body.transactionList.lift(transactionLocation.txIndex)
       receipts <- blockchain.getReceiptsByHash(block.header.hash)

src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala

@@ -368,15 +368,18 @@ trait TestServiceBuilder {
     with BlockchainConfigBuilder
     with VmBuilder
     with TestmodeConsensusBuilder
-    with TestModeServiceBuilder =>
+    with TestModeServiceBuilder
+    with StorageBuilder =>
 
   lazy val testService =
     new TestService(
       blockchain,
+      storagesInstance.storages.stateStorage,
       pendingTransactionsManager,
       consensusConfig,
       testModeComponentsProvider,
       blockchainConfig,
+      storagesInstance.storages.transactionMappingStorage,
       preimages
     )(scheduler)
 }
@@ -439,13 +442,18 @@ trait EthMiningServiceBuilder {
   )
 }
 trait EthTxServiceBuilder {
-  self: BlockchainBuilder with PendingTransactionsManagerBuilder with LedgerBuilder with TxPoolConfigBuilder =>
+  self: BlockchainBuilder
+    with PendingTransactionsManagerBuilder
+    with LedgerBuilder
+    with TxPoolConfigBuilder
+    with StorageBuilder =>
 
   lazy val ethTxService = new EthTxService(
     blockchain,
     ledger,
     pendingTransactionsManager,
-    txPoolConfig.getTransactionFromPoolTimeout
+    txPoolConfig.getTransactionFromPoolTimeout,
+    storagesInstance.storages.transactionMappingStorage
   )
 }
 
@@ -779,7 +787,8 @@ object ShutdownHookBuilder extends ShutdownHookBuilder with Logger
 trait GenesisDataLoaderBuilder {
   self: BlockchainBuilder with StorageBuilder with BlockchainConfigBuilder =>
 
-  lazy val genesisDataLoader = new GenesisDataLoader(blockchain, blockchainConfig)
+  lazy val genesisDataLoader =
+    new GenesisDataLoader(blockchain, storagesInstance.storages.stateStorage, blockchainConfig)
 }
 
 /** Provides the basic functionality of a Node, except the consensus algorithm.

src/main/scala/io/iohk/ethereum/testmode/TestBlockchainBuilder.scala

@@ -20,9 +20,7 @@ trait TestBlockchainBuilder extends BlockchainBuilder {
       blockNumberMappingStorage = storages.blockNumberMappingStorage,
       receiptStorage = storages.receiptStorage,
       evmCodeStorage = storages.evmCodeStorage,
-      pruningMode = storages.pruningMode,
       nodeStorage = storages.nodeStorage,
-      cachedNodeStorage = storages.cachedNodeStorage,
       chainWeightStorage = storages.chainWeightStorage,
       transactionMappingStorage = storages.transactionMappingStorage,
       appStateStorage = storages.appStateStorage,

src/test/scala/io/iohk/ethereum/blockchain/sync/StateSyncSpec.scala

@@ -114,9 +114,7 @@ class StateSyncSpec
         blockNumberMappingStorage = storages.blockNumberMappingStorage,
         receiptStorage = storages.receiptStorage,
         evmCodeStorage = storages.evmCodeStorage,
-        pruningMode = storages.pruningMode,
         nodeStorage = storages.nodeStorage,
-        cachedNodeStorage = storages.cachedNodeStorage,
         chainWeightStorage = storages.chainWeightStorage,
         transactionMappingStorage = storages.transactionMappingStorage,
         appStateStorage = storages.appStateStorage,

src/test/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSpec.scala

@@ -691,7 +691,7 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
     )
     override lazy val blockchainConfig = baseBlockchainConfig
 
-    val genesisDataLoader = new GenesisDataLoader(blockchain, blockchainConfig)
+    val genesisDataLoader = new GenesisDataLoader(blockchain, storagesInstance.storages.stateStorage, blockchainConfig)
     genesisDataLoader.loadGenesisData()
 
     val bestBlock = blockchain.getBestBlock()