ETCM-845: Through rpc expose only blocks that are saved to storage

Author: AnastasiiaL

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

@@ -142,6 +142,8 @@ trait Blockchain {
 
   def getBestBlockNumber(): BigInt
 
+  def getBestSavedBlockNumber(): BigInt
+
   def getBestBlock(): Option[Block]
 
   def getLatestCheckpointBlockNumber(): BigInt
@@ -286,6 +288,8 @@ class BlockchainImpl(
     bestKnownBlockNumber
   }
 
+  override def getBestSavedBlockNumber(): BigInt = appStateStorage.getBestBlockNumber()
+
   override def getLatestCheckpointBlockNumber(): BigInt =
     bestKnownBlockAndLatestCheckpoint.get().latestCheckpointNumber
 

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

@@ -210,7 +210,7 @@ class EthProofService(blockchain: Blockchain, blockGenerator: BlockGenerator, et
     blockParam match {
       case BlockParam.WithNumber(blockNumber) => getBlock(blockNumber).map(ResolvedBlock(_, pendingState = None))
       case BlockParam.Earliest => getBlock(0).map(ResolvedBlock(_, pendingState = None))
-      case BlockParam.Latest => getBlock(blockchain.getBestBlockNumber()).map(ResolvedBlock(_, pendingState = None))
+      case BlockParam.Latest => getBlock(blockchain.getBestSavedBlockNumber()).map(ResolvedBlock(_, pendingState = None))
       case BlockParam.Pending =>
         blockGenerator.getPendingBlockAndState
           .map(pb => ResolvedBlock(pb.pendingBlock.block, pendingState = Some(pb.worldState)))

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

@@ -151,7 +151,7 @@ class EthTxService(
 
   def getGetGasPrice(req: GetGasPriceRequest): ServiceResponse[GetGasPriceResponse] = {
     val blockDifference = 30
-    val bestBlock = blockchain.getBestBlockNumber()
+    val bestBlock = blockchain.getBestSavedBlockNumber()
 
     Task {
       val gasPrice = ((bestBlock - blockDifference) to bestBlock)

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

@@ -221,7 +221,7 @@ class PersonalService(
   }
 
   private def getCurrentAccount(address: Address): Option[Account] =
-    blockchain.getAccount(address, blockchain.getBestBlockNumber())
+    blockchain.getAccount(address, blockchain.getBestSavedBlockNumber())
 
   private def getMessageToSign(message: ByteString) = {
     val prefixed: Array[Byte] =

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

@@ -22,7 +22,7 @@ trait ResolveBlock {
     blockParam match {
       case BlockParam.WithNumber(blockNumber) => getBlock(blockNumber).map(ResolvedBlock(_, pendingState = None))
       case BlockParam.Earliest => getBlock(0).map(ResolvedBlock(_, pendingState = None))
-      case BlockParam.Latest => getBlock(blockchain.getBestBlockNumber()).map(ResolvedBlock(_, pendingState = None))
+      case BlockParam.Latest => getBlock(blockchain.getBestSavedBlockNumber()).map(ResolvedBlock(_, pendingState = None))
       case BlockParam.Pending =>
         ledger.consensus.blockGenerator.getPendingBlockAndState
           .map(pb => ResolvedBlock(pb.pendingBlock.block, pendingState = Some(pb.worldState)))