Baseserver send

.gitignore

@@ -5,4 +5,4 @@ merkleeyes.db
 build
 shunit2
 docs/guide/*.sh
-
+keys/

client/commands/proofs/get.go

@@ -2,6 +2,8 @@ package proofs
 
 import (
 	"fmt"
+	"io"
+	"os"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
@@ -111,15 +113,22 @@ type proof struct {
 	Data   interface{} `json:"data"`
 }
 
-// OutputProof prints the proof to stdout
-// reuse this for printing proofs and we should enhance this for text/json,
-// better presentation of height
-func OutputProof(info interface{}, height uint64) error {
-	wrap := proof{height, info}
-	res, err := data.ToJSON(wrap)
+// FoutputProof writes the output of wrapping height and info
+// in the form {"data": <the_data>, "height": <the_height>}
+// to the provider io.Writer
+func FoutputProof(w io.Writer, v interface{}, height uint64) error {
+	wrap := &proof{height, v}
+	blob, err := data.ToJSON(wrap)
 	if err != nil {
 		return err
 	}
-	fmt.Println(string(res))
-	return nil
+	_, err = fmt.Fprintf(w, "%s\n", blob)
+	return err
+}
+
+// OutputProof prints the proof to stdout
+// reuse this for printing proofs and we should enhance this for text/json,
+// better presentation of height
+func OutputProof(data interface{}, height uint64) error {
+	return FoutputProof(os.Stdout, data, height)
 }

client/commands/txs/helpers.go

@@ -62,25 +62,27 @@ func GetSignerAct() (res basecoin.Actor) {
 // eg. if you already set the middleware layers in your code, or want to
 // output in another format.
 func DoTx(tx basecoin.Tx) (err error) {
-	tx, err = Middleware.Wrap(tx)
+	bres, err := CommitTx(tx)
 	if err != nil {
 		return err
 	}
-
-	err = SignTx(tx)
-	if err != nil {
-		return err
+	if bres == nil {
+		return nil // successful prep, nothing left to do
 	}
+	return OutputTx(bres) // print response of the post
+}
 
-	bres, err := PrepareOrPostTx(tx)
+func CommitTx(tx basecoin.Tx) (*ctypes.ResultBroadcastTxCommit, error) {
+	tx, err := Middleware.Wrap(tx)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	if bres == nil {
-		return nil // successful prep, nothing left to do
+
+	if err := SignTx(tx); err != nil {
+		return nil, err
 	}
-	return OutputTx(bres) // print response of the post
 
+	return PrepareOrPostTx(tx)
 }
 
 // SignTx will validate the tx, and signs it if it is wrapping a Signable.

client/rest/cmd.go

@@ -0,0 +1,47 @@
+package rest
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+
+	"github.com/gorilla/mux"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	coinrest "github.com/tendermint/basecoin/modules/coin/rest"
+)
+
+var ServeCmd = &cobra.Command{
+	Use:   "serve",
+	Short: "Serve the light REST client for tendermint",
+	Long:  "Access basecoin via REST",
+	RunE:  serve,
+}
+
+const envPortFlag = "port"
+
+func init() {
+	_ = ServeCmd.PersistentFlags().Int(envPortFlag, 8998, "the port to run the server on")
+}
+
+const defaultAlgo = "ed25519"
+
+func serve(cmd *cobra.Command, args []string) error {
+	port := viper.GetInt(envPortFlag)
+	keysManager := DefaultKeysManager()
+	router := mux.NewRouter()
+	ctx := Context{
+		Keys: New(keysManager, defaultAlgo),
+	}
+	if err := ctx.RegisterHandlers(router); err != nil {
+		return err
+	}
+	if err := coinrest.RegisterHandlers(router); err != nil {
+		return err
+	}
+
+	addr := fmt.Sprintf(":%d", port)
+	log.Printf("Serving on %q", addr)
+	return http.ListenAndServe(addr, router)
+}