Merge branch '1.x' into release/1.6.1

Author: spacesailor24

CHANGELOG.md

@@ -480,4 +480,9 @@ Released with 1.0.0-beta.37 code base.
 
 ## [Unreleased]
 
-## [1.6.2]
+## [1.7.0]
+
+### Changed
+
+ - Changed getFeeHistory first parameter type from `number` to `hex` according to the [spec](https://playground.open-rpc.org/?schemaUrl=https://raw.githubusercontent.com/ethereum/eth1.0-apis/assembled-spec/openrpc.json&uiSchema%5BappBar%5D%5Bui:splitView%5D=false&uiSchema%5BappBar%5D%5Bui:input%5D=false&uiSchema%5BappBar%5D%5Bui:examplesDropdown%5D=false) (#4529)
+

packages/web3-eth/src/index.js

@@ -408,7 +408,7 @@ var Eth = function Eth() {
             name: 'getFeeHistory',
             call: 'eth_feeHistory',
             params: 3,
-            inputFormatter: [utils.toNumber, formatter.inputBlockNumberFormatter, null]
+            inputFormatter: [utils.numberToHex, formatter.inputBlockNumberFormatter, null]
         }),
         new Method({
             name: 'getAccounts',

test/eth.feeHistory.js

@@ -8,7 +8,7 @@ var methodCall = 'eth_feeHistory';
 var tests = [
     {
         args: [4, "0xA30953", []],
-        formattedArgs: [4, "0xa30953", []],
+        formattedArgs: ['0x4', "0xa30953", []],
         result: {
             "baseFeePerGas": [
             "0xa",
@@ -45,7 +45,7 @@ var tests = [
     },
     {
         args: ['0x4', 10684755, []],
-        formattedArgs: [4, "0xa30953", []],
+        formattedArgs: ['0x4', "0xa30953", []],
         result: {
             "baseFeePerGas": [
             "0xa",
@@ -82,7 +82,7 @@ var tests = [
     },
     {
         args: [new BigNumber(4), '10684755', []],
-        formattedArgs: [4, "0xa30953", []],
+        formattedArgs: ["0x4", "0xa30953", []],
         result: {
             "baseFeePerGas": [
             "0xa",
@@ -119,7 +119,7 @@ var tests = [
     },
     {
         args: [4, 'latest', []],
-        formattedArgs: [4, 'latest', []],
+        formattedArgs: ["0x4", 'latest', []],
         result: {
             "baseFeePerGas": [
             "0xa",
@@ -156,7 +156,7 @@ var tests = [
     },
     {
         args: [4, 'earliest', []],
-        formattedArgs: [4, 'earliest', []],
+        formattedArgs: ["0x4", 'earliest', []],
         result: {
             "baseFeePerGas": [
             "0xa",
@@ -193,7 +193,7 @@ var tests = [
     },
     {
         args: [4, 'pending', []],
-        formattedArgs: [4, 'pending', []],
+        formattedArgs: ['0x4', 'pending', []],
         result: {
             "baseFeePerGas": [
             "0xa",