Merge remote-tracking branch 'origin/develop' into rigel/fee-distribution

docs/config.js

@@ -57,7 +57,9 @@ module.exports = {
       {
         title: "Lotion JS",
         collapsable: false,
-        children: [["/lotion/overview", "Overview"], "/lotion/building-an-app"]
+        children: [
+	  ["/lotion/overview", "Overview"]
+	]
       },
       {
         title: "Validators",

docs/light/api.md

@@ -763,7 +763,7 @@ The GovernanceAPI exposes all functionality needed for casting votes on plain te
     	"chain_id": "string",
         "account_number": 0,
     	"sequence": 0,
-    	"gas": 0
+    	"gas": "simulate"
   },
   "depositer": "string",
   "amount": 0,
@@ -866,7 +866,7 @@ The GovernanceAPI exposes all functionality needed for casting votes on plain te
     	"chain_id": "string",
     	"account_number": 0,
     	"sequence": 0,
-    	"gas": 0
+    	"gas": "simulate"
   	},
     // A cosmos address
   	"voter": "string",

docs/lotion/building-an-app.md

@@ -1,46 +0,0 @@
-# Building an App
-
-::: tip
-Lotion requires __node v7.6.0__ or higher, and a mac or linux machine.
-:::
-
-## Installation
-```
-$ npm install lotion
-```
-
-## Simple App
-`app.js`:
-```js
-let lotion = require('lotion')
-
-let app = lotion({
-  initialState: {
-    count: 0
-  }
-})
-
-app.use(function (state, tx) {
-  if(state.count === tx.nonce) {
-    state.count++
-  }
-})
-
-app.listen(3000)
-```
-
-run `node app.js`, then:
-```bash
-$ curl http://localhost:3000/state
-# { "count": 0 }
-
-$ curl http://localhost:3000/txs -d '{ "nonce": 0 }'
-# { "ok": true }
-
-$ curl http://localhost:3000/state
-# { "count": 1 }
-```
-
-## Learn More
-
-You can learn more about Lotion JS by visiting Lotion on [Github](https://github.com/keppel/lotion).

docs/lotion/overview.md

@@ -1,5 +1,54 @@
-# Lotion JS Overview
+# Overview
 
-Lotion is a new way to create blockchain apps in JavaScript, which aims to make writing new blockchains fast and fun. It builds on top of Tendermint using the ABCI protocol. Lotion lets you write secure, scalable applications that can easily interoperate with other blockchains on the Cosmos Network using IBC.
+Lotion is an alternative to the Cosmos SDK and allows you to create blockchain apps in JavaScript. It aims to make writing new blockchain apps fast and easy by using the ABCI protocol to build on top of Tendermint. Lotion lets you write secure, scalable applications that can easily interoperate with other blockchains on the Cosmos Network using IBC.
 
 Lotion itself is a tiny framework; its true power comes from the network of small, focused modules built upon it. Adding a fully-featured cryptocurrency to your blockchain, for example, takes only a few lines of code.
+
+For more information see the [website](https://lotionjs.com) and [GitHub repo](https://github.com/keppel/lotion), for complete documentation which expands on the following example.
+
+## Building an App
+
+### Installation
+
+::: tip
+Lotion requires __node v7.6.0__ or higher, and a mac or linux machine.
+:::
+
+```
+$ npm install lotion
+```
+
+### Simple App
+
+`app.js`:
+
+```js
+let lotion = require('lotion')
+
+let app = lotion({
+  initialState: {
+    count: 0
+  }
+})
+
+app.use(function (state, tx) {
+  if(state.count === tx.nonce) {
+    state.count++
+  }
+})
+
+app.listen(3000)
+```
+
+run `node app.js`, then:
+
+```bash
+$ curl http://localhost:3000/state
+# { "count": 0 }
+
+$ curl http://localhost:3000/txs -d '{ "nonce": 0 }'
+# { "ok": true }
+
+$ curl http://localhost:3000/state
+# { "count": 1 }
+```

docs/sdk/clients.md

@@ -111,7 +111,7 @@ The `--amount` flag accepts the format `--amount=<value|coin_name>`.
 
 ::: tip Note
 You may want to cap the maximum gas that can be consumed by the transaction via the `--gas` flag.
-If set to 0, the gas limit will be automatically estimated.
+If you pass `--gas=simulate`, the gas limit will be automatically estimated.
 Gas estimate might be inaccurate as state changes could occur in between the end of the simulation and the actual execution of a transaction, thus an adjustment is applied on top of the original estimate in order to ensure the transaction is broadcasted successfully. The adjustment can be controlled via the `--gas-adjustment` flag, whose default value is 1.0.
 :::
 

docs/spec/staking/end_block.md

@@ -12,7 +12,7 @@ the changes cleared
 
 ```golang
 EndBlock() ValidatorSetChanges
-    vsc = GetTendermintUpdates()
+    vsc = GetValidTendermintUpdates()
     ClearTendermintUpdates()
     return vsc
 ```