Merge pull request #599 from frankcrypto2023/dev/1.2

stats gbt2.0

Author: dindinw

params/params.go

@@ -8,13 +8,14 @@ package params
 import (
 	"encoding/hex"
 	"errors"
+	"strings"
+	"time"
+
 	"github.com/Qitmeer/qng/common/hash"
 	"github.com/Qitmeer/qng/core/protocol"
 	"github.com/Qitmeer/qng/core/types"
 	"github.com/Qitmeer/qng/core/types/pow"
 	"github.com/Qitmeer/qng/ledger"
-	"strings"
-	"time"
 )
 
 // CheckForDuplicateHashes checks for duplicate hashes when validating blocks.

services/miner/api.go

@@ -6,6 +6,8 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
+	"time"
+
 	"github.com/Qitmeer/qng/common/hash"
 	"github.com/Qitmeer/qng/core/json"
 	"github.com/Qitmeer/qng/core/types"
@@ -15,7 +17,6 @@ import (
 	"github.com/Qitmeer/qng/rpc/api"
 	"github.com/Qitmeer/qng/rpc/client/cmds"
 	"github.com/Qitmeer/qng/services/mining"
-	"time"
 )
 
 const (
@@ -171,11 +172,21 @@ func (api *PublicMinerAPI) GetRemoteGBT(powType byte, extraNonce *bool) (interfa
 	if extraNonce != nil && *extraNonce {
 		coinbaseFlags = mining.CoinbaseFlagsDynamic
 	}
+	start := time.Now().UnixMilli()
+	api.miner.stats.TotalGbtRequests++
+
 	err := api.miner.RemoteMining(pow.PowType(powType), coinbaseFlags, reply)
 	if err != nil {
 		return nil, err
 	}
 	resp := <-reply
+	txcount := len(api.miner.template.Block.Transactions)
+	if err := api.checkGBTTime(txcount); err != nil {
+		api.miner.stats.MempoolEmptyWarns++
+		return nil, err
+	}
+	api.miner.stats.LastestMempoolEmptyTimestamp = 0
+	api.miner.StatsGbtRequest(time.Now().UnixMilli()-start, txcount, api.miner.template.Block.Header.ParentRoot.String())
 	return resp.result, resp.err
 }
 

services/miner/miner.go

@@ -5,6 +5,11 @@ import (
 	"context"
 	ejson "encoding/json"
 	"fmt"
+	"math/rand"
+	"net/http"
+	"sync"
+	"time"
+
 	"github.com/Qitmeer/qng/common/hash"
 	"github.com/Qitmeer/qng/common/roughtime"
 	"github.com/Qitmeer/qng/config"
@@ -23,10 +28,6 @@ import (
 	"github.com/Qitmeer/qng/rpc"
 	"github.com/Qitmeer/qng/services/mempool"
 	"github.com/Qitmeer/qng/services/mining"
-	"math/rand"
-	"net/http"
-	"sync"
-	"time"
 )
 
 const (
@@ -657,6 +658,8 @@ func (m *Miner) submitBlockHeader(header *types.BlockHeader, extraNonce uint64)
 	if !IsEqualForMiner(&m.template.Block.Header, header) {
 		return nil, fmt.Errorf("You're overdue")
 	}
+
+	start := time.Now().UnixMilli()
 	block, err := m.template.Block.Clone()
 	if err != nil {
 		return nil, err
@@ -681,7 +684,9 @@ func (m *Miner) submitBlockHeader(header *types.BlockHeader, extraNonce uint64)
 	block.Header.Difficulty = header.Difficulty
 	block.Header.Timestamp = header.Timestamp
 	block.Header.Pow = header.Pow
-	return m.submitBlock(types.NewBlock(block))
+	res, err := m.submitBlock(types.NewBlock(block))
+	m.StatsSubmit(time.Now().UnixMilli()-start, header.BlockHash().String(), len(block.Transactions)-1)
+	return res, err
 }
 
 func (m *Miner) CanMining() error {