Added Properties object and call

PaulSnow · PaulSnow · commit 9c4754eb6513 · 2015-09-18T21:37:10.000-05:00
diff --git a/common/constants.go b/common/constants.go
@@ -28,11 +28,14 @@ const (
 	
 	COMMIT_TIME_WINDOW = time.Duration(12)	  //Time windows for commit chain and commit entry +/- 12 hours
 
+	
+	// maxProtocolVersion is the max protocol version the peer supports.
 	//Common constants
-	VERSION_0     = byte(0)
-	NETWORK_ID_DB = uint32(4203931041) //0xFA92E5A1
-	NETWORK_ID_EB = uint32(4203931042) //0xFA92E5A2
-	NETWORK_ID_CB = uint32(4203931043) //0xFA92E5A3
+	VERSION_0         = byte(0)
+	FACTOMD_VERSION   = 3001               //version starts from 1000 for Factom
+	NETWORK_ID_DB 	  = uint32(4203931041) //0xFA92E5A1
+	NETWORK_ID_EB     = uint32(4203931042) //0xFA92E5A2
+	NETWORK_ID_CB     = uint32(4203931043) //0xFA92E5A3
 
 	//For Factom TestNet
 	NETWORK_ID_TEST = uint32(0) //0x0
@@ -85,3 +88,11 @@ var FACTOID_CHAINID = []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0f}
 
 var ZERO_HASH = []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+
+// Structure for reporting properties (used by the web API
+//
+type Properties struct {
+	Protocol_Version  int
+	Factomd_Version	  int
+	Fctwallet_Version int
+}
diff --git a/wsapi/wsapi.go b/wsapi/wsapi.go
@@ -16,6 +16,7 @@ import (
 	"github.com/FactomProject/FactomCode/factomapi"
 	"github.com/FactomProject/FactomCode/util"
 	"github.com/FactomProject/btcd/wire"
+	"github.com/FactomProject/btcd"
 	fct "github.com/FactomProject/factoid"
 	"github.com/hoisie/web"
 )
@@ -62,6 +63,7 @@ func Start(db database.Db, inMsgQ chan wire.FtmInternalMsg) {
 	server.Get("/v1/entry-credit-balance/([^/]+)", handleEntryCreditBalance)
 	server.Get("/v1/factoid-balance/([^/]+)", handleFactoidBalance)
 	server.Get("/v1/factoid-get-fee/", handleGetFee)
+	server.Get("/v1/properties/",handleProperties)
 
 	wsLog.Info("Starting server")
 	go server.Run("localhost:" + strconv.Itoa(portNumber))
@@ -71,6 +73,22 @@ func Stop() {
 	server.Close()
 }
 
+func handleProperties(ctx *web.Context) {
+
+	r := new(common.Properties)
+	r.Factomd_Version  = common.FACTOMD_VERSION
+	r.Protocol_Version = btcd.ProtocolVersion
+	
+	if p, err := json.Marshal(r); err != nil {
+		wsLog.Error(err)
+		ctx.WriteHeader(httpBad)
+		ctx.Write([]byte(err.Error()))
+		return
+	} else {
+		ctx.Write(p)
+	}
+}
+
 func handleCommitChain(ctx *web.Context) {
 	type commitchain struct {
 		CommitChainMsg string
@@ -114,7 +132,6 @@ func handleCommitChain(ctx *web.Context) {
 		return
 	}
 
-	//	ctx.WriteHeader(httpOK)
 }
 
 func handleRevealChain(ctx *web.Context) {
