Update the info api

server/network.go

@@ -25,7 +25,7 @@ func connCheck(host, port string) bool {
 }
 
 func getConnectors() int {
-	resp, err := client.Get("https://127.0.0.1:2131/bitmarkd/info")
+	resp, err := client.Get("https://127.0.0.1:2131/bitmarkd/details")
 	if err != nil {
 		return 0
 	}
@@ -38,17 +38,14 @@ func getConnectors() int {
 		return 0
 	}
 
-	var result map[string]interface{}
+	var reply DetailReply
 	d := json.NewDecoder(&buf)
-	err = d.Decode(&result)
+	err = d.Decode(&reply)
 	if err != nil {
 		return 0
 	}
-	if count, ok := result["client_count"]; !ok {
-		return 0
-	} else {
-		return int(count.(float64))
-	}
+
+	return int(reply.Peers.Local)
 }
 
 func (ws *WebServer) ConnectionStatus(c *gin.Context) {

server/server.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/bitmark-inc/bitmark-node/config"
 	"github.com/bitmark-inc/bitmark-node/services"
-	"github.com/bitmark-inc/bitmarkd/rpc"
 	"github.com/gin-gonic/gin"
 )
 
@@ -143,7 +142,7 @@ func (ws *WebServer) BitmarkdStartStop(c *gin.Context) {
 		return
 	case "info":
 
-		resp, err := client.Get("https://127.0.0.1:2131/bitmarkd/info")
+		resp, err := client.Get("https://127.0.0.1:2131/bitmarkd/details")
 		if err != nil {
 			c.String(500, "unable to get bitmark info")
 			return
@@ -157,7 +156,7 @@ func (ws *WebServer) BitmarkdStartStop(c *gin.Context) {
 			return
 		}
 
-		var reply rpc.InfoReply
+		var reply DetailReply
 		d := json.NewDecoder(&bb)
 
 		if err := d.Decode(&reply); err != nil {

server/structs.go

@@ -0,0 +1,24 @@
+package server
+
+type Counters struct {
+	Pending  int `json:"pending"`
+	Verified int `json:"verified"`
+}
+
+type BlockCounts struct {
+	Local  uint64 `json:"local"`
+	Remote uint64 `json:"remote"`
+}
+
+type DetailReply struct {
+	Chain               string      `json:"chain"`
+	Mode                string      `json:"mode"`
+	Blocks              BlockCounts `json:"blocks"`
+	RPCs                uint64      `json:"rpcs"`
+	Peers               BlockCounts `json:"peers"`
+	TransactionCounters Counters    `json:"transactionCounters"`
+	Difficulty          float64     `json:"difficulty"`
+	Version             string      `json:"version"`
+	Uptime              string      `json:"uptime"`
+	PublicKey           string      `json:"publicKey"`
+}

ui/src/app/node.vue

@@ -64,12 +64,12 @@
           <h3 class="paragraph-title ">Bitmark node info</h3>
           <div class="row__box ">
             <Box title="Network ID ">
-              <p>{{ this.bitmarkdInfo.public_key }}</p>
+              <p>{{ this.bitmarkdInfo.publicKey }}</p>
             </Box>
             <!-- End: box -->
             <Box title="Current Block ">
               <div class="blocks ">
-                <span class="blocks__num ">{{ this.bitmarkdInfo.blocks }}/{{ this.bitmarkdInfo.block_height || this.bitmarkdInfo.blocks }}</span>
+                <span class="blocks__num ">{{ this.bitmarkdInfo.blocks.local }}/{{ this.bitmarkdInfo.blocks.local || this.bitmarkdInfo.blocks.remote }}</span>
                 <span class="blocks__label ">
                   <template v-if="this.bitmarkdInfo.mode === 'Resynchronise'">Updating blockchain</template>
                   <template v-else-if="this.bitmarkdInfo.mode === 'Normal'">Latest block</template>