Update 3.0.0 with latest 1.4.0 changes

.github/workflows/build.yml

@@ -7,11 +7,19 @@ on:
         tags:
             - v1*
             - v3*
+        paths-ignore:
+            - "docs/**"
+            - "assets/**"
+            - "**.md"
     pull_request:
         branches:
             - "1.x"
             - "3.x"
         types: [opened, reopened, synchronize]
+        paths-ignore:
+            - "docs/**"
+            - "assets/**"
+            - "**.md"
 jobs:
     lint:
         runs-on: ubuntu-latest

CHANGELOG.md

@@ -349,8 +349,6 @@ Released with 1.0.0-beta.37 code base.
 - Deprecation of bzz warning (#3872)
 - Deprecation of shh warning (#3888)
 
-## [Unreleased]
-
 ## [1.3.5]
 
 ### Added
@@ -359,6 +357,7 @@ Released with 1.0.0-beta.37 code base.
 - Added description to documentation on how to connect using a remote node provider (#3884)
 - Added Security risk warning to docs for `web3.utils.soliditySha3` (#3908)
 - `.nvmrc` file using Node.js version `v.14.15.1` (#3817)
+- Add commitment to semantic versioning since version `1.3.0` and onwards (#3961)
 
 ### Changed
 
@@ -380,7 +379,14 @@ Released with 1.0.0-beta.37 code base.
 
 - Updates the use of `hexToNumber` to `outputBigNumberFormatter` (which returns a number string instead of a number) (#3976)
 - Update `e2e.ganahce.core.sh` to point to ChainSafe's fork of `ganache-core` (#3976)
+- Bump `underscore` package from `1.9.1` to `1.12.1` (#4051)
+- Bump `@ensdomains/ens` package from `^0.4.5` to `^0.6.0` (#4059)
+- Bump `ethers` package from `^5.0.18` to `^5.1.4` (#4059)
+- Berlin Transaction Support (#4083)
+- When signing a transaction, common object now defaults to berlin instead of petersburg
+- Changed Geth Docker verision from `stable` to `1.10.3` in `e2e.geth.instamine.sh` and `scripts/e2e.geth.automine.sh` (#4154)
 
 ### Removed
 
 - Removed bzz and shh api (#3909)
+- Accidental commit (yarn-error.log) (#4062)

docs/web3-eth-accounts.rst

@@ -158,14 +158,14 @@ Parameters
     - ``gasPrice`` - ``String``: (optional) The gas price set by this transaction, if empty, it will use :ref:`web3.eth.getGasPrice() <eth-gasprice>`
     - ``gas`` - ``String``: The gas provided by the transaction.
     - ``chain`` - ``String``: (optional) Defaults to ``mainnet``.
-    - ``hardfork`` - ``String``: (optional) Defaults to ``petersburg``.
+    - ``hardfork`` - ``String``: (optional) Defaults to ``berlin``.
     - ``common`` - ``Object``: (optional) The common object
         - ``customChain`` - ``Object``: The custom chain properties
             - ``name`` - ``string``: (optional) The name of the chain
             - ``networkId`` - ``number``: Network ID of the custom chain
             - ``chainId`` - ``number``: Chain ID of the custom chain
         - ``baseChain`` - ``string``: (optional) ``mainnet``, ``goerli``, ``kovan``, ``rinkeby``, or ``ropsten``
-        - ``hardfork`` - ``string``: (optional) ``chainstart``, ``homestead``, ``dao``, ``tangerineWhistle``, ``spuriousDragon``, ``byzantium``, ``constantinople``, ``petersburg``, or ``istanbul``
+        - ``hardfork`` - ``string``: (optional) ``chainstart``, ``homestead``, ``dao``, ``tangerineWhistle``, ``spuriousDragon``, ``byzantium``, ``constantinople``, ``petersburg``, ``istanbul``, or ``berlin``
 2. ``privateKey`` - ``String``: The private key to sign with.
 3. ``callback`` - ``Function``: (optional) Optional callback, returns an error object as first parameter and the result as second.
 

docs/web3-eth.rst

@@ -1534,7 +1534,7 @@ Example
 
 .. code-block:: javascript
 
-    var Tx = require('ethereumjs-tx').Transaction;
+    var Tx = require('@ethereumjs/tx').Transaction;
     var privateKey = Buffer.from('e331b6d69882b4cb4ea581d88e0b604039a3de5967688d3dcffdd2270c0fd109', 'hex');
 
     var rawTx = {

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.4",
+  "version": "1.4.0",
   "lerna": "2.0.0",
   "command": {
     "init": {