Types back-port from 2.x with changes to match the 1.x logic

.gitignore

@@ -15,4 +15,5 @@ bower_components
 .vscode/
 dist/
 packages/web3/dist/
+lerna-debug.log
 !./dist/web3.min.js

README.md

@@ -10,7 +10,6 @@
 This is the Ethereum [JavaScript API][docs]
 which connects to the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) spec.
 
-
 You need to run a local or remote [Ethereum](https://www.ethereum.org/) node to use this library.
 
 Please read the [documentation][docs] for more.
@@ -31,15 +30,15 @@ yarn add web3
 
 ### Meteor
 
-*Note*: works only in the Browser for now. (PR welcome).
+_Note_: works only in the Browser for now. (PR welcome).
 
 ```bash
 meteor add ethereum:web3
 ```
 
 ### In the Browser
 
-Use the prebuild ``dist/web3.min.js``, or
+Use the prebuild `dist/web3.min.js`, or
 build using the [web3.js][repo] repository:
 
 ```bash
@@ -76,40 +75,39 @@ web3.setProvider(new Web3.providers.WebsocketProvider('ws://localhost:8546'));
 There you go, now you can use it:
 
 ```js
-web3.eth.getAccounts()
-.then(console.log);
+web3.eth.getAccounts().then(console.log);
 ```
 
 ### Usage with TypeScript
 
-Type definitions are maintained at [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped) by others. You can install them with:
-
-```bash
-npm install --dev @types/web3.js
-```
-
-You might need to install type definitions for `bignumber.js` and `lodash` too.
+We support types within the repo itself. Please open an issue here if you find any wrong types.
 
-And then use `web3.js` as follows:
+You can use `web3.js` as follows:
 
 ```typescript
-import Web3 = require("web3"); // Note the special syntax! Copy this line when in doubt!
-const web3 = new Web3("ws://localhost:8546");
+import Web3 from 'web3';
+const web3 = new Web3('ws://localhost:8546');
 ```
 
-**Please note:** We do not support TypeScript ourselves. If you have any issue with TypeScript and `web3.js` do not create an issue here. Go over to DefinitelyTyped and do it there.
+If you are using the types in a `commonjs` module like for example a node app you just have to enable `esModuleInterop` in your `tsconfig` compile option, also enable `allowSyntheticDefaultImports` for typesystem compatibility:
+
+```js
+"compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    ....
+```
 
 ## Documentation
 
 Documentation can be found at [read the docs][docs].
 
-
 ## Building
 
 ### Requirements
 
-* [Node.js](https://nodejs.org)
-* [npm](https://www.npmjs.com/)
+-   [Node.js](https://nodejs.org)
+-   [npm](https://www.npmjs.com/)
 
 ```bash
 sudo apt-get update
@@ -133,7 +131,6 @@ npm run-script build-all
 
 This will put all the browser build files into the `dist` folder.
 
-
 ### Testing (mocha)
 
 ```bash
@@ -142,22 +139,22 @@ npm test
 
 ### Contributing
 
-- All contributions have to go into develop, or the 1.0 branch
-- Please follow the code style of the other files, we use 4 spaces as tabs.
+-   All contributions have to go into develop, or the 1.0 branch
+-   Please follow the code style of the other files, we use 4 spaces as tabs.
 
 ### Community
- - [Gitter](https://gitter.im/ethereum/web3.js?source=orgpage)
- - [Forum](https://forum.ethereum.org/categories/ethereum-js)
 
+-   [Gitter](https://gitter.im/ethereum/web3.js?source=orgpage)
+-   [Forum](https://forum.ethereum.org/categories/ethereum-js)
 
 ### Similar libraries in other languages
- - Python - [Web3.py](https://github.com/ethereum/web3.py)
- - Haskell - [hs-web3](https://github.com/airalab/hs-web3)		   
- - Java - [web3j](https://github.com/web3j/web3j)		   
- - Scala - [web3j-scala](https://github.com/mslinn/web3j-scala)
- - Purescript - [purescript-web3](https://github.com/f-o-a-m/purescript-web3)
- - PHP - [web3.php](https://github.com/sc0Vu/web3.php)
 
+-   Python - [Web3.py](https://github.com/ethereum/web3.py)
+-   Haskell - [hs-web3](https://github.com/airalab/hs-web3)
+-   Java - [web3j](https://github.com/web3j/web3j)
+-   Scala - [web3j-scala](https://github.com/mslinn/web3j-scala)
+-   Purescript - [purescript-web3](https://github.com/f-o-a-m/purescript-web3)
+-   PHP - [web3.php](https://github.com/sc0Vu/web3.php)
 
 [repo]: https://github.com/ethereum/web3.js
 [docs]: http://web3js.readthedocs.io/

docs/web3-eth-personal.rst

@@ -239,6 +239,54 @@ Example
 
 ------------------------------------------------------------------------------
 
+sendTransaction
+=====================
+
+.. code-block:: javascript
+
+    web3.eth.personal.sendTransaction(transactionOptions, password [, callback])
+
+This method sends a transaction over the management API.
+
+.. note:: Sending your account password over an unsecured HTTP RPC connection is highly unsecure.
+
+----------
+Parameters
+----------
+
+
+1. ``Object`` - The transaction options
+2. ``String`` - The passphrase for the current account
+3. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second.
+
+
+-------
+Returns
+-------
+
+
+``Promise<string>`` - The transaction hash.
+
+
+-------
+Example
+-------
+
+
+.. code-block:: javascript
+
+    web3.eth.sendTransaction({
+        from: "0xEB014f8c8B418Db6b45774c326A0E64C78914dC0",
+        gasPrice: "20000000000",
+        gas: "21000",
+        to: '0x3535353535353535353535353535353535353535',
+        value: "1000000000000000000",
+        data: ""
+    }, 'MyPassword!').then(console.log);
+    > '0xda3be87732110de6c1354c83770aae630ede9ac308d9f7b399ecfba23d923384'
+
+------------------------------------------------------------------------------
+
 
 unlockAccount
 =====================
@@ -271,6 +319,124 @@ Example
     .then(console.log('Account unlocked!'));
     > "Account unlocked!"
 
-// TODO
+------------------------------------------------------------------------------
+
+lockAccount
+=====================
+
+.. code-block:: javascript
+
+    web3.eth.personal.lockAccount(address [, callback])
+
+Locks the given account.
+
+.. note:: Sending your account password over an unsecured HTTP RPC connection is highly unsecure.
+
+----------
+Parameters
+----------
+
+
+1. ``address`` - ``String``: The account address.
+4. ``Function`` - (optional) Optional callback, returns an error object as first parameter and the result as second.
+
+
+-------
+Returns
+-------
+
+
+``Promise<boolean>``
+
+
+-------
+Example
+-------
+
+
+.. code-block:: javascript
+
+    web3.eth.personal.lockAccount("0x11f4d0A3c12e86B4b5F39B213F7E19D048276DAe")
+    .then(console.log('Account locked!'));
+    > "Account locked!"
+
+------------------------------------------------------------------------------
+
+.. _personal-getaccounts:
+
+getAccounts
+=====================
+
+.. code-block:: javascript
+
+    web3.eth.personal.getAccounts([callback])
+
+Returns a list of accounts the node controls by using the provider and calling
+the RPC method ``personal_listAccounts``. Using :ref:`web3.eth.accounts.create() <accounts-create>`
+will not add accounts into this list. For that use
+:ref:`web3.eth.personal.newAccount() <personal-newaccount>`.
+
+The results are the same as :ref:`web3.eth.getAccounts() <eth-getaccounts>` except that calls
+the RPC method ``eth_accounts``.
+
+-------
+Returns
+-------
+
+
+``Promise<Array>`` - An array of addresses controlled by node.
+
+-------
+Example
+-------
+
+
+.. code-block:: javascript
+
+    web3.eth.personal.getAccounts()
+    .then(console.log);
+    > ["0x11f4d0A3c12e86B4b5F39B213F7E19D048276DAe", "0xDCc6960376d6C6dEa93647383FfB245CfCed97Cf"]
+
+------------------------------------------------------------------------------
+
+importRawKey
+=====================
+
+.. code-block:: javascript
+
+    web3.eth.personal.importRawKey(privateKey, password)
+
+Imports the given private key into the key store, encrypting it with the passphrase.
+
+Returns the address of the new account.
+
+.. note:: Sending your account password over an unsecured HTTP RPC connection is highly unsecure.
+
+----------
+Parameters
+----------
+
+
+1. ``privateKey`` - ``String`` - An unencrypted private key (hex string).
+2. ``password`` - ``String`` - The password of the account.
+
+
+-------
+Returns
+-------
+
+
+``Promise<string>`` - The address of the account.
+
+-------
+Example
+-------
+
+
+.. code-block:: javascript
+
+    web3.eth.personal.importRawKey("cd3376bb711cb332ee3fb2ca04c6a8b9f70c316fcdf7a1f44ef4c7999483295e", "password1234")
+    .then(console.log);
+    > "0x8f337bf484b2fc75e4b0436645dcc226ee2ac531"
+
 
-getAccounts, lockAccount, sendTransaction

docs/web3-eth.rst

@@ -1558,3 +1558,30 @@ Example
     > 61
 
 ------------------------------------------------------------------------------
+
+.. _eth-getNodeInfo:
+
+getNodeInfo
+===========
+
+.. code-block:: javascript
+
+    web3.eth.getNodeInfo([callback])
+
+-------
+Returns
+-------
+
+``Promise<String>`` - The current client version.
+
+-------
+Example
+-------
+
+
+.. code-block:: javascript
+
+    web3.eth.getNodeInfo().then(console.log);
+    > "Mist/v0.9.3/darwin/go1.4.1"
+
+------------------------------------------------------------------------------