-
-```java
-import org.ethereum.geth.*;
-
-public class MainActivity extends AppCompatActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
-
- setTitle("Android In-Process Node");
- final TextView textbox = (TextView) findViewById(R.id.textbox);
-
- Context ctx = new Context();
-
- try {
- Node node = Geth.newNode(getFilesDir() + "/.ethereum", new NodeConfig());
- node.start();
-
- NodeInfo info = node.getNodeInfo();
- textbox.append("My name: " + info.getName() + "\n");
- textbox.append("My address: " + info.getListenerAddress() + "\n");
- textbox.append("My protocols: " + info.getProtocols() + "\n\n");
-
- EthereumClient ec = node.getEthereumClient();
- textbox.append("Latest block: " + ec.getBlockByNumber(ctx, -1).getNumber() + ", syncing...\n");
-
- NewHeadHandler handler = new NewHeadHandler() {
- @Override public void onError(String error) { }
- @Override public void onNewHead(final Header header) {
- MainActivity.this.runOnUiThread(new Runnable() {
- public void run() { textbox.append("#" + header.getNumber() + ": " + header.getHash().getHex().substring(0, 10) + ".\n"); }
- });
- }
- };
- ec.subscribeNewHead(ctx, handler, 16);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
-```
-
-#### Known quirks
-
- * Many constructors (those that would throw exceptions) are of the form `Geth.newXXX()`, instead of simply the Java style `new XXX()` This is an upstream limitation of the [gomobile](https://github.com/golang/mobile) project, one which is currently being worked on to resolve.
- * There are zero documentations attached to the Java library methods. This too is a limitation of the [gomobile](https://github.com/golang/mobile) project. We will try to propose a fix upstream to make our docs from the Go codebase available in Java.
diff --git a/docs/_doc/Accounts---key-storage-specification.md b/docs/_doc/Accounts---key-storage-specification.md
deleted file mode 100644
index ff1e4d86a7..0000000000
--- a/docs/_doc/Accounts---key-storage-specification.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-title: Accounts
----
-**THIS PAGE IS PARTLY OUTDATED! TODO: REFACTOR OR DELETE**
-
-# Accounts / key storage specification
-
-This is an attempt to compile a single, written specification from the multiple sources which have so far been used for accounts / key storage specs:
-
-* Skype calls
-* Skype chats
-* Email conversations
-* Github issues
-* Github pull request comments
-* Github commits
-* Lively in-person discussions in the Amsterdam office.
-* Several past instances of the Amsterdam office whiteboard contents.
-
-# Background
-
-Up until Ethereum PoC 8, the Go client has used a single, default key in plaintext on disk for use as wallet and for signing all txs. We want to extend this to have a more generic key storage supporting multiple keys. We also want an "accounts" abstraction over these keys where an account corresponds to a key, and a user can have multiple accounts and be able to send / receive to any of them.
-
-The goal of this is to support better wallet / account functionality both in Mist as well as in DAPPs.
-
-# Specification
-
-## Key Storage
-
-The key storage must support:
-
-1. Generation of new keys
-2. Deletion of keys.
-3. Multiple, uniquely identifiable keys.
-4. Password protection of keys.
-5. Persistence of keys (e.g. on disk)
-6. Export & Import of keys.
-7. Import of pre-sale keys (generated by https://github.com/ethereum/pyethsaletool) NOTE: this is a different import functionality than general import (6)
-8. Proper use of secure cryptography for key generation, password protection, key persistence and export format of keys.
-9. Mechanism for Backing the keys up – maybe automatically
-
-## Account Manager
-
-0. Account == address of an Ethereum account == address of EC public key of EC private key the user controls.
-
-The account manager must support:
-
-1. Account creation & deletion
-2. Multiple, unique accounts.
-3. Persistence of accounts (e.g. on disk)
-4. An account is mapped to a single key.
-5. The account is identifiable by some public, non-sensitive data. E.g. the Ethereum address of a EC keypair can be used as account identifier / address.
-
-## Mist
-
-The Mist UI must support:
-
-1. Creation of a new account.
-2. Display a list of all available accounts (addresses)
-3. Copy-paste of account addresses to easily use when receiving funds.
-4. Choosing one of the available accounts when sending a tx.
-5. Typing password when accessing one of the hot wallet keys
-6. Showing the possible ways to temporarily input wallet keys when needed
-
-## RPC API
-
-The RPC API must support:
-
-1. The list of accounts is exposed through the eth_accounts API: https://github.com/ethereum/wiki/JSON-RPC#eth_accounts
-2. Using any of the available accounts as from/sender with the eth_transact API: https://github.com/ethereum/wiki/JSON-RPC#eth_transact (NOTE: the current API definition on that wiki page does not include a from/sender field!)
-
-
-## Wallet DAPP
-
-TODO:
\ No newline at end of file
diff --git a/docs/_doc/Achieving-Darkness.md b/docs/_doc/Achieving-Darkness.md
deleted file mode 100644
index 7b171bee74..0000000000
--- a/docs/_doc/Achieving-Darkness.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: Achieving Darkness
----
-Whisper is designed to be a building block in the next generation of unstoppable ÐApps. It was designed to provide resilience and privacy at considerable expense. At its most secure mode of operation Whisper can theoretically deliver complete darkness. Whisper should also allow the users to configure the level of privacy (how much information it leaks concerning the ÐApp content and ultimately, user activities) as a trade-off for performance. In this article we will discuss the strategy of achieving complete darkness.
-
-### Adversary
-
-In the worst case, you are playing against a very powerful adversary, which has a capacity to run a lot of Whisper nodes. In addition to that, it might generate Whisper identities in order to target a specific node. For example, it might generate IDs that will be very close to the ID of the target node, which then fit into Kademlia topology in such a way that will allow a traffic analysis from this node. As a result, it will be possible to see which messages originate from the target node.
-
-### Recipient vs. Sender
-
-Even if most nodes of the network belong to adversary, it will be still impossible to identify the recipient of particular message by the means of simple traffic analysis. But the sender might be identified. In order to prevent that, the node might maintain a certain noise level. For example, if the node sends on average several messages per hour, it might still send random messages every minute. Those extra messages should resemble the meaningful messages, but should contain randomly generated bytes and be encrypted with random key, so that adversary will not be able to distinguish the meaningful messages from the noise. It is necessary to encrypt (not only generate) random data because encrypted messages might have some common traits, which distinguish them from noise. E.g. in case of asymmetric encryption some bytes are allowed to have only certain values.
-
-In some cases recipient might also be probabilistically identified if two nodes send each other messages with common traits, e.g. same Topic or same size. That's why it is important to use different Topics for sending and receiving the messages within the session.
-
-### Topics
-
-It is possible to send asymmetrically encrypted messages without any Topic. However, in case of huge traffic it might be not practical to try decrypting all the incoming messages, since decrypt operation is quite expensive. Some filtering might be necessary. Whisper allows to subscribe for messages with particular Topic or specify several possible Topics. It is also possible to subscribe for partial Topic(s), e.g. first one, two, or three bytes of the Topic.
-
-Topic collisions are part of the plausible deniability strategy. Some messages from different nodes (and encrypted with different keys) should have the same Topic (or partial Topic). Therefore it is recommended to set the Topics dynamically, so that collisions will regulary occur on your node.
-
-For example, if there are 6000 nodes in the network and each of them on average sends ten messages per minute, it would make sense to set only first byte of the Topic (leaving the other three bytes random). In this case each node will receive on average 1000 messages per second. The node will try to decrypt approximately four messages (those matching the Topic), and one of them will be successfully decrypted. The rest of the messages will be ignored and just forwarded to the other peers.
-
-### Message Size and Padding
-
-When sending the messages, another important metric which could potentially leak metainformation is the size. Therefore, depending on the circumstances, it might be useful to send messages only of certain size or always generate random size (not exceeding certain limit). The API allows easy setting of padding. The default implementation of Whisper also uses the padding to align the messages along the 256-byte boundaries.
-
-### Symmetric vs. Asymmetric
-
-In case of symmetric encryption, the nodes must have already exchanged the encryption key via some secure channel. So, they should use the same channel to exchange the Topics (or partial Topics), and maybe PoW requirement for individual messages. In case of asymmetric encryption, the public key is exchanged via open channels, and it might be impossible to exchange any other information before they engage in secure communication. In this case different strategies might be employed.
-
-For example, the first message might be sent without any Topic. This message may contain all the information necessary to start a symmetrically encrypted session, complete with (partial) Topics, PoW requirement and symmetric keys. Because it requires trying to decrypt all the incoming asymmetric messages, the PoW requirement for such messages might be set very high, which might be acceptable since such messages are only sent once per session.
-
-Alternatively, a partial Topic should be published along with the public key and PoW requirement. E.g., if we use two or three bytes for the partial Topic of symmetrically encrypted messages, we might only use one byte for the asymmetric encryption.
-
-### Example of Session
-
-Suppose two nodes want to engage in secure communication. One of them sends an asymmetrically encrypted message of certain (pre-defined) format, which contains two symmetric keys and corresponding partial Topics, all randomly generated. The sender of this message subscribes for the messages with the first Topic (encrypted with the first key), and always encrypts outgoing messages with the second key. The recipient subscribes for the messages with the second Topic (encrypted with the second key), and always encrypts outgoing messages with the first key. They also include the message number in each outgoing message, in order to ensure the correct order of the messages, and detect if some of them did not arrive. After the session is over, the keys are deleted and never used again.
-
-In case of several participants (e.g. a group chat) they just need one additional key and one additional subscription for any additional participant.
-
-### Plausible Deniability
-
-Suppose a user has lost control of his key. It might happen due to hacker attack on his computer, or becuase a hostile entity forces him to reveal the key. In case he signed any message with his private key, it might be used as evidence against him. So, the user might prefer to use his key only to establish the session, and then engage in symmetrically encrypted communication without signing the messages. His peer may be sure about his identity, since the symmetric key was signed with his private key. But these messages can not be used as evidence, since this message could have been sent by anyone in possession of the symmetric key, especially if this key was used in a group chat session.
-
-### Steganography
-
-However, in some extreme cases even plausible deniability might not be enough. In those cases users might utilize the padding mechanism for steganographic purposes. It is possible to set arbitrary data as padding. The Whisper API allows easy access to padding for both writing and reading. Since vast majority of the messages will contain some kind of padding (either default or customized), it will be impossible to distinguish between randomly generated and encrypted padding bytes. The users should only use such encryption which does not reveal any metainformation (preferably symmetric stream ciphers), and then add the resulting data as padding to a message with some irrelevant payload.
-
-### Private Networks
-
-It is very easy to set up a private Whisper network, since Whisper does not contain any genesis block or indeed any state at all. You just start a bootstrap node to which everybody should connect. It might be useful for organizations with restricted access. Private network may have several advantages. For example, it might be very difficult for any adversary to join the network, which will make the traffic analysis almost impossible. Also, PoW requirement might be dropped, thus allowing instant messaging with very little overhead.
diff --git a/docs/_doc/Backup--restore.md b/docs/_doc/Backup--restore.md
deleted file mode 100644
index a87b256e1f..0000000000
--- a/docs/_doc/Backup--restore.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-title: Backup & restore
----
-**DO NOT FORGET YOUR PASSWORD** and **BACKUP YOUR KEYSTORE**
-
-# Backup & restore
-
-## Data directory
-
-Everything `geth` persists gets written inside its data directory (except for the PoW Ethash DAG, see note below).
-The default data directory locations are platform specific:
-
-* Mac: `~/Library/Ethereum`
-* Linux: `~/.ethereum`
-* Windows: `%APPDATA%\Ethereum`
-
-Accounts are stored in the `keystore` subdirectory. The contents of this directories should be transportable between nodes, platforms, implementations (C++, Go, Python).
-
-To configure the location of the data directory, the `--datadir` parameter can be specified. See [CLI Options](../interface/Command-Line-Options) for more details.
-
-_**Note:** The [Ethash DAG](../how-to/Mining#ethash-dag) is stored at `~/.ethash` (Mac/Linux) or `%APPDATA%\Ethash` (Windows) so that it can be reused by all clients. You can store this in a different location by using a symbolic link._
-
-## Upgrades
-
-Sometimes the internal database formats need updating (for example, when upgrade from before 0.9.20). This can be run with the following command (geth should not be otherwise running):
-
-```
-geth upgradedb
-```
-
-## Cleanup
-
-Geth's blockchain and state databases can be removed with:
-
-```
-geth removedb
-```
-
-This is useful for deleting an old chain and sync'ing to a new one. It only affects data directories that can be re-created on synchronisation and does not touch the keystore.
-
-## Blockchain import/export
-
-Export the blockchain in binary format with:
-```
-geth export PoW = (2^BestBit) / (size * TTL)
-
-Thus, we can use PoW as a single aggregated parameter for the message rating. In the future versions every node will be able to set its own PoW requirement dynamically and communicate this change to the other nodes via the Whisper protocol. Now it is only possible to set PoW requirement at the Ðapp startup.
-
-### Packet Codes (ÐΞVp2p level)
-
-As a sub-protocol of [ÐΞVp2p](https://github.com/ethereum/wiki/wiki/%C3%90%CE%9EVp2p-Wire-Protocol), Whisper sends and receives its messages within ÐΞVp2p packets.
-Whisper v5 supports the following packet codes:
-
-Status (0x0)
-
-Messages (0x1)
-
-P2PMessage (0x2)
-
-P2PRequest (0x3)
-
-Also, the following codes might be supported in the future:
-
-PoWRequirement (0x4)
-
-BloomFilterExchange (0x5)
-
-### Basic Operation
-
-Nodes are expected to receive and send envelopes continuously. They should maintain a map of envelopes, indexed by expiry time, and prune accordingly. They should also efficiently deliver messages to the front-end API through maintaining mappings between Ðapps, their filters and envelopes.
-
-When a node's envelope memory becomes exhausted, a node may drop envelopes it considers unimportant or unlikely to please its peers. Nodes should rate peers higher if they pass them envelopes with higher PoW. Nodes should blacklist peers if they pass invalid envelopes, i.e., expired envelopes or envelopes with an implied insertion time in the future.
-
-Nodes should always treat messages that its ÐApps have created no different than incoming messages.
-
-#### Creating and Sending Messages
-
-To send a message, the node should place the envelope its envelope pool. Then this envelope will be forwarded to the peers in due course along with the other envelopes. Composing an envelope from a basic payload, is done in a few steps:
-
-- Compose the Envelope data by concatenating the relevant flag byte, padding, payload (randomly generated or provided by user), and an optional signature.
-- Encrypt the data symmetrically or asymmetrically.
-- Add a Topic.
-- Set the TTL attribute.
-- Set the expiry as the present Unix time plus TTL.
-- Set the nonce which provides the best PoW.
-
-### Mail Server
-
-Suppose, a Ðapp waits for messages with certain Topic and suffers an unexpected network failure for certain period of time. As a result, a number of important messages will be lost. Since those messages are expired, there is no way to resend them via the normal Whisper channels, because they will be rejected and the peer punished.
-
-One possible way to solve this problem is to run a Mail Server, which would store all the messages, and resend them at the request of the known nodes. Even though the server might repack the old messages and provide sufficient PoW, it's not feasible to resend all of them at whim, because it would tantamount to DDoS attack on the entire network. Instead, the Mail Server should engage in peer-to-peer communication with the node, and resend the expired messages directly. The recipient will consume the messages and will not forward them any further.
-
-In order to facilitate this task, protocol-level support is provided in version 5. New message types are introduced to Whisper v.5: mailRequestCode and p2pCode.
-
-- mailRequestCode is used by the node to request historic (expired) messages from the Mail Server. The payload of this message should be understood by the Server. The Whisper protocol is entirely agnostic about it. It might contain a time frame, the node's authorization details, filtering information, payment details, etc.
-
-- p2pCode is a peer-to-peer message, that is not supposed to be forwarded to other peers. It will also bypass the protocol-level checks for expiry and PoW threshold.
-
-There is MailServer interface defined in the codebase for easy Mail Server implementation. One only needs to implement two functions:
-
-type MailServer interface {
- Archive(env *Envelope)
- DeliverMail(whisperPeer *Peer, data []byte)
-}
-
-Archive should just save all incoming messages.
-DeliverMail should be able to process the request and send the historic messages to the corresponding peer (with p2pCode), according to additional information in the data parameter. This function will be invoked upon receipt of protocol-level mailRequestCode.
diff --git a/docs/_doc/Whisper-js-example.md b/docs/_doc/Whisper-js-example.md
deleted file mode 100644
index 85c7c8acd1..0000000000
--- a/docs/_doc/Whisper-js-example.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: Whisper JavaScript example
----
-
-[This link](https://github.com/gballet/whisper-chat-example) contains a full-fledged example of how to use Whisper in a small chat application.
-
-Let's now have a look at the `sendMessage` function:
-
-```javascript
-sendMessage() {
- // Start by declaring the message, we picked a JSON format with
- // `text` as the content and `name` as the name of the user who
- // is sending the message.
- let msg = {
- text: this.text,
- name: this.name
- };
-
- // (code elided for clarity)
-
- // Create the data object that will be sent to the RPC endpoint.
- let postData = {
- ttl: 7,
- topic: '0x07678231',
- powTarget: 2.01,
- powTime: 100,
- payload: encodeToHex(JSON.stringify(msg)),
- };
-
- // Set the appropriate key id.
- if (this.asym) {
- postData.pubKey = this.recipientPubKey;
- postData.sig = this.asymKeyId;
- } else
- postData.symKeyID = this.symKeyId;
-
- // Perform the RPC call that will tell the node to forward
- // that message to all its neighboring nodes.
- this.shh.post(postData);
-
- // (code elided for clarity)
-}
-```
\ No newline at end of file
diff --git a/docs/_doc/Whisper-v5-RPC-API.md b/docs/_doc/Whisper-v5-RPC-API.md
deleted file mode 100644
index 2f26363f99..0000000000
--- a/docs/_doc/Whisper-v5-RPC-API.md
+++ /dev/null
@@ -1,785 +0,0 @@
----
-title: Whisper RPC API 5.0
----
-
-This is the proposed API for whisper v5.
-
-### Specs
-
-- [shh_version](#shh_version)
-- [shh_info](#shh_info)
-- [shh_setMaxMessageSize](#shh_setmaxmessagesize)
-- [shh_setMinPoW](#shh_setminpow)
-- [shh_markTrustedPeer](#shh_marktrustedpeer)
-- [shh_newKeyPair](#shh_newkeypair)
-- [shh_addPrivateKey](#shh_addprivatekey)
-- [shh_deleteKeyPair](#shh_deletekeypair)
-- [shh_hasKeyPair](#shh_haskeypair)
-- [shh_getPublicKey](#shh_getpublickey)
-- [shh_getPrivateKey](#shh_getprivatekey)
-- [shh_newSymKey](#shh_newsymkey)
-- [shh_addSymKey](#shh_addsymkey)
-- [shh_generateSymKeyFromPassword](#shh_generatesymkeyfrompassword)
-- [shh_hasSymKey](#shh_hassymkey)
-- [shh_getSymKey](#shh_getsymkey)
-- [shh_deleteSymKey](#shh_deletesymkey)
-- [shh_subscribe](#shh_subscribe)
-- [shh_unsubscribe](#shh_unsubscribe)
-- [shh_newMessageFilter](#shh_newmessagefilter)
-- [shh_deleteMessageFilter](#shh_deletemessagefilter)
-- [shh_getFilterMessages](#shh_getfiltermessages)
-- [shh_post](#shh_post)
-
-
-***
-
-#### shh_version
-
-Returns the current semver version number.
-
-##### Parameters
-
-none
-
-##### Returns
-
-`String` - The version number.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_version","params":[],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "5.0"
-}
-```
-
-***
-
-#### shh_info
-
-Returns diagnostic information about the whisper node.
-
-##### Parameters
-
-none
-
-##### Returns
-
-`Object` - diagnostic information with the following properties:
- - `minPow` - `Number`: current minimum PoW requirement.
- - `maxMessageSize` - `Float`: current messgae size limit in bytes.
- - `memory` - `Number`: Memory size of the floating messages in bytes.
- - `messages` - `Number`: Number of floating messages.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_info","params":[],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": {
- "minPow": 12.5,
- "maxMessageSize": 20000,
- "memory": 10000,
- "messages": 20,
- }
-}
-```
-
-***
-
-#### shh_setMaxMessageSize
-
-Sets the maximal message size allowed by this node.
-Incoming and outgoing messages with a larger size will be rejected.
-Whisper message size can never exceed the limit imposed by the underlying P2P protocol (10 Mb).
-
-##### Parameters
-
-1. `Number`: Message size in bytes.
-
-##### Returns
-
-`Boolean`: (`true`) on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_setMaxMessageSize","params":[234567],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-#### shh_setMinPoW
-
-Sets the minimal PoW required by this node.
-
-This experimental function was introduced for the future dynamic adjustment of PoW requirement. If the node is overwhelmed with messages, it should raise the PoW requirement and notify the peers. The new value should be set relative to the old value (e.g. double). The old value could be obtained via shh_info call.
-
-**Note** This function is currently experimental.
-
-##### Parameters
-
-1. `Number`: The new PoW requirement.
-
-##### Returns
-
-`Boolean`: `true` on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_setMinPoW","params":[12.3],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-#### shh_markTrustedPeer
-
-Marks specific peer trusted, which will allow it to send historic (expired) messages.
-
-**Note** This function is not adding new nodes, the node needs to exists as a peer.
-
-##### Parameters
-
-1. `String`: Enode of the trusted peer.
-
-##### Returns
-
-`Boolean` (`true`) on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_markTrustedPeer","params":["enode://d25474361659861e9e651bc728a17e807a3359ca0d344afd544ed0f11a31faecaf4d74b55db53c6670fd624f08d5c79adfc8da5dd4a11b9213db49a3b750845e@52.178.209.125:30379"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-
-#### shh_newKeyPair
-
-Generates a new public and private key pair for message decryption and encryption.
-
-##### Parameters
-
-none
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_newKeyPair","id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
-}
-```
-
-***
-
-
-#### shh_addPrivateKey
-
-Stores the key pair, and returns its ID.
-
-##### Parameters
-
-1. `String`: private key as HEX bytes.
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_addPrivateKey","params":["0x8bda3abeb454847b515fa9b404cede50b1cc63cfdeddd4999d074284b4c21e15"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
-}
-```
-
-***
-
-#### shh_deleteKeyPair
-
-Deletes the specifies key if it exists.
-
-##### Parameters
-
-1. `String`: ID of key pair.
-
-##### Returns
-
-`Boolean`: `true` on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_deleteKeyPair","params":["5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-
-#### shh_hasKeyPair
-
-Checks if the whisper node has a private key of a key pair matching the given ID.
-
-##### Parameters
-
-1. `String`: ID of key pair.
-
-##### Returns
-
-`Boolean`: (`true` or `false`) and error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_hasKeyPair","params":["5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": false
-}
-```
-
-***
-
-#### shh_getPublicKey
-
-Returns the public key for identity ID.
-
-##### Parameters
-
-1. `String`: ID of key pair.
-
-##### Returns
-
-`String`: Public key on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_getPublicKey","params":["86e658cbc6da63120b79b5eec0c67d5dcfb6865a8f983eff08932477282b77bb"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "0x04d1574d4eab8f3dde4d2dc7ed2c4d699d77cbbdd09167b8fffa099652ce4df00c4c6e0263eafe05007a46fdf0c8d32b11aeabcd3abbc7b2bc2bb967368a68e9c6"
-}
-```
-
-***
-
-#### shh_getPrivateKey
-
-Returns the private key for identity ID.
-
-##### Parameters
-
-1. `String`: ID of the key pair.
-
-##### Returns
-
-`String`: Private key on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_getPrivateKey","params":["0xc862bf3cf4565d46abcbadaf4712a8940bfea729a91b9b0e338eab5166341ab5"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "0x234234e22b9ffc2387e18636e0534534a3d0c56b0243567432453264c16e78a2adc"
-}
-```
-
-***
-
-#### shh_newSymKey
-
-Generates a random symmetric key and stores it under an ID, which is then returned.
-Can be used encrypting and decrypting messages where the key is known to both parties.
-
-##### Parameters
-
-none
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_newSymKey", "params": [], "id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "cec94d139ff51d7df1d228812b90c23ec1f909afa0840ed80f1e04030bb681e4"
-}
-```
-
-***
-
-#### shh_addSymKey
-
-Stores the key, and returns its ID.
-
-##### Parameters
-
-1. `String`: The raw key for symmetric encryption as HEX bytes.
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_addSymKey","params":["0xf6dcf21ed6a17bd78d8c4c63195ab997b3b65ea683705501eae82d32667adc92"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
-}
-```
-
-***
-
-#### shh_generateSymKeyFromPassword
-
-Generates the key from password, stores it, and returns its ID.
-
-##### Parameters
-
-1. `String`: password.
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_generateSymKeyFromPassword","params":["test"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "2e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
-}
-```
-
-***
-
-#### shh_hasSymKey
-
-Returns true if there is a key associated with the name string. Otherwise, returns false.
-
-##### Parameters
-
-1. `String`: key ID.
-
-##### Returns
-
-`Boolean` (`true` or `false`) on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_hasSymKey","params":["f6dcf21ed6a17bd78d8c4c63195ab997b3b65ea683705501eae82d32667adc92"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-
-***
-
-#### shh_getSymKey
-
-Returns the symmetric key associated with the given ID.
-
-##### Parameters
-
-1. `String`: key ID.
-
-##### Returns
-
-`String`: Raw key on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_getSymKey","params":["f6dcf21ed6a17bd78d8c4c63195ab997b3b65ea683705501eae82d32667adc92"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "0xa82a520aff70f7a989098376e48ec128f25f767085e84d7fb995a9815eebff0a"
-}
-```
-
-
-***
-
-#### shh_deleteSymKey
-
-Deletes the key associated with the name string if it exists.
-
-##### Parameters
-
-1. `String`: key ID.
-
-##### Returns
-
-`Boolean` (`true` or `false`) on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_deleteSymKey","params":["5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-#### shh_subscribe
-
-Creates and registers a new subscription to receive notifications for inbound whisper messages. Returns the ID of the newly created subscription.
-
-##### Parameters
-
-1. `id` - `String`: identifier of function call. In case of Whisper must contain the value "messages".
-
-2. `Object`. Options object with the following properties:
- - `symKeyID` - `String`: ID of symmetric key for message decryption.
- - `privateKeyID` - `String`: ID of private (asymmetric) key for message decryption.
- - `sig` - `String` (optional): Public key of the signature.
- - `minPow` - `Number` (optional): Minimal PoW requirement for incoming messages.
- - `topics` - `Array` (optional when asym key): Array of possible topics (or partial topics).
- - `allowP2P` - `Boolean` (optional): Indicates if this filter allows processing of direct peer-to-peer messages (which are not to be forwarded any further, because they might be expired). This might be the case in some very rare cases, e.g. if you intend to communicate to MailServers, etc.
-
-Either `symKeyID` or `privateKeyID` must be present. Can not be both.
-
-##### Returns
-
-`String` - The subscription ID on success, the error on failure.
-
-
-##### Notification Return
-
-`Object`: The whisper message matching the subscription options, with the following parameters:
- - `sig` - `String`: Public key who signed this message.
- - `recipientPublicKey` - `String`: The recipients public key.
- - `ttl` - `Number`: Time-to-live in seconds.
- - `timestamp` - `Number`: Unix timestamp of the message genertion.
- - `topic` - `String` 4 Bytes: Message topic.
- - `payload` - `String`: Decrypted payload.
- - `padding` - `String`: Optional padding (byte array of arbitrary length).
- - `pow` - `Number`: Proof of work value.
- - `hash` - `String`: Hash of the enveloved message.
-
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_subscribe","params":["messages", {
- topics: ['0x5a4ea131', '0x11223344'],
- symKeyID: 'b874f3bbaf031214a567485b703a025cec27d26b2c4457d6b139e56ad8734cea',
- sig: '0x048229fb947363cf13bb9f9532e124f08840cd6287ecae6b537cda2947ec2b23dbdc3a07bdf7cd2bfb288c25c4d0d0461d91c719da736a22b7bebbcf912298d1e6',
- pow: 12.3(?)
- }],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "02c1f5c953804acee3b68eda6c0afe3f1b4e0bec73c7445e10d45da333616412"
-}
-
-
-// Notification Result
-{
- "jsonrpc": "2.0",
- "method": "shh_subscription",
- "params": {
- subscription: "02c1f5c953804acee3b68eda6c0afe3f1b4e0bec73c7445e10d45da333616412",
- result: {
- sig: '0x0498ac1951b9078a0549c93c3f6088ec7c790032b17580dc3c0c9e900899a48d89eaa27471e3071d2de6a1f48716ecad8b88ee022f4321a7c29b6ffcbee65624ff',
- recipientPublicKey: null,
- ttl: 10,
- timestamp: 1498577270,
- topic: '0xffaadd11',
- payload: '0xffffffdddddd1122',
- padding: '0x35d017b66b124dd4c67623ed0e3f23ba68e3428aa500f77aceb0dbf4b63f69ccfc7ae11e39671d7c94f1ed170193aa3e327158dffdd7abb888b3a3cc48f718773dc0a9dcf1a3680d00fe17ecd4e8d5db31eb9a3c8e6e329d181ecb6ab29eb7a2d9889b49201d9923e6fd99f03807b730780a58924870f541a8a97c87533b1362646e5f573dc48382ef1e70fa19788613c9d2334df3b613f6e024cd7aadc67f681fda6b7a84efdea40cb907371cd3735f9326d02854',
- pow: 0.6714754098360656,
- hash: '0x17f8066f0540210cf67ef400a8a55bcb32a494a47f91a0d26611c5c1d66f8c57'
- }
- }
-}
-```
-
-***
-
-#### shh_unsubscribe
-
-Cancels and removes an existing subscription.
-
-##### Parameters
-
-1. `String`: subscription ID.
-
-##### Returns
-
-`Boolean`: `true` or `false`.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_unsubscribe","params":["02c1f5c953804acee3b68eda6c0afe3f1b4e0bec73c7445e10d45da333616412"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-#### shh_newMessageFilter
-
-Create a new filter within the node. This filter can be used to poll for new messages that match the set of criteria.
-
-##### Parameters
-
-1. `criteria` - `Object`: see [shh_subscribe](#shh_subscribe)
-
-##### Returns
-
-`String`: filter identifier
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_newMessageFilter","params":[{"symKeyID": "3742c75e4232325d54143707e4b73d17c2f86a5e4abe3359021be5653f5b2c81"}],"id":1}' localhost:8545
-
-// Result
-{"jsonrpc":"2.0","id":1,"result":"2b47fbafb3cce24570812a82e6e93cd9e2551bbc4823f6548ff0d82d2206b326"}
-
-```
-
-
-***
-
-#### shh_deleteMessageFilter
-
-Uninstall a message filter in the node
-
-##### Parameters
-
-1. `id` - `String`: filter identifier as returned when the filter was created
-
-##### Returns
-
-`Boolean`: `true` on success, error on failure.
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_deleteMessageFilter","params":[{"symKeyID": "3742c75e4232325d54143707e4b73d17c2f86a5e4abe3359021be5653f5b2c81"}],"id":1}' localhost:8545
-
-// Result
-{"jsonrpc":"2.0","id":1,"result": true}
-
-```
-
-
-***
-
-#### shh_getFilterMessages
-
-Retrieve messages that match the filter criteria and are received between the last time this
-function was called and now.
-
-##### Parameters
-
-1. `id` - `String`: ID of filter that was created with `shh_newMessageFilter`
-
-
-##### Returns
-
-`Array of messages`: `true` on success and an error on failure.
-
-`Object`: whisper message:
- - `sig` - `String`: Public key who signed this message.
- - `ttl` - `Number`: Time-to-live in seconds.
- - `timestamp` - `Number`: Unix timestamp of the message generation.
- - `topic` - `String` 4 Bytes: Message topic.
- - `payload` - `String`: Decrypted payload.
- - `padding` - `String`: Optional padding (byte array of arbitrary length).
- - `pow` - `Number`: Proof of work value.
- - `hash` - `String`: Hash of the enveloped message.
- - `recipientPublicKey` - `String`: recipient public key
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_getFilterMessages","params":["2b47fbafb3cce24570812a82e6e93cd9e2551bbc4823f6548ff0d82d2206b326"],"id":1}'
-
-// Result
-{
- "id": 1,
- "jsonrpc": "2.0",
- "result": [
- {
- "hash": "0xe05c4be74d667bd4c57dba2a8dbfb097d6fc2719d5c0d699d2f84a2442a4d8c2",
- "padding": "0x6e3e82571c7aa91f2a9e82e20344ede0d1112205555843d9dafffeb1536741a1fca758ff30cc01320bb0775aa5b82b9c9f48deb10bff8b5c61354bf8f95f2ab7289c7894c52e285b1d750ea2ffa78edd374bc7386a901d36a59022d73208c852dedaca8709087693ef6831b861139f42a89263af5931cb2b9253216dc42edc1393afd03940f91c561d20080f7a258aa52d30dcf4b1b921b7c910ad429f73ed9308cb6218537f0444d915e993ba8c9bb00af311aab3574bf1722b5640632bf5bb6b12406e1b89d0c98628117b1d8f55ea6b974e251b34969d4c49dfb6036d40e0d90414c65a8b036ae985396d6a4bf28332676e85dc0a0d352a58680200cc",
- "payload": "0xabcd",
- "pow": 0.5371803278688525,
- "recipientPublicKey": null,
- "sig": null,
- "timestamp": 1496991875,
- "topic": "0x01020304",
- "ttl": 50
- },
- {
- "hash": "0x4158eb81ad8e30cfcee67f20b1372983d388f1243a96e39f94fd2797b1e9c78e",
- "padding": "0xc15f786f34e5cef0fef6ce7c1185d799ecdb5ebca72b3310648c5588db2e99a0d73301c7a8d90115a91213f0bc9c72295fbaf584bf14dc97800550ea53577c9fb57c0249caeb081733b4e605cdb1a6011cee8b6d8fddb972c2b90157e23ba3baae6c68d4f0b5822242bb2c4cd821b9568d3033f10ec1114f641668fc1083bf79ebb9f5c15457b538249a97b22a4bcc4f02f06dec7318c16758f7c008001c2e14eba67d26218ec7502ad6ba81b2402159d7c29b068b8937892e3d4f0d4ad1fb9be5e66fb61d3d21a1c3163bce74c0a9d16891e2573146aa92ecd7b91ea96a6987ece052edc5ffb620a8987a83ac5b8b6140d8df6e92e64251bf3a2cec0cca",
- "payload": "0xdeadbeaf",
- "pow": 0.5371803278688525,
- "recipientPublicKey": null,
- "sig": null,
- "timestamp": 1496991876,
- "topic": "0x01020304",
- "ttl": 50
- }
- ]
-}
-
-```
-
-
-
-
-
-
-
-***
-
-#### shh_post
-
-Creates a whisper message and injects it into the network for distribution.
-
-##### Parameters
-
-1. `Object`. Post options object with the following properties:
- - `symKeyID` - `String`: ID of symmetric key for message encryption.
- - `pubKey` - `String`: public key for message encryption.
- - `sig` - `String` (optional): ID of the signing key.
- - `ttl` - `Number`: Time-to-live in seconds.
- - `topic` - `String` 4 Bytes (mandatory when key is symmetric): Message topic.
- - `payload` - `String`: Payload to be encrypted.
- - `padding` - `String` (optional): Optional padding (byte array of arbitrary length).
- - `powTime` - `Number`: Maximal time in seconds to be spent on proof of work.
- - `powTarget` - `Number`: Minimal PoW target required for this message.
- - `targetPeer` - `String` (optional): Optional peer ID (for peer-to-peer message only).
-
-Either `symKeyID` or `pubKey` must be present. Can not be both.
-
-##### Returns
-
-`Boolean`: `true` on success and an error on failure.
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_post","params":[{
- pubKey: 'b874f3bbaf031214a567485b703a025cec27d26b2c4457d6b139e56ad8734cea',
- ttl: 7,
- topic: '0x07678231',
- powTarget: 2.01,
- powTime: 2,
- payload: '0x68656c6c6f'
- }],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
\ No newline at end of file
diff --git a/docs/_doc/Whisper-v6-RPC-API.md b/docs/_doc/Whisper-v6-RPC-API.md
deleted file mode 100644
index 70aa01953f..0000000000
--- a/docs/_doc/Whisper-v6-RPC-API.md
+++ /dev/null
@@ -1,785 +0,0 @@
----
-title: Whisper RPC API 6.0
----
-
-This is the proposed API for whisper v6.
-
-### Specs
-
-- [shh_version](#shh_version)
-- [shh_info](#shh_info)
-- [shh_setMaxMessageSize](#shh_setmaxmessagesize)
-- [shh_setMinPoW](#shh_setminpow)
-- [shh_markTrustedPeer](#shh_marktrustedpeer)
-- [shh_newKeyPair](#shh_newkeypair)
-- [shh_addPrivateKey](#shh_addprivatekey)
-- [shh_deleteKeyPair](#shh_deletekeypair)
-- [shh_hasKeyPair](#shh_haskeypair)
-- [shh_getPublicKey](#shh_getpublickey)
-- [shh_getPrivateKey](#shh_getprivatekey)
-- [shh_newSymKey](#shh_newsymkey)
-- [shh_addSymKey](#shh_addsymkey)
-- [shh_generateSymKeyFromPassword](#shh_generatesymkeyfrompassword)
-- [shh_hasSymKey](#shh_hassymkey)
-- [shh_getSymKey](#shh_getsymkey)
-- [shh_deleteSymKey](#shh_deletesymkey)
-- [shh_subscribe](#shh_subscribe)
-- [shh_unsubscribe](#shh_unsubscribe)
-- [shh_newMessageFilter](#shh_newmessagefilter)
-- [shh_deleteMessageFilter](#shh_deletemessagefilter)
-- [shh_getFilterMessages](#shh_getfiltermessages)
-- [shh_post](#shh_post)
-
-
-***
-
-#### shh_version
-
-Returns the current semver version number.
-
-##### Parameters
-
-none
-
-##### Returns
-
-`String` - The version number.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_version","params":[],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "6.0"
-}
-```
-
-***
-
-#### shh_info
-
-Returns diagnostic information about the whisper node.
-
-##### Parameters
-
-none
-
-##### Returns
-
-`Object` - diagnostic information with the following properties:
- - `minPow` - `Number`: current minimum PoW requirement.
- - `maxMessageSize` - `Float`: current messgae size limit in bytes.
- - `memory` - `Number`: Memory size of the floating messages in bytes.
- - `messages` - `Number`: Number of floating messages.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_info","params":[],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": {
- "minPow": 12.5,
- "maxMessageSize": 20000,
- "memory": 10000,
- "messages": 20,
- }
-}
-```
-
-***
-
-#### shh_setMaxMessageSize
-
-Sets the maximal message size allowed by this node.
-Incoming and outgoing messages with a larger size will be rejected.
-Whisper message size can never exceed the limit imposed by the underlying P2P protocol (10 Mb).
-
-##### Parameters
-
-1. `Number`: Message size in bytes.
-
-##### Returns
-
-`Boolean`: (`true`) on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_setMaxMessageSize","params":[234567],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-#### shh_setMinPoW
-
-Sets the minimal PoW required by this node.
-
-This experimental function was introduced for the future dynamic adjustment of PoW requirement. If the node is overwhelmed with messages, it should raise the PoW requirement and notify the peers. The new value should be set relative to the old value (e.g. double). The old value could be obtained via shh_info call.
-
-**Note** This function is currently experimental.
-
-##### Parameters
-
-1. `Number`: The new PoW requirement.
-
-##### Returns
-
-`Boolean`: `true` on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_setMinPoW","params":[12.3],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-#### shh_markTrustedPeer
-
-Marks specific peer trusted, which will allow it to send historic (expired) messages.
-
-**Note** This function is not adding new nodes, the node needs to exists as a peer.
-
-##### Parameters
-
-1. `String`: Enode of the trusted peer.
-
-##### Returns
-
-`Boolean` (`true`) on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_markTrustedPeer","params":["enode://d25474361659861e9e651bc728a17e807a3359ca0d344afd544ed0f11a31faecaf4d74b55db53c6670fd624f08d5c79adfc8da5dd4a11b9213db49a3b750845e@52.178.209.125:30379"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-
-#### shh_newKeyPair
-
-Generates a new public and private key pair for message decryption and encryption.
-
-##### Parameters
-
-none
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_newKeyPair","id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
-}
-```
-
-***
-
-
-#### shh_addPrivateKey
-
-Stores the key pair, and returns its ID.
-
-##### Parameters
-
-1. `String`: private key as HEX bytes.
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_addPrivateKey","params":["0x8bda3abeb454847b515fa9b404cede50b1cc63cfdeddd4999d074284b4c21e15"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
-}
-```
-
-***
-
-#### shh_deleteKeyPair
-
-Deletes the specifies key if it exists.
-
-##### Parameters
-
-1. `String`: ID of key pair.
-
-##### Returns
-
-`Boolean`: `true` on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_deleteKeyPair","params":["5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-
-#### shh_hasKeyPair
-
-Checks if the whisper node has a private key of a key pair matching the given ID.
-
-##### Parameters
-
-1. `String`: ID of key pair.
-
-##### Returns
-
-`Boolean`: (`true` or `false`) and error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_hasKeyPair","params":["5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": false
-}
-```
-
-***
-
-#### shh_getPublicKey
-
-Returns the public key for identity ID.
-
-##### Parameters
-
-1. `String`: ID of key pair.
-
-##### Returns
-
-`String`: Public key on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_getPublicKey","params":["86e658cbc6da63120b79b5eec0c67d5dcfb6865a8f983eff08932477282b77bb"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "0x04d1574d4eab8f3dde4d2dc7ed2c4d699d77cbbdd09167b8fffa099652ce4df00c4c6e0263eafe05007a46fdf0c8d32b11aeabcd3abbc7b2bc2bb967368a68e9c6"
-}
-```
-
-***
-
-#### shh_getPrivateKey
-
-Returns the private key for identity ID.
-
-##### Parameters
-
-1. `String`: ID of the key pair.
-
-##### Returns
-
-`String`: Private key on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_getPrivateKey","params":["0xc862bf3cf4565d46abcbadaf4712a8940bfea729a91b9b0e338eab5166341ab5"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "0x234234e22b9ffc2387e18636e0534534a3d0c56b0243567432453264c16e78a2adc"
-}
-```
-
-***
-
-#### shh_newSymKey
-
-Generates a random symmetric key and stores it under an ID, which is then returned.
-Can be used encrypting and decrypting messages where the key is known to both parties.
-
-##### Parameters
-
-none
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_newSymKey", "params": [], "id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "cec94d139ff51d7df1d228812b90c23ec1f909afa0840ed80f1e04030bb681e4"
-}
-```
-
-***
-
-#### shh_addSymKey
-
-Stores the key, and returns its ID.
-
-##### Parameters
-
-1. `String`: The raw key for symmetric encryption as HEX bytes.
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_addSymKey","params":["0xf6dcf21ed6a17bd78d8c4c63195ab997b3b65ea683705501eae82d32667adc92"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
-}
-```
-
-***
-
-#### shh_generateSymKeyFromPassword
-
-Generates the key from password, stores it, and returns its ID.
-
-##### Parameters
-
-1. `String`: password.
-
-##### Returns
-
-`String`: Key ID on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_generateSymKeyFromPassword","params":["test"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "2e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
-}
-```
-
-***
-
-#### shh_hasSymKey
-
-Returns true if there is a key associated with the name string. Otherwise, returns false.
-
-##### Parameters
-
-1. `String`: key ID.
-
-##### Returns
-
-`Boolean` (`true` or `false`) on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_hasSymKey","params":["f6dcf21ed6a17bd78d8c4c63195ab997b3b65ea683705501eae82d32667adc92"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-
-***
-
-#### shh_getSymKey
-
-Returns the symmetric key associated with the given ID.
-
-##### Parameters
-
-1. `String`: key ID.
-
-##### Returns
-
-`String`: Raw key on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_getSymKey","params":["f6dcf21ed6a17bd78d8c4c63195ab997b3b65ea683705501eae82d32667adc92"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "0xa82a520aff70f7a989098376e48ec128f25f767085e84d7fb995a9815eebff0a"
-}
-```
-
-
-***
-
-#### shh_deleteSymKey
-
-Deletes the key associated with the name string if it exists.
-
-##### Parameters
-
-1. `String`: key ID.
-
-##### Returns
-
-`Boolean` (`true` or `false`) on success and an error on failure.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_deleteSymKey","params":["5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-#### shh_subscribe
-
-Creates and registers a new subscription to receive notifications for inbound whisper messages. Returns the ID of the newly created subscription.
-
-##### Parameters
-
-1. `id` - `String`: identifier of function call. In case of Whisper must contain the value "messages".
-
-2. `Object`. Options object with the following properties:
- - `symKeyID` - `String`: ID of symmetric key for message decryption.
- - `privateKeyID` - `String`: ID of private (asymmetric) key for message decryption.
- - `sig` - `String` (optional): Public key of the signature.
- - `minPow` - `Number` (optional): Minimal PoW requirement for incoming messages.
- - `topics` - `Array` (optional when asym key): Array of possible topics (or partial topics).
- - `allowP2P` - `Boolean` (optional): Indicates if this filter allows processing of direct peer-to-peer messages (which are not to be forwarded any further, because they might be expired). This might be the case in some very rare cases, e.g. if you intend to communicate to MailServers, etc.
-
-Either `symKeyID` or `privateKeyID` must be present. Can not be both.
-
-##### Returns
-
-`String` - The subscription ID on success, the error on failure.
-
-
-##### Notification Return
-
-`Object`: The whisper message matching the subscription options, with the following parameters:
- - `sig` - `String`: Public key who signed this message.
- - `recipientPublicKey` - `String`: The recipients public key.
- - `ttl` - `Number`: Time-to-live in seconds.
- - `timestamp` - `Number`: Unix timestamp of the message genertion.
- - `topic` - `String` 4 Bytes: Message topic.
- - `payload` - `String`: Decrypted payload.
- - `padding` - `String`: Optional padding (byte array of arbitrary length).
- - `pow` - `Number`: Proof of work value.
- - `hash` - `String`: Hash of the enveloved message.
-
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_subscribe","params":["messages", {
- topics: ['0x5a4ea131', '0x11223344'],
- symKeyID: 'b874f3bbaf031214a567485b703a025cec27d26b2c4457d6b139e56ad8734cea',
- sig: '0x048229fb947363cf13bb9f9532e124f08840cd6287ecae6b537cda2947ec2b23dbdc3a07bdf7cd2bfb288c25c4d0d0461d91c719da736a22b7bebbcf912298d1e6',
- pow: 12.3(?)
- }],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": "02c1f5c953804acee3b68eda6c0afe3f1b4e0bec73c7445e10d45da333616412"
-}
-
-
-// Notification Result
-{
- "jsonrpc": "2.0",
- "method": "shh_subscription",
- "params": {
- subscription: "02c1f5c953804acee3b68eda6c0afe3f1b4e0bec73c7445e10d45da333616412",
- result: {
- sig: '0x0498ac1951b9078a0549c93c3f6088ec7c790032b17580dc3c0c9e900899a48d89eaa27471e3071d2de6a1f48716ecad8b88ee022f4321a7c29b6ffcbee65624ff',
- recipientPublicKey: null,
- ttl: 10,
- timestamp: 1498577270,
- topic: '0xffaadd11',
- payload: '0xffffffdddddd1122',
- padding: '0x35d017b66b124dd4c67623ed0e3f23ba68e3428aa500f77aceb0dbf4b63f69ccfc7ae11e39671d7c94f1ed170193aa3e327158dffdd7abb888b3a3cc48f718773dc0a9dcf1a3680d00fe17ecd4e8d5db31eb9a3c8e6e329d181ecb6ab29eb7a2d9889b49201d9923e6fd99f03807b730780a58924870f541a8a97c87533b1362646e5f573dc48382ef1e70fa19788613c9d2334df3b613f6e024cd7aadc67f681fda6b7a84efdea40cb907371cd3735f9326d02854',
- pow: 0.6714754098360656,
- hash: '0x17f8066f0540210cf67ef400a8a55bcb32a494a47f91a0d26611c5c1d66f8c57'
- }
- }
-}
-```
-
-***
-
-#### shh_unsubscribe
-
-Cancels and removes an existing subscription.
-
-##### Parameters
-
-1. `String`: subscription ID.
-
-##### Returns
-
-`Boolean`: `true` or `false`.
-
-##### Example
-```js
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_unsubscribe","params":["02c1f5c953804acee3b68eda6c0afe3f1b4e0bec73c7445e10d45da333616412"],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
-
-***
-
-#### shh_newMessageFilter
-
-Create a new filter within the node. This filter can be used to poll for new messages that match the set of criteria.
-
-##### Parameters
-
-1. `criteria` - `Object`: see [shh_subscribe](#shh_subscribe)
-
-##### Returns
-
-`String`: filter identifier
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_newMessageFilter","params":[{"symKeyID": "3742c75e4232325d54143707e4b73d17c2f86a5e4abe3359021be5653f5b2c81"}],"id":1}' localhost:8545
-
-// Result
-{"jsonrpc":"2.0","id":1,"result":"2b47fbafb3cce24570812a82e6e93cd9e2551bbc4823f6548ff0d82d2206b326"}
-
-```
-
-
-***
-
-#### shh_deleteMessageFilter
-
-Uninstall a message filter in the node
-
-##### Parameters
-
-1. `id` - `String`: filter identifier as returned when the filter was created
-
-##### Returns
-
-`Boolean`: `true` on success, error on failure.
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_deleteMessageFilter","params":[{"symKeyID": "3742c75e4232325d54143707e4b73d17c2f86a5e4abe3359021be5653f5b2c81"}],"id":1}' localhost:8545
-
-// Result
-{"jsonrpc":"2.0","id":1,"result": true}
-
-```
-
-
-***
-
-#### shh_getFilterMessages
-
-Retrieve messages that match the filter criteria and are received between the last time this
-function was called and now.
-
-##### Parameters
-
-1. `id` - `String`: ID of filter that was created with `shh_newMessageFilter`
-
-
-##### Returns
-
-`Array of messages`: `true` on success and an error on failure.
-
-`Object`: whisper message:
- - `sig` - `String`: Public key who signed this message.
- - `ttl` - `Number`: Time-to-live in seconds.
- - `timestamp` - `Number`: Unix timestamp of the message generation.
- - `topic` - `String` 4 Bytes: Message topic.
- - `payload` - `String`: Decrypted payload.
- - `padding` - `String`: Optional padding (byte array of arbitrary length).
- - `pow` - `Number`: Proof of work value.
- - `hash` - `String`: Hash of the enveloped message.
- - `recipientPublicKey` - `String`: recipient public key
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_getFilterMessages","params":["2b47fbafb3cce24570812a82e6e93cd9e2551bbc4823f6548ff0d82d2206b326"],"id":1}'
-
-// Result
-{
- "id": 1,
- "jsonrpc": "2.0",
- "result": [
- {
- "hash": "0xe05c4be74d667bd4c57dba2a8dbfb097d6fc2719d5c0d699d2f84a2442a4d8c2",
- "padding": "0x6e3e82571c7aa91f2a9e82e20344ede0d1112205555843d9dafffeb1536741a1fca758ff30cc01320bb0775aa5b82b9c9f48deb10bff8b5c61354bf8f95f2ab7289c7894c52e285b1d750ea2ffa78edd374bc7386a901d36a59022d73208c852dedaca8709087693ef6831b861139f42a89263af5931cb2b9253216dc42edc1393afd03940f91c561d20080f7a258aa52d30dcf4b1b921b7c910ad429f73ed9308cb6218537f0444d915e993ba8c9bb00af311aab3574bf1722b5640632bf5bb6b12406e1b89d0c98628117b1d8f55ea6b974e251b34969d4c49dfb6036d40e0d90414c65a8b036ae985396d6a4bf28332676e85dc0a0d352a58680200cc",
- "payload": "0xabcd",
- "pow": 0.5371803278688525,
- "recipientPublicKey": null,
- "sig": null,
- "timestamp": 1496991875,
- "topic": "0x01020304",
- "ttl": 50
- },
- {
- "hash": "0x4158eb81ad8e30cfcee67f20b1372983d388f1243a96e39f94fd2797b1e9c78e",
- "padding": "0xc15f786f34e5cef0fef6ce7c1185d799ecdb5ebca72b3310648c5588db2e99a0d73301c7a8d90115a91213f0bc9c72295fbaf584bf14dc97800550ea53577c9fb57c0249caeb081733b4e605cdb1a6011cee8b6d8fddb972c2b90157e23ba3baae6c68d4f0b5822242bb2c4cd821b9568d3033f10ec1114f641668fc1083bf79ebb9f5c15457b538249a97b22a4bcc4f02f06dec7318c16758f7c008001c2e14eba67d26218ec7502ad6ba81b2402159d7c29b068b8937892e3d4f0d4ad1fb9be5e66fb61d3d21a1c3163bce74c0a9d16891e2573146aa92ecd7b91ea96a6987ece052edc5ffb620a8987a83ac5b8b6140d8df6e92e64251bf3a2cec0cca",
- "payload": "0xdeadbeaf",
- "pow": 0.5371803278688525,
- "recipientPublicKey": null,
- "sig": null,
- "timestamp": 1496991876,
- "topic": "0x01020304",
- "ttl": 50
- }
- ]
-}
-
-```
-
-
-
-
-
-
-
-***
-
-#### shh_post
-
-Creates a whisper message and injects it into the network for distribution.
-
-##### Parameters
-
-1. `Object`. Post options object with the following properties:
- - `symKeyID` - `String`: ID of symmetric key for message encryption.
- - `pubKey` - `String`: public key for message encryption.
- - `sig` - `String` (optional): ID of the signing key.
- - `ttl` - `Number`: Time-to-live in seconds.
- - `topic` - `String` 4 Bytes (mandatory when key is symmetric): Message topic.
- - `payload` - `String`: Payload to be encrypted.
- - `padding` - `String` (optional): Optional padding (byte array of arbitrary length).
- - `powTime` - `Number`: Maximal time in seconds to be spent on proof of work.
- - `powTarget` - `Number`: Minimal PoW target required for this message.
- - `targetPeer` - `String` (optional): Optional peer ID (for peer-to-peer message only).
-
-Either `symKeyID` or `pubKey` must be present. Can not be both.
-
-##### Returns
-
-`Boolean`: `true` on success and an error on failure.
-
-##### Example
-```
-// Request
-curl -X POST --data '{"jsonrpc":"2.0","method":"shh_post","params":[{
- pubKey: 'b874f3bbaf031214a567485b703a025cec27d26b2c4457d6b139e56ad8734cea',
- ttl: 7,
- topic: '0x07678231',
- powTarget: 2.01,
- powTime: 2,
- payload: '0x68656c6c6f'
- }],"id":1}'
-
-// Result
-{
- "id":1,
- "jsonrpc": "2.0",
- "result": true
-}
-```
\ No newline at end of file
diff --git a/docs/_doc/Whisper.md b/docs/_doc/Whisper.md
deleted file mode 100644
index 9364a9ce3d..0000000000
--- a/docs/_doc/Whisper.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Whisper v6
----
-
-[Whisper Overview](Whisper-Overview)
-
-[Whisper web3.js API Documentation](http://web3js.readthedocs.io/en/1.0/web3-shh.html)
-
-[Whisper RPC API 6.0](Whisper-v6-RPC-API)
-
-[Diagnostic Tool wnode](Diagnostic-Tool-wnode)
-
-[Achieving Darkness](Achieving-Darkness)
-
-[Javascript Example](Whisper-js-example)
-
-## Legacy documentation (unsupported)
-
-Whisper v2 to v5 are no longer supported.
-
-[Whisper RPC API 5.0](Whisper-v5-RPC-API)
\ No newline at end of file
diff --git a/docs/_doc/geth.md b/docs/_doc/geth.md
deleted file mode 100644
index 77c89fb29a..0000000000
--- a/docs/_doc/geth.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-title: Geth
----
-`geth` is the the command line interface for running a full ethereum node implemented in Go.
-It is the main deliverable of the [Frontier Release](https://ethereum.gitbooks.io/frontier-guide/content/frontier.html)
-
-## Capabilities
-
-By installing and running `geth`, you can take part in the ethereum frontier live network and
-* mine real ether
-* transfer funds between addresses
-* create contracts and send transactions
-* explore block history
-* and much much more
-
-## Install
-
-Supported Platforms are Linux, Mac Os and Windows.
-
-We support two types of installation: binary or scripted install for users.
-See [Install instructions](../install-and-build/Building-Ethereum) for binary and scripted installs.
-
-Developers and community enthusiast are advised to read the [Developers' Guide](../install-and-build/Developers-Guide), which contains detailed instructions for manual build from source (on any platform) as well as detailed tips on testing, monitoring, contributing, debugging and submitting pull requests on github.
-
-## Interfaces
-
-* Javascript Console: `geth` can be launched with an interactive console, that provides a javascript runtime environment exposing a javascript API to interact with your node. [Javascript Console API](../interface/JavaScript-Console) includes the `web3` javascript Ðapp API as well as an additional admin API.
-* JSON-RPC server: `geth` can be launched with a json-rpc server that exposes the [JSON-RPC API](https://github.com/ethereum/wiki/JSON-RPC)
-* [Command line options](../interface/Command-Line-Options) documents command line parameters as well as subcommands.
-
-## Basic Use Case Documentation
-
-* [Managing accounts](../how-to/Managing-your-accounts)
-* [Mining](../how-to/Mining)
-
-**Note** buying and selling ether through exchanges is not discussed here.
-
-## License
-
-The Ethereum Core Protocol licensed under the [GNU Lesser General Public License](https://www.gnu.org/licenses/lgpl.html). All frontend client software (under [cmd](https://github.com/ethereum/go-ethereum/tree/develop/cmd)) is licensed under the [GNU General Public License](https://www.gnu.org/copyleft/gpl.html).
-
-## Reporting
-
-Security issues are best sent to security@ethereum.org or shared in PM with devs on one of the channels (see Community and Suppport).
-
-Non-sensitive bug reports are welcome on github. Please always state the version (on master) or commit of your build (if on develop), give as much detail as possible about the situation and the anomaly that occurred. Provide logs or stacktrace if you can.
-
-## Contributors
-
-Ethereum is joint work of ETHDEV and the community.
-
-Name or blame = list of contributors:
-* [go-ethereum](https://github.com/ethereum/go-ethereum/graphs/contributors)
-* [cpp-ethereum](https://github.com/ethereum/cpp-ethereum/graphs/contributors)
-* [web3.js](https://github.com/ethereum/web3.js/graphs/contributors)
-* [ethash](https://github.com/ethereum/ethash/graphs/contributors)
-* [netstats](https://github.com/cubedro/eth-netstats/graphs/contributors),
-[netintelligence-api](https://github.com/cubedro/eth-net-intelligence-api/graphs/contributors)
-
-## Community and support
-
-### Ethereum on social media
-
-- Main site: https://www.ethereum.org
-- Forum: https://forum.ethereum.org
-- Github: https://github.com/ethereum
-- Blog: https://blog.ethereum.org
-- Wiki: http://wiki.ethereum.org
-- Twitter: http://twitter.com/ethereumproject
-- Reddit: http://reddit.com/r/ethereum
-- Meetups: http://ethereum.meetup.com
-- Facebook: https://www.facebook.com/ethereumproject
-- Youtube: http://www.youtube.com/ethereumproject
-- Google+: http://google.com/+EthereumOrgOfficial
-
-### IRC
-
-IRC Freenode channels:
-* `#ethereum`: for general discussion
-* `#ethereum-dev`: for development specific questions and discussions
-* `##ethereum`: for offtopic and banter
-* `#ethereumjs`: for questions related to web3.js and node-ethereum
-* `#ethereum-markets`: Trading
-* `#ethereum-mining` Mining
-* `#dappdevs`: Dapp developers channel
-* `#ethdev`: buildserver etc
-
-[IRC Logs by ZeroGox](https://zerogox.com/bot/log)
-
-### Gitter
-
-* [go-ethereum Gitter](https://gitter.im/ethereum/go-ethereum)
-* [cpp-ethereum Gitter](https://gitter.im/ethereum/cpp-ethereum)
-* [web3.js Gitter](https://gitter.im/ethereum/web3.js)
-* [ethereum documentation project Gitter](https://gitter.im/ethereum/frontier-guide)
-
-### Forum
-
-- [Forum](https://forum.ethereum.org/categories/go-implementation)
-
-### The ZeroGox Bot
-
-[ZeroGox Bot](https://zerogox.com/bot)
-
-### Dapp developers' mailing list
-
-https://dapplist.net/
-
-### Helpdesk
-
-On gitter, irc, skype or mail to helpdesk@ethereum.org
diff --git a/docs/_doc/swarm---POC-series.md b/docs/_doc/swarm---POC-series.md
deleted file mode 100644
index e28be3da79..0000000000
--- a/docs/_doc/swarm---POC-series.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: Swarm POC series
----
-now project features and POC milestones are managed under
-https://github.com/ethereum/go-ethereum/projects/6
-
-## POC 0.1: plan bee
-
-* [x] underground dev testnet launched on BZZ day (3.22 is l33t for BZZ)
-* [x] create ansible and docker for node deployment
-* [x] a few public gateways
-
-## POC 0.2 sworm
-
-* [x] rebase on geth 1.5 edge
-* [x] small toynet deployed, see [network monitor](http://146.185.130.117/)
-* [x] support for separate url schemes for dns enabled, immutable and raw manifest - feature [#2279](https://github.com/ethereum/go-ethereum/issues/2279)
-* [x] Ethereum name service integration
-* [x] scripted network tests, cluster control framework
-* [x] algorithmic improvements on chunker split/join
-* [x] algorithmic improvements on upload/download
-* [x] algorithmic improvements in kademlia and hive peers manager
-* [x] calibrating kademlia connectivity parameters to toynet scale
-* [x] orange paper series released hosted on [swarm toynet](http://swarm-gateways.net/bzz:/swarm#the-thsphr-orange-papers)
-* [x] minimalistic [swarm homepage](http://swarm-gateways.net/bzz:/swarm)
-* [x] adapt to felix's rpc-client-as-eth-backend scheme to run swarm as a separate daemon
-* [x] merge into main repo develop branch
-
-## POC 0.3
-
-Priorities are not finalised, this is just a tentative plan.
-The following features are prioritised for POC 3 (subject to change)
-
-* [ ] docker on azure: complete test cluster deployment and remote node control framework
-* [ ] comprehensive suite of typical network scenarios
-* [ ] syncer rewrite - syncdb refactor to storage
-* [ ] mist integration
-* [ ] storage monitoring and parameter setting API for Mist swarm dashboard
-* [ ] bzz protocol should implement info for reporting - feature [#2042](https://github.com/ethereum/go-ethereum/issues/2042)
-* [x] improved peer propagation [#2044](https://github.com/ethereum/go-ethereum/issues/2044)
-* [x] abstract network simulation framework
-* [x] protocol stack abstraction, pluggable subprotocol components - (swap, hive/protocol, syncer, peers) for pss
-* [ ] new p2p API integration - feature [#2060](https://github.com/ethereum/go-ethereum/issues/2060)
-* [ ] pss - unicast
-* [ ] swap rewrite
-* [ ] obfuscation for plausible deniability
-
-## POC 0.4
-
-* [ ] enhanced network monitoring, structured logging and stats aggregation
-* [ ] unicast/multicast messaging over swarm - pss
-* [ ] swear and swindle http://swarm-gateways.net/bzz:/swarm/ethersphere/orange-papers/1/sw%5E3.pdf
-* [ ] smash/crash proof of custody http://swarm-gateways.net/bzz:/swarm/ethersphere/orange-papers/2/smash.pdf
-* [ ] swarm DB support phase 0 - compact manifest trie and proof requests
-* [ ] [SWarm On-demand Retrieval Daemon](https://gist.github.com/zelig/aa6eb43615e12d834d9f) - feature [#2049](https://github.com/ethereum/go-ethereum/issues/2049) = sword. ethereum state, contract storage, receipts, blocks on swarm
-* [x] ~implement (a reviewed version of) [EIP-26](https://github.com/ethereum/EIPs/issues/26)~ obsoleted by ENS and the vickrey auction
-* [ ] swarm namereg/natspec rewrite - enhancement [#2048](https://github.com/ethereum/go-ethereum/issues/2048)
-* [x] ~solidity [contractInfo standard](https://github.com/ethereum/solidity/pull/645) and contract source verification support~ https://www.reddit.com/r/ethereum/comments/5d5lyd/first_contract_to_contain_swarm_hash_to_its/
-
-## POC 0.5
\ No newline at end of file
diff --git a/docs/_doc/swarm-dev-progress.md b/docs/_doc/swarm-dev-progress.md
deleted file mode 100644
index dafb53fd0f..0000000000
--- a/docs/_doc/swarm-dev-progress.md
+++ /dev/null
@@ -1 +0,0 @@
-See [Swarm Roadmap](https://github.com/orgs/ethersphere/projects/5)
\ No newline at end of file
diff --git a/docs/_doc/swarm-roadmap.md b/docs/_doc/swarm-roadmap.md
deleted file mode 100644
index dafb53fd0f..0000000000
--- a/docs/_doc/swarm-roadmap.md
+++ /dev/null
@@ -1 +0,0 @@
-See [Swarm Roadmap](https://github.com/orgs/ethersphere/projects/5)
\ No newline at end of file
diff --git a/docs/_how-to/Contract-Tutorial.md b/docs/_how-to/Contract-Tutorial.md
deleted file mode 100644
index e30ad5578c..0000000000
--- a/docs/_how-to/Contract-Tutorial.md
+++ /dev/null
@@ -1,935 +0,0 @@
----
-title: Contract tutorial
----
-## Introduction
-
-Now that you mastered the basics on how to get started and how to send ether, it's time to get your hands dirty in what really makes ethereum stand out of the crowd: smart contracts. Smart contracts are pieces of code that live on the blockchain and execute commands exactly how they were told to. They can read other contracts, make decisions, send ether and execute other contracts. Contracts will exist and run as long as the whole network exists, and will only stop if they run out of gas or if they were programmed to self destruct.
-
-What can you do with contracts? You can do almost anything really, but for this guide let's do some simple things: You will get funds through a crowdfunding that, if successful, will supply a radically transparent and democratic organization that will only obey its own citizens, will never swerve away from its constitution and cannot be censored or shut down. And all that in less than 300 lines of code.
-
-So let's start now.
-
-
-## Your first citizen: the greeter
-
-Now that you’ve mastered the basics of Ethereum, let’s move into your first serious contract. The Frontier is a big open territory and sometimes you might feel lonely, so our first order of business will be to create a little automatic companion to greet you whenever you feel lonely. We’ll call him the “Greeter”.
-
-The Greeter is an intelligent digital entity that lives on the blockchain and is able to have conversations with anyone who interacts with it, based on its input. It might not be a talker, but it’s a great listener. Here is its code:
-
-```js
-contract mortal {
- /* Define variable owner of the type address*/
- address owner;
-
- /* this function is executed at initialization and sets the owner of the contract */
- function mortal() { owner = msg.sender; }
-
- /* Function to recover the funds on the contract */
- function kill() { if (msg.sender == owner) suicide(owner); }
-}
-
-contract greeter is mortal {
- /* define variable greeting of the type string */
- string greeting;
-
- /* this runs when the contract is executed */
- function greeter(string _greeting) public {
- greeting = _greeting;
- }
-
- /* main function */
- function greet() constant returns (string) {
- return greeting;
- }
-}
-```
-
-You'll notice that there are two different contracts in this code: _"mortal"_ and _"greeter"_. This is because Solidity (the high level contract language we are using) has *inheritance*, meaning that one contract can inherit characteristics of another. This is very useful to simplify coding as common traits of contracts don't need to be rewritten every time, and all contracts can be written in smaller, more readable chunks. So by just declaring that _greeter is mortal_ you inherited all characteristics from the "mortal" contract and kept the greeter code simple and easy to read.
-
-The inherited characteristic _"mortal"_ simply means that the greeter contract can be killed by its owner, to clean up the blockchain and recover funds locked into it when the contract is no longer needed. Contracts in ethereum are, by default, immortal and have no owner, meaning that once deployed the author has no special privileges anymore. Consider this before deploying.
-
-### Installing a compiler
-
-Before you are able to Deploy it though, you'll need two things: the compiled code, and the Application Binary Interface, which is a sort of reference template that defines how to interact with the contract.
-
-The first you can get by using a compiler. You should have a solidity compiler built in on your geth console. To test it, use this command:
-
- eth.getCompilers()
-
-If you have it installed, it should output something like this:
-
- ['Solidity' ]
-
-If instead the command returns an error, then you need to install it.
-
-#### Using an online compiler
-
-If you don't have solC installed, we have a [online solidity compiler](https://chriseth.github.io/cpp-ethereum/) available. But be aware that **if the compiler is compromised, your contract is not safe**. For this reason, if you want to use the online compiler we encourage you to [host your own](https://github.com/chriseth/browser-solidity).
-
-#### Install SolC on Ubuntu
-
-Press control+c to exit the console (or type _exit_) and go back to the command line. Open the terminal and execute these commands:
-
- sudo add-apt-repository ppa:ethereum/ethereum
- sudo apt-get update
- sudo apt-get install solc
- which solc
-
-Take note of the path given by the last line, you'll need it soon.
-
-#### Install SolC on Mac OSX
-
-You need [brew](http://brew.sh) in order to install on your mac
-
- brew tap ethereum/ethereum
- brew install solidity
- which solc
-
-Take note of the path given by the last line, you'll need it soon.
-
-#### Install SolC on Windows
-
-You need [chocolatey](http://chocolatey.org) in order to install solc.
-
- cinst -pre solC-stable
-
-Windows is more complicated than that, you'll need to wait a bit more.
-
-If you have the SolC Solidity Compiler installed, you need now reformat by removing spaces so it fits into a string variable [(there are some online tools that will do this)](http://www.textfixer.com/tools/remove-line-breaks.php):
-
-#### Compile from source
-
- git clone https://github.com/ethereum/cpp-ethereum.git
- mkdir cpp-ethereum/build
- cd cpp-ethereum/build
- cmake -DJSONRPC=OFF -DMINER=OFF -DETHKEY=OFF -DSERPENT=OFF -DGUI=OFF -DTESTS=OFF -DJSCONSOLE=OFF ..
- make -j4
- make install
- which solc
-
-#### Linking your compiler in Geth
-
-Now [go back to the console](../doc/geth) and type this command to install solC, replacing _path/to/solc_ to the path that you got on the last command you did:
-
- admin.setSolc("path/to/solc")
-
-Now type again:
-
- eth.getCompilers()
-
-If you now have solC installed, then congratulations, you can keep reading. If you don't, then go to our [forums](http://forum.ethereum.org) or [subreddit](http://www.reddit.com/r/ethereum) and berate us on failing to make the process easier.
-
-
-### Compiling your contract
-
-
-If you have the compiler installed, you need now reformat your contract by removing line-breaks so it fits into a string variable [(there are some online tools that will do this)](http://www.textfixer.com/tools/remove-line-breaks.php):
-
- var greeterSource = 'contract mortal { address owner; function mortal() { owner = msg.sender; } function kill() { if (msg.sender == owner) suicide(owner); } } contract greeter is mortal { string greeting; function greeter(string _greeting) public { greeting = _greeting; } function greet() constant returns (string) { return greeting; } }'
-
- var greeterCompiled = web3.eth.compile.solidity(greeterSource)
-
-You have now compiled your code. Now you need to get it ready for deployment, this includes setting some variables up, like what is your greeting. Edit the first line below to something more interesting than 'Hello World!" and execute these commands:
-
- var _greeting = "Hello World!"
- var greeterContract = web3.eth.contract(greeterCompiled.greeter.info.abiDefinition);
-
- var greeter = greeterContract.new(_greeting,{from:web3.eth.accounts[0], data: greeterCompiled.greeter.code, gas: 1000000}, function(e, contract){
- if(!e) {
-
- if(!contract.address) {
- console.log("Contract transaction send: TransactionHash: " + contract.transactionHash + " waiting to be mined...");
-
- } else {
- console.log("Contract mined! Address: " + contract.address);
- console.log(contract);
- }
-
- }
- })
-
-#### Using the online compiler
-
-If you don't have solC installed, you can simply use the online compiler. Copy the source code above to the [online solidity compiler](https://chriseth.github.io/cpp-ethereum/) and then your compiled code should appear on the left pane. Copy the code on the box labeled **Geth deploy** to a text file. Now change the first line to your greeting:
-
- var _greeting = "Hello World!"
-
-Now you can paste the resulting text on your geth window. Wait up to thirty seconds and you'll see a message like this:
-
- Contract mined! address: 0xdaa24d02bad7e9d6a80106db164bad9399a0423e
-
-You will probably be asked for the password you picked in the beginning, because you need to pay for the gas costs to deploying your contract. This contract is estimated to need 172 thousand gas to deploy (according to the [online solidity compiler](https://chriseth.github.io/cpp-ethereum/)), at the time of writing, gas on the test net is priced at 1 to 10 microethers per unit of gas (nicknamed "szabo" = 1 followed by 12 zeroes in wei). To know the latest price in ether all you can see the [latest gas prices at the network stats page](https://stats.ethdev.com) and multiply both terms.
-
-**Notice that the cost is not paid to the [ethereum developers](https://ethereum.org), instead it goes to the _Miners_, people who are running computers who keep the network running. Gas price is set by the market of the current supply and demand of computation. If the gas prices are too high, you can be a miner and lower your asking price.**
-
-
-After less than a minute, you should have a log with the contract address, this means you've sucessfully deployed your contract. You can verify the deployed code (compiled) by using this command:
-
- eth.getCode(greeter.address)
-
-If it returns anything other than "0x" then congratulations! Your little Greeter is live! If the contract is created again (by performing another eth.sendTransaction), it will be published to a new address.
-
-
-### Run the Greeter
-
-In order to call your bot, just type the following command in your terminal:
-
- greeter.greet();
-
-Since this call changes nothing on the blockchain, it returns instantly and without any gas cost. You should see it return your greeting:
-
- 'Hello World!'
-
-
-### Getting other people to interact with your code
-
-In order to other people to run your contract they need two things: the address where the contract is located and the ABI (Application Binary Interface) which is a sort of user manual, describing the name of its functions and how to call them. In order to get each of them run these commands:
-
- greeterCompiled.greeter.info.abiDefinition;
- greeter.address;
-
-Then you can instantiate a javascript object which can be used to call the contract on any machine connected to the network. Replace 'ABI' and 'address' to create a contract object in javascript:
-
- var greeter = eth.contract(ABI).at(Address);
-
-This particular example can be instantiated by anyone by simply calling:
-
- var greeter2 = eth.contract([{constant:false,inputs:[],name:'kill',outputs:[],type:'function'},{constant:true,inputs:[],name:'greet',outputs:[{name:'',type:'string'}],type:'function'},{inputs:[{name:'_greeting',type:'string'}],type:'constructor'}]).at('greeterAddress');
-
-Replace _greeterAddress_ with your contract's address.
-
-
-**Tip: if the solidity compiler isn't properly installed in your machine, you can get the ABI from the online compiler. To do so, use the code below carefully replacing _greeterCompiled.greeter.info.abiDefinition_ with the abi from your compiler.**
-
-
-### Cleaning up after yourself:
-
-You must be very excited to have your first contract live, but this excitement wears off sometimes, when the owners go on to write further contracts, leading to the unpleasant sight of abandoned contracts on the blockchain. In the future, blockchain rent might be implemented in order to increase the scalability of the blockchain but for now, be a good citizen and humanely put down your abandoned bots.
-
-Unlike last time we will not be making a call as we wish to change something on the blockchain. This requires a transaction be sent to the network and a fee to be paid for the changes made. The suicide is subsidized by the network so it will cost much less than a usual transaction.
-
- greeter.kill.sendTransaction({from:eth.accounts[0]})
-
-You can verify that the deed is done simply seeing if this returns 0:
-
- eth.getCode(greeter.contractAddress)
-
-Notice that every contract has to implement its own kill clause. In this particular case only the account that created the contract can kill it.
-
-If you don't add any kill clause it could potentially live forever (or at least until the frontier contracts are all wiped) independently of you and any earthly borders, so before you put it live check what your local laws say about it, including any possible limitation on technology export, restrictions on speech and maybe any legislation on the civil rights of sentient digital beings. Treat your bots humanely.
-
-
-
-
-
-## The Coin
-
-What is a coin? Coins are much more interesting and useful than they seem, they are in essence just a tradeable token, but can become much more, depending on how you use them. Its value depends on what you do with it: a token can be used to control access (**an entrance ticket**), can be used for voting rights in an organization (**a share**), can be placeholders for an asset held by a third party (**a certificate of ownership**) or even be simply used as an exchange of value within a community (**a currency**).
-
-You could do all those things by creating a centralized server, but using an Ethereum token contract comes with some free functionalities: for one, it's a decentralized service and tokens can be still exchanged even if the original service goes down for any reason. The code can guarantee that no tokens will ever be created other than the ones set in the original code. Finally, by having each user hold their own token, this eliminates the scenarios where one single server break-in can result in the loss of funds from thousands of clients.
-
-You could create your own token on a different blockchain, but creating on ethereum is easier — so you can focus your energy on the innovation that will make your coin stand out - and it's more secure, as your security is provided by all the miners who are supporting the ethereum network. Finally, by creating your token in Ethereum, your coin will be compatible with any other contract running on ethereum.
-
-### The Code
-
-This is the code for the contract we're building:
-
- contract token {
- mapping (address => uint) public coinBalanceOf;
- event CoinTransfer(address sender, address receiver, uint amount);
-
- /* Initializes contract with initial supply tokens to the creator of the contract */
- function token(uint supply) {
- coinBalanceOf[msg.sender] = supply;
- }
-
- /* Very simple trade function */
- function sendCoin(address receiver, uint amount) returns(bool sufficient) {
- if (coinBalanceOf[msg.sender] < amount) return false;
- coinBalanceOf[msg.sender] -= amount;
- coinBalanceOf[receiver] += amount;
- CoinTransfer(msg.sender, receiver, amount);
- return true;
- }
- }
-
-If you have ever programmed, you won't find it hard to understand what it does: it is a contract that generates 10 thousand tokens to the creator of the contract, and then allows anyone with enough balance to send it to others. These tokens are the minimum tradeable unit and cannot be subdivided, but for the final users could be presented as a 100 units subdividable by 100 subunits, so owning a single token would represent having 0.01% of the total. If your application needs more fine grained atomic divisibility, then just increase the initial issuance amount.
-
-In this example we declared the variable "coinBalanceOf" to be public, this will automatically create a function that checks any account's balance.
-
-### Compile and Deploy
-
-**So let's run it!**
-
- var tokenSource = ' contract token { mapping (address => uint) public coinBalanceOf; event CoinTransfer(address sender, address receiver, uint amount); /* Initializes contract with initial supply tokens to the creator of the contract */ function token(uint supply) { coinBalanceOf[msg.sender] = supply; } /* Very simple trade function */ function sendCoin(address receiver, uint amount) returns(bool sufficient) { if (coinBalanceOf[msg.sender] < amount) return false; coinBalanceOf[msg.sender] -= amount; coinBalanceOf[receiver] += amount; CoinTransfer(msg.sender, receiver, amount); return true; } }'
-
- var tokenCompiled = eth.compile.solidity(tokenSource)
-
-Now let’s set up the contract, just like we did in the previous section. Change the "initial Supply" to the amount of non divisible tokens you want to create. If you want to have divisible units, you should do that on the user frontend but keep them represented in the minimun unit of account.
-
- var supply = 10000;
- var tokenContract = web3.eth.contract(tokenCompiled.token.info.abiDefinition);
- var token = tokenContract.new(
- supply,
- {
- from:web3.eth.accounts[0],
- data:tokenCompiled.token.code,
- gas: 1000000
- }, function(e, contract){
- if(!e) {
-
- if(!contract.address) {
- console.log("Contract transaction send: TransactionHash: " + contract.transactionHash + " waiting to be mined...");
-
- } else {
- console.log("Contract mined! Address: " + contract.address);
- console.log(contract);
- }
-
- }
- })
-
-#### Online Compiler
-
-**If you don't have solC installed, you can simply use the online compiler.** Copy the contract code to the [online solidity compiler](https://chriseth.github.io/cpp-ethereum/), if there are no errors on the contract you should see a text box labeled **Geth Deploy**. Copy the content to a text file so you can change the first line to set the initial supply, like this:
-
- var supply = 10000;
-
-Now you can paste the resulting text on your geth window. Wait up to thirty seconds and you'll see a message like this:
-
- Contract mined! address: 0xdaa24d02bad7e9d6a80106db164bad9399a0423e
-
-
-### Check balance watching coin transfers
-
-If everything worked correctly, you should be able to check your own balance with:
-
- token.coinBalanceOf(eth.accounts[0]) + " tokens"
-
-It should have all the 10 000 tokens that were created once the contract was published. Since there is not any other defined way for new coins to be issued, these are all that will ever exist.
-
-You can set up a **Watcher** to react whenever anyone sends a coin using your contract. Here's how you do it:
-
- var event = token.CoinTransfer({}, '', function(error, result){
- if (!error)
- console.log("Coin transfer: " + result.args.amount + " tokens were sent. Balances now are as following: \n Sender:\t" + result.args.sender + " \t" + token.coinBalanceOf.call(result.args.sender) + " tokens \n Receiver:\t" + result.args.receiver + " \t" + token.coinBalanceOf.call(result.args.receiver) + " tokens" )
- });
-
-### Sending coins
-
-Now of course those tokens aren't very useful if you hoard them all, so in order to send them to someone else, use this command:
-
- token.sendCoin.sendTransaction(eth.accounts[1], 1000, {from: eth.accounts[0]})
-
-If a friend has registered a name on the registrar you can send it without knowing their address, doing this:
-
- token.sendCoin.sendTransaction(registrar.addr("Alice"), 2000, {from: eth.accounts[0]})
-
-
-Note that our first function **coinBalanceOf** was simply called directly on the contract instance and returned a value. This was possible since this was a simple read operation that incurs no state change and which executes locally and synchronously. Our second function **sendCoin** needs a **.sendTransaction()** call. Since this function is meant to change the state (write operation), it is sent as a transaction to the network to be picked up by miners and included in the canonical blockchain. As a result the consensus state of all participant nodes will adequately reflect the state changes resulting from executing the transaction. Sender address needs to be sent as part of the transaction to fund the fuel needed to run the transaction. Now, wait a minute and check both accounts balances:
-
- token.coinBalanceOf.call(eth.accounts[0])/100 + "% of all tokens"
- token.coinBalanceOf.call(eth.accounts[1])/100 + "% of all tokens"
- token.coinBalanceOf.call(registrar.addr("Alice"))/100 + "% of all tokens"
-
-
-### Improvement suggestions
-
-Right now this cryptocurrency is quite limited as there will only ever be 10,000 coins and all are controlled by the coin creator, but you can change that. You could for example reward ethereum miners, by creating a transaction that will reward who found the current block:
-
- mapping (uint => address) miningReward;
- function claimMiningReward() {
- if (miningReward[block.number] == 0) {
- coinBalanceOf[block.coinbase] += 1;
- miningReward[block.number] = block.coinbase;
- }
- }
-
-You could modify this to anything else: maybe reward someone who finds a solution for a new puzzle, wins a game of chess, install a solar panel—as long as that can be somehow translated to a contract. Or maybe you want to create a central bank for your personal country, so you can keep track of hours worked, favours owed or control of property. In that case you might want to add a function to allow the bank to remotely freeze funds and destroy tokens if needed.
-
-
-### Register a name for your coin
-
-The commands mentioned only work because you have token javascript object instantiated on your local machine. If you send tokens to someone they won't be able to move them forward because they don't have the same object and wont know where to look for your contract or call its functions. In fact if you restart your console these objects will be deleted and the contracts you've been working on will be lost forever. So how do you instantiate the contract on a clean machine?
-
-There are two ways. Let's start with the quick and dirty, providing your friends with a reference to your contract’s ABI:
-
- token = eth.contract([{constant:false,inputs:[{name:'receiver',type:'address'},{name:'amount',type:'uint256'}],name:'sendCoin',outputs:[{name:'sufficient',type:'bool'}],type:'function'},{constant:true,inputs:[{name:'',type:'address'}],name:'coinBalanceOf',outputs:[{name:'',type:'uint256'}],type:'function'},{inputs:[{name:'supply',type:'uint256'}],type:'constructor'},{anonymous:false,inputs:[{indexed:false,name:'sender',type:'address'},{indexed:false,name:'receiver',type:'address'},{indexed:false,name:'amount',type:'uint256'}],name:'CoinTransfer',type:'event'}]).at('0x4a4ce7844735c4b6fc66392b200ab6fe007cfca8')
-
-Just replace the address at the end for your own token address, then anyone that uses this snippet will immediately be able to use your contract. Of course this will work only for this specific contract so let's analyze step by step and see how to improve this code so you'll be able to use it anywhere.
-
-All accounts are referenced in the network by their public address. But addresses are long, difficult to write down, hard to memorize and immutable. The last one is specially important if you want to be able to generate fresh accounts in your name, or upgrade the code of your contract. In order to solve this, there is a default name registrar contract which is used to associate the long addresses with short, human-friendly names.
-
-Names have to use only alphanumeric characters and, cannot contain blank spaces. In future releases the name registrar will likely implement a bidding process to prevent name squatting but for now, it works on a first come first served basis: as long as no one else registered the name, you can claim it.
-
-
-First, if you register a name, then you won't need the hardcoded address in the end. Select a nice coin name and try to reserve it for yourself. First, select your name:
-
- var tokenName = "MyFirstCoin"
-
-Then, check the availability of your name:
-
- registrar.addr(tokenName)
-
-If that function returns "0x00..", you can claim it to yourself:
-
- registrar.reserve.sendTransaction(tokenName, {from: eth.accounts[0]});
-
-
-Wait for the previous transaction to be picked up. Wait up to thirty seconds and then try:
-
- registrar.owner(myName)
-
-If it returns your address, it means you own that name and are able to set your chosen name to any address you want:
-
- registrar.setAddress.sendTransaction(tokenName, token.address, true,{from: eth.accounts[0]});
-
-_You can replace **token.address** for **eth.accounts[0]** if you want to use it as a personal nickname._
-
-Wait a little bit for that transaction to be picked up too and test it:
-
- registrar.addr("MyFirstCoin")
-
-You can send a transaction to anyone or any contract by name instead of account simply by typing
-
- eth.sendTransaction({from: eth.accounts[0], to: registrar.addr("MyFirstCoin"), value: web3.toWei(1, "ether")})
-
-**Tip: don't mix registrar.addr for registrar.owner. The first is to which address that name is pointed at: anyone can point a name to anywhere else, just like anyone can forward a link to google.com, but only the owner of the name can change and update the link. You can set both to be the same address.**
-
-This should now return your token address, meaning that now the previous code to instantiate could use a name instead of an address.
-
- token = eth.contract([{constant:false,inputs:[{name:'receiver',type:'address'},{name:'amount',type:'uint256'}],name:'sendCoin',outputs:[{name:'sufficient',type:'bool'}],type:'function'},{constant:true,inputs:[{name:'',type:'address'}],name:'coinBalanceOf',outputs:[{name:'',type:'uint256'}],type:'function'},{inputs:[{name:'supply',type:'uint256'}],type:'constructor'},{anonymous:false,inputs:[{indexed:false,name:'sender',type:'address'},{indexed:false,name:'receiver',type:'address'},{indexed:false,name:'amount',type:'uint256'}],name:'CoinTransfer',type:'event'}]).at(registrar.addr("MyFirstCoin"))
-
-This also means that the owner of the coin can update the coin by pointing the registrar to the new contract. This would, of course, require the coin holders trust the owner set at registrar.owner("MyFirstCoin")
-
-### Learn More
-
-* [Meta coin standard](https://github.com/ethereum/wiki/wiki/Standardized_Contract_APIs) is a proposed standardization of function names for coin and token contracts, to allow them to be automatically added to other ethereum contract that utilizes trading, like exchanges or escrow.
-
-* [Formal proofing](https://github.com/ethereum/wiki/wiki/Ethereum-Natural-Specification-Format#documentation-output) is a way where the contract developer will be able to assert some invariant qualities of the contract, like the total cap of the coin. *Not yet implemented*.
-
-
-
-# Crowdfund your idea
-
-Sometimes a good idea takes a lot of funds and collective effort. You could ask for donations, but donors prefer to give to projects they are more certain that will get traction and proper funding. This is an example where a crowdfunding would be ideal: you set up a goal and a deadline for reaching it. If you miss your goal, the donations are returned, therefore reducing the risk for donors. Since the code is open and auditable, there is no need for a centralized trusted platform and therefore the only fees everyone will pay are just the gas fees.
-
-In a crowdfunding prizes are usually given. This would require you to get everyone's contact information and keep track of who owns what. But since you just created your own token, why not use that to keep track of the prizes? This allows donors to immediately own something after they donated. They can store it safely, but they can also sell or trade it if they realize they don't want the prize anymore. If your idea is something physical, all you have to do after the project is completed is to give the product to everyone who sends you back a token. If the project is digital the token itself can immediately be used for users to participate or get entry on your project.
-
-### The code
-
-The way this particular crowdsale contract works is that you set an exchange rate for your token and then the donors will immediately get a proportional amount of tokens in exchange of their ether. You will also choose a funding goal and a deadline: once that deadline is over you can ping the contract and if the goal was reached it will send the ether raised to you, otherwise it goes back to the donors. Donors keep their tokens even if the project doesn't reach its goal, as a proof that they helped.
-
-
- contract token { mapping (address => uint) public coinBalanceOf; function token() {} function sendCoin(address receiver, uint amount) returns(bool sufficient) { } }
-
- contract Crowdsale {
-
- address public beneficiary;
- uint public fundingGoal; uint public amountRaised; uint public deadline; uint public price;
- token public tokenReward;
- Funder[] public funders;
- event FundTransfer(address backer, uint amount, bool isContribution);
-
- /* data structure to hold information about campaign contributors */
- struct Funder {
- address addr;
- uint amount;
- }
-
- /* at initialization, setup the owner */
- function Crowdsale(address _beneficiary, uint _fundingGoal, uint _duration, uint _price, token _reward) {
- beneficiary = _beneficiary;
- fundingGoal = _fundingGoal;
- deadline = now + _duration * 1 minutes;
- price = _price;
- tokenReward = token(_reward);
- }
-
- /* The function without name is the default function that is called whenever anyone sends funds to a contract */
- function () {
- uint amount = msg.value;
- funders[funders.length++] = Funder({addr: msg.sender, amount: amount});
- amountRaised += amount;
- tokenReward.sendCoin(msg.sender, amount / price);
- FundTransfer(msg.sender, amount, true);
- }
-
- modifier afterDeadline() { if (now >= deadline) _ }
-
- /* checks if the goal or time limit has been reached and ends the campaign */
- function checkGoalReached() afterDeadline {
- if (amountRaised >= fundingGoal){
- beneficiary.send(amountRaised);
- FundTransfer(beneficiary, amountRaised, false);
- } else {
- FundTransfer(0, 11, false);
- for (uint i = 0; i < funders.length; ++i) {
- funders[i].addr.send(funders[i].amount);
- FundTransfer(funders[i].addr, funders[i].amount, false);
- }
- }
- suicide(beneficiary);
- }
- }
-
-### Set the parameters
-
-Before we go further, let's start by setting the parameters of the crowdsale:
-
- var _beneficiary = eth.accounts[1]; // create an account for this
- var _fundingGoal = web3.toWei(100, "ether"); // raises 100 ether
- var _duration = 30; // number of minutes the campaign will last
- var _price = web3.toWei(0.02, "ether"); // the price of the tokens, in ether
- var _reward = token.address; // the token contract address.
-
-On Beneficiary put the new address that will receive the raised funds. The funding goal is the amount of ether to be raised. Deadline is measured in blocktimes which average 12 seconds, so the default is about 4 weeks. The price is tricky: but just change the number 2 for the amount of tokens the contributors will receive for each ether donated. Finally reward should be the address of the token contract you created in the last section.
-
-In this example you are selling on the crowdsale half of all the tokens that ever existed, in exchange for 100 ether. Decide those parameters very carefully as they will play a very important role in the next part of our guide.
-
-### Deploy
-
-You know the drill: if you are using the solC compiler,[remove line breaks](http://www.textfixer.com/tools/remove-line-breaks.php) and copy the following commands on the terminal:
-
-
- var crowdsaleCompiled = eth.compile.solidity(' contract token { mapping (address => uint) public coinBalanceOf; function token() {} function sendCoin(address receiver, uint amount) returns(bool sufficient) { } } contract Crowdsale { address public beneficiary; uint public fundingGoal; uint public amountRaised; uint public deadline; uint public price; token public tokenReward; Funder[] public funders; event FundTransfer(address backer, uint amount, bool isContribution); /* data structure to hold information about campaign contributors */ struct Funder { address addr; uint amount; } /* at initialization, setup the owner */ function Crowdsale(address _beneficiary, uint _fundingGoal, uint _duration, uint _price, token _reward) { beneficiary = _beneficiary; fundingGoal = _fundingGoal; deadline = now + _duration * 1 minutes; price = _price; tokenReward = token(_reward); } /* The function without name is the default function that is called whenever anyone sends funds to a contract */ function () { Funder f = funders[++funders.length]; f.addr = msg.sender; f.amount = msg.value; amountRaised += f.amount; tokenReward.sendCoin(msg.sender, f.amount/price); FundTransfer(f.addr, f.amount, true); } modifier afterDeadline() { if (now >= deadline) _ } /* checks if the goal or time limit has been reached and ends the campaign */ function checkGoalReached() afterDeadline { if (amountRaised >= fundingGoal){ beneficiary.send(amountRaised); FundTransfer(beneficiary, amountRaised, false); } else { FundTransfer(0, 11, false); for (uint i = 0; i < funders.length; ++i) { funders[i].addr.send(funders[i].amount); FundTransfer(funders[i].addr, funders[i].amount, false); } } suicide(beneficiary); } }');
-
- var crowdsaleContract = web3.eth.contract(crowdsaleCompiled.Crowdsale.info.abiDefinition);
- var crowdsale = crowdsaleContract.new(
- _beneficiary,
- _fundingGoal,
- _duration,
- _price,
- _reward,
- {
- from:web3.eth.accounts[0],
- data:crowdsaleCompiled.Crowdsale.code,
- gas: 1000000
- }, function(e, contract){
- if(!e) {
-
- if(!contract.address) {
- console.log("Contract transaction send: TransactionHash: " + contract.transactionHash + " waiting to be mined...");
-
- } else {
- console.log("Contract mined! Address: " + contract.address);
- console.log(contract);
- }
-
- } })
-
-**If you are using the _online compiler_ Copy the contract code to the [online solidity compiler](https://chriseth.github.io/cpp-ethereum/), and then grab the content of the box labeled **Geth Deploy**. Since you have already set the parameters, you don't need to change anything to that text, simply paste the resulting text on your geth window.**
-
-Wait up to thirty seconds and you'll see a message like this:
-
- Contract mined! address: 0xdaa24d02bad7e9d6a80106db164bad9399a0423e
-
-If you received that alert then your code should be online. You can always double check by doing this:
-
- eth.getCode(crowdsale.address)
-
-Now fund your newly created contract with the necessary tokens so it can automatically distribute rewards to the contributors!
-
- token.sendCoin.sendTransaction(crowdsale.address, 5000,{from: eth.accounts[0]})
-
-After the transaction is picked, you can check the amount of tokens the crowdsale address has, and all other variables this way:
-
- "Current crowdsale must raise " + web3.fromWei(crowdsale.fundingGoal.call(), "ether") + " ether in order to send it to " + crowdsale.beneficiary.call() + "."
-
-
-
-### Put some watchers on
-
-You want to be alerted whenever your crowdsale receives new funds, so paste this code:
-
- var event = crowdsale.FundTransfer({}, '', function(error, result){
- if (!error)
-
- if (result.args.isContribution) {
- console.log("\n New backer! Received " + web3.fromWei(result.args.amount, "ether") + " ether from " + result.args.backer )
-
- console.log( "\n The current funding at " +( 100 * crowdsale.amountRaised.call() / crowdsale.fundingGoal.call()) + "% of its goals. Funders have contributed a total of " + web3.fromWei(crowdsale.amountRaised.call(), "ether") + " ether.");
-
- var timeleft = Math.floor(Date.now() / 1000)-crowdsale.deadline();
- if (timeleft>3600) { console.log("Deadline has passed, " + Math.floor(timeleft/3600) + " hours ago")
- } else if (timeleft>0) { console.log("Deadline has passed, " + Math.floor(timeleft/60) + " minutes ago")
- } else if (timeleft>-3600) { console.log(Math.floor(-1*timeleft/60) + " minutes until deadline")
- } else { console.log(Math.floor(-1*timeleft/3600) + " hours until deadline")
- }
-
- } else {
- console.log("Funds transferred from crowdsale account: " + web3.fromWei(result.args.amount, "ether") + " ether to " + result.args.backer )
- }
-
- });
-
-
-
-
-### Register the contract
-
-You are now set. Anyone can now contribute by simply sending ether to the crowdsale address, but to make it even simpler, let's register a name for your sale. First, pick a name for your crowdsale:
-
- var name = "mycrowdsale"
-
-Check if that's available and register:
-
- registrar.addr(name)
- registrar.reserve.sendTransaction(name, {from: eth.accounts[0]});
-
-Wait for the previous transaction to be picked up and then:
-
- registrar.setAddress.sendTransaction(name, crowdsale.address, true,{from: eth.accounts[0]});
-
-
-### Contribute to the crowdsale
-
-Contributing to the crowdsale is very simple, it doesn't even require instantiating the contract. This is because the crowdsale responds to simple ether deposits, so anyone that sends ether to the crowdsale will automatically receive a reward.
-Anyone can contribute to it by simply executing this command:
-
- var amount = web3.toWei(5, "ether") // decide how much to contribute
-
- eth.sendTransaction({from: eth.accounts[0], to: crowdsale.address, value: amount, gas: 1000000})
-
-
-Alternatively, if you want someone else to send it, they can even use the name registrar to contribute:
-
- eth.sendTransaction({from: eth.accounts[0], to: registrar.addr("mycrowdsale"), value: amount, gas: 500000})
-
-
-Now wait a minute for the blocks to pickup and you can check if the contract received the ether by doing any of these commands:
-
- web3.fromWei(crowdsale.amountRaised.call(), "ether") + " ether"
- token.coinBalanceOf.call(eth.accounts[0]) + " tokens"
- token.coinBalanceOf.call(crowdsale.address) + " tokens"
-
-
-### Recover funds
-
-Once the deadline is passed someone has to wake up the contract to have the funds sent to either the beneficiary or back to the funders (if it failed). This happens because there is no such thing as an active loop or timer on ethereum so any future transactions must be pinged by someone.
-
- crowdsale.checkGoalReached.sendTransaction({from:eth.accounts[0], gas: 2000000})
-
-You can check your accounts with these lines of code:
-
- web3.fromWei(eth.getBalance(eth.accounts[0]), "ether") + " ether"
- web3.fromWei(eth.getBalance(eth.accounts[1]), "ether") + " ether"
- token.coinBalanceOf.call(eth.accounts[0]) + " tokens"
- token.coinBalanceOf.call(eth.accounts[1]) + " tokens"
-
-The crowdsale instance is setup to self destruct once it has done its job, so if the deadline is over and everyone got their prizes the contract is no more, as you can see by running this:
-
- eth.getCode(crowdsale.address)
-
-So you raised a 100 ethers and successfully distributed your original coin among the crowdsale donors. What could you do next with those things?
-
-
-
-
-
-
-# Democracy DAO
-
-
-
-So far you have created a tradeable token and you successfully distributed it among all those who were willing to help fundraise a 100 ethers. That's all very interesting but what exactly are those tokens for? Why would anyone want to own or trade it for anything else valuable? If you can convince your new token is the next big money maybe others will want it, but so far your token offers no value per se. We are going to change that, by creating your first decentralized autonomous organization, or DAO.
-
-Think of the DAO as the constitution of a country, the executive branch of a government or maybe like a robotic manager for an organization. The DAO receives the money that your organization raises, keeps it safe and uses it to fund whatever its members want. The robot is incorruptible, will never defraud the bank, never create secret plans, never use the money for anything other than what its constituents voted on. The DAO will never disappear, never run away and cannot be controlled by anyone other than its own citizens.
-
-The token we distributed using the crowdsale is the only citizen document needed. Anyone who holds any token is able to create and vote on proposals. Similar to being a shareholder in a company, the token can be traded on the open market and the vote is proportional to amounts of tokens the voter holds.
-
-Take a moment to dream about the revolutionary possibilities this would allow, and now you can do it yourself, in under a 100 lines of code:
-
-
-### The Code
-
-
-
-
- contract token { mapping (address => uint) public coinBalanceOf; function token() { } function sendCoin(address receiver, uint amount) returns(bool sufficient) { } }
-
-
- contract Democracy {
-
- uint public minimumQuorum;
- uint public debatingPeriod;
- token public voterShare;
- address public founder;
- Proposal[] public proposals;
- uint public numProposals;
-
- event ProposalAdded(uint proposalID, address recipient, uint amount, bytes32 data, string description);
- event Voted(uint proposalID, int position, address voter);
- event ProposalTallied(uint proposalID, int result, uint quorum, bool active);
-
- struct Proposal {
- address recipient;
- uint amount;
- bytes32 data;
- string description;
- uint creationDate;
- bool active;
- Vote[] votes;
- mapping (address => bool) voted;
- }
-
- struct Vote {
- int position;
- address voter;
- }
-
- function Democracy(token _voterShareAddress, uint _minimumQuorum, uint _debatingPeriod) {
- founder = msg.sender;
- voterShare = token(_voterShareAddress);
- minimumQuorum = _minimumQuorum || 10;
- debatingPeriod = _debatingPeriod * 1 minutes || 30 days;
- }
-
-
- function newProposal(address _recipient, uint _amount, bytes32 _data, string _description) returns (uint proposalID) {
- if (voterShare.coinBalanceOf(msg.sender)>0) {
- proposalID = proposals.length++;
- Proposal p = proposals[proposalID];
- p.recipient = _recipient;
- p.amount = _amount;
- p.data = _data;
- p.description = _description;
- p.creationDate = now;
- p.active = true;
- ProposalAdded(proposalID, _recipient, _amount, _data, _description);
- numProposals = proposalID+1;
- }
- }
-
- function vote(uint _proposalID, int _position) returns (uint voteID){
- if (voterShare.coinBalanceOf(msg.sender)>0 && (_position >= -1 || _position <= 1 )) {
- Proposal p = proposals[_proposalID];
- if (p.voted[msg.sender] == true) return;
- voteID = p.votes.length++;
- p.votes[voteID] = Vote({position: _position, voter: msg.sender});
- p.voted[msg.sender] = true;
- Voted(_proposalID, _position, msg.sender);
- }
- }
-
- function executeProposal(uint _proposalID) returns (int result) {
- Proposal p = proposals[_proposalID];
- /* Check if debating period is over */
- if (now > (p.creationDate + debatingPeriod) && p.active){
- uint quorum = 0;
- /* tally the votes */
- for (uint i = 0; i < p.votes.length; ++i) {
- Vote v = p.votes[i];
- uint voteWeight = voterShare.coinBalanceOf(v.voter);
- quorum += voteWeight;
- result += int(voteWeight) * v.position;
- }
- /* execute result */
- if (quorum > minimumQuorum && result > 0 ) {
- p.recipient.call.value(p.amount)(p.data);
- p.active = false;
- } else if (quorum > minimumQuorum && result < 0) {
- p.active = false;
- }
- ProposalTallied(_proposalID, result, quorum, p.active);
- }
- }
- }
-
-
-
-
-
-There's a lot of going on but it's simpler than it looks. The rules of your organization are very simple: anyone with at least one token can create proposals to send funds from the country's account. After a week of debate and votes, if it has received votes worth a total of 100 tokens or more and has more approvals than rejections, the funds will be sent. If the quorum hasn't been met or it ends on a tie, then voting is kept until it's resolved. Otherwise, the proposal is locked and kept for historical purposes.
-
-So let's recap what this means: in the last two sections you created 10,000 tokens, sent 1,000 of those to another account you control, 2,000 to a friend named Alice and distributed 5,000 of them via a crowdsale. This means that you no longer control over 50% of the votes in the DAO, and if Alice and the community bands together, they can outvote any spending decision on the 100 ethers raised so far. This is exactly how a democracy should work. If you don't want to be a part of your country anymore the only thing you can do is sell your own tokens on a decentralized exchange and opt out, but you cannot prevent the others from doing so.
-
-
-### Set Up your Organization
-
-So open your console and let's get ready to finally put your country online. First, let's set the right parameters, pick them with care:
-
- var _voterShareAddress = token.address;
- var _minimumQuorum = 10; // Minimun amount of voter tokens the proposal needs to pass
- var _debatingPeriod = 60; // debating period, in minutes;
-
-With these default parameters anyone with any tokens can make a proposal on how to spend the organization's money. The proposal has 1 hour to be debated and it will pass if it has at least votes from at least 0.1% of the total tokens and has more support than rejections. Pick those parameters with care, as you won't be able to change them in the future.
-
- var daoCompiled = eth.compile.solidity('contract token { mapping (address => uint) public coinBalanceOf; function token() { } function sendCoin(address receiver, uint amount) returns(bool sufficient) { } } contract Democracy { uint public minimumQuorum; uint public debatingPeriod; token public voterShare; address public founder; Proposal[] public proposals; uint public numProposals; event ProposalAdded(uint proposalID, address recipient, uint amount, bytes32 data, string description); event Voted(uint proposalID, int position, address voter); event ProposalTallied(uint proposalID, int result, uint quorum, bool active); struct Proposal { address recipient; uint amount; bytes32 data; string description; uint creationDate; bool active; Vote[] votes; mapping (address => bool) voted; } struct Vote { int position; address voter; } function Democracy(token _voterShareAddress, uint _minimumQuorum, uint _debatingPeriod) { founder = msg.sender; voterShare = token(_voterShareAddress); minimumQuorum = _minimumQuorum || 10; debatingPeriod = _debatingPeriod * 1 minutes || 30 days; } function newProposal(address _recipient, uint _amount, bytes32 _data, string _description) returns (uint proposalID) { if (voterShare.coinBalanceOf(msg.sender)>0) { proposalID = proposals.length++; Proposal p = proposals[proposalID]; p.recipient = _recipient; p.amount = _amount; p.data = _data; p.description = _description; p.creationDate = now; p.active = true; ProposalAdded(proposalID, _recipient, _amount, _data, _description); numProposals = proposalID+1; } else { return 0; } } function vote(uint _proposalID, int _position) returns (uint voteID){ if (voterShare.coinBalanceOf(msg.sender)>0 && (_position >= -1 || _position <= 1 )) { Proposal p = proposals[_proposalID]; if (p.voted[msg.sender] == true) return; voteID = p.votes.length++; Vote v = p.votes[voteID]; v.position = _position; v.voter = msg.sender; p.voted[msg.sender] = true; Voted(_proposalID, _position, msg.sender); } else { return 0; } } function executeProposal(uint _proposalID) returns (int result) { Proposal p = proposals[_proposalID]; /* Check if debating period is over */ if (now > (p.creationDate + debatingPeriod) && p.active){ uint quorum = 0; /* tally the votes */ for (uint i = 0; i < p.votes.length; ++i) { Vote v = p.votes[i]; uint voteWeight = voterShare.coinBalanceOf(v.voter); quorum += voteWeight; result += int(voteWeight) * v.position; } /* execute result */ if (quorum > minimumQuorum && result > 0 ) { p.recipient.call.value(p.amount)(p.data); p.active = false; } else if (quorum > minimumQuorum && result < 0) { p.active = false; } } ProposalTallied(_proposalID, result, quorum, p.active); } }');
-
- var democracyContract = web3.eth.contract(daoCompiled.Democracy.info.abiDefinition);
-
- var democracy = democracyContract.new(
- _voterShareAddress,
- _minimumQuorum,
- _debatingPeriod,
- {
- from:web3.eth.accounts[0],
- data:daoCompiled.Democracy.code,
- gas: 3000000
- }, function(e, contract){
- if(!e) {
-
- if(!contract.address) {
- console.log("Contract transaction send: TransactionHash: " + contract.transactionHash + " waiting to be mined...");
-
- } else {
- console.log("Contract mined! Address: " + contract.address);
- console.log(contract);
- }
-
- }
- })
-
-**If you are using the _online compiler_ Copy the contract code to the [online solidity compiler](https://chriseth.github.io/cpp-ethereum/), and then grab the content of the box labeled **Geth Deploy**. Since you have already set the parameters, you don't need to change anything to that text, simply paste the resulting text on your geth window.**
-
-Wait a minute until the miners pick it up. It will cost you about 850k Gas. Once that is picked up, it's time to instantiate it and set it up, by pointing it to the correct address of the token contract you created previously.
-
-If everything worked out, you can take a look at the whole organization by executing this string:
-
- "This organization has " + democracy.numProposals() + " proposals and uses the token at the address " + democracy.voterShare() ;
-
-If everything is setup then your DAO should return a proposal count of 0 and an address marked as the "founder". While there are still no proposals, the founder of the DAO can change the address of the token to anything it wants.
-
-### Register your organization name
-
-Let's also register a name for your contract so it's easily accessible (don't forget to check your name availability with registrar.addr("nameYouWant") before reserving!)
-
- var name = "MyPersonalDemocracy"
- registrar.reserve.sendTransaction(name, {from: eth.accounts[0]})
- var democracy = eth.contract(daoCompiled.Democracy.info.abiDefinition).at(democracy.address);
- democracy.setup.sendTransaction(registrar.addr("MyFirstCoin"),{from:eth.accounts[0]})
-
-Wait for the previous transactions to be picked up and then:
-
- registrar.setAddress.sendTransaction(name, democracy.address, true,{from: eth.accounts[0]});
-
-
-### The Democracy Watchbots
-
-
- var event = democracy.ProposalAdded({}, '', function(error, result){
- if (!error)
- console.log("New Proposal #"+ result.args.proposalID +"!\n Send " + web3.fromWei(result.args.amount, "ether") + " ether to " + result.args.recipient.substring(2,8) + "... for " + result.args.description )
- });
- var eventVote = democracy.Voted({}, '', function(error, result){
- if (!error)
- var opinion = "";
- if (result.args.position > 0) {
- opinion = "in favor"
- } else if (result.args.position < 0) {
- opinion = "against"
- } else {
- opinion = "abstaining"
- }
-
- console.log("Vote on Proposal #"+ result.args.proposalID +"!\n " + result.args.voter + " is " + opinion )
- });
- var eventTally = democracy.ProposalTallied({}, '', function(error, result){
- if (!error)
- var totalCount = "";
- if (result.args.result > 1) {
- totalCount = "passed"
- } else if (result.args.result < 1) {
- totalCount = "rejected"
- } else {
- totalCount = "a tie"
- }
- console.log("Votes counted on Proposal #"+ result.args.proposalID +"!\n With a total of " + Math.abs(result.args.result) + " out of " + result.args.quorum + ", proposal is " + totalCount + ". Proposal is " + (result.args.active? " still on the floor" : "archived") )
- });
-
-
-### Interacting with the DAO
-
-After you are satisfied with what you want, it's time to get all that ether you got from the crowdfunding into your new organization:
-
- eth.sendTransaction({from: eth.accounts[1], to: democracy.address, value: web3.toWei(100, "ether")})
-
-This should take only a minute and your country is ready for business! Now, as a first priority, your organisation needs a nice logo, but unless you are a designer, you have no idea how to do that. For the sake of argument let's say you find that your friend Bob is a great designer who's willing to do it for only 10 ethers, so you want to propose to hire him.
-
- recipient = registrar.addr("bob");
- amount = web3.toWei(10, "ether");
- shortNote = "Logo Design";
-
- democracy.newProposal.sendTransaction( recipient, amount, '', shortNote, {from: eth.accounts[0], gas:1000000})
-
-After a minute, anyone can check the proposal recipient and amount by executing these commands:
-
- "This organization has " + (Number(democracy.numProposals())+1) + " pending proposals";
-
-### Keep an eye on the organization
-
-Unlike most governments, your country's government is completely transparent and easily programmable. As a small demonstration here's a snippet of code that goes through all the current proposals and prints what they are and for whom:
-
-
-
- function checkAllProposals() {
- console.log("Country Balance: " + web3.fromWei( eth.getBalance(democracy.address), "ether") );
- for (i = 0; i< (Number(democracy.numProposals())); i++ ) {
- var p = democracy.proposals(i);
- var timeleft = Math.floor(((Math.floor(Date.now() / 1000)) - Number(p[4]) - Number(democracy.debatingPeriod()))/60);
- console.log("Proposal #" + i + " Send " + web3.fromWei( p[1], "ether") + " ether to address " + p[0].substring(2,6) + " for "+ p[3] + ".\t Deadline:"+ Math.abs(Math.floor(timeleft)) + (timeleft>0?" minutes ago ":" minutes left ") + (p[5]? " Active":" Archived") );
- }
- }
-
- checkAllProposals();
-
-A concerned citizen could easily write a bot that periodically pings the blockchain and then publicizes any new proposals that were put forth, guaranteeing total transparency.
-
-Now of course you want other people to be able to vote on your proposals. You can check the crowdsale tutorial on the best way to register your contract app so that all the user needs is a name, but for now let's use the easier version. Anyone should be able to instantiate a local copy of your country in their computer by using this giant command:
-
-
- democracy = eth.contract( [{ constant: true, inputs: [{ name: '', type: 'uint256' } ], name: 'proposals', outputs: [{ name: 'recipient', type: 'address' }, { name: 'amount', type: 'uint256' }, { name: 'data', type: 'bytes32' }, { name: 'descriptionHash', type: 'bytes32' }, { name: 'creationDate', type: 'uint256' }, { name: 'numVotes', type: 'uint256' }, { name: 'quorum', type: 'uint256' }, { name: 'active', type: 'bool' } ], type: 'function' }, { constant: false, inputs: [{ name: '_proposalID', type: 'uint256' } ], name: 'executeProposal', outputs: [{ name: 'result', type: 'uint256' } ], type: 'function' }, { constant: true, inputs: [ ], name: 'debatingPeriod', outputs: [{ name: '', type: 'uint256' } ], type: 'function' }, { constant: true, inputs: [ ], name: 'numProposals', outputs: [{ name: '', type: 'uint256' } ], type: 'function' }, { constant: true, inputs: [ ], name: 'founder', outputs: [{ name: '', type: 'address' } ], type: 'function' }, { constant: false, inputs: [{ name: '_proposalID', type: 'uint256' }, { name: '_position', type: 'int256' } ], name: 'vote', outputs: [{ name: 'voteID', type: 'uint256' } ], type: 'function' }, { constant: false, inputs: [{ name: '_voterShareAddress', type: 'address' } ], name: 'setup', outputs: [ ], type: 'function' }, { constant: false, inputs: [{ name: '_recipient', type: 'address' }, { name: '_amount', type: 'uint256' }, { name: '_data', type: 'bytes32' }, { name: '_descriptionHash', type: 'bytes32' } ], name: 'newProposal', outputs: [{ name: 'proposalID', type: 'uint256' } ], type: 'function' }, { constant: true, inputs: [ ], name: 'minimumQuorum', outputs: [{ name: '', type: 'uint256' } ], type: 'function' }, { inputs: [ ], type: 'constructor' } ] ).at(registrar.addr('MyPersonalCountry'))
-
-Then anyone who owns any of your tokens can vote on the proposals by doing this:
-
- var proposalID = 0;
- var position = -1; // +1 for voting yea, -1 for voting nay, 0 abstains but counts as quorum
- democracy.vote.sendTransaction(proposalID, position, {from: eth.accounts[0], gas: 1000000});
-
- var proposalID = 1;
- var position = 1; // +1 for voting yea, -1 for voting nay, 0 abstains but counts as quorum
- democracy.vote.sendTransaction(proposalID, position, {from: eth.accounts[0], gas: 1000000});
-
-
-Unless you changed the basic parameters in the code, any proposal will have to be debated for at least a week until it can be executed. After that anyone—even a non-citizen—can demand the votes to be counted and the proposal to be executed. The votes are tallied and weighted at that moment and if the proposal is accepted then the ether is sent immediately and the proposal is archived. If the votes end in a tie or the minimum quorum hasn’t been reached, the voting is kept open until the stalemate is resolved. If it loses, then it's archived and cannot be voted again.
-
- var proposalID = 1;
- democracy.executeProposal.sendTransaction(proposalID, {from: eth.accounts[0], gas: 1000000});
-
-
-If the proposal passed then you should be able to see Bob's ethers arriving on his address:
-
- web3.fromWei(eth.getBalance(democracy.address), "ether") + " ether";
- web3.fromWei(eth.getBalance(registrar.addr("bob")), "ether") + " ether";
-
-
-**Try for yourself:** This is a very simple democracy contract, which could be vastly improved: currently, all proposals have the same debating time and are won by direct vote and simple majority. Can you change that so it will have some situations, depending on the amount proposed, that the debate might be longer or that it would require a larger majority? Also think about some way where citizens didn't need to vote on every issue and could temporarily delegate their votes to a special representative. You might have also noticed that we added a tiny description for each proposal. This could be used as a title for the proposal or could be a hash of a larger document describing it in detail.
-
-### Let's go exploring!
-
-You have reached the end of this tutorial, but it's just the beginning of a great adventure. Look back and see how much you accomplished: you created a living, talking robot, your own cryptocurrency, raised funds through a trustless crowdfunding and used it to kickstart your own personal democratic organization.
-
-For the sake of simplicity, we only used the democratic organization you created to send ether around, the native currency of ethereum. While that might be good enough for some, this is only scratching the surface of what can be done. In the ethereum network contracts have all the same rights as any normal user, meaning that your organization could do any of the transactions that you executed coming from your own accounts.
-
-
-### What could happen next?
-
-* The greeter contract you created at the beginning could be improved to charge ether for its services and could funnel those funds into the DAO.
-
-* The tokens you still control could be sold on a decentralized exchange or traded for goods and services to fund further develop the first contract and grow the organization.
-
-* Your DAO could own its own name on the name registrar, and then change where it's redirecting in order to update itself if the token holders approved.
-
-* The organization could hold not only ethers, but any kind of other coin created on ethereum, including assets whose value are tied to the bitcoin or dollar.
-
-* The DAO could be programmed to allow a proposal with multiple transactions, some scheduled to the future.
-It could also own shares of other DAO's, meaning it could vote on larger organization or be a part of a federation of DAO's.
-
-* The Token Contract could be reprogrammed to hold ether or to hold other tokens and distribute it to the token holders. This would link the value of the token to the value of other assets, so paying dividends could be accomplished by simply moving funds to the token address.
-
-This all means that this tiny society you created could grow, get funding from third parties, pay recurrent salaries, own any kind of crypto-assets and even use crowdsales to fund its activities. All with full transparency, complete accountability and complete immunity from any human interference. While the network lives the contracts will execute exactly the code they were created to execute, without any exception, forever.
-
-So what will your contract be? Will it be a country, a company, a non-profit group? What will your code do?
-
-That's up to you.
diff --git a/docs/_how-to/Managing-your-accounts.md b/docs/_how-to/Managing-your-accounts.md
deleted file mode 100644
index bda5590836..0000000000
--- a/docs/_how-to/Managing-your-accounts.md
+++ /dev/null
@@ -1,350 +0,0 @@
----
-title: Managing your accounts
----
-**WARNING**
-Remember your password.
-
-If you lose the password you use to encrypt your account, you will not be able to access that account.
-Repeat: It is NOT possible to access your account without a password and there is no _forgot my password_ option here. Do not forget it.
-
-The ethereum CLI `geth` provides account management via the `account` command:
-
-```
-$ geth account