ETCM-697: Added initial account range implementation

Author: Igor Grahovac

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

@@ -30,7 +30,6 @@ trait BaseBlockResponse {
   def timestamp: BigInt
   def transactions: Either[Seq[ByteString], Seq[TransactionResponse]]
   def uncles: Seq[ByteString]
-  def coinbase: Option[ByteString]
 }
 
 case class EthBlockResponse(
@@ -53,8 +52,7 @@ case class EthBlockResponse(
     gasUsed: BigInt,
     timestamp: BigInt,
     transactions: Either[Seq[ByteString], Seq[TransactionResponse]],
-    uncles: Seq[ByteString],
-    coinbase: Option[ByteString]
+    uncles: Seq[ByteString]
 ) extends BaseBlockResponse
 
 //scalastyle:off method.length
@@ -83,8 +81,7 @@ case class BlockResponse(
     transactions: Either[Seq[ByteString], Seq[TransactionResponse]],
     uncles: Seq[ByteString],
     signature: String,
-    signer: String,
-    coinbase: Option[ByteString]
+    signer: String
 ) extends BaseBlockResponse {
   val chainWeight: Option[ChainWeight] = for {
     lcn <- lastCheckpointNumber
@@ -155,8 +152,7 @@ object BlockResponse {
       transactions = transactions,
       uncles = block.body.uncleNodesList.map(_.hash),
       signature = signatureStr,
-      signer = signerStr,
-      coinbase = None
+      signer = signerStr
     )
   }
 

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

@@ -1,7 +1,6 @@
 package io.iohk.ethereum.jsonrpc
 
 import java.time.Duration
-
 import akka.util.ByteString
 import io.iohk.ethereum.crypto.ECDSASignature
 import io.iohk.ethereum.domain.Address
@@ -13,13 +12,14 @@ import io.iohk.ethereum.jsonrpc.serialization.JsonMethodDecoder.NoParamsMethodDe
 import io.iohk.ethereum.jsonrpc.serialization.{JsonEncoder, JsonMethodCodec, JsonMethodDecoder, JsonSerializers}
 import io.iohk.ethereum.utils.BigIntExtensionMethods.BigIntAsUnsigned
 import org.bouncycastle.util.encoders.Hex
+import org.json4s.Formats
 import org.json4s.JsonAST._
 import org.json4s.JsonDSL._
 
 import scala.util.Try
 
 trait JsonMethodsImplicits {
-  implicit val formats = JsonSerializers.formats
+  implicit val formats: Formats = JsonSerializers.formats
 
   def encodeAsHex(input: ByteString): JString =
     JString(s"0x${Hex.toHexString(input.toArray[Byte])}")

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

@@ -6,14 +6,11 @@ import io.iohk.ethereum.jsonrpc.TestService._
 import io.iohk.ethereum.jsonrpc.serialization.{JsonEncoder, JsonMethodDecoder}
 import org.json4s.JsonAST._
 import org.json4s.JsonDSL._
-import org.bouncycastle.util.encoders.Hex
 import cats.implicits._
 import io.iohk.ethereum.blockchain.data.GenesisAccount
 
 import scala.util.Try
 import io.iohk.ethereum.domain.UInt256
-import org.json4s
-import org.json4s.Extraction
 
 object TestJsonMethodsImplicits extends JsonMethodsImplicits {
 
@@ -183,6 +180,11 @@ object TestJsonMethodsImplicits extends JsonMethodsImplicits {
       extractHash(blockHash)
         .fold(_ => Left(BigInt(blockHash)), Right(_))
 
-    override def encodeJson(t: AccountsInRangeResponse): JValue = Extraction.decompose(t)
+    override def encodeJson(t: AccountsInRangeResponse): JValue = JObject(
+      "addressMap" -> JObject(
+        t.addressMap.toList.map(addressPair => encodeAsHex(addressPair._1).values -> encodeAsHex(addressPair._2))
+      ),
+      "nextKey" -> encodeAsHex(t.nextKey)
+    )
   }
 }

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

@@ -5,6 +5,7 @@ import akka.util.{ByteString, Timeout}
 import io.iohk.ethereum.blockchain.data.{GenesisAccount, GenesisData, GenesisDataLoader}
 import io.iohk.ethereum.consensus.ConsensusConfig
 import io.iohk.ethereum.consensus.blocks._
+import io.iohk.ethereum.crypto
 import io.iohk.ethereum.domain.Block._
 import io.iohk.ethereum.domain.{Address, Block, BlockchainImpl, UInt256}
 import io.iohk.ethereum.ledger._
@@ -80,7 +81,7 @@ object TestService {
   case class ImportRawBlockResponse(blockHash: String)
 
   case class AccountsInRangeRequest(parameters: AccountsInRangeRequestParams)
-  case class AccountsInRangeResponse(addressMap: Map[String, String], nextKey: String)
+  case class AccountsInRangeResponse(addressMap: Map[ByteString, ByteString], nextKey: ByteString)
 }
 
 class TestService(
@@ -97,6 +98,8 @@ class TestService(
   import io.iohk.ethereum.jsonrpc.AkkaTaskOps._
 
   private var etherbase: Address = consensusConfig.coinbase
+  private var accountAddresses: List[String] = List()
+  private var accountRangeOffset = 0
 
   def setChainParams(request: SetChainParamsRequest): ServiceResponse[SetChainParamsResponse] = {
     val newBlockchainConfig = testLedgerWrapper.blockchainConfig.copy(
@@ -130,6 +133,9 @@ class TestService(
     // update test ledger with new config
     testLedgerWrapper.blockchainConfig = newBlockchainConfig
 
+    accountAddresses = genesisData.alloc.keys.toList
+    accountRangeOffset = 0
+
     Task.now(Right(SetChainParamsResponse()))
   }
 
@@ -211,5 +217,38 @@ class TestService(
       .timeout(timeout.duration)
   }
 
-  def getAccountsInRange(request: AccountsInRangeRequest): ServiceResponse[AccountsInRangeResponse] = ???
+  def getAccountsInRange(request: AccountsInRangeRequest): ServiceResponse[AccountsInRangeResponse] = {
+    val blockOpt = request.parameters.blockHashOrNumber
+      .fold(number => blockchain.getBlockByNumber(number), blockHash => blockchain.getBlockByHash(blockHash))
+
+    if (blockOpt.isEmpty) {
+      Task.now(Right(AccountsInRangeResponse(Map(), ByteString(0))))
+    }
+
+    val accountBatch = accountAddresses
+      .slice(accountRangeOffset, accountRangeOffset + request.parameters.maxResults.toInt + 1)
+
+    val addressesForExistingAccounts = accountBatch
+      .filter(key => {
+        val accountOpt = blockchain.getAccount(Address(key), blockOpt.get.header.number)
+        accountOpt.isDefined
+      })
+      .map(key => (key, Address(crypto.kec256(Hex.decode(key)))))
+
+    Task.now(
+      Right(
+        AccountsInRangeResponse(
+          addressMap = addressesForExistingAccounts
+            .take(request.parameters.maxResults.toInt)
+            .foldLeft(Map[ByteString, ByteString]())((el, addressPair) =>
+              el + (addressPair._2.bytes -> ByteStringUtils.string2hash(addressPair._1))
+            ),
+          nextKey =
+            if (accountBatch.size > request.parameters.maxResults)
+              ByteStringUtils.string2hash(addressesForExistingAccounts.last._1)
+            else UInt256(0).bytes
+        )
+      )
+    )
+  }
 }

src/main/scala/io/iohk/ethereum/jsonrpc/serialization/JsonSerializers.scala

@@ -8,7 +8,7 @@ import org.json4s.{CustomSerializer, DefaultFormats, Formats, JNull, JString}
 
 object JsonSerializers {
   implicit val formats: Formats =
-    DefaultFormats.preservingEmptyValues + UnformattedDataJsonSerializer + QuantitiesSerializer + OptionNoneToJNullSerializer + AddressJsonSerializer
+    DefaultFormats + UnformattedDataJsonSerializer + QuantitiesSerializer + OptionNoneToJNullSerializer + AddressJsonSerializer
 
   object UnformattedDataJsonSerializer
       extends CustomSerializer[ByteString](_ =>

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

@@ -44,9 +44,7 @@ class TestEthBlockServiceWrapper(blockchain: Blockchain, ledger: Ledger, consens
       _.map(blockByBlockResponse =>
         BlockByNumberResponse(
           blockByBlockResponse.blockResponse
-            .map(response =>
-              toEthResponse(response).copy(coinbase = Some(ByteString(consensus.config.generic.coinbase.toArray)))
-            )
+            .map(response => toEthResponse(response))
         )
       )
     )
@@ -71,7 +69,6 @@ class TestEthBlockServiceWrapper(blockchain: Blockchain, ledger: Ledger, consens
     response.gasUsed,
     response.timestamp,
     response.transactions,
-    response.uncles,
-    response.coinbase
+    response.uncles
   )
 }