Docs

README.md

@@ -2,20 +2,16 @@
 
 DISCLAIMER: Basecoin is not associated with Coinbase.com, an excellent Bitcoin/Ethereum service.
 
-Basecoin is a sample [ABCI application](https://github.com/tendermint/abci) designed to be used with the [tendermint consensus engine](https://tendermint.com/) to form a Proof-of-Stake cryptocurrency. This project has two main purposes:
+Basecoin is an [ABCI application](https://github.com/tendermint/abci) designed to be used with the [tendermint consensus engine](https://tendermint.com/) to form a Proof-of-Stake cryptocurrency. 
+It also provides a general purpose framework for extending the feature-set of the cryptocurrency
+by implementing plugins.
 
-  1. As an example for anyone wishing to build a custom application using tendermint.
-  2. As a framework for anyone wishing to build a tendermint-based currency, extensible using the plugin system.
+Basecoin serves as a reference implementation for how we build ABCI applications in Go,
+and is the framework in which we implement the [Cosmos Hub](https://cosmos.network). 
+It's easy to use, and doesn't require any forking - just implement your plugin, import the basecoin libraries,
+and away you go with a full-stack blockchain and command line tool for transacting.
 
-If you wish to use basecoin as a framework to build your application, you most likely do not need to fork basecoin or modify it in any way. In fact, even the cli tool is designed to be easily extended by third party repos with almost no copying of code. You just need to add basecoin as a dependency in the `vendor` dir and take a look at [some examples](https://github.com/tendermint/basecoin-examples/blob/master/README.md) of how to customize it without modifying the code.
-
-## Contents
-
-  1. [Installation](#installation)
-  1. [Using the plugin system](#using-the-plugin-system)
-  1. [Using the cli](#using-the-cli)
-  1. [Tutorials and other reading](#tutorials-and-other-reading)
-  1. [Contributing](#contributing)
+WARNING: Currently uses plain-text private keys for transactions and is otherwise not production ready.
 
 ## Installation
 
@@ -30,49 +26,21 @@ make install
 
 This will create the `basecoin` binary in `$GOPATH/bin`.
 
-## Using the Plugin System
-
-Basecoin is designed to serve as a common base layer for developers building cryptocurrency applications.
-It handles public-key authentication of transactions, maintaining the balance of arbitrary types of currency (BTC, ATOM, ETH, MYCOIN, ...),
-sending currency (one-to-one or n-to-m multisig), and providing merkle-proofs of the state.
-These are common factors that many people wish to have in a crypto-currency system,
-so instead of trying to start from scratch, developers can extend the functionality of Basecoin using the plugin system, just writing the custom business logic they need, and leaving the rest to the basecoin system.
-
-Interested in building a plugin?  Then [read more details here](./Plugins.md) and then you can follow a [simple tutorial](https://github.com/tendermint/basecoin-examples/blob/master/pluginDev/tutorial.md) to get your first plugin working.
-
-### Best Practices
-
-We are still trying out sort out the best practices for basecoin plugins, and ABCi apps in general.  Flexibility is very powerful once one has mastered a system, but when starting out, it is nice to have a set of guidelines to follow (and then expand beyond when no longer needed). I have attempted to gather some [good design practices](https://github.com/tendermint/basecoin-examples/tree/master/trader#code-design) I have discovered/invented while building progress. These are not hard rules, but should give you a good start.  And please give feedback to improve and extend them.
+## Command Line Interface
 
-## Using the CLI
-
-The basecoin cli can be used to start a stand-alone basecoin instance (`basecoin start`),
+The basecoin CLI can be used to start a stand-alone basecoin instance (`basecoin start`),
 or to start basecoin with tendermint in the same process (`basecoin start --in-proc`).
-It can also be used to send transactions, eg. `basecoin sendtx --to 0x4793A333846E5104C46DD9AB9A00E31821B2F301 --amount 100`
+It can also be used to send transactions, eg. `basecoin tx send --to 0x4793A333846E5104C46DD9AB9A00E31821B2F301 --amount 100`
 See `basecoin --help` and `basecoin [cmd] --help` for more details`.
 
-Or follow through a [step-by-step introduction](https://github.com/tendermint/basecoin-examples/blob/master/tutorial.md) to testing basecoin locally.
-
-## Tutorials and Other Reading
-
-See our [introductory blog post](https://cosmos.network/blog/cosmos-creating-interoperable-blockchains-part-1), which explains the motivation behind Basecoin.
-
-There are a [number of examples](https://github.com/tendermint/basecoin-examples/blob/master/README.md) along with some tutorials and introductory texts, that should give you some pointers on how to wirte you own plugins and integrate them into your own custom app.
-
-We are working on extending these examples, as well as documenting (and automating) setting up a testnet, and providing an example GUI for viewing basecoin, which can all be used as a starting point for your application. They should be published during the course of February 2017, so stay tuned....
-
-## Contributing
+## Learn more
 
-We will merge in interesting plugin implementations and improvements to Basecoin.
+1. Getting started with the [Basecoin tool](/docs/guide/basecoin-basics.md)
+1. Learn more about [Basecoin's design](/docs/guide/basecoin-design.md)
+1. Extend Basecoin [using the plugin system](/docs/guide/example-plugin.md)
+1. Learn more about [plugin design](/docs/guide/plugin-design.md)
+1. See some [more example applications](/docs/guide/more-examples.md)
+1. Learn how to use [InterBlockchain Communication (IBC)](/docs/guide/ibc.md)
+1. [Deploy testnets](deployment.md) running your basecoin application.
 
-If you don't have much experience forking in go, there are a few tricks you want to keep in mind to avoid headaches. Basically, all imports in go are absolute from GOPATH, so if you fork a repo with more than one directory, and you put it under github.com/MYNAME/repo, all the code will start calling github.com/ORIGINAL/repo, which is very confusing.  My preferred solution to this is as follows:
 
-  * Create your own fork on github, using the fork button.
-  * Go to the original repo checked out locally (from `go get`)
-  * `git remote rename origin upstream`
-  * `git remote add origin [email protected]:YOUR-NAME/basecoin.git`
-  * `git push -u origin master`
-  * You can now push all changes to your fork and all code compiles, all other code referencing the original repo, now references your fork.
-  * If you want to pull in updates from the original repo:
-    * `git fetch upstream`
-    * `git rebase upstream/master` (or whatever branch you want)

cmd/adam/main.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"os"
+
+	"github.com/tendermint/basecoin/cmd/commands"
+
+	"github.com/urfave/cli"
+)
+
+func init() {
+	commands.RegisterIBC()
+}
+
+func main() {
+	app := cli.NewApp()
+	app.Name = "adam"
+	app.Usage = "adam [command] [args...]"
+	app.Version = "0.1.0"
+	app.Commands = []cli.Command{
+		commands.StartCmd,
+		commands.TxCmd,
+		commands.KeyCmd,
+		commands.QueryCmd,
+		commands.VerifyCmd, // TODO: move to merkleeyes?
+		commands.BlockCmd,
+		commands.AccountCmd,
+	}
+	app.Run(os.Args)
+}

cmd/basecoin/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/tendermint/basecoin/cmd/basecoin/commands"
+	"github.com/tendermint/basecoin/cmd/commands"
 	"github.com/urfave/cli"
 )
 
@@ -14,12 +14,11 @@ func main() {
 	app.Version = "0.1.0"
 	app.Commands = []cli.Command{
 		commands.StartCmd,
-		commands.SendTxCmd,
-		commands.AppTxCmd,
-		commands.IbcCmd,
+		commands.TxCmd,
 		commands.QueryCmd,
-		commands.VerifyCmd,
-		commands.BlockCmd,
+		commands.KeyCmd,
+		commands.VerifyCmd, // TODO: move to merkleeyes?
+		commands.BlockCmd,  // TODO: move to adam?
 		commands.AccountCmd,
 	}
 	app.Run(os.Args)

cmd/basecoin/commands/flags.go → cmd/commands/flags.go

@@ -31,11 +31,6 @@ var (
 		Name:  "in-proc",
 		Usage: "Run Tendermint in-process with the App",
 	}
-
-	IbcPluginFlag = cli.BoolFlag{
-		Name:  "ibc-plugin",
-		Usage: "Enable the ibc plugin",
-	}
 )
 
 // tx flags
@@ -61,7 +56,7 @@ var (
 
 	FromFlag = cli.StringFlag{
 		Name:  "from",
-		Value: "priv_validator.json",
+		Value: "key.json",
 		Usage: "Path to a private key to sign the transaction",
 	}
 
@@ -106,86 +101,6 @@ var (
 		Value: "test_chain_id",
 		Usage: "ID of the chain for replay protection",
 	}
-
-	ValidFlag = cli.BoolFlag{
-		Name:  "valid",
-		Usage: "Set valid field in CounterTx",
-	}
-)
-
-// ibc flags
-var (
-	IbcChainIDFlag = cli.StringFlag{
-		Name:  "chain_id",
-		Usage: "ChainID for the new blockchain",
-		Value: "",
-	}
-
-	IbcGenesisFlag = cli.StringFlag{
-		Name:  "genesis",
-		Usage: "Genesis file for the new blockchain",
-		Value: "",
-	}
-
-	IbcHeaderFlag = cli.StringFlag{
-		Name:  "header",
-		Usage: "Block header for an ibc update",
-		Value: "",
-	}
-
-	IbcCommitFlag = cli.StringFlag{
-		Name:  "commit",
-		Usage: "Block commit for an ibc update",
-		Value: "",
-	}
-
-	IbcFromFlag = cli.StringFlag{
-		Name:  "from",
-		Usage: "Source ChainID",
-		Value: "",
-	}
-
-	IbcToFlag = cli.StringFlag{
-		Name:  "to",
-		Usage: "Destination ChainID",
-		Value: "",
-	}
-
-	IbcTypeFlag = cli.StringFlag{
-		Name:  "type",
-		Usage: "IBC packet type (eg. coin)",
-		Value: "",
-	}
-
-	IbcPayloadFlag = cli.StringFlag{
-		Name:  "payload",
-		Usage: "IBC packet payload",
-		Value: "",
-	}
-
-	IbcPacketFlag = cli.StringFlag{
-		Name:  "packet",
-		Usage: "hex-encoded IBC packet",
-		Value: "",
-	}
-
-	IbcProofFlag = cli.StringFlag{
-		Name:  "proof",
-		Usage: "hex-encoded proof of IBC packet from source chain",
-		Value: "",
-	}
-
-	IbcSequenceFlag = cli.IntFlag{
-		Name:  "sequence",
-		Usage: "sequence number for IBC packet",
-		Value: 0,
-	}
-
-	IbcHeightFlag = cli.IntFlag{
-		Name:  "height",
-		Usage: "Height the packet became egress in source chain",
-		Value: 0,
-	}
 )
 
 // proof flags