v1.3.2

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
     pull_request:
         branches:
             - "1.x"
+            - "release/*"
         types: [opened, reopened, synchronize]
 jobs:
     lint:

CHANGELOG.md

@@ -309,7 +309,8 @@ Released with 1.0.0-beta.37 code base.
 - Grammar changes to inputAddressFormatter error message
 - Fixed vulnerable dependencies
 
-## [Unreleased]
-
 ## [1.3.2]
 
+### Fixed
+
+- Fix EIP-1193 provider subscriptions (#3864)

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.1",
+  "version": "1.3.2-rc.2",
   "lerna": "2.0.0",
   "command": {
     "init": {

packages/web3-bzz/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-bzz",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "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.3.1",
+    "version": "1.3.2-rc.2",
     "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": "lib/index.js",
     "dependencies": {
         "underscore": "1.9.1",
-        "web3-eth-iban": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-eth-iban": "1.3.2-rc.2",
+        "web3-utils": "1.3.2-rc.2"
     },
     "devDependencies": {
         "@types/node": "^12.12.6",

packages/web3-core-method/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-method",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "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.3.1",
-        "web3-core-promievent": "1.3.1",
-        "web3-core-subscriptions": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core-helpers": "1.3.2-rc.2",
+        "web3-core-promievent": "1.3.2-rc.2",
+        "web3-core-subscriptions": "1.3.2-rc.2",
+        "web3-utils": "1.3.2-rc.2"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-promievent/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-promievent",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "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.3.1",
+    "version": "1.3.2-rc.2",
     "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",
@@ -14,9 +14,9 @@
     "dependencies": {
         "underscore": "1.9.1",
         "util": "^0.12.0",
-        "web3-core-helpers": "1.3.1",
-        "web3-providers-http": "1.3.1",
-        "web3-providers-ipc": "1.3.1",
-        "web3-providers-ws": "1.3.1"
+        "web3-core-helpers": "1.3.2-rc.2",
+        "web3-providers-http": "1.3.2-rc.2",
+        "web3-providers-ipc": "1.3.2-rc.2",
+        "web3-providers-ws": "1.3.2-rc.2"
     }
 }

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

@@ -98,14 +98,25 @@ RequestManager.prototype.setProvider = function (provider, net) {
 
     // listen to incoming notifications
     if (this.provider && this.provider.on) {
-        this.provider.on('data', function data(result, deprecatedResult) {
-            result = result || deprecatedResult; // this is for possible old providers, which may had the error first handler
-
-            // if result is a subscription, call callback for that subscription
-            if (result.method && result.params && result.params.subscription && _this.subscriptions.has(result.params.subscription)) {
-                _this.subscriptions.get(result.params.subscription).callback(null, result.params.result);
-            }
-        });
+        if (typeof provider.request === 'function') { // EIP-1193 provider
+            this.provider.on('message', function (payload) {
+                if (payload && payload.type === 'eth_subscription' && payload.data) {
+                    const data = payload.data
+                    if (data.subscription && _this.subscriptions.has(data.subscription)) {
+                        _this.subscriptions.get(data.subscription).callback(null, data.result);
+                    }
+                }
+            })
+        } else { // legacy provider subscription event
+            this.provider.on('data', function data(result, deprecatedResult) {
+                result = result || deprecatedResult; // this is for possible old providers, which may had the error first handler
+
+                // if result is a subscription, call callback for that subscription
+                if (result.method && result.params && result.params.subscription && _this.subscriptions.has(result.params.subscription)) {
+                    _this.subscriptions.get(result.params.subscription).callback(null, result.params.result);
+                }
+            });
+        }
 
         // resubscribe if the provider has reconnected
         this.provider.on('connect', function connect() {

packages/web3-core-subscriptions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-subscriptions",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "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.3.1"
+        "web3-core-helpers": "1.3.2-rc.2"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "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.3.1",
-        "web3-core-method": "1.3.1",
-        "web3-core-requestmanager": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core-helpers": "1.3.2-rc.2",
+        "web3-core-method": "1.3.2-rc.2",
+        "web3-core-requestmanager": "1.3.2-rc.2",
+        "web3-utils": "1.3.2-rc.2"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-eth-abi/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-abi",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "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.7",
         "underscore": "1.9.1",
-        "web3-utils": "1.3.1"
+        "web3-utils": "1.3.2-rc.2"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-eth-accounts/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-accounts",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "description": "Web3 module to generate Ethereum accounts and sign data and transactions.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-accounts",
     "license": "LGPL-3.0",
@@ -21,10 +21,10 @@
         "scrypt-js": "^3.0.1",
         "underscore": "1.9.1",
         "uuid": "3.3.2",
-        "web3-core": "1.3.1",
-        "web3-core-helpers": "1.3.1",
-        "web3-core-method": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core": "1.3.2-rc.2",
+        "web3-core-helpers": "1.3.2-rc.2",
+        "web3-core-method": "1.3.2-rc.2",
+        "web3-utils": "1.3.2-rc.2"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-eth-contract/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-contract",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "description": "Web3 module to interact with Ethereum smart contracts.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-contract",
     "license": "LGPL-3.0",
@@ -16,13 +16,13 @@
     "dependencies": {
         "@types/bn.js": "^4.11.5",
         "underscore": "1.9.1",
-        "web3-core": "1.3.1",
-        "web3-core-helpers": "1.3.1",
-        "web3-core-method": "1.3.1",
-        "web3-core-promievent": "1.3.1",
-        "web3-core-subscriptions": "1.3.1",
-        "web3-eth-abi": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core": "1.3.2-rc.2",
+        "web3-core-helpers": "1.3.2-rc.2",
+        "web3-core-method": "1.3.2-rc.2",
+        "web3-core-promievent": "1.3.2-rc.2",
+        "web3-core-subscriptions": "1.3.2-rc.2",
+        "web3-eth-abi": "1.3.2-rc.2",
+        "web3-utils": "1.3.2-rc.2"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-eth-ens/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-ens",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "description": "ENS support for web3.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-ens",
     "license": "LGPL-3.0",
@@ -17,12 +17,12 @@
         "content-hash": "^2.5.2",
         "eth-ens-namehash": "2.0.8",
         "underscore": "1.9.1",
-        "web3-core": "1.3.1",
-        "web3-core-helpers": "1.3.1",
-        "web3-core-promievent": "1.3.1",
-        "web3-eth-abi": "1.3.1",
-        "web3-eth-contract": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core": "1.3.2-rc.2",
+        "web3-core-helpers": "1.3.2-rc.2",
+        "web3-core-promievent": "1.3.2-rc.2",
+        "web3-eth-abi": "1.3.2-rc.2",
+        "web3-eth-contract": "1.3.2-rc.2",
+        "web3-utils": "1.3.2-rc.2"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-eth-iban/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-iban",
-    "version": "1.3.1",
+    "version": "1.3.2-rc.2",
     "description": "This package converts Ethereum addresses to IBAN addresses a vice versa.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-iban",
     "license": "LGPL-3.0",
@@ -15,7 +15,7 @@
     "main": "lib/index.js",
     "dependencies": {
         "bn.js": "^4.11.9",
-        "web3-utils": "1.3.1"
+        "web3-utils": "1.3.2-rc.2"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",