Merge pull request #2751 from ethereum/release/1.0.0-beta.53

Release - 1.0.0-beta.53

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``.
 
 ----------

docs/web3-eth-debug.rst

@@ -48,7 +48,7 @@ Parameters
 Returns
 -------
 
-``Promise<boolean>``
+``Promise<null>``
 
 -------
 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<boolean>``
+``Promise<null>``
 
 
 -------
@@ -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<boolean>``
+``Promise<null>``
 
 
 -------
@@ -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<boolean>``
+``Promise<null>``
 
 
 -------
@@ -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<boolean>``
+``Promise<null>``
 
 
 -------
@@ -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<boolean>``
+``Promise<null>``
 
 
 -------
@@ -502,7 +501,6 @@ Example
 .. code-block:: javascript
 
     debug.getStacks().then(console.log);
-    > null
 
 ------------------------------------------------------------------------------
 
@@ -528,7 +526,7 @@ Returns
 -------
 
 
-``Promise<boolean>``
+``Promise<null>``
 
 
 -------
@@ -565,7 +563,7 @@ Returns
 -------
 
 
-``Promise<boolean>``
+``Promise<null>``
 
 
 -------
@@ -602,7 +600,7 @@ Returns
 -------
 
 
-``Promise<boolean>``
+``Promise<null>``
 
 
 -------
@@ -638,7 +636,7 @@ Returns
 -------
 
 
-``Promise<boolean>``
+``Promise<null>``
 
 
 -------
@@ -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<boolean>``
+``Promise<null>``
 
 
 -------
@@ -940,7 +938,7 @@ Returns
 -------
 
 
-``Promise<boolean>``
+``Promise<null>``
 
 
 -------
@@ -993,7 +991,7 @@ Returns
 -------
 
 
-``Promise<boolean>``
+``Promise<null>``
 
 
 -------
@@ -1030,7 +1028,7 @@ Returns
 -------
 
 
-``Promise<boolean>``
+``Promise<null>``
 
 
 -------

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.
 
 

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<object>`` - An Arrayy of pending transactions:
+``Promise<object[]>`` - 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'
         }
    ]