From 3d1235f1ff9f2bf6193a98813816fed07808fc16 Mon Sep 17 00:00:00 2001 From: frankcrypto Date: Fri, 8 Mar 2024 11:15:18 +0800 Subject: [PATCH 1/2] remove gbt limit to bps achieve 1 --- services/miner/api.go | 1 + 1 file changed, 1 insertion(+) diff --git a/services/miner/api.go b/services/miner/api.go index 227e47ad..1f2b9d8c 100644 --- a/services/miner/api.go +++ b/services/miner/api.go @@ -225,6 +225,7 @@ func (api *PublicMinerAPI) checkSubmitLimit() error { } func (api *PublicMinerAPI) checkGBTTime(txcount int) error { + return nil if txcount < 1 && time.Since(api.miner.stats.LastestGbtRequest) < params.ActiveNetParams.TargetTimePerBlock { log.Debug("[gbttxzreo]Client init download, qitmeer is sync tx...") return rpc.RPCClientInInitialDownloadError("Client in initial download ", From 57eb575ded9c2e36b30947eaef6283fc86b720d6 Mon Sep 17 00:00:00 2001 From: frankcrypto Date: Fri, 8 Mar 2024 11:48:26 +0800 Subject: [PATCH 2/2] fix params test --- services/miner/api.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/services/miner/api.go b/services/miner/api.go index 1f2b9d8c..066a2547 100644 --- a/services/miner/api.go +++ b/services/miner/api.go @@ -218,14 +218,19 @@ func (api *PublicMinerAPI) SubmitBlockHeader(hexBlockHeader string, extraNonce * } func (api *PublicMinerAPI) checkSubmitLimit() error { - // if time.Since(api.miner.stats.LastestSubmit) < SubmitInterval { - // return fmt.Errorf("Submission interval Limited:%s < %s\n", time.Since(api.miner.stats.LastestSubmit), SubmitInterval) - // } + if params.ActiveNetParams.Name == params.MixNetParam.Name { + return nil + } + if time.Since(api.miner.stats.LastestSubmit) < SubmitInterval { + return fmt.Errorf("Submission interval Limited:%s < %s\n", time.Since(api.miner.stats.LastestSubmit), SubmitInterval) + } return nil } func (api *PublicMinerAPI) checkGBTTime(txcount int) error { - return nil + if params.ActiveNetParams.Name == params.MixNetParam.Name { + return nil + } if txcount < 1 && time.Since(api.miner.stats.LastestGbtRequest) < params.ActiveNetParams.TargetTimePerBlock { log.Debug("[gbttxzreo]Client init download, qitmeer is sync tx...") return rpc.RPCClientInInitialDownloadError("Client in initial download ",