Update iele call response

Author: Łukasz Gąsior

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

@@ -127,8 +127,9 @@ object EthService {
     contractCode: Option[ByteString])
 
   case class CallRequest(tx: CallTx, block: BlockParam)
-  case class IeleCallRequest(tx: IeleCallTx, block: BlockParam)
   case class CallResponse(returnData: ByteString)
+  case class IeleCallRequest(tx: IeleCallTx, block: BlockParam)
+  case class IeleCallResponse(returnData: Seq[ByteString])
   case class EstimateGasResponse(gas: BigInt)
 
   case class GetCodeRequest(address: Address, block: BlockParam)
@@ -567,7 +568,7 @@ class EthService(
     }
   }
 
-  def ieleCall(req: IeleCallRequest): ServiceResponse[CallResponse] = {
+  def ieleCall(req: IeleCallRequest): ServiceResponse[IeleCallResponse] = {
     import req.tx
 
     val args = tx.arguments.getOrElse(Nil)
@@ -578,7 +579,9 @@ class EthService(
     }
 
     dataEither match {
-      case Right(data) => call(CallRequest(CallTx(tx.from, tx.to, tx.gas, tx.gasPrice, tx.value, ByteString(data)), req.block))
+      case Right(data) =>
+        call(CallRequest(CallTx(tx.from, tx.to, tx.gas, tx.gasPrice, tx.value, ByteString(data)), req.block))
+          .map(_.right.map { callResponse => IeleCallResponse(rlp.decode[Seq[ByteString]](callResponse.returnData)(seqEncDec[ByteString])) })
       case Left(error) => Future.successful(Left(error))
     }
   }

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

@@ -2,7 +2,7 @@ package io.iohk.ethereum.jsonrpc
 
 import akka.util.ByteString
 import io.iohk.ethereum.jsonrpc.EthService._
-import io.iohk.ethereum.jsonrpc.JsonRpcController.JsonDecoder
+import io.iohk.ethereum.jsonrpc.JsonRpcController.{JsonDecoder, JsonEncoder}
 import io.iohk.ethereum.jsonrpc.JsonRpcErrors.InvalidParams
 import io.iohk.ethereum.jsonrpc.PersonalService.{InvalidAddress, SendIeleTransactionRequest}
 import org.json4s.JsonAST.{JArray, JObject, JString, JValue}
@@ -33,7 +33,7 @@ object IeleJsonMethodsImplicits extends JsonMethodsImplicits {
       arguments = arguments)
   }
 
-  implicit val iele_call = new JsonDecoder[IeleCallRequest] {
+  implicit val iele_call = new JsonDecoder[IeleCallRequest] with JsonEncoder[IeleCallResponse] {
     def decodeJson(params: Option[JArray]): Either[JsonRpcError, IeleCallRequest] =
       params match {
         case Some(JArray((txObj: JObject) :: (blockValue: JValue) :: Nil)) =>
@@ -43,6 +43,8 @@ object IeleJsonMethodsImplicits extends JsonMethodsImplicits {
           } yield IeleCallRequest(tx, blockParam)
         case _ => Left(InvalidParams())
       }
+
+    override def encodeJson(t: IeleCallResponse): JValue = JArray(t.returnData.map(encodeAsHex).toList)
   }
 
 

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

@@ -222,7 +222,7 @@ class JsonRpcController(
     case req @ JsonRpcRequest(_, "iele_sendTransaction", _, _) =>
       handle[SendIeleTransactionRequest, SendTransactionResponse](personalService.sendIeleTransaction, req)
     case req @ JsonRpcRequest(_, "iele_call", _, _) =>
-      handle[IeleCallRequest, CallResponse](ethService.ieleCall, req)
+      handle[IeleCallRequest, IeleCallResponse](ethService.ieleCall, req)
   }
 
   private def handlePersonalRequest: PartialFunction[JsonRpcRequest, Future[JsonRpcResponse]] = {