Merge branch '1.x' into junaid/e2e_gnosis_dex4436

web3 · Jan 18, 2022 · e10f886 · e10f886
2 parents 5e7f73a + 1e93729
commit e10f886
Show file tree

Hide file tree

Showing 58 changed files with 27,237 additions and 220 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -478,8 +478,6 @@ Released with 1.0.0-beta.37 code base.
 - Correct `web3.rst` example in documentation (#4511)
 - Correct `BlockHeader` typing (`receiptRoot` -> `receiptsRoot`) (#4452)
 
-## [Unreleased]
-
 ## [1.7.0]
 
 ### Added
@@ -493,8 +491,13 @@ Released with 1.0.0-beta.37 code base.
 
  - 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)
 
+## [Unreleased]
+
 ## [1.7.1]
 
+### Added
+- `transactionPollingInterval` added to web3, contract and method constructor options. defaults to 1 second. (#4584)
+
 ### Fixed
 -  Fix a typo in the documentation for `methods.myMethod.send` (#4599)
 -  Added effectiveGasPrice to TransactionReceipt (#4692)

diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/dist/web3.min.js.map b/dist/web3.min.js.map
diff --git a/docs/web3-eth-contract.rst b/docs/web3-eth-contract.rst
@@ -380,6 +380,27 @@ Returns
 
 ------------------------------------------------------------------------------
 
+.. _eth-contract-module-transactionpollinginterval:
+
+transactionPollingInterval
+=====================
+
+.. code-block:: javascript
+
+    web3.eth.Contract.transactionPollingInterval
+    contract.transactionPollingInterval // on contract instance
+
+The ``transactionPollingInterval`` is used over HTTP connections. This option defines the number of seconds between Web3 calls for a receipt which confirms that a transaction was mined by the network.
+
+
+-------
+Returns
+-------
+
+``number``: The current value of transactionPollingInterval (default: 1000ms)
+
+------------------------------------------------------------------------------
+
 .. _eth-contract-module-handlerevert:
 
 handleRevert

diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst
@@ -475,6 +475,26 @@ Example
     web3.eth.transactionPollingTimeout = 1000;
 
 
+------------------------------------------------------------------------------
+
+.. _eth-module-transactionpollinginterval:
+
+transactionPollingInterval
+=====================
+
+.. code-block:: javascript
+
+    web3.eth.transactionPollingInterval
+
+The ``transactionPollingInterval`` is used over HTTP connections. This option defines the number of seconds between Web3 calls for a receipt which confirms that a transaction was mined by the network.
+
+
+-------
+Returns
+-------
+
+``number``: The current value of transactionPollingInterval (default: 1000ms)
+
 ------------------------------------------------------------------------------
 
 .. _web3-module-handlerevert:

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.6.1",
+  "version": "1.7.0",
   "lerna": "2.0.0",
   "command": {
     "init": {