Solve merge conflicts

.github/workflows/build.yml

@@ -3,15 +3,18 @@ on:
     push:
         branches:
             - "1.x"
+            - "3.x"
         tags:
             - v1*
+            - v3*
         paths-ignore:
             - "docs/**"
             - "assets/**"
             - "**.md"
     pull_request:
         branches:
             - "1.x"
+            - "3.x"
         types: [opened, reopened, synchronize]
         paths-ignore:
             - "docs/**"

CHANGELOG.md

@@ -371,29 +371,38 @@ Released with 1.0.0-beta.37 code base.
 - Bump `elliptic` from `6.5.3` to `6.5.4` for `web3-core-requestmanager` (#3945)
 - Rewrite `web3-eth-iban` in ES6 (#3955)
 
-## [1.3.6]
+## [Unreleased]
 
-### Changes
+## [3.0.0]
 
+### Changed
+
+- 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)
 
-### Removes
+### Removed
 
+- Removed bzz and shh api (#3909)
 - Accidental commit (yarn-error.log) (#4062)
 
+## [1.3.6]
+
+### Changes
+
+
+### Removes
+
+
 ## [1.4.0]
 
 ### Added
 
-- Berlin Transaction Support (#4083)
-- When signing a transaction, common object now defaults to berlin instead of petersburg
 
 ### Changed
 
-- Changed Geth Docker verision from `stable` to `1.10.3` in `e2e.geth.instamine.sh` and `scripts/e2e.geth.automine.sh` (#4154)
-
-## [Unreleased]
-
-## [1.4.1]

README.md

@@ -61,7 +61,6 @@ let web3 = new Web3('ws://localhost:8546');
 console.log(web3);
 > {
     eth: ... ,
-    shh: ... ,
     utils: ...,
     ...
 }

docs/getting-started.rst

@@ -6,8 +6,6 @@ Getting Started
 The web3.js library is a collection of modules that contain functionality for the ethereum ecosystem.
 
 - ``web3-eth`` is for the ethereum blockchain and smart contracts.
-- ``web3-shh`` is for the whisper protocol, to communicate p2p and broadcast.
-- ``web3-bzz`` is for the swarm protocol, the decentralized file storage.
 - ``web3-utils`` contains useful helper functions for Dapp developers.
 
 

docs/include_package-core.rst

@@ -7,14 +7,12 @@ setProvider
 
     web3.setProvider(myProvider)
     web3.eth.setProvider(myProvider)
-    web3.shh.setProvider(myProvider)
-    web3.bzz.setProvider(myProvider)
     ...
 
 Will change the provider for its module.
 
 .. note::
-    When called on the umbrella package ``web3`` it will also set the provider for all sub modules ``web3.eth``, ``web3.shh``, etc. EXCEPT ``web3.bzz`` which needs a separate provider at all times.
+    When called on the umbrella package ``web3`` it will also set the provider for all sub modules
 
 ----------
 Parameters
@@ -72,8 +70,6 @@ providers
 
     web3.providers
     web3.eth.providers
-    web3.shh.providers
-    web3.bzz.providers
     ...
 
 Contains the current available :ref:`providers <web3-providers>`.
@@ -192,8 +188,6 @@ givenProvider
 
     web3.givenProvider
     web3.eth.givenProvider
-    web3.shh.givenProvider
-    web3.bzz.givenProvider
     ...
 
 When using web3.js in an Ethereum compatible browser, it will set with the current native provider by that browser.
@@ -223,8 +217,6 @@ currentProvider
 
     web3.currentProvider
     web3.eth.currentProvider
-    web3.shh.currentProvider
-    web3.bzz.currentProvider
     ...
 
 Will return the current provider, otherwise ``null``.
@@ -254,8 +246,6 @@ BatchRequest
 
     new web3.BatchRequest()
     new web3.eth.BatchRequest()
-    new web3.shh.BatchRequest()
-    new web3.bzz.BatchRequest()
 
 Class to create and execute batch requests.
 
@@ -297,8 +287,6 @@ extend
 
     web3.extend(methods)
     web3.eth.extend(methods)
-    web3.shh.extend(methods)
-    web3.bzz.extend(methods)
     ...
 
 Allows extending the web3 modules.
@@ -362,7 +350,6 @@ Example
         },
         directCall: function(){},
         eth: Eth {...},
-        bzz: Bzz {...},
         ...
     }
 

docs/include_package-net.rst

@@ -7,8 +7,6 @@ getId
 .. code-block:: javascript
 
     web3.eth.net.getId([callback])
-    web3.bzz.net.getId([callback])
-    web3.shh.net.getId([callback])
 
 Gets the current network ID.
 
@@ -43,8 +41,6 @@ isListening
 .. code-block:: javascript
 
     web3.eth.net.isListening([callback])
-    web3.bzz.net.isListening([callback])
-    web3.shh.net.isListening([callback])
 
 Checks if the node is listening for peers.
 
@@ -78,8 +74,6 @@ getPeerCount
 .. code-block:: javascript
 
     web3.eth.net.getPeerCount([callback])
-    web3.bzz.net.getPeerCount([callback])
-    web3.shh.net.getPeerCount([callback])
 
 Get the number of peers connected to.
 

docs/index.rst

@@ -34,8 +34,6 @@ Contents:
     web3-eth-iban
     web3-eth-abi
     web3-net
-    web3-bzz
-    web3-shh
     web3-utils
     web3-admin