EIP1559

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.6",
+  "version": "1.4.0-rc.0",
   "lerna": "2.0.0",
   "command": {
     "init": {

packages/web3-bzz/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-bzz",
-    "version": "1.3.6",
+    "version": "1.4.0-rc.0",
     "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.6",
+    "version": "1.4.0-rc.0",
     "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.12.1",
-        "web3-eth-iban": "1.3.6",
-        "web3-utils": "1.3.6"
+        "web3-eth-iban": "1.4.0-rc.0",
+        "web3-utils": "1.4.0-rc.0"
     },
     "devDependencies": {
         "@types/node": "^12.12.6",

packages/web3-core-method/package.json

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

packages/web3-core-promievent/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-promievent",
-    "version": "1.3.6",
+    "version": "1.4.0-rc.0",
     "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.6",
+    "version": "1.4.0-rc.0",
     "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.12.1",
         "util": "^0.12.0",
-        "web3-core-helpers": "1.3.6",
-        "web3-providers-http": "1.3.6",
-        "web3-providers-ipc": "1.3.6",
-        "web3-providers-ws": "1.3.6"
+        "web3-core-helpers": "1.4.0-rc.0",
+        "web3-providers-http": "1.4.0-rc.0",
+        "web3-providers-ipc": "1.4.0-rc.0",
+        "web3-providers-ws": "1.4.0-rc.0"
     }
 }

packages/web3-core-subscriptions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-subscriptions",
-    "version": "1.3.6",
+    "version": "1.4.0-rc.0",
     "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.12.1",
-        "web3-core-helpers": "1.3.6"
+        "web3-core-helpers": "1.4.0-rc.0"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core/package.json

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

packages/web3-eth-abi/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-abi",
-    "version": "1.3.6",
+    "version": "1.4.0-rc.0",
     "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.12.1",
-        "web3-utils": "1.3.6"
+        "web3-utils": "1.4.0-rc.0"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-eth-accounts/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-accounts",
-    "version": "1.3.6",
+    "version": "1.4.0-rc.0",
     "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",
@@ -22,10 +22,10 @@
         "scrypt-js": "^3.0.1",
         "underscore": "1.12.1",
         "uuid": "3.3.2",
-        "web3-core": "1.3.6",
-        "web3-core-helpers": "1.3.6",
-        "web3-core-method": "1.3.6",
-        "web3-utils": "1.3.6"
+        "web3-core": "1.4.0-rc.0",
+        "web3-core-helpers": "1.4.0-rc.0",
+        "web3-core-method": "1.4.0-rc.0",
+        "web3-utils": "1.4.0-rc.0"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-eth-accounts/src/index.js

@@ -81,7 +81,17 @@ var Accounts = function Accounts() {
             }, function() {
                 return 'latest';
             }]
-        })
+        }),
+        new Method({
+            name: 'getBlockByNumber',
+            call: 'eth_getBlockByNumber',
+            params: 2,
+            inputFormatter: [function(blockNumber) {
+                return blockNumber ? utils.toHex(blockNumber) : 'latest'
+            }, function() {
+                return false
+            }]
+        }),
     ];
     // attach methods to this._ethereumCall
     this._ethereumCall = {};
@@ -162,6 +172,9 @@ Accounts.prototype.signTransaction = function signTransaction(tx, privateKey, ca
             if (transaction.accessList) {
                 // EIP-2930
                 transaction.type = "0x01"
+            } else if (transaction.maxPriorityFeePerGas || transaction.maxFeePerGas) {
+                // EIP-1559
+                transaction.type = "0x02"
             }
 
             // Because tx has no @ethereumjs/tx signing options we use fetched vals.
@@ -173,7 +186,7 @@ Accounts.prototype.signTransaction = function signTransaction(tx, privateKey, ca
                         networkId: transaction.networkId,
                         chainId: transaction.chainId
                     },
-                    transaction.hardfork || "berlin"
+                    transaction.hardfork || "london"
                 );
 
                 delete transaction.networkId;
@@ -186,7 +199,7 @@ Accounts.prototype.signTransaction = function signTransaction(tx, privateKey, ca
                             networkId: transaction.common.customChain.networkId,
                             chainId: transaction.common.customChain.chainId
                         },
-                        transaction.common.hardfork || "berlin",
+                        transaction.common.hardfork || "london",
                     );
 
                     delete transaction.common;
@@ -241,21 +254,41 @@ Accounts.prototype.signTransaction = function signTransaction(tx, privateKey, ca
 
 
     // Resolve immediately if nonce, chainId, price and signing options are provided
-    if (tx.nonce !== undefined && tx.chainId !== undefined && tx.gasPrice !== undefined && hasTxSigningOptions) {
+    if (
+        tx.nonce !== undefined &&
+        tx.chainId !== undefined &&
+        (
+            tx.gasPrice !== undefined ||
+            (
+                tx.maxFeePerGas !== undefined &&
+                tx.maxPriorityFeePerGas !== undefined
+            )
+        ) &&
+        hasTxSigningOptions
+    ) {
         return Promise.resolve(signed(tx));
     }
 
     // Otherwise, get the missing info from the Ethereum Node
     return Promise.all([
         isNot(tx.chainId) ? _this._ethereumCall.getChainId() : tx.chainId,
-        isNot(tx.gasPrice) ? _this._ethereumCall.getGasPrice() : tx.gasPrice,
+        // isNot(tx.gasPrice) ? _this._ethereumCall.getGasPrice() : tx.gasPrice,
+        _handleTxPricing(tx),
         isNot(tx.nonce) ? _this._ethereumCall.getTransactionCount(_this.privateKeyToAccount(privateKey).address) : tx.nonce,
         isNot(hasTxSigningOptions) ? _this._ethereumCall.getNetworkId() : 1
     ]).then(function(args) {
         if (isNot(args[0]) || isNot(args[1]) || isNot(args[2]) || isNot(args[3])) {
             throw new Error('One of the values "chainId", "networkId", "gasPrice", or "nonce" couldn\'t be fetched: ' + JSON.stringify(args));
         }
-        return signed(_.extend(tx, {chainId: args[0], gasPrice: args[1], nonce: args[2], networkId: args[3]}));
+        return signed(_.extend(
+            tx,
+            {
+                chainId: args[0],
+                nonce: args[2],
+                networkId: args[3],
+                ...args[1] // Will either be gasPrice or maxFeePerGas and maxPriorityFeePerGas
+            }
+        ));
     });
 };
 
@@ -287,6 +320,30 @@ function _validateTransactionForSigning(tx) {
     return;
 }
 
+function _handleTxPricing(tx) {
+    new Promise((resolve, reject) => {
+        try {
+            Promise.all([
+                _this._ethereumCall.getBlockByNumber(),
+                _this._ethereumCall.getGasPrice()
+            ]).then(responses => {
+                const [block, gasPrice] = responses;
+                if (block && block.baseFee) {
+                    // Taken from https://github.com/ethers-io/ethers.js/blob/c5bca7767e3f3d43e3d0bd3c9e9420321ee9907a/packages/abstract-provider/src.ts/index.ts#L228
+                    resolve({
+                        maxFeePerGas: tx.maxFeePerGas || utils.toHex(utils.toBN(block.baseFee).mul(2)),
+                        maxPriorityFeePerGas: tx.maxPriorityFeePerGas || '0x1'
+                    });
+                } else {
+                    resolve({ gasPrice });
+                }
+            })
+        } catch (error) {
+            reject(e)
+        }
+    })
+}
+
 /* jshint ignore:start */
 Accounts.prototype.recoverTransaction = function recoverTransaction(rawTx, txOptions = {}) {
     // Rely on EthereumJs/tx to determine the type of transaction

packages/web3-eth-contract/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-contract",
-    "version": "1.3.6",
+    "version": "1.4.0-rc.0",
     "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.12.1",
-        "web3-core": "1.3.6",
-        "web3-core-helpers": "1.3.6",
-        "web3-core-method": "1.3.6",
-        "web3-core-promievent": "1.3.6",
-        "web3-core-subscriptions": "1.3.6",
-        "web3-eth-abi": "1.3.6",
-        "web3-utils": "1.3.6"
+        "web3-core": "1.4.0-rc.0",
+        "web3-core-helpers": "1.4.0-rc.0",
+        "web3-core-method": "1.4.0-rc.0",
+        "web3-core-promievent": "1.4.0-rc.0",
+        "web3-core-subscriptions": "1.4.0-rc.0",
+        "web3-eth-abi": "1.4.0-rc.0",
+        "web3-utils": "1.4.0-rc.0"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",