Merge branch '1.x' into 5153/Number-can-only-safely-store-53-bits

Author: nikoulai

.prettierignore

@@ -0,0 +1 @@
+**

CHANGELOG.md

@@ -578,7 +578,16 @@ Released with 1.0.0-beta.37 code base.
 
 ## [1.7.5]
 
+### Added
+- Documentation details about `maxFeePerGas` and `maxPriorityFeePerGas` (#5121)
+
 ### Fixed
 
--   Fix typos in web3-eth-accounts.rst & TESTING.md (#5047)
+-  Fix typos in web3-eth-accounts.rst & TESTING.md (#5047)
+-  Improve README.md & Fix typos (#4848)
 -   Fix `hexToNumber` supporting more than 53 bits numbers (#5153)
+
+### Security
+-  Updated `got` lib version and fixed other libs using npm audit fix
+
+

README.md

@@ -1,5 +1,5 @@
-<p align="center">
-  <img src="assets/logo/web3js.jpg" width="200" alt="web3.js" />
+<p style="text-align: center;">
+  <img src="assets/logo/web3js.jpg" width="200" alt="web3.js">
 </p>
 
 # web3.js - Ethereum JavaScript API
@@ -56,10 +56,10 @@ UNPKG:
 ```js
 // In Node.js
 const Web3 = require('web3');
-
-let web3 = new Web3('ws://localhost:8546');
+const web3 = new Web3('ws://localhost:8546');
 console.log(web3);
-> {
+// Output
+{
     eth: ... ,
     shh: ... ,
     utils: ...,
@@ -227,7 +227,7 @@ global.process = {
 
 If you are using Ionic/Angular at a version >5 you may run into a build error in which modules `crypto` and `stream` are `undefined`
 
-a work around for this is to go into your node-modules and at `/angular-cli-files/models/webpack-configs/browser.js` change  the `node: false` to `node: {crypto: true, stream: true}` as mentioned [here](https://github.com/ethereum/web3.js/issues/2260#issuecomment-458519127)
+a workaround for this is to go into your node-modules and at `/angular-cli-files/models/webpack-configs/browser.js` change  the `node: false` to `node: {crypto: true, stream: true}` as mentioned [here](https://github.com/ethereum/web3.js/issues/2260#issuecomment-458519127)
 
 Another variation of this problem was an [issue opned on angular-cli](https://github.com/angular/angular-cli/issues/1548)
 

docs/web3-eth-accounts.rst

@@ -156,6 +156,8 @@ Parameters
     - ``data`` - ``String``: (optional) The call data of the transaction, can be empty for simple value transfers.
     - ``value`` - ``String``: (optional) The value of the transaction in wei.
     - ``gasPrice`` - ``String``: (optional) The gas price set by this transaction, if empty, it will use :ref:`web3.eth.getGasPrice() <eth-gasprice>`
+    - ``maxFeePerGas`` - ``Number|String|BN``: (optional, defaulted to ``(2 * block.baseFeePerGas) + maxPriorityFeePerGas``) The maximum fee per gas that the transaction is willing to pay in total. If ``gasPrice`` is also set, ``maxFeePerGas`` will be set equal to it, regardless of this value.
+    - ``maxPriorityFeePerGas`` - ``Number|String|BN`` (optional, defaulted to ``2.5 Gwei``) The maximum fee per gas to give miners to incentivize them to include the transaction (Priority fee). If ``gasPrice`` is also set, ``maxPriorityFeePerGas`` will be set equal to it, regardless of this value.
     - ``gas`` - ``String``: The gas provided by the transaction.
     - ``chain`` - ``String``: (optional) Defaults to ``mainnet``.
     - ``hardfork`` - ``String``: (optional) Defaults to ``berlin``.