s/adam/basecoin/g; fix tests

cmd/adam/main.go

@@ -1,30 +0,0 @@
-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)
-}

demo/clean.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-killall -9 adam tendermint
+killall -9 basecoin tendermint
 TMROOT=./data/chain1/tendermint tendermint unsafe_reset_all
 TMROOT=./data/chain2/tendermint tendermint unsafe_reset_all
 

demo/start.sh

@@ -26,11 +26,11 @@ echo "... starting chains"
 echo ""
 # start the first node
 TMROOT=./data/chain1/tendermint tendermint node &> chain1_tendermint.log &
-adam start --dir ./data/chain1/basecoin &> chain1_basecoin.log &
+basecoin start --dir ./data/chain1/basecoin &> chain1_basecoin.log &
 
 # start the second node
 TMROOT=./data/chain2/tendermint tendermint node --node_laddr tcp://localhost:36656 --rpc_laddr tcp://localhost:36657 --proxy_app tcp://localhost:36658 &> chain2_tendermint.log &
-adam start --address tcp://localhost:36658 --dir ./data/chain2/basecoin &> chain2_basecoin.log &
+basecoin start --address tcp://localhost:36658 --dir ./data/chain2/basecoin &> chain2_basecoin.log &
 
 echo ""
 echo "... waiting for chains to start"
@@ -40,20 +40,20 @@ sleep 10
 echo "... registering chain1 on chain2"
 echo ""
 # register chain1 on chain2
-adam tx ibc --amount 10 $CHAIN_FLAGS2 register --chain_id $CHAIN_ID1 --genesis ./data/chain1/tendermint/genesis.json
+basecoin tx ibc --amount 10 $CHAIN_FLAGS2 register --chain_id $CHAIN_ID1 --genesis ./data/chain1/tendermint/genesis.json
 
 echo ""
 echo "... creating egress packet on chain1"
 echo ""
 # create a packet on chain1 destined for chain2
 PAYLOAD="DEADBEEF" #TODO
-adam tx ibc --amount 10 $CHAIN_FLAGS1 packet create --from $CHAIN_ID1 --to $CHAIN_ID2 --type coin --payload $PAYLOAD --sequence 1
+basecoin tx ibc --amount 10 $CHAIN_FLAGS1 packet create --from $CHAIN_ID1 --to $CHAIN_ID2 --type coin --payload $PAYLOAD --sequence 1
 
 echo ""
 echo "... querying for packet data"
 echo ""
 # query for the packet data and proof
-QUERY_RESULT=$(adam query ibc,egress,$CHAIN_ID1,$CHAIN_ID2,1)
+QUERY_RESULT=$(basecoin query ibc,egress,$CHAIN_ID1,$CHAIN_ID2,1)
 HEIGHT=$(echo $QUERY_RESULT | jq .height)
 PACKET=$(echo $QUERY_RESULT | jq .value)
 PROOF=$(echo $QUERY_RESULT | jq .proof)
@@ -75,7 +75,7 @@ echo ""
 echo "... querying for block data"
 echo ""
 # get the header and commit for the height
-HEADER_AND_COMMIT=$(adam block $HEIGHT) 
+HEADER_AND_COMMIT=$(basecoin block $HEIGHT) 
 HEADER=$(echo $HEADER_AND_COMMIT | jq .hex.header)
 HEADER=$(removeQuotes $HEADER)
 COMMIT=$(echo $HEADER_AND_COMMIT | jq .hex.commit)
@@ -89,19 +89,19 @@ echo ""
 echo "... updating state of chain1 on chain2"
 echo ""
 # update the state of chain1 on chain2
-adam tx ibc --amount 10 $CHAIN_FLAGS2 update --header 0x$HEADER --commit 0x$COMMIT
+basecoin tx ibc --amount 10 $CHAIN_FLAGS2 update --header 0x$HEADER --commit 0x$COMMIT
 
 echo ""
 echo "... posting packet from chain1 on chain2"
 echo ""
 # post the packet from chain1 to chain2
-adam tx ibc --amount 10 $CHAIN_FLAGS2 packet post --from $CHAIN_ID1 --height $((HEIGHT + 1)) --packet 0x$PACKET --proof 0x$PROOF
+basecoin tx ibc --amount 10 $CHAIN_FLAGS2 packet post --from $CHAIN_ID1 --height $((HEIGHT + 1)) --packet 0x$PACKET --proof 0x$PROOF
 
 echo ""
 echo "... checking if the packet is present on chain2"
 echo ""
 # query for the packet on chain2 !
-adam query --node tcp://localhost:36657 ibc,ingress,test_chain_2,test_chain_1,1
+basecoin query --node tcp://localhost:36657 ibc,ingress,test_chain_2,test_chain_1,1
 
 echo ""
 echo "DONE!"

docs/guide/ibc.md

@@ -181,10 +181,9 @@ Now that we have all the background knowledge, let's actually walk through the t
 
 Make sure you have installed
 [tendermint](https://tendermint.com/intro/getting-started/download) and
-[adam](/docs/guide/install.md).
+[basecoin](/docs/guide/install.md).
 
-`adam` is the name for the program that will become the Cosmos Hub.
-We call it Adam because it's the first blockchain in [the Cosmos Network](https://cosmos.network).
+`basecoin` is a framework for creating new cryptocurrency applications.
 
 Now let's start the two blockchains.
 In this tutorial, each chain will have only a single validator,
@@ -201,14 +200,14 @@ We can start the two chains as follows:
 
 ```
 TMROOT=./data/chain1/tendermint tendermint node &> chain1_tendermint.log &
-adam start --dir ./data/chain1/basecoin &> chain1_adam.log &
+basecoin start --dir ./data/chain1/basecoin &> chain1_basecoin.log &
 ```
 
 and
 
 ```
 TMROOT=./data/chain2/tendermint tendermint node --node_laddr tcp://localhost:36656 --rpc_laddr tcp://localhost:36657 --proxy_app tcp://localhost:36658 &> chain2_tendermint.log &
-adam start --address tcp://localhost:36658 --dir ./data/chain2/basecoin &> chain2_basecoin.log &
+basecoin start --address tcp://localhost:36658 --dir ./data/chain2/basecoin &> chain2_basecoin.log &
 ```
 
 Note how we refer to the relevant data directories. Also note how we have to set the various addresses for the second node so as not to conflict with the first.
@@ -237,20 +236,20 @@ export CHAIN_FLAGS2="--chain_id $CHAIN_ID2 --from ./data/chain2/basecoin/key.jso
 Let's start by registering `test_chain_1` on `test_chain_2`:
 
 ```
-adam tx ibc --amount 10 $CHAIN_FLAGS2 register --chain_id $CHAIN_ID1 --genesis ./data/chain1/tendermint/genesis.json
+basecoin tx ibc --amount 10 $CHAIN_FLAGS2 register --chain_id $CHAIN_ID1 --genesis ./data/chain1/tendermint/genesis.json
 ```
 
 Now we can create the outgoing packet on `test_chain_1`:
 
 ```
-adam tx ibc --amount 10 $CHAIN_FLAGS1 packet create --from $CHAIN_ID1 --to $CHAIN_ID2 --type coin --payload 0xDEADBEEF --sequence 1
+basecoin tx ibc --amount 10 $CHAIN_FLAGS1 packet create --from $CHAIN_ID1 --to $CHAIN_ID2 --type coin --payload 0xDEADBEEF --sequence 1
 ```
 
 Note our payload is just `DEADBEEF`.
 Now that the packet is committed in the chain, let's get some proof by querying:
 
 ```
-adam query ibc,egress,$CHAIN_ID1,$CHAIN_ID2,1
+basecoin query ibc,egress,$CHAIN_ID1,$CHAIN_ID2,1
 ```
 
 The result contains the latest height, a value (ie. the hex-encoded binary serialization of our packet),
@@ -261,7 +260,7 @@ We'll need a recent block header and a set of commit signatures.
 Fortunately, we can get them with the `block` command:
 
 ```
-adam block <height>
+basecoin block <height>
 ```
 
 where `<height>` is the height returned in the previous query.
@@ -271,7 +270,7 @@ The former is used as input for later commands; the latter is human-readable, so
 Let's send this updated information about `test_chain_1` to `test_chain_2`:
 
 ```
-adam tx ibc --amount 10 $CHAIN_FLAGS2 update --header 0x<header>--commit 0x<commit>
+basecoin tx ibc --amount 10 $CHAIN_FLAGS2 update --header 0x<header>--commit 0x<commit>
 ```
 
 where `<header>` and `<commit>` are the hex-encoded header and commit returned by the previous `block` command.
@@ -281,7 +280,7 @@ along with proof the packet was committed on `test_chain_1`. Since `test_chain_2
 of `test_chain_1`, it will be able to verify the proof!
 
 ```
-adam tx ibc --amount 10 $CHAIN_FLAGS2 packet post --from $CHAIN_ID1 --height <height + 1> --packet 0x<packet> --proof 0x<proof>
+basecoin tx ibc --amount 10 $CHAIN_FLAGS2 packet post --from $CHAIN_ID1 --height <height + 1> --packet 0x<packet> --proof 0x<proof>
 ```
 
 Here, `<height + 1>` is one greater than the height retuned by the previous `query` command, and `<packet>` and `<proof>` are the

docs/guide/src/example-plugin/plugin.go

@@ -72,9 +72,9 @@ func (ep *ExamplePlugin) RunTx(store types.KVStore, ctx types.CallContext, txByt
 func (ep *ExamplePlugin) InitChain(store types.KVStore, vals []*abci.Validator) {
 }
 
-func (ep *ExamplePlugin) BeginBlock(store types.KVStore, height uint64) {
+func (ep *ExamplePlugin) BeginBlock(store types.KVStore, hash []byte, header *abci.Header) {
 }
 
-func (ep *ExamplePlugin) EndBlock(store types.KVStore, height uint64) []*abci.Validator {
-	return nil
+func (ep *ExamplePlugin) EndBlock(store types.KVStore, height uint64) abci.ResponseEndBlock {
+	return abci.ResponseEndBlock{}
 }

plugins/counter/counter.go

@@ -21,21 +21,18 @@ type CounterTx struct {
 //--------------------------------------------------------------------------------
 
 type CounterPlugin struct {
-	name string
 }
 
 func (cp *CounterPlugin) Name() string {
-	return cp.name
+	return "counter"
 }
 
 func (cp *CounterPlugin) StateKey() []byte {
-	return []byte(fmt.Sprintf("CounterPlugin{name=%v}.State", cp.name))
+	return []byte(fmt.Sprintf("CounterPlugin.State"))
 }
 
 func New() *CounterPlugin {
-	return &CounterPlugin{
-		name: "counter",
-	}
+	return &CounterPlugin{}
 }
 
 func (cp *CounterPlugin) SetOption(store types.KVStore, key string, value string) (log string) {

plugins/counter/counter_test.go

@@ -22,8 +22,7 @@ func TestCounterPlugin(t *testing.T) {
 	t.Log(bcApp.Info())
 
 	// Add Counter plugin
-	counterPluginName := "testcounter"
-	counterPlugin := New(counterPluginName)
+	counterPlugin := New()
 	bcApp.RegisterPlugin(counterPlugin)
 
 	// Account initialization
@@ -40,7 +39,7 @@ func TestCounterPlugin(t *testing.T) {
 		tx := &types.AppTx{
 			Gas:   gas,
 			Fee:   fee,
-			Name:  counterPluginName,
+			Name:  "counter",
 			Input: types.NewTxInput(test1Acc.PubKey, inputCoins, inputSequence),
 			Data:  wire.BinaryBytes(CounterTx{Valid: true, Fee: appFee}),
 		}