Merge branch '1.x' into release/1.2.5

.gitignore

@@ -18,3 +18,8 @@ packages/web3/dist/
 lerna-debug.log
 !./dist/web3.min.js
 .nyc_output/
+build/
+contracts/
+migrations/
+truffle-config.js
+test/config/ensAddresses.json

.travis.yml

@@ -20,6 +20,8 @@ matrix:
       env: TEST=e2e_ganache
     - node_js: 10
       env: TEST=e2e_mosaic
+    - node_js: 10
+      env: TEST=e2e_ens
     - node_js: 10
       env: TEST=e2e_browsers
       addons:

CHANGELOG.md

@@ -126,3 +126,17 @@ Released with 1.0.0-beta.37 code base.
 - Prefer receipt status to code availability on contract deployment (#3298)
 
 ## [Unreleased]
+
+## [1.2.6]
+
+### Added
+
+- ENS module extended with the possibility to add a custom registry (#3301)
+
+### Changed
+
+- Ensure '0x' prefix is existing for Accounts.sign and Accounts.privateKeyToAccount (#3041)
+
+### Fixed
+
+- Add missing subscription.on('connected') TS type definition (#3319)

docs/web3-eth-accounts.rst

@@ -94,7 +94,7 @@ privateKeyToAccount
 
 .. code-block:: javascript
 
-    web3.eth.accounts.privateKeyToAccount(privateKey);
+    web3.eth.accounts.privateKeyToAccount(privateKey [, ignoreLength ]);
 
 Creates an account object from a private key.
 
@@ -103,6 +103,7 @@ Parameters
 ----------
 
 1. ``privateKey`` - ``String``: The private key to convert.
+1. ``ignoreLength`` - ``Boolean``: If set to true does the ``privateKey`` length not get validated.
 
 -------
 Returns

docs/web3-eth-ens.rst

@@ -8,6 +8,35 @@ The ``web3.eth.ens`` functions let you interacting with ENS.
 
 ------------------------------------------------------------------------------
 
+registryAddress
+=====================
+
+.. code-block:: javascript
+
+    web3.eth.ens.registryAddress;
+
+The ``registryAddress`` property can be used to define a custom registry address when you are connected to an unknown chain.
+
+.. note::
+   If no address is defined will it try to detect the registry on the chain you are currently connected with and on the call of ``setProvider`` in the Eth module will it keep the defined address and use it for the ENS module.
+
+-------
+Returns
+-------
+
+``String`` - The address of the custom registry.
+
+-------
+Example
+-------
+
+.. code-block:: javascript
+
+    web3.eth.ens.registryAddress;
+    > "0x314159265dD8dbb310642f98f50C066173C1259b"
+
+------------------------------------------------------------------------------
+
 registry
 =====================