Merge pull request #14 from kehiy/main

fix: last blocktime logic
jwmdev · Nov 21, 2023 · 0836216 · 0836216
2 parents c0d0d5b + 1147400
commit 0836216
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/client/client.go b/client/client.go
@@ -112,6 +112,13 @@ func (c *Client) TransactionData(hash string) (*pactus.TransactionInfo, error) {
 	return data.GetTransaction(), nil
 }
 
+func (c *Client) LastBlockTime() (uint32, error) {
+	info, _ := c.blockchainClient.GetBlockchainInfo(context.Background(), &pactus.GetBlockchainInfoRequest{})
+	lastBlockTime, err := c.blockchainClient.GetBlock(context.Background(), &pactus.GetBlockRequest{Height: info.LastBlockHeight})
+
+	return lastBlockTime.BlockTime, err
+}
+
 func (c *Client) Close() error {
 	return c.conn.Close()
 }
diff --git a/client/client_mgr.go b/client/client_mgr.go
@@ -61,18 +61,18 @@ func (cm *Mgr) GetBlockchainHeight() (uint32, error) {
 }
 
 func (cm *Mgr) GetLastBlockTime() uint32 {
-	var lastBlockHeight uint32 = 0
+	var lastBlockTime uint32 = 0
 	for _, c := range cm.clients {
-		info, err := c.GetBlockchainInfo()
+		t, err := c.LastBlockTime()
 		if err != nil {
 			continue
 		}
-		if info.LastBlockHeight > lastBlockHeight {
-			lastBlockHeight = info.LastBlockHeight
+		if t > lastBlockTime {
+			lastBlockTime = t
 		}
 	}
 
-	return lastBlockHeight
+	return lastBlockTime
 }
 
 func (cm *Mgr) GetNetworkInfo() (*pactus.GetNetworkInfoResponse, error) {