Merge branch 'Hotfix2'

Author: carryforward

all.sh

@@ -120,6 +120,8 @@ checkout btclog       $branch $default
 checkout dynrsrc      $branch $default
 checkout ed25519      $branch $default
 checkout fastsha256   $branch $default 
+checkout go-bip32     $branch $default
+checkout go-bip39     $branch $default
 checkout go-flags     $branch $default
 checkout go-socks     $branch $default
 checkout seelog       $branch $default

common/constants.go

@@ -32,7 +32,7 @@ const (
 	// maxProtocolVersion is the max protocol version the peer supports.
 	//Common constants
 	VERSION_0         = byte(0)
-	FACTOMD_VERSION   = 3002               //fixed point. resolves to 0.<thousands place>.<rightmost digits>
+	FACTOMD_VERSION   = 3003               //fixed point. resolves to 0.<thousands place>.<rightmost digits>
 	NETWORK_ID_DB 	  = uint32(4203931041) //0xFA92E5A1
 	NETWORK_ID_EB     = uint32(4203931042) //0xFA92E5A2
 	NETWORK_ID_CB     = uint32(4203931043) //0xFA92E5A3

wsapi/wsapi.go

@@ -56,6 +56,7 @@ func Start(db database.Db, inMsgQ chan wire.FtmInternalMsg) {
 	server.Get("/v1/directory-block-head/?", handleDirectoryBlockHead)
 	server.Get("/v1/get-raw-data/([^/]+)", handleGetRaw)
 	server.Get("/v1/directory-block-by-keymr/([^/]+)", handleDirectoryBlock)
+	server.Get("/v1/directory-block-height/?", handleDirectoryBlockHeight)
 	server.Get("/v1/entry-block-by-keymr/([^/]+)", handleEntryBlock)
 	server.Get("/v1/entry-by-hash/([^/]+)", handleEntry)
 	server.Get("/v1/chain-head/([^/]+)", handleChainHead)
@@ -250,8 +251,32 @@ func handleDirectoryBlockHead(ctx *web.Context) {
 	} else {
 		ctx.Write(p)
 	}
+}
 
-	//	ctx.WriteHeader(httpOK)
+
+func handleDirectoryBlockHeight(ctx *web.Context) {
+	type dbheight struct {
+		Height int
+	}
+	
+	h := new(dbheight)
+	if block, err := factomapi.DBlockHead(); err != nil {
+		wsLog.Error(err)
+		ctx.WriteHeader(httpBad)
+		ctx.Write([]byte(err.Error()))
+		return
+	} else {
+		h.Height = int(block.Header.DBHeight)
+	}
+		
+	if p, err := json.Marshal(h); err != nil {
+		wsLog.Error(err)
+		ctx.WriteHeader(httpBad)
+		ctx.Write([]byte(err.Error()))
+		return
+	} else {
+		ctx.Write(p)
+	}	
 }
 
 func handleDirectoryBlock(ctx *web.Context, keymr string) {
@@ -519,7 +544,7 @@ func handleFactoidSubmit(ctx *web.Context) {
 	}
 
 	msg := new(wire.MsgFactoidTX)
-
+	fmt.Println(string(p))
 	if p, err = hex.DecodeString(t.Transaction); err != nil {
 		returnMsg(ctx, "Unable to decode the transaction", false)
 		return