From ce1914d144ee40339c795ee4dbf3fed47b5a216c Mon Sep 17 00:00:00 2001
From: brave-builds <devops@brave.com>
Date: Mon, 11 Jul 2022 10:43:44 +0000
Subject: [PATCH] Uplift of #14088 (squashed) to beta

---
 components/brave_wallet/browser/eth_requests.cc          | 2 +-
 components/brave_wallet/browser/eth_requests.h           | 2 +-
 components/brave_wallet/browser/eth_requests_unittest.cc | 4 ++--
 components/brave_wallet/browser/json_rpc_service.cc      | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/components/brave_wallet/browser/eth_requests.cc b/components/brave_wallet/browser/eth_requests.cc
index 0b430fb4115a..a74a5de072ce 100644
--- a/components/brave_wallet/browser/eth_requests.cc
+++ b/components/brave_wallet/browser/eth_requests.cc
@@ -70,7 +70,7 @@ std::string eth_blockNumber() {
   return GetJsonRpcNoParams("eth_blockNumber");
 }
 
-std::string eth_feeHistory(int num_blocks,
+std::string eth_feeHistory(const std::string& num_blocks,
                            const std::string& head,
                            const std::vector<double>& reward_percentiles) {
   base::Value percentile_values(base::Value::Type::LIST);
diff --git a/components/brave_wallet/browser/eth_requests.h b/components/brave_wallet/browser/eth_requests.h
index 3690352cbe06..7700a4222865 100644
--- a/components/brave_wallet/browser/eth_requests.h
+++ b/components/brave_wallet/browser/eth_requests.h
@@ -45,7 +45,7 @@ std::string eth_accounts();
 // Returns the number of most recent block.
 std::string eth_blockNumber();
 // Returns the fee history.
-std::string eth_feeHistory(int num_blocks,
+std::string eth_feeHistory(const std::string& num_blocks,
                            const std::string& head,
                            const std::vector<double>& reward_percentiles);
 // Returns the balance of the account of given address.
diff --git a/components/brave_wallet/browser/eth_requests_unittest.cc b/components/brave_wallet/browser/eth_requests_unittest.cc
index 4d98f3a9dacd..a682cacd9bea 100644
--- a/components/brave_wallet/browser/eth_requests_unittest.cc
+++ b/components/brave_wallet/browser/eth_requests_unittest.cc
@@ -85,8 +85,8 @@ TEST(EthRequestUnitTest, eth_blockNumber) {
 
 TEST(EthRequestUnitTest, eth_feeHistory) {
   ASSERT_EQ(
-      eth_feeHistory(40, "latest", std::vector<double>{20, 50, 80}),
-      R"({"id":1,"jsonrpc":"2.0","method":"eth_feeHistory","params":[40,"latest",[20.0,50.0,80.0]]})");
+      eth_feeHistory("0x28", "latest", std::vector<double>{20, 50, 80}),
+      R"({"id":1,"jsonrpc":"2.0","method":"eth_feeHistory","params":["0x28","latest",[20.0,50.0,80.0]]})");
 }
 
 TEST(EthRequestUnitTest, eth_getBalance) {
diff --git a/components/brave_wallet/browser/json_rpc_service.cc b/components/brave_wallet/browser/json_rpc_service.cc
index 455f1cb74e61..2276749f9297 100644
--- a/components/brave_wallet/browser/json_rpc_service.cc
+++ b/components/brave_wallet/browser/json_rpc_service.cc
@@ -611,8 +611,9 @@ void JsonRpcService::GetFeeHistory(GetFeeHistoryCallback callback) {
                      weak_ptr_factory_.GetWeakPtr(), std::move(callback));
 
   RequestInternal(
-      eth::eth_feeHistory(40, "latest", std::vector<double>{20, 50, 80}), true,
-      network_urls_[mojom::CoinType::ETH], std::move(internal_callback));
+      eth::eth_feeHistory("0x28",  // blockCount = 40
+                          "latest", std::vector<double>{20, 50, 80}),
+      true, network_urls_[mojom::CoinType::ETH], std::move(internal_callback));
 }
 
 void JsonRpcService::OnGetFeeHistory(