From 2245bc855146fdf248531c3e974fcfaec39feae9 Mon Sep 17 00:00:00 2001 From: Matus Kysel Date: Thu, 16 Mar 2023 15:54:26 +0100 Subject: [PATCH] chore: modify rest of the API calls to accept int for block num --- libraries/core_libs/network/rpc/EthFace.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libraries/core_libs/network/rpc/EthFace.h b/libraries/core_libs/network/rpc/EthFace.h index e17fa2acaf..d3d415636c 100644 --- a/libraries/core_libs/network/rpc/EthFace.h +++ b/libraries/core_libs/network/rpc/EthFace.h @@ -27,24 +27,24 @@ class EthFace : public ServerInterface { jsonrpc::Procedure("eth_blockNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, NULL), &taraxa::net::EthFace::eth_blockNumberI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getBalance", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, - "param1", JSON_ANY, "param2", jsonrpc::JSON_OBJECT, NULL), + "param1", jsonrpc::JSON_STRING, "param2", JSON_ANY, NULL), &taraxa::net::EthFace::eth_getBalanceI); this->bindAndAddMethod( jsonrpc::Procedure("eth_getStorageAt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1", - jsonrpc::JSON_STRING, "param2", JSON_ANY, "param3", jsonrpc::JSON_OBJECT, NULL), + jsonrpc::JSON_STRING, "param2", JSON_ANY, "param3", JSON_ANY, NULL), &taraxa::net::EthFace::eth_getStorageAtI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getStorageRoot", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, - "param1", jsonrpc::JSON_STRING, "param2", jsonrpc::JSON_STRING, NULL), + "param1", jsonrpc::JSON_STRING, "param2", JSON_ANY, NULL), &taraxa::net::EthFace::eth_getStorageRootI); this->bindAndAddMethod( jsonrpc::Procedure("eth_getTransactionCount", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1", - JSON_ANY, "param2", jsonrpc::JSON_OBJECT, NULL), + jsonrpc::JSON_STRING, "param2", JSON_ANY, NULL), &taraxa::net::EthFace::eth_getTransactionCountI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getBlockTransactionCountByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1", jsonrpc::JSON_STRING, NULL), &taraxa::net::EthFace::eth_getBlockTransactionCountByHashI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getBlockTransactionCountByNumber", jsonrpc::PARAMS_BY_POSITION, - jsonrpc::JSON_OBJECT, "param1", jsonrpc::JSON_STRING, NULL), + jsonrpc::JSON_OBJECT, "param1", JSON_ANY, NULL), &taraxa::net::EthFace::eth_getBlockTransactionCountByNumberI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getUncleCountByBlockHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1", jsonrpc::JSON_STRING, NULL), @@ -53,16 +53,16 @@ class EthFace : public ServerInterface { jsonrpc::JSON_OBJECT, "param1", jsonrpc::JSON_STRING, NULL), &taraxa::net::EthFace::eth_getUncleCountByBlockNumberI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getCode", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, - "param1", JSON_ANY, "param2", jsonrpc::JSON_OBJECT, NULL), + "param1", jsonrpc::JSON_STRING, "param2", JSON_ANY, NULL), &taraxa::net::EthFace::eth_getCodeI); this->bindAndAddMethod(jsonrpc::Procedure("eth_call", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1", - JSON_ANY, "param2", jsonrpc::JSON_OBJECT, NULL), + jsonrpc::JSON_OBJECT, "param2", JSON_ANY, NULL), &taraxa::net::EthFace::eth_callI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getBlockByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1", jsonrpc::JSON_STRING, "param2", jsonrpc::JSON_BOOLEAN, NULL), &taraxa::net::EthFace::eth_getBlockByHashI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getBlockByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, - "param1", jsonrpc::JSON_STRING, "param2", jsonrpc::JSON_BOOLEAN, NULL), + "param1", JSON_ANY, "param2", jsonrpc::JSON_BOOLEAN, NULL), &taraxa::net::EthFace::eth_getBlockByNumberI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getTransactionByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1", jsonrpc::JSON_STRING, NULL), @@ -71,10 +71,9 @@ class EthFace : public ServerInterface { jsonrpc::Procedure("eth_getTransactionByBlockHashAndIndex", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1", jsonrpc::JSON_STRING, "param2", jsonrpc::JSON_STRING, NULL), &taraxa::net::EthFace::eth_getTransactionByBlockHashAndIndexI); - this->bindAndAddMethod( - jsonrpc::Procedure("eth_getTransactionByBlockNumberAndIndex", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, - "param1", jsonrpc::JSON_STRING, "param2", jsonrpc::JSON_STRING, NULL), - &taraxa::net::EthFace::eth_getTransactionByBlockNumberAndIndexI); + this->bindAndAddMethod(jsonrpc::Procedure("eth_getTransactionByBlockNumberAndIndex", jsonrpc::PARAMS_BY_POSITION, + jsonrpc::JSON_OBJECT, "param1", JSON_ANY, "param2", JSON_ANY, NULL), + &taraxa::net::EthFace::eth_getTransactionByBlockNumberAndIndexI); this->bindAndAddMethod(jsonrpc::Procedure("eth_getTransactionReceipt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1", jsonrpc::JSON_STRING, NULL), &taraxa::net::EthFace::eth_getTransactionReceiptI);