merge 1.x

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
                   path: |
                       node_modules
                       */*/node_modules
-                  key: ${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }}
+                  key: 0-${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }}
             - run: bash ./scripts/install.sh
               if: steps.cache-deps.outputs.cache-hit != 'true'
             - run: bash ./scripts/ci.sh
@@ -48,7 +48,7 @@ jobs:
                   path: |
                       node_modules
                       */*/node_modules
-                  key: ${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
+                  key: 0-${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
             - run: bash ./scripts/install.sh
               if: steps.cache-deps.outputs.cache-hit != 'true'
             - run: bash ./scripts/ci.sh
@@ -78,7 +78,7 @@ jobs:
                   path: |
                       node_modules
                       */*/node_modules
-                  key: ${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }}
+                  key: 0-${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }}
             - run: bash ./scripts/install.sh
               if: steps.cache-deps.outputs.cache-hit != 'true'
             - run: bash ./scripts/ci.sh

.jshintrc

@@ -3,6 +3,7 @@
     "bitwise": true,
     "camelcase": true,
     "eqeqeq": true,
+    "esversion": 8,
     "freeze": true,
     "funcscope": false,
     "maxcomplexity": 15,

CHANGELOG.md

@@ -229,8 +229,6 @@ Released with 1.0.0-beta.37 code base.
 - Docs: spelling of pre-defined block number (#3539)
 - Docs: missing defaultBlock param option in `method.call` description (#3558)
 
-## [Unreleased]
-
 ## [1.2.10]
 
 ### Added
@@ -256,9 +254,19 @@ Released with 1.0.0-beta.37 code base.
 - Add undefined callback check to websocket provider response queue (#3574)
 - Fix WS clientConfig type (#3563)
 
+## [1.2.11]
+
+### Fixed
+
+- Fix Provider.request response (#3647)
+
+### Added
+
+- Add unit tests for isHex and isHexStrict (#3622)
+
 ## [Unreleased]
 
-## [1.2.11]
+## [1.2.12]
 
 ### Added
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.9",
+  "version": "1.2.11",
   "lerna": "2.0.0",
   "command": {
     "init": {

packages/web3-bzz/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-bzz",
-    "version": "1.2.9",
+    "version": "1.2.11",
     "description": "Web3 module to interact with the Swarm network.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-bzz",
     "license": "LGPL-3.0",

packages/web3-core-helpers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-helpers",
-    "version": "1.2.9",
+    "version": "1.2.11",
     "description": "Web3 core tools helper for sub packages. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers",
     "license": "LGPL-3.0",
@@ -15,8 +15,8 @@
     "main": "src/index.js",
     "dependencies": {
         "underscore": "1.9.1",
-        "web3-eth-iban": "1.2.9",
-        "web3-utils": "1.2.9"
+        "web3-eth-iban": "1.2.11",
+        "web3-utils": "1.2.11"
     },
     "devDependencies": {
         "@types/node": "^12.12.6",

packages/web3-core-method/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-method",
-    "version": "1.2.9",
+    "version": "1.2.11",
     "description": "Creates the methods on the web3 modules. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-method",
     "license": "LGPL-3.0",
@@ -16,10 +16,10 @@
     "dependencies": {
         "@ethersproject/transactions": "^5.0.0-beta.135",
         "underscore": "1.9.1",
-        "web3-core-helpers": "1.2.9",
-        "web3-core-promievent": "1.2.9",
-        "web3-core-subscriptions": "1.2.9",
-        "web3-utils": "1.2.9"
+        "web3-core-helpers": "1.2.11",
+        "web3-core-promievent": "1.2.11",
+        "web3-core-subscriptions": "1.2.11",
+        "web3-utils": "1.2.11"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-method/src/index.js

@@ -453,7 +453,7 @@ Method.prototype._confirmTransaction = function (defer, result, payload) {
                                                 gas: parsedTx.gasLimit.toHexString(),
                                                 gasPrice: parsedTx.gasPrice.toHexString(),
                                                 value: parsedTx.value.toHexString()
-                                            })
+                                            });
                                         }
 
                                         // Get revert reason string with eth_call
@@ -549,19 +549,19 @@ Method.prototype._confirmTransaction = function (defer, result, payload) {
     var startWatching = function (existingReceipt) {
         const startInterval = () => {
             intervalId = setInterval(checkConfirmation.bind(null, existingReceipt, true), 1000);
-        }
+        };
 
         if (!this.requestManager.provider.on) {
-            startInterval()
+            startInterval();
         } else {
             _ethereumCall.subscribe('newBlockHeaders', function (err, blockHeader, sub) {
                 if (err || !blockHeader) {
                     // fall back to polling
-                    startInterval()
+                    startInterval();
                 } else {
                     checkConfirmation(existingReceipt, false, err, blockHeader, sub);
                 }
-            })
+            });
         }
     }.bind(this);
 

packages/web3-core-promievent/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-promievent",
-    "version": "1.2.9",
+    "version": "1.2.11",
     "description": "This package extends the EventEmitter with the Promise class to allow chaining as well as multiple final states of a function.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-promievent",
     "license": "LGPL-3.0",

packages/web3-core-requestmanager/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-requestmanager",
-    "version": "1.2.9",
+    "version": "1.2.11",
     "description": "Web3 module to handle requests to external providers.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-requestmanager",
     "license": "LGPL-3.0",
@@ -13,9 +13,9 @@
     },
     "dependencies": {
         "underscore": "1.9.1",
-        "web3-core-helpers": "1.2.9",
-        "web3-providers-http": "1.2.9",
-        "web3-providers-ipc": "1.2.9",
-        "web3-providers-ws": "1.2.9"
+        "web3-core-helpers": "1.2.11",
+        "web3-providers-http": "1.2.11",
+        "web3-providers-ipc": "1.2.11",
+        "web3-providers-ws": "1.2.11"
     }
 }

packages/web3-core-requestmanager/src/index.js

@@ -159,7 +159,7 @@ RequestManager.prototype.send = function (data, callback) {
 
     const payload = Jsonrpc.toPayload(data.method, data.params);
 
-    const onResult = function (err, result) {
+    const onJsonrpcResult = function (err, result) {
         if(result && result.id && payload.id !== result.id) {
             return callback(new Error(`Wrong response id ${result.id} (expected: ${payload.id}) in ${JSON.stringify(payload)}`));
         }
@@ -180,11 +180,11 @@ RequestManager.prototype.send = function (data, callback) {
     };
 
     if (this.provider.request) {
-        callbackify(this.provider.request.bind(this.provider))(payload, onResult);
+        callbackify(this.provider.request.bind(this.provider))(payload, callback);
     } else if (this.provider.sendAsync) {
-        this.provider.sendAsync(payload, onResult);
+        this.provider.sendAsync(payload, onJsonrpcResult);
     } else if (this.provider.send) {
-        this.provider.send(payload, onResult);
+        this.provider.send(payload, onJsonrpcResult);
     } else {
         throw new Error('Provider does not have a request or send method to use.');
     }

packages/web3-core-subscriptions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-subscriptions",
-    "version": "1.2.9",
+    "version": "1.2.11",
     "description": "Manages web3 subscriptions. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-subscriptions",
     "license": "LGPL-3.0",
@@ -16,7 +16,7 @@
     "dependencies": {
         "eventemitter3": "4.0.4",
         "underscore": "1.9.1",
-        "web3-core-helpers": "1.2.9"
+        "web3-core-helpers": "1.2.11"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-subscriptions/src/subscription.js

@@ -227,7 +227,7 @@ Subscription.prototype.subscribe = function() {
     // Re-subscription only: continue fetching from the last block we received.
     // a dropped connection may have resulted in gaps in the logs...
     if (this.lastBlock && _.isObject(this.options.params)){
-        payload.params[1] = this.options.params
+        payload.params[1] = this.options.params;
         payload.params[1].fromBlock = formatters.inputBlockNumberFormatter(this.lastBlock + 1);
     }
 

packages/web3-core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core",
-    "version": "1.2.9",
+    "version": "1.2.11",
     "description": "Web3 core tools for sub-packages. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core",
     "license": "LGPL-3.0",
@@ -17,10 +17,10 @@
         "@types/bn.js": "^4.11.5",
         "@types/node": "^12.12.6",
         "bignumber.js": "^9.0.0",
-        "web3-core-helpers": "1.2.9",
-        "web3-core-method": "1.2.9",
-        "web3-core-requestmanager": "1.2.9",
-        "web3-utils": "1.2.9"
+        "web3-core-helpers": "1.2.11",
+        "web3-core-method": "1.2.11",
+        "web3-core-requestmanager": "1.2.11",
+        "web3-utils": "1.2.11"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-eth-abi/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-abi",
-    "version": "1.2.9",
+    "version": "1.2.11",
     "description": "Web3 module encode and decode EVM in/output.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-abi",
     "license": "LGPL-3.0",
@@ -16,7 +16,7 @@
     "dependencies": {
         "@ethersproject/abi": "5.0.0-beta.153",
         "underscore": "1.9.1",
-        "web3-utils": "1.2.9"
+        "web3-utils": "1.2.11"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",