diff --git a/docs/web3-eth-admin.rst b/docs/web3-eth-admin.rst index c5c6627d0b4..3bec1f78866 100644 --- a/docs/web3-eth-admin.rst +++ b/docs/web3-eth-admin.rst @@ -114,7 +114,7 @@ getNodeInfo admin.getNodeInfo([, callback]) -This property can be queried for all the information known about the running node at the networking granularity.. +This property can be queried for all the information known about the running node at the networking granularity. The RPC method used is ``admin_nodeInfo``. ---------- diff --git a/docs/web3-eth-debug.rst b/docs/web3-eth-debug.rst index 536e646ac97..9b247ce379d 100644 --- a/docs/web3-eth-debug.rst +++ b/docs/web3-eth-debug.rst @@ -48,7 +48,7 @@ Parameters Returns ------- -``Promise`` +``Promise`` ------- Example @@ -78,7 +78,7 @@ Parameters 1. ``file`` - ``String`` -1. ``seconds`` - ``Number`` +1. ``seconds`` - ``Number|String`` The seconds as Hex string or number. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -87,7 +87,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -119,7 +119,7 @@ Parameters 1. ``file`` - ``String`` -1. ``seconds`` - ``Number`` +1. ``seconds`` - ``Number | String`` The seconds as Hex string or number. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -128,7 +128,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -158,7 +158,7 @@ Parameters ---------- -1. ``blockNumber`` - ``Number`` +1. ``blockNumber`` - ``Number | String`` The block number as Hex string or number. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -211,7 +211,8 @@ getGCStats debug.getGCStats([, callback]) -Retrieves the state that corresponds to the block number and returns a list of accounts (including storage and code). +Returns GC statistics. +See https://golang.org/pkg/runtime/debug/#GCStats for information about the fields of the returned object. ---------- Parameters @@ -237,8 +238,6 @@ Example .. code-block:: javascript debug.getGCStats().then(console.log); - > null - ------------------------------------------------------------------------------ @@ -257,7 +256,7 @@ Parameters ---------- -1. ``number`` - ``Number`` The block number +1. ``number`` - ``Number | String`` The block number as hex string or number. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -297,7 +296,7 @@ Parameters ---------- 1. ``file`` - ``String`` -1. ``seconds`` - ``Number`` +1. ``seconds`` - ``Number | String`` The seconds as Hex string or number. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -306,7 +305,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -370,7 +369,7 @@ Fetches and retrieves the seed hash of the block by number Parameters ---------- -1. ``number`` - ``Number`` The block number. +1. ``number`` - ``Number | String`` The block number as Hex string or number. 1. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -408,7 +407,7 @@ Collected profile data can be written using ``debug.writeBlockProfile``. Parameters ---------- -1. ``number`` - ``Number`` The block profile rate. +1. ``number`` - ``Number | String`` The block profile rate as number or Hex string. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -417,7 +416,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -446,7 +445,7 @@ Use with extreme caution. Parameters ---------- -1. ``number`` - ``Number`` The block number +1. ``number`` - ``Number | String`` The block number as Hex string or number. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -455,7 +454,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -502,7 +501,6 @@ Example .. code-block:: javascript debug.getStacks().then(console.log); - > null ------------------------------------------------------------------------------ @@ -528,7 +526,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -565,7 +563,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -602,7 +600,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -638,7 +636,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -668,7 +666,7 @@ Parameters ---------- 1. ``blockRlp`` - ``String`` RLP encoded block -2. ``options`` - ``Object``The block trace object +2. ``options`` - ``Object`` The block trace object 3. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -709,7 +707,7 @@ The traceBlockByNumber method accepts a block number and will replay the block t Parameters ---------- -1. ``number`` - ``Number`` The block number +1. ``number`` - ``Number | String`` The block number as Hex string or number. 2. ``options`` - ``Object`` The block trace object 3. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -894,7 +892,7 @@ The verbosity of individual packages and source files can be raised using ``debu Parameters ---------- -1. ``level`` - ``Number`` The verbosity level +1. ``level`` - ``Number | String`` The verbosity level as Hex string or number. 1. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -903,7 +901,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -940,7 +938,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -993,7 +991,7 @@ Returns ------- -``Promise`` +``Promise`` ------- @@ -1030,7 +1028,7 @@ Returns ------- -``Promise`` +``Promise`` ------- diff --git a/docs/web3-eth-miner.rst b/docs/web3-eth-miner.rst index 4d8c257dbda..6ce1e3a64b3 100644 --- a/docs/web3-eth-miner.rst +++ b/docs/web3-eth-miner.rst @@ -77,7 +77,7 @@ Parameters ---------- -1. ``number | hex`` - Gas price. +1. ``Number | String`` - Gas price. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. @@ -161,7 +161,7 @@ Parameters ---------- -1. ``hex | number`` - Mining threads. +1. ``Number | String`` - Mining threads. 2. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second. diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst index cba1dd6e111..2a83ef21234 100644 --- a/docs/web3-eth.rst +++ b/docs/web3-eth.rst @@ -714,14 +714,16 @@ Example ------------------------------------------------------------------------------ +.. _eth-getpendingtransactions: + getPendingTransactions -===================== +====================== .. code-block:: javascript web3.eth.getPendingTransactions([, callback]) -Returns a transaction matching the given transaction hash. +Returns a list of pending transactions. ---------- Parameters @@ -737,7 +739,7 @@ Returns ------- -``Promise`` - An Arrayy of pending transactions: +``Promise`` - Array of pending transactions: - ``hash`` 32 Bytes - ``String``: Hash of the transaction. - ``nonce`` - ``Number``: The number of transactions made by the sender prior to this one. @@ -752,6 +754,7 @@ Returns - ``input`` - ``String``: The data sent along with the transaction. + ------- Example ------- @@ -761,35 +764,35 @@ Example web3.eth.getPendingTransactions().then(console.log); > [ { - blockHash: '0x0000000000000000000000000000000000000000000000000000000000000000', - blockNumber: null, - from: '0x28bdb9c230f4d5e45435e4d006326ee32e46cb31', - gas: '0x204734', - gasPrice: '0x4a817c800', - hash: '0x8dfa6a59307a490d672494a171feee09db511f05e9c097e098edc2881f9ca4f6', - input: '0x6080604052600', - nonce: '0x12', - to: null, - transactionIndex: '0x0', - value: '0x0', + hash: '0x9fc76417374aa880d4449a1f7f31ec597f00b1f6f3dd2d66f4c9c6c445836d8b', + nonce: 2, + blockHash: '0xef95f2f1ed3ca60b048b4bf67cde2195961e0bba6f70bcbea9a2c4e133e34b46', + blockNumber: 3, + transactionIndex: 0, + from: '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b', + to: '0x6295ee1b4f6dd65047762f924ecd367c17eabf8f', + value: '123450000000000000', + gas: 314159, + gasPrice: '2000000000000', + input: '0x57cb2fc4' v: '0x3d', r: '0xaabc9ddafffb2ae0bac4107697547d22d9383667d9e97f5409dd6881ce08f13f', s: '0x69e43116be8f842dcd4a0b2f760043737a59534430b762317db21d9ac8c5034' },....,{ - blockHash: '0x0000000000000000000000000000000000000000000000000000000000000000', - blockNumber: null, - from: '0x28bdb9c230f4d5e45435e4d006326ee32e487b31', - gas: '0x205940', - gasPrice: '0x4a817c800', - hash: '0x8e4340ea3983d86e4b6c44249362f716ec9e09849ef9b6e3321140581d2e4dac', - input: '0xe4b6c4424936', - nonce: '0x14', - to: null, - transactionIndex: '0x0', - value: '0x0', + hash: '0x9fc76417374aa880d4449a1f7f31ec597f00b1f6f3dd2d66f4c9c6c445836d8b', + nonce: 3, + blockHash: '0xef95f2f1ed3ca60b048b4bf67cde2195961e0bba6f70bcbea9a2c4e133e34b46', + blockNumber: 4, + transactionIndex: 0, + from: '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b', + to: '0x6295ee1b4f6dd65047762f924ecd367c17eabf8f', + value: '123450000000000000', + gas: 314159, + gasPrice: '2000000000000', + input: '0x57cb2fc4' v: '0x3d', - r: '0x1ec191ef20b0e9628c4397665977cbe7a53a263c04f6f185132b77fa0fd5ca44', - s: '0x8a58e00c63e05cfeae4f1cf19f05ce82079dc4d5857e2cc281b7797d58b5faf' + r: '0xaabc9ddafffb2ae0bac4107697547d22d9383667d9e97f5409dd6881ce08f13f', + s: '0x69e43116be8f842dcd4a0b2f760043737a59534430b762317db21d9ac8c5034' } ] diff --git a/docs/web3-utils.rst b/docs/web3-utils.rst index 8ddcd7bc59f..b1adcad517b 100644 --- a/docs/web3-utils.rst +++ b/docs/web3-utils.rst @@ -408,7 +408,7 @@ isAddress .. code-block:: javascript - web3.utils.isAddress(address) + web3.utils.isAddress(address, [, chainId]) Checks if a given string is a valid Ethereum address. It will also check the checksum, if the address has upper and lowercase letters. @@ -418,6 +418,7 @@ Parameters ---------- 1. ``address`` - ``String``: An address string. +2. ``chainId`` - ``number`` (optional): Chain id where checksummed address should be valid, defaults to ``null``. RSKIP-60 for details. ------- Returns @@ -446,15 +447,17 @@ Example web3.utils.isAddress('0xC1912fEE45d61C87Cc5EA59DaE31190FFFFf232d'); > false // wrong checksum ------------------------------------------------------------------------------- + web3.utils.isAddress('0x5aaEB6053f3e94c9b9a09f33669435E7ef1bEAeD', 30); + > true +------------------------------------------------------------------------------ toChecksumAddress -===================== +================= .. code-block:: javascript - web3.utils.toChecksumAddress(address) + web3.utils.toChecksumAddress(address[, chainId]) Will convert an upper or lowercase Ethereum address to a checksum address. @@ -463,6 +466,7 @@ Parameters ---------- 1. ``address`` - ``String``: An address string. +2. ``chainId`` - ``number`` (optional): Chain id where checksummed address should be valid, defaults to ``null``. RSKIP-60 for details. ------- Returns @@ -482,16 +486,49 @@ Example web3.utils.toChecksumAddress('0XC1912FEE45D61C87CC5EA59DAE31190FFFFF232D'); > "0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d" // same as above + web3.utils.toChecksumAddress('0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed', 30); + > "0x5aaEB6053f3e94c9b9a09f33669435E7ef1bEAeD" + ------------------------------------------------------------------------------ +stripHexPrefix +============== + + .. code-block:: javascript + web3.utils.stripHexPrefix(address) + + Removes the prefix ``0x`` from a given hex if it exists. + +---------- +Parameters +---------- + + 1. ``hex`` - ``String``: Hex + +------- +Returns +------- + + ``String``: Hex without prefix. + +------- +Example +------- + + .. code-block:: javascript + web3.utils.stripHexPrefix('0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d'); + > "c1912fEE45d61C87Cc5EA59DaE31190FFFFf232d" + + +------------------------------------------------------------------------------ checkAddressChecksum -===================== +==================== .. code-block:: javascript - web3.utils.checkAddressChecksum(address) + web3.utils.checkAddressChecksum(address [, chainId]) Checks the checksum of a given address. Will also return false on non-checksum addresses. @@ -500,6 +537,7 @@ Parameters ---------- 1. ``address`` - ``String``: An address string. +2. ``chainId`` - ``number`` (optional): Chain id where checksummed address should be valid, defaults to ``null``. RSKIP-60 for details. ------- Returns @@ -516,6 +554,9 @@ Example web3.utils.checkAddressChecksum('0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d'); > true + web3.utils.checkAddressChecksum('0x5aAeb6053F3e94c9b9A09F33669435E7EF1BEaEd', 31); + > true + ------------------------------------------------------------------------------ diff --git a/lerna.json b/lerna.json index 798a86861f8..784585c732c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "lerna": "2.0.0", "command": { "init": { diff --git a/package.json b/package.json index c3697cca6a5..bfa0cd96a75 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "web3", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Ethereum JavaScript API wrapper repository", "license": "LGPL-3.0", "main": "./packages/web3/src/index.js", diff --git a/packages/web3-bzz/package.json b/packages/web3-bzz/package.json index f2be4a5e68c..0b89030a4a2 100644 --- a/packages/web3-bzz/package.json +++ b/packages/web3-bzz/package.json @@ -1,7 +1,7 @@ { "name": "web3-bzz", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Swarm network.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-bzz", "license": "LGPL-3.0", @@ -29,5 +29,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-core-helpers/package.json b/packages/web3-core-helpers/package.json index 0ad95b5b232..fc40fd3a198 100644 --- a/packages/web3-core-helpers/package.json +++ b/packages/web3-core-helpers/package.json @@ -1,7 +1,7 @@ { "name": "web3-core-helpers", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 core tools helper for sub packages. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-core-helpers", "license": "LGPL-3.0", @@ -18,18 +18,18 @@ "dependencies": { "@babel/runtime": "^7.3.1", "lodash": "^4.17.11", - "web3-eth-iban": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-eth-iban": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", "dtslint": "0.4.2", - "web3-core": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53" }, "files": [ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-core-method/package.json b/packages/web3-core-method/package.json index c0396359612..04e014741cf 100644 --- a/packages/web3-core-method/package.json +++ b/packages/web3-core-method/package.json @@ -1,7 +1,7 @@ { "name": "web3-core-method", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Handles the JSON-RPC methods. This package is also internally used by web3.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-core-method", "license": "LGPL-3.0", @@ -25,15 +25,15 @@ "definitelytyped-header-parser": "^1.0.1", "dtslint": "0.4.2", "rxjs": "^6.4.0", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-subscriptions": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-subscriptions": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "files": [ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-core-method/src/methods/EstimateGasMethod.js b/packages/web3-core-method/src/methods/EstimateGasMethod.js index 4075d9d601f..21fb22e0e3b 100644 --- a/packages/web3-core-method/src/methods/EstimateGasMethod.js +++ b/packages/web3-core-method/src/methods/EstimateGasMethod.js @@ -50,7 +50,7 @@ export default class EstimateGasMethod extends AbstractMethod { * * @method afterExecution * - * @param {Object} response + * @param {string} response * * @returns {Number} */ diff --git a/packages/web3-core-method/src/methods/admin/NodeInfoMethod.js b/packages/web3-core-method/src/methods/admin/NodeInfoMethod.js index 6e51bd2fc5c..f0e136bf885 100644 --- a/packages/web3-core-method/src/methods/admin/NodeInfoMethod.js +++ b/packages/web3-core-method/src/methods/admin/NodeInfoMethod.js @@ -33,4 +33,22 @@ export default class NodeInfoMethod extends AbstractMethod { constructor(utils, formatters, moduleInstance) { super('admin_nodeInfo', 0, utils, formatters, moduleInstance); } + + /** + * This method will be executed after the RPC request. + * + * @method afterExecution + * + * @param {Object} response + * + * @returns {Object} + */ + afterExecution(response) { + if (response) { + response.ports.discovery = this.utils.hexToNumber(response.ports.discovery); + response.ports.listener = this.utils.hexToNumber(response.ports.listener); + } + + return response; + } } diff --git a/packages/web3-core-method/src/methods/admin/StartRpcMethod.js b/packages/web3-core-method/src/methods/admin/StartRpcMethod.js index 8af189f4e3c..ab5ce4bbef8 100644 --- a/packages/web3-core-method/src/methods/admin/StartRpcMethod.js +++ b/packages/web3-core-method/src/methods/admin/StartRpcMethod.js @@ -33,4 +33,17 @@ export default class StartRpcMethod extends AbstractMethod { constructor(utils, formatters, moduleInstance) { super('admin_startRPC', 4, utils, formatters, moduleInstance); } + + /** + * This method will be executed before the RPC request. + * + * @method beforeExecution + * + * @param {AbstractWeb3Module} moduleInstance - The package where the method is called from for example Eth. + */ + beforeExecution(moduleInstance) { + if (this.parameters[1]) { + this.parameters[1] = this.utils.numberToHex(this.parameters[1]); + } + } } diff --git a/packages/web3-core-method/src/methods/admin/StartWsMethod.js b/packages/web3-core-method/src/methods/admin/StartWsMethod.js index 12b52b06125..7650a6ae308 100644 --- a/packages/web3-core-method/src/methods/admin/StartWsMethod.js +++ b/packages/web3-core-method/src/methods/admin/StartWsMethod.js @@ -33,4 +33,17 @@ export default class StartWsMethod extends AbstractMethod { constructor(utils, formatters, moduleInstance) { super('admin_startWS', 4, utils, formatters, moduleInstance); } + + /** + * This method will be executed before the RPC request. + * + * @method beforeExecution + * + * @param {AbstractWeb3Module} moduleInstance - The package where the method is called from for example Eth. + */ + beforeExecution(moduleInstance) { + if (this.parameters[1]) { + this.parameters[1] = this.utils.numberToHex(this.parameters[1]); + } + } } diff --git a/packages/web3-core-method/src/methods/miner/SetGasPriceMethod.js b/packages/web3-core-method/src/methods/miner/SetGasPriceMethod.js index 65a0b47770e..4e66badef04 100644 --- a/packages/web3-core-method/src/methods/miner/SetGasPriceMethod.js +++ b/packages/web3-core-method/src/methods/miner/SetGasPriceMethod.js @@ -33,4 +33,15 @@ export default class SetGasPriceMethod extends AbstractMethod { constructor(utils, formatters, moduleInstance) { super('miner_setGasPrice', 1, utils, formatters, moduleInstance); } + + /** + * This method will be executed before the RPC request. + * + * @method beforeExecution + * + * @param {AbstractWeb3Module} moduleInstance - The package where the method is called from for example Eth. + */ + beforeExecution(moduleInstance) { + this.parameters[0] = this.utils.numberToHex(this.parameters[0]); + } } diff --git a/packages/web3-core-method/src/methods/miner/StartMinerMethod.js b/packages/web3-core-method/src/methods/miner/StartMinerMethod.js index e9cf84fa890..f4d78610415 100644 --- a/packages/web3-core-method/src/methods/miner/StartMinerMethod.js +++ b/packages/web3-core-method/src/methods/miner/StartMinerMethod.js @@ -33,4 +33,15 @@ export default class StartMinerMethod extends AbstractMethod { constructor(utils, formatters, moduleInstance) { super('miner_start', 1, utils, formatters, moduleInstance); } + + /** + * This method will be executed before the RPC request. + * + * @method beforeExecution + * + * @param {AbstractWeb3Module} moduleInstance - The package where the method is called from for example Eth. + */ + beforeExecution(moduleInstance) { + this.parameters[0] = this.utils.numberToHex(this.parameters[0]); + } } diff --git a/packages/web3-core-method/src/methods/node/GetProofMethod.js b/packages/web3-core-method/src/methods/node/GetProofMethod.js index 40fc233112f..e4ddbe6d257 100644 --- a/packages/web3-core-method/src/methods/node/GetProofMethod.js +++ b/packages/web3-core-method/src/methods/node/GetProofMethod.js @@ -34,6 +34,18 @@ export default class GetProofMethod extends AbstractMethod { super('eth_getProof', 3, utils, formatters, moduleInstance); } + /** + * This method will be executed before the RPC request. + * + * @method beforeExecution + * + * @param {AbstractWeb3Module} moduleInstance - The package where the method is called from for example Eth. + */ + beforeExecution(moduleInstance) { + this.parameters[0] = this.formatters.inputAddressFormatter(this.parameters[0]); + this.parameters[2] = this.formatters.inputDefaultBlockNumberFormatter(this.parameters[2], moduleInstance); + } + /** * This method will be executed after the RPC request. * diff --git a/packages/web3-core-method/src/methods/transaction/GetPendingTransactionsMethod.js b/packages/web3-core-method/src/methods/transaction/GetPendingTransactionsMethod.js index cbb3b089084..becbff13582 100644 --- a/packages/web3-core-method/src/methods/transaction/GetPendingTransactionsMethod.js +++ b/packages/web3-core-method/src/methods/transaction/GetPendingTransactionsMethod.js @@ -33,4 +33,23 @@ export default class GetPendingTransactionsMethod extends AbstractMethod { constructor(utils, formatters, moduleInstance) { super('eth_pendingTransactions', 0, utils, formatters, moduleInstance); } + + /** + * This method will be executed after the RPC request. + * + * @method afterExecution + * + * @param {Object} response + * + * @returns {Object} + */ + afterExecution(response) { + if (response) { + return response.map((item) => { + return this.formatters.outputTransactionFormatter(item); + }); + } + + return response; + } } diff --git a/packages/web3-core-method/src/methods/txpool/StatusMethod.js b/packages/web3-core-method/src/methods/txpool/StatusMethod.js index 1be278cae43..a50e0bf6942 100644 --- a/packages/web3-core-method/src/methods/txpool/StatusMethod.js +++ b/packages/web3-core-method/src/methods/txpool/StatusMethod.js @@ -33,4 +33,22 @@ export default class StatusMethod extends AbstractMethod { constructor(utils, formatters, moduleInstance) { super('txpool_status', 0, utils, formatters, moduleInstance); } + + /** + * This method will be executed after the RPC request. + * + * @method afterExecution + * + * @param {Object} response + * + * @returns {Object} + */ + afterExecution(response) { + if (response) { + response.pending = this.utils.hexToNumber(response.pending); + response.queued = this.utils.hexToNumber(response.queued); + } + + return response; + } } diff --git a/packages/web3-core-method/tests/src/methods/admin/NodeInfoMethodTest.js b/packages/web3-core-method/tests/src/methods/admin/NodeInfoMethodTest.js index 19ad450840d..b96e48c9481 100644 --- a/packages/web3-core-method/tests/src/methods/admin/NodeInfoMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/admin/NodeInfoMethodTest.js @@ -1,6 +1,10 @@ +import * as Utils from 'web3-utils'; import AbstractMethod from '../../../../lib/methods/AbstractMethod'; import NodeInfoMethod from '../../../../src/methods/admin/NodeInfoMethod'; +// Mocks +jest.mock('web3-utils'); + /** * NodeInfoMethod test */ @@ -8,7 +12,7 @@ describe('NodeInfoMethodTest', () => { let method; beforeEach(() => { - method = new NodeInfoMethod({}, {}, {}); + method = new NodeInfoMethod(Utils, {}, {}); }); it('constructor check', () => { @@ -18,4 +22,18 @@ describe('NodeInfoMethodTest', () => { expect(method.parametersAmount).toEqual(0); }); + + it('calls afterExecution and calls utils.hexToNumber', () => { + Utils.hexToNumber.mockReturnValue(1); + + expect(method.afterExecution({ports: {discovery: '0x1', listener: '0x2'}})).toEqual({ + ports: { + discovery: 1, + listener: 1 + } + }); + + expect(Utils.hexToNumber).toHaveBeenNthCalledWith(1, '0x1'); + expect(Utils.hexToNumber).toHaveBeenNthCalledWith(2, '0x2'); + }); }); diff --git a/packages/web3-core-method/tests/src/methods/admin/StartRpcMethodTest.js b/packages/web3-core-method/tests/src/methods/admin/StartRpcMethodTest.js index 060fc97f29f..af257e8597d 100644 --- a/packages/web3-core-method/tests/src/methods/admin/StartRpcMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/admin/StartRpcMethodTest.js @@ -1,6 +1,10 @@ +import * as Utils from 'web3-utils'; import AbstractMethod from '../../../../lib/methods/AbstractMethod'; import StartRpcMethod from '../../../../src/methods/admin/StartRpcMethod'; +// Mocks +jest.mock('web3-utils'); + /** * StartRpcMethod test */ @@ -8,7 +12,7 @@ describe('StartRpcMethodTest', () => { let method; beforeEach(() => { - method = new StartRpcMethod({}, {}, {}); + method = new StartRpcMethod(Utils, {}, {}); }); it('constructor check', () => { @@ -18,4 +22,16 @@ describe('StartRpcMethodTest', () => { expect(method.parametersAmount).toEqual(4); }); + + it('calls beforeExecution and calls utils.numberToHex', () => { + Utils.numberToHex.mockReturnValueOnce('0x1'); + + method.parameters = [0, 1]; + + method.beforeExecution(); + + expect(method.parameters[1]).toEqual('0x1'); + + expect(Utils.numberToHex).toHaveBeenCalledWith(1); + }); }); diff --git a/packages/web3-core-method/tests/src/methods/admin/StartWsMethodTest.js b/packages/web3-core-method/tests/src/methods/admin/StartWsMethodTest.js index 4a4ca07043a..9d32800e710 100644 --- a/packages/web3-core-method/tests/src/methods/admin/StartWsMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/admin/StartWsMethodTest.js @@ -1,6 +1,10 @@ +import * as Utils from 'web3-utils'; import AbstractMethod from '../../../../lib/methods/AbstractMethod'; import StartWsMethod from '../../../../src/methods/admin/StartWsMethod'; +// Mocks +jest.mock('web3-utils'); + /** * StartWsMethod test */ @@ -8,7 +12,7 @@ describe('StartWsMethodTest', () => { let method; beforeEach(() => { - method = new StartWsMethod({}, {}, {}); + method = new StartWsMethod(Utils, {}, {}); }); it('constructor check', () => { @@ -18,4 +22,16 @@ describe('StartWsMethodTest', () => { expect(method.parametersAmount).toEqual(4); }); + + it('calls beforeExecution and calls utils.numberToHex', () => { + Utils.numberToHex.mockReturnValueOnce('0x1'); + + method.parameters = [0, 1]; + + method.beforeExecution(); + + expect(method.parameters[1]).toEqual('0x1'); + + expect(Utils.numberToHex).toHaveBeenCalledWith(1); + }); }); diff --git a/packages/web3-core-method/tests/src/methods/debug/BlockProfileMethodTest.js b/packages/web3-core-method/tests/src/methods/debug/BlockProfileMethodTest.js index 9a37f3b9aaf..d231b69b58e 100644 --- a/packages/web3-core-method/tests/src/methods/debug/BlockProfileMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/debug/BlockProfileMethodTest.js @@ -32,5 +32,5 @@ describe('BlockProfileMethodTest', () => { expect(method.parameters[1]).toEqual('0x1'); expect(Utils.numberToHex).toHaveBeenCalledWith(1); - }) + }); }); diff --git a/packages/web3-core-method/tests/src/methods/debug/DumpBlockMethodTest.js b/packages/web3-core-method/tests/src/methods/debug/DumpBlockMethodTest.js index eeb7caad7c3..6dfac72d556 100644 --- a/packages/web3-core-method/tests/src/methods/debug/DumpBlockMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/debug/DumpBlockMethodTest.js @@ -33,5 +33,5 @@ describe('DumpBlockMethodTest', () => { expect(method.parameters[0]).toEqual('0x1'); expect(Utils.numberToHex).toHaveBeenCalledWith(1); - }) + }); }); diff --git a/packages/web3-core-method/tests/src/methods/debug/GetBlockRlpMethodTest.js b/packages/web3-core-method/tests/src/methods/debug/GetBlockRlpMethodTest.js index 016351dd8e2..d618dbe449a 100644 --- a/packages/web3-core-method/tests/src/methods/debug/GetBlockRlpMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/debug/GetBlockRlpMethodTest.js @@ -33,5 +33,5 @@ describe('GetBlockRlpMethodTest', () => { expect(method.parameters[0]).toEqual('0x1'); expect(Utils.numberToHex).toHaveBeenCalledWith(1); - }) + }); }); diff --git a/packages/web3-core-method/tests/src/methods/debug/GoTraceMethodTest.js b/packages/web3-core-method/tests/src/methods/debug/GoTraceMethodTest.js index ca4888a75ad..9f1d6b55038 100644 --- a/packages/web3-core-method/tests/src/methods/debug/GoTraceMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/debug/GoTraceMethodTest.js @@ -33,5 +33,5 @@ describe('GoTraceMethodTest', () => { expect(method.parameters[1]).toEqual('0x1'); expect(Utils.numberToHex).toHaveBeenCalledWith(1); - }) + }); }); diff --git a/packages/web3-core-method/tests/src/methods/debug/TraceBlockByNumberMethodTest.js b/packages/web3-core-method/tests/src/methods/debug/TraceBlockByNumberMethodTest.js index 6bd95f25b10..be6b0d014e0 100644 --- a/packages/web3-core-method/tests/src/methods/debug/TraceBlockByNumberMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/debug/TraceBlockByNumberMethodTest.js @@ -33,5 +33,5 @@ describe('TraceBlockByNumberMethodTest', () => { expect(method.parameters[0]).toEqual('0x1'); expect(Utils.numberToHex).toHaveBeenCalledWith(1); - }) + }); }); diff --git a/packages/web3-core-method/tests/src/methods/miner/SetGasPriceMethodTest.js b/packages/web3-core-method/tests/src/methods/miner/SetGasPriceMethodTest.js index a2603c74417..5afc4f28b31 100644 --- a/packages/web3-core-method/tests/src/methods/miner/SetGasPriceMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/miner/SetGasPriceMethodTest.js @@ -1,6 +1,10 @@ +import * as Utils from 'web3-utils'; import AbstractMethod from '../../../../lib/methods/AbstractMethod'; import SetGasPriceMethod from '../../../../src/methods/miner/SetGasPriceMethod'; +// Mocks +jest.mock('web3-utils'); + /** * SetGasPriceMethod test */ @@ -8,7 +12,7 @@ describe('SetGasPriceMethodTest', () => { let method; beforeEach(() => { - method = new SetGasPriceMethod({}, {}, {}); + method = new SetGasPriceMethod(Utils, {}, {}); }); it('constructor check', () => { @@ -18,4 +22,16 @@ describe('SetGasPriceMethodTest', () => { expect(method.parametersAmount).toEqual(1); }); + + it('beforeExecution should call Utils.numberToHex', () => { + method.parameters = [1]; + + Utils.numberToHex.mockReturnValueOnce('0x1'); + + method.beforeExecution({}); + + expect(method.parameters[0]).toEqual('0x1'); + + expect(Utils.numberToHex).toHaveBeenCalledWith(1); + }); }); diff --git a/packages/web3-core-method/tests/src/methods/miner/StartMinerMethodTest.js b/packages/web3-core-method/tests/src/methods/miner/StartMinerMethodTest.js index 670e583524d..2912ed8d926 100644 --- a/packages/web3-core-method/tests/src/methods/miner/StartMinerMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/miner/StartMinerMethodTest.js @@ -1,6 +1,10 @@ +import * as Utils from 'web3-utils'; import AbstractMethod from '../../../../lib/methods/AbstractMethod'; import StartMinerMethod from '../../../../src/methods/miner/StartMinerMethod'; +// Mocks +jest.mock('web3-utils'); + /** * StartMinerMethod test */ @@ -8,7 +12,7 @@ describe('StartMinerMethodTest', () => { let method; beforeEach(() => { - method = new StartMinerMethod({}, {}, {}); + method = new StartMinerMethod(Utils, {}, {}); }); it('constructor check', () => { @@ -18,4 +22,16 @@ describe('StartMinerMethodTest', () => { expect(method.parametersAmount).toEqual(1); }); + + it('beforeExecution should call Utils.numberToHex', () => { + method.parameters = [1]; + + Utils.numberToHex.mockReturnValueOnce('0x1'); + + method.beforeExecution({}); + + expect(method.parameters[0]).toEqual('0x1'); + + expect(Utils.numberToHex).toHaveBeenCalledWith(1); + }); }); diff --git a/packages/web3-core-method/tests/src/methods/node/GetProofMethodTest.js b/packages/web3-core-method/tests/src/methods/node/GetProofMethodTest.js index 54a456c9697..adb847f9130 100644 --- a/packages/web3-core-method/tests/src/methods/node/GetProofMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/node/GetProofMethodTest.js @@ -1,7 +1,11 @@ import * as Utils from 'web3-utils'; +import {formatters} from 'web3-core-helpers'; import AbstractMethod from '../../../../lib/methods/AbstractMethod'; import GetProofMethod from '../../../../src/methods/node/GetProofMethod'; +// Mocks +jest.mock('web3-core-helpers'); + /** * GetProofMethod test */ @@ -9,7 +13,7 @@ describe('GetProofMethodTest', () => { let method; beforeEach(() => { - method = new GetProofMethod(Utils, null, {}); + method = new GetProofMethod(Utils, formatters, {}); }); it('constructor check', () => { @@ -18,10 +22,21 @@ describe('GetProofMethodTest', () => { expect(method.rpcMethod).toEqual('eth_getProof'); expect(method.parametersAmount).toEqual(3); + }); + + it('beforeExecution should call inputAddressFormatter and inputDefaultBlockNumberFormatter', () => { + method.parameters = ['address', '', 'latest']; + + formatters.inputAddressFormatter.mockReturnValueOnce('0x0'); + formatters.inputDefaultBlockNumberFormatter.mockReturnValueOnce('0x0'); + + method.beforeExecution({}); - expect(method.utils).toEqual(Utils); + expect(method.parameters[0]).toEqual('0x0'); + expect(method.parameters[2]).toEqual('0x0'); - expect(method.formatters).toEqual(null); + expect(formatters.inputAddressFormatter).toHaveBeenCalledWith('address'); + expect(formatters.inputDefaultBlockNumberFormatter).toHaveBeenCalledWith('latest', {}); }); it('afterExecution should map the response', () => { diff --git a/packages/web3-core-method/tests/src/methods/transaction/GetPendingTransactionsMethodTest.js b/packages/web3-core-method/tests/src/methods/transaction/GetPendingTransactionsMethodTest.js index 8e595e33909..5b1f85bf80e 100644 --- a/packages/web3-core-method/tests/src/methods/transaction/GetPendingTransactionsMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/transaction/GetPendingTransactionsMethodTest.js @@ -26,4 +26,20 @@ describe('GetPendingTransactionsMethodTest', () => { expect(method.formatters).toEqual(formatters); }); + + it('calls afterExecution and returns the expected value', () => { + formatters.outputTransactionFormatter.mockReturnValueOnce({status: true}); + + expect(method.afterExecution([{status: false}])).toEqual([{status: true}]); + + expect(formatters.outputTransactionFormatter).toHaveBeenCalledWith({status: false}); + }); + + it('calls afterExecution with an empty array and returns the expected value', () => { + expect(method.afterExecution([])).toEqual([]); + }); + + it('calls afterExecution with null and returns the expected value', () => { + expect(method.afterExecution(null)).toEqual(null); + }); }); diff --git a/packages/web3-core-method/tests/src/methods/transaction/SendTransactionMethodTest.js b/packages/web3-core-method/tests/src/methods/transaction/SendTransactionMethodTest.js index 3c3292ea302..60164c05bd3 100644 --- a/packages/web3-core-method/tests/src/methods/transaction/SendTransactionMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/transaction/SendTransactionMethodTest.js @@ -21,7 +21,7 @@ describe('SendTransactionMethodTest', () => { expect(method.rpcMethod).toEqual('eth_sendTransaction'); }); - it('beforeExecution should call inputAddressFormatter and inputDefaultBlockNumberFormatter', () => { + it('beforeExecution should call the inputTransactionFormatter', () => { method.parameters = ['tx']; formatters.inputTransactionFormatter.mockReturnValueOnce('0x0'); diff --git a/packages/web3-core-method/tests/src/methods/txpool/StatusMethodTest.js b/packages/web3-core-method/tests/src/methods/txpool/StatusMethodTest.js index b58e939450c..2c1ffeb0546 100644 --- a/packages/web3-core-method/tests/src/methods/txpool/StatusMethodTest.js +++ b/packages/web3-core-method/tests/src/methods/txpool/StatusMethodTest.js @@ -1,6 +1,10 @@ +import * as Utils from 'web3-utils'; import AbstractMethod from '../../../../lib/methods/AbstractMethod'; import StatusMethod from '../../../../src/methods/txpool/StatusMethod'; +// Mocks +jest.mock('web3-utils'); + /** * StatusMethod test */ @@ -8,7 +12,7 @@ describe('StatusMethodTest', () => { let method; beforeEach(() => { - method = new StatusMethod({}, {}, {}); + method = new StatusMethod(Utils, {}, {}); }); it('constructor check', () => { @@ -18,4 +22,13 @@ describe('StatusMethodTest', () => { expect(method.parametersAmount).toEqual(0); }); + + it('calls afterExecution and returns the expected object', () => { + Utils.hexToNumber.mockReturnValue(1); + + expect(method.afterExecution({pending: '0x1', queued: '0x1'})).toEqual({pending: 1, queued: 1}); + + expect(Utils.hexToNumber).toHaveBeenNthCalledWith(1, '0x1'); + expect(Utils.hexToNumber).toHaveBeenNthCalledWith(2, '0x1'); + }); }); diff --git a/packages/web3-core-subscriptions/package.json b/packages/web3-core-subscriptions/package.json index 3976fb73122..33d3ad80513 100644 --- a/packages/web3-core-subscriptions/package.json +++ b/packages/web3-core-subscriptions/package.json @@ -1,7 +1,7 @@ { "name": "web3-core-subscriptions", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Manages web3 subscriptions. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-core-subscriptions", "license": "LGPL-3.0", @@ -22,11 +22,11 @@ "devDependencies": { "definitelytyped-header-parser": "^1.0.1", "dtslint": "0.4.2", - "web3-core-helpers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core-helpers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "files": [ "dist" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json index 6977a6b300e..1294926ba21 100644 --- a/packages/web3-core/package.json +++ b/packages/web3-core/package.json @@ -1,7 +1,7 @@ { "name": "web3-core", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 core tools for sub packages. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-core", "license": "LGPL-3.0", @@ -20,18 +20,18 @@ "@types/bn.js": "^4.11.4", "@types/node": "^10.12.18", "lodash": "^4.17.11", - "web3-utils": "1.0.0-beta.52" + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", "dtslint": "0.4.2", - "web3-core-method": "1.0.0-beta.52", - "web3-eth-accounts": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52" + "web3-core-method": "1.0.0-beta.53", + "web3-eth-accounts": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53" }, "files": [ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-abi/package.json b/packages/web3-eth-abi/package.json index 8c1c2298bd4..5748c1561ea 100644 --- a/packages/web3-eth-abi/package.json +++ b/packages/web3-eth-abi/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-abi", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module encode and decode EVM in/output.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-abi", "license": "LGPL-3.0", @@ -19,7 +19,7 @@ "@babel/runtime": "^7.3.1", "ethers": "^4.0.27", "lodash": "^4.17.11", - "web3-utils": "1.0.0-beta.52" + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -29,5 +29,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json index 69f1a25a31d..b7f40dbb429 100644 --- a/packages/web3-eth-accounts/package.json +++ b/packages/web3-eth-accounts/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-accounts", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to generate Ethereum accounts and sign data and transactions.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-accounts", "license": "LGPL-3.0", @@ -22,11 +22,11 @@ "lodash": "^4.17.11", "scrypt.js": "0.2.0", "uuid": "3.3.2", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -36,5 +36,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-admin/package.json b/packages/web3-eth-admin/package.json index 0c4fc856c53..08ff9793629 100644 --- a/packages/web3-eth-admin/package.json +++ b/packages/web3-eth-admin/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-admin", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-admin", "license": "LGPL-3.0", @@ -17,12 +17,12 @@ "types": "types/index.d.ts", "dependencies": { "@babel/runtime": "^7.3.1", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -32,5 +32,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json index 1197c94e702..1ab0af80177 100644 --- a/packages/web3-eth-contract/package.json +++ b/packages/web3-eth-contract/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-contract", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with Ethereum smart contracts.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-contract", "license": "LGPL-3.0", @@ -19,14 +19,14 @@ "@babel/runtime": "^7.3.1", "@types/bn.js": "^4.11.4", "lodash": "^4.17.11", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-core-subscriptions": "1.0.0-beta.52", - "web3-eth-abi": "1.0.0-beta.52", - "web3-eth-accounts": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-core-subscriptions": "1.0.0-beta.53", + "web3-eth-abi": "1.0.0-beta.53", + "web3-eth-accounts": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -36,5 +36,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-debug/package.json b/packages/web3-eth-debug/package.json index d5b32dee7dd..0141283d782 100644 --- a/packages/web3-eth-debug/package.json +++ b/packages/web3-eth-debug/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-debug", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-debug", "license": "LGPL-3.0", @@ -17,12 +17,12 @@ "types": "types/index.d.ts", "dependencies": { "@babel/runtime": "^7.3.1", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -32,5 +32,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-ens/package.json b/packages/web3-eth-ens/package.json index bb058e0bb69..7757ecf2933 100644 --- a/packages/web3-eth-ens/package.json +++ b/packages/web3-eth-ens/package.json @@ -1,6 +1,6 @@ { "name": "web3-eth-ens", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "ENS support for web3.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-ens", "license": "LGPL-3.0", @@ -18,23 +18,23 @@ "@babel/runtime": "^7.3.1", "eth-ens-namehash": "2.0.8", "lodash": "^4.17.11", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-eth-abi": "1.0.0-beta.52", - "web3-eth-contract": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-eth-abi": "1.0.0-beta.53", + "web3-eth-contract": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", "dtslint": "0.4.2", - "web3-eth-accounts": "1.0.0-beta.52" + "web3-eth-accounts": "1.0.0-beta.53" }, "files": [ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-iban/package.json b/packages/web3-eth-iban/package.json index 961a60fa9ae..37392e00592 100644 --- a/packages/web3-eth-iban/package.json +++ b/packages/web3-eth-iban/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-iban", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "This package converts Ethereum addresses to IBAN addresses a vice versa.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-iban", "license": "LGPL-3.0", @@ -18,7 +18,7 @@ "dependencies": { "@babel/runtime": "^7.3.1", "bn.js": "4.11.8", - "web3-utils": "1.0.0-beta.52" + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -28,5 +28,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-miner/package.json b/packages/web3-eth-miner/package.json index a65a1907e9a..71c43f8ed35 100644 --- a/packages/web3-eth-miner/package.json +++ b/packages/web3-eth-miner/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-miner", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-miner", "license": "LGPL-3.0", @@ -17,12 +17,12 @@ "types": "types/index.d.ts", "dependencies": { "@babel/runtime": "^7.3.1", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -32,5 +32,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-personal/package.json b/packages/web3-eth-personal/package.json index f6b92ff0fae..132b74557df 100644 --- a/packages/web3-eth-personal/package.json +++ b/packages/web3-eth-personal/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-personal", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-personal", "license": "LGPL-3.0", @@ -17,13 +17,13 @@ "types": "types/index.d.ts", "dependencies": { "@babel/runtime": "^7.3.1", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52", - "web3-eth-accounts": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-eth-accounts": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -33,5 +33,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth-txpool/package.json b/packages/web3-eth-txpool/package.json index bc8ca6cd917..b8756837a38 100644 --- a/packages/web3-eth-txpool/package.json +++ b/packages/web3-eth-txpool/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth-txpool", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-txpool", "license": "LGPL-3.0", @@ -17,12 +17,12 @@ "types": "types/index.d.ts", "dependencies": { "@babel/runtime": "^7.3.1", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -32,5 +32,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-eth/package.json b/packages/web3-eth/package.json index a413e3d47e9..bbd934d51ed 100644 --- a/packages/web3-eth/package.json +++ b/packages/web3-eth/package.json @@ -1,7 +1,7 @@ { "name": "web3-eth", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Ethereum blockchain and smart contracts.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth", "license": "LGPL-3.0", @@ -19,19 +19,19 @@ "@babel/runtime": "^7.3.1", "ethereumjs-tx": "^1.3.7", "rxjs": "^6.4.0", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-core-subscriptions": "1.0.0-beta.52", - "web3-eth-abi": "1.0.0-beta.52", - "web3-eth-accounts": "1.0.0-beta.52", - "web3-eth-contract": "1.0.0-beta.52", - "web3-eth-ens": "1.0.0-beta.52", - "web3-eth-iban": "1.0.0-beta.52", - "web3-eth-personal": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-core-subscriptions": "1.0.0-beta.53", + "web3-eth-abi": "1.0.0-beta.53", + "web3-eth-accounts": "1.0.0-beta.53", + "web3-eth-contract": "1.0.0-beta.53", + "web3-eth-ens": "1.0.0-beta.53", + "web3-eth-iban": "1.0.0-beta.53", + "web3-eth-personal": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -41,5 +41,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-net/package.json b/packages/web3-net/package.json index 12fed4d7adc..23a52d47a16 100644 --- a/packages/web3-net/package.json +++ b/packages/web3-net/package.json @@ -1,7 +1,7 @@ { "name": "web3-net", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Ethereum nodes networking properties.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-net", "license": "LGPL-3.0", @@ -18,11 +18,11 @@ "dependencies": { "@babel/runtime": "^7.3.1", "lodash": "^4.17.11", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -32,5 +32,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-providers/package.json b/packages/web3-providers/package.json index ae0af83b389..7347373eb21 100644 --- a/packages/web3-providers/package.json +++ b/packages/web3-providers/package.json @@ -1,7 +1,7 @@ { "name": "web3-providers", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to handle requests to external providers.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-providers", "license": "LGPL-3.0", @@ -27,14 +27,14 @@ "devDependencies": { "definitelytyped-header-parser": "^1.0.1", "dtslint": "0.4.2", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "files": [ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-shh/package.json b/packages/web3-shh/package.json index c5085e796e3..388531d2ef3 100644 --- a/packages/web3-shh/package.json +++ b/packages/web3-shh/package.json @@ -1,7 +1,7 @@ { "name": "web3-shh", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Web3 module to interact with the Whisper messaging protocol.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-shh", "license": "LGPL-3.0", @@ -17,13 +17,13 @@ }, "dependencies": { "@babel/runtime": "^7.3.1", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-core-subscriptions": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-core-subscriptions": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -33,5 +33,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3-utils/package.json b/packages/web3-utils/package.json index 66ce39fda74..90ec804c61b 100644 --- a/packages/web3-utils/package.json +++ b/packages/web3-utils/package.json @@ -1,7 +1,7 @@ { "name": "web3-utils", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Collection of utility functions used in web3.js.", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3-utils", "license": "LGPL-3.0", @@ -36,5 +36,5 @@ "dist", "types/index.d.ts" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" } diff --git a/packages/web3/package-lock.json b/packages/web3/package-lock.json index 99897b4e234..41999b0e7dc 100644 --- a/packages/web3/package-lock.json +++ b/packages/web3/package-lock.json @@ -1,6 +1,6 @@ { "name": "web3", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/web3/package.json b/packages/web3/package.json index 9b37a81b7ed..b4fd2a4af4a 100644 --- a/packages/web3/package.json +++ b/packages/web3/package.json @@ -1,7 +1,7 @@ { "name": "web3", "namespace": "ethereum", - "version": "1.0.0-beta.52", + "version": "1.0.0-beta.53", "description": "Ethereum JavaScript API", "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3", "license": "LGPL-3.0", @@ -59,16 +59,16 @@ "dependencies": { "@babel/runtime": "^7.3.1", "@types/node": "^10.12.18", - "web3-bzz": "1.0.0-beta.52", - "web3-core": "1.0.0-beta.52", - "web3-core-helpers": "1.0.0-beta.52", - "web3-core-method": "1.0.0-beta.52", - "web3-eth": "1.0.0-beta.52", - "web3-eth-personal": "1.0.0-beta.52", - "web3-net": "1.0.0-beta.52", - "web3-providers": "1.0.0-beta.52", - "web3-shh": "1.0.0-beta.52", - "web3-utils": "1.0.0-beta.52" + "web3-bzz": "1.0.0-beta.53", + "web3-core": "1.0.0-beta.53", + "web3-core-helpers": "1.0.0-beta.53", + "web3-core-method": "1.0.0-beta.53", + "web3-eth": "1.0.0-beta.53", + "web3-eth-personal": "1.0.0-beta.53", + "web3-net": "1.0.0-beta.53", + "web3-providers": "1.0.0-beta.53", + "web3-shh": "1.0.0-beta.53", + "web3-utils": "1.0.0-beta.53" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", @@ -79,5 +79,5 @@ "types/index.d.ts", "angular-patch.js" ], - "gitHead": "1c89f503c90180598910d29892f6ebf92455cfe1" + "gitHead": "d955a98a5fc8819ff866254ff7141a10b503b5cd" }