...

docs/_attic/basecoin/basics.rst

@@ -78,7 +78,7 @@ window. Here run:
 
 ::
 
-    basecli init --node=tcp://localhost:46657 --genesis=$HOME/.basecoin/genesis.json
+    basecli init --node=tcp://localhost:26657 --genesis=$HOME/.basecoin/genesis.json
 
 If you provide the genesis file to basecli, it can calculate the proper
 chainID and validator hash. Basecli needs to get this information from

docs/_attic/basecoin/extensions.rst

@@ -49,7 +49,7 @@ initialize the light-client and send a transaction:
 
 ::
 
-    countercli init --node=tcp://localhost:46657 --genesis=$HOME/.counter/genesis.json
+    countercli init --node=tcp://localhost:26657 --genesis=$HOME/.counter/genesis.json
 
     YOU=$(countercli keys get friend | awk '{print $2}')
     countercli tx send --name=cool --amount=1000mycoin --to=$YOU --sequence=1

docs/_attic/staking/local-testnet.rst

@@ -39,18 +39,18 @@ and ports. It should look like:
 
 ::
 
-    proxy_app = "tcp://127.0.0.1:46668"
+    proxy_app = "tcp://127.0.0.1:26668"
     moniker = "anonymous"
     fast_sync = true
     db_backend = "leveldb"
     log_level = "state:info,*:error"
 
     [rpc]
-    laddr = "tcp://0.0.0.0:46667"
+    laddr = "tcp://0.0.0.0:26667"
 
     [p2p]
-    laddr = "tcp://0.0.0.0:46666"
-    seeds = "0.0.0.0:46656"
+    laddr = "tcp://0.0.0.0:26666"
+    seeds = "0.0.0.0:26656"
 
 Start Nodes
 -----------
@@ -69,14 +69,14 @@ account:
 
 ::
 
-    gaia client init --chain-id=gaia-test --node=tcp://localhost:46657
+    gaia client init --chain-id=gaia-test --node=tcp://localhost:26657
     gaia client query account 5D93A6059B6592833CBC8FA3DA90EE0382198985 
 
 To see what tendermint considers the validator set is, use:
 
 ::
 
-    curl localhost:46657/validators
+    curl localhost:26657/validators
 
 and compare the information in this file: ``~/.gaia1/priv_validator.json``. The ``address`` and ``pub_key`` fields should match.
 

docs/_attic/staking/public-testnet.rst

@@ -49,7 +49,7 @@ Finally, let's initialize the gaia client to interact with the testnet:
 
 ::
 
-    gaia client init --chain-id=gaia-1 --node=tcp://localhost:46657
+    gaia client init --chain-id=gaia-1 --node=tcp://localhost:26657
 
 and check our balance:
 

docs/conf.py

@@ -38,9 +38,15 @@
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+
+from recommonmark.parser import CommonMarkParser
+
+source_parsers = {
+    '.md': CommonMarkParser,
+}
+
+source_suffix = ['.rst', '.md']
+#source_suffix = '.rst'
 
 # The master toctree document.
 master_doc = 'index'
@@ -69,7 +75,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'old']
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '_attic', 'spec']
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'

docs/guides/sdk/install.md

@@ -0,0 +1,59 @@
+# Install
+
+The fastest and easiest way to install the Cosmos SDK binaries
+is to run [this script](https://github.com/cosmos/cosmos-sdk/blob/develop/scripts/install_sdk_ubuntu.sh) on a fresh Ubuntu instance. Similarly, you can run [this script](https://github.com/cosmos/cosmos-sdk/blob/develop/scripts/install_sdk_bsd.sh) on a fresh FreeBSD instance. Read the scripts before running them to ensure no untrusted connection is being made, for example we're making curl requests to download golang. Also read the comments / instructions carefully (i.e., reset your terminal after running the script).
+
+Cosmos SDK can be installed to
+`$GOPATH/src/github.com/cosmos/cosmos-sdk` like a normal Go program:
+
+```
+go get github.com/cosmos/cosmos-sdk
+```
+
+If the dependencies have been updated with breaking changes, or if
+another branch is required, `dep` is used for dependency management.
+Thus, assuming you've already run `go get` or otherwise cloned the repo,
+the correct way to install is:
+
+```
+cd $GOPATH/src/github.com/cosmos/cosmos-sdk
+make get_tools
+make get_vendor_deps
+make install
+make install_examples
+```
+
+This will install `gaiad` and `gaiacli` and four example binaries:
+`basecoind`, `basecli`, `democoind`, and `democli`.
+
+Verify that everything is OK by running:
+
+```
+gaiad version
+```
+
+you should see:
+
+```
+0.17.3-a5a78eb
+```
+
+then with:
+
+```
+gaiacli version
+```
+you should see the same version (or a later one for both).
+
+## Update
+
+Get latest code (you can also `git fetch` only the version desired),
+ensure the dependencies are up to date, then recompile.
+
+```
+cd $GOPATH/src/github.com/cosmos/cosmos-sdk
+git fetch -a origin
+git checkout VERSION
+make get_vendor_deps
+make install
+```

docs/guides/sdk/key-management.md

@@ -0,0 +1,7 @@
+# Key Management
+
+Here we cover many aspects of handling keys within the Cosmos SDK
+framework.
+
+// TODO add relevant key discussion
+(related https://github.com/tendermint/tendermint/blob/master/docs/spec/blockchain/encoding.md#public-key-cryptography)

docs/guides/sdk/lcd-rest-api.yaml

@@ -17,6 +17,13 @@ paths:
       responses:
         200:
           description: Plaintext version i.e. "v0.5.0"
+  /node_version:
+    get:
+      summary: Version of the connected node
+      description: Get the version of the SDK running on the connected node to compare against expected
+      responses:
+        200:
+          description: Plaintext version i.e. "v0.5.0"
   /node_info:
     get:
       description: Only the node info. Block information can be queried via /block/latest
@@ -41,7 +48,7 @@ paths:
                 type: string
               listen_addr:
                 type: string
-                example: 192.168.56.1:46656
+                example: 192.168.56.1:26656
               version:
                 description: Tendermint version
                 type: string
@@ -102,7 +109,7 @@ paths:
         - application/json
       responses:
         200:
-          description: 12 word Seed
+          description: 16 word Seed
           schema:
             type: string
   /keys/{name}:
@@ -204,7 +211,7 @@ paths:
     parameters:
       - in: path
         name: address
-        description: Account address
+        description: Account address in bech32 format
         required: true
         type: string
     get:
@@ -222,7 +229,7 @@ paths:
     parameters:
       - in: path
         name: address
-        description: Account address
+        description: Account address in bech32 format
         required: true
         type: string
     post:
@@ -255,18 +262,6 @@ paths:
           description: Tx was send and will probably be added to the next block
         400:
           description: The Tx was malformated
-  /accounts/{address}/nonce:
-    parameters:
-      - in: path
-        name: address
-        description: Account address
-        required: true
-        type: string
-    get:
-      summary: Get the nonce for a certain account
-      responses:
-        200:
-          description: Plaintext nonce i.e. "4" defaults to "0"
   /blocks/latest:
     get:
       summary: Get the latest block
@@ -304,9 +299,14 @@ paths:
         200:
           description: The validator set at the latest block height
           schema:
-            type: array
-            items:
-              $ref: "#/definitions/Delegate"
+            type: object
+            properties:
+              block_height:
+                type: number
+              validators:
+                type: array
+                items:
+                  $ref: "#/definitions/Validator"
   /validatorsets/{height}:
     parameters:
       - in: path
@@ -322,9 +322,14 @@ paths:
         200:
           description: The validator set at a specific block height
           schema:
-            type: array
-            items:
-              $ref: "#/definitions/Delegate"
+            type: object
+            properties:
+              block_height:
+                type: number
+              validators:
+                type: array
+                items:
+                  $ref: "#/definitions/Validator"
         404:
           description: Block at height not available
   # /txs:
@@ -549,7 +554,20 @@ paths:
 definitions:
   Address:
     type: string
-    example: DF096FDE8D380FA5B2AD20DB2962C82DDEA1ED9B
+    description: bech32 encoded addres
+    example: cosmosaccaddr:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
+  ValidatorAddress:
+    type: string
+    description: bech32 encoded addres
+    example: cosmosvaladdr:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
+  PubKey:
+    type: string
+    description: bech32 encoded public key
+    example: cosmosaccpub:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
+  ValidatorPubKey:
+    type: string
+    description: bech32 encoded public key
+    example: cosmosvalpub:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
   Coins:
     type: object
     properties:
@@ -652,16 +670,6 @@ definitions:
                 example: 81B11E717789600CC192B26F452A983DF13B985EE75ABD9DD9E68D7BA007A958
               Pubkey:
                 $ref: "#/definitions/PubKey"
-  PubKey:
-    type: object
-    properties:
-      type:
-        type: string
-        enum:
-          - ed25519
-      data:
-        type: string
-        example: 81B11E717789600CC192B26F452A983DF13B985EE75ABD9DD9E68D7BA007A958
   Account:
     type: object
     properties:
@@ -753,17 +761,19 @@ definitions:
             type: array
             items:
               type: object
-  Delegate:
+  Validator:
     type: object
     properties:
+      address:
+        $ref: '#/definitions/ValidatorAddress'
       pub_key:
-        $ref: "#/definitions/PubKey"
+        $ref: "#/definitions/ValidatorPubKey"
       power:
         type: number
         example: 1000
-      name:
-        type: string
-        example: "159.89.3.34"
+      accum:
+        type: number
+        example: 1000
 # Added by API Auto Mocking Plugin
 host: virtserver.swaggerhub.com
 basePath: /faboweb1/Cosmos-LCD-2/1.0.0

docs/guides/sdk/overview.rst

@@ -232,12 +232,14 @@ a standard form:
     type StdSignature struct {
     	crypto.PubKey // optional
     	crypto.Signature
-    	Sequence int64
+    	AccountNumber int64
+        Sequence int64
     }
 
-It contains the signature itself, as well as the corresponding account's
-sequence number.  The sequence number is expected to increment every time a
-message is signed by a given account.  This prevents "replay attacks", where
+It contains the signature itself, as well as the corresponding account's account and 
+sequence numbers.  The sequence number is expected to increment every time a
+message is signed by a given account. The account number stays the same and is assigned
+when the account is first generated.  These prevent "replay attacks", where
 the same message could be executed over and over again.
 
 The ``StdSignature`` can also optionally include the public key for verifying the

docs/guides/staking/intro.rst

@@ -291,7 +291,7 @@ To confirm for certain the new validator is active, ask the tendermint node:
 
 ::
 
-    curl localhost:46657/validators
+    curl localhost:26657/validators
 
 If you now kill either node, blocks will stop streaming in, because
 there aren't enough validators online. Turn it back on and they will