fix get GasPrice bug (ontio#1361)

* fix get GasPrice bug * fix get GasPrice bug
rongyi · Aug 9, 2021 · c79fd38 · c79fd38
1 parent 9be6fac
commit c79fd38
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/http/base/actor/txnpool.go b/http/base/actor/txnpool.go
@@ -76,3 +76,7 @@ func GetTxnCount() []uint32 {
 func GetTxnHashList() []common.Uint256 {
 	return txPoolService.GetTxList()
 }
+
+func GetGasPrice() uint64 {
+	return txPoolService.GetGasPrice()
+}
diff --git a/http/base/common/common.go b/http/base/common/common.go
@@ -512,6 +512,9 @@ func GetGasPrice() (gasPrice uint64, height uint32, err error) {
 			break
 		}
 	}
+	if gasPrice == 0 {
+		gasPrice = bactor.GetGasPrice()
+	}
 	return
 }
 

diff --git a/http/ethrpc/eth/api.go b/http/ethrpc/eth/api.go
@@ -57,6 +57,7 @@ type TxPoolService interface {
 	Nonce(addr oComm.Address) uint64
 	PendingEIPTransactions() []*types.Transaction
 	PendingTransactionsByHash(target common.Hash) *types.Transaction
+	GetGasPrice() uint64
 }
 
 type EthereumAPI struct {

diff --git a/txnpool/common/txnpool_common.go b/txnpool/common/txnpool_common.go
@@ -141,6 +141,7 @@ type TxPoolService interface {
 	GetTransactionStatus(hash common.Uint256) *TxStatus
 	GetTxAmount() []uint32
 	GetTxList() []common.Uint256
+	GetGasPrice() uint64
 	AppendTransaction(sender SenderType, txn *types.Transaction) *TxResult
 	AppendTransactionAsync(sender SenderType, txn *types.Transaction)
 }

diff --git a/txnpool/proc/txnpool_actor.go b/txnpool/proc/txnpool_actor.go
@@ -134,7 +134,7 @@ func (ta *TxPoolService) handleTransaction(sender tc.SenderType, txn *tx.Transac
 	}
 
 	gasLimitConfig := config.DefConfig.Common.MinGasLimit
-	gasPriceConfig := ta.server.getGasPrice()
+	gasPriceConfig := ta.server.GetGasPrice()
 	if txn.GasLimit < gasLimitConfig || txn.GasPrice < gasPriceConfig {
 		log.Debugf("handleTransaction: invalid gasLimit %v, gasPrice %v", txn.GasLimit, txn.GasPrice)
 		replyTxResult(txResultCh, txn.Hash(), errors.ErrUnknown,
@@ -214,6 +214,10 @@ func (ta *TxPoolService) GetTxList() []common.Uint256 {
 	return ta.server.getTxHashList()
 }
 
+func (ta *TxPoolService) GetGasPrice() uint64 {
+	return ta.server.GetGasPrice()
+}
+
 func (ta *TxPoolService) AppendTransaction(sender tc.SenderType, txn *tx.Transaction) *tc.TxResult {
 	ch := make(chan *tc.TxResult, 1)
 	ta.handleTransaction(sender, txn, ch)

diff --git a/txnpool/proc/txnpool_server.go b/txnpool/proc/txnpool_server.go
@@ -127,8 +127,8 @@ func (s *TXPoolServer) setHeight(height uint32) {
 	atomic.StoreUint32(&s.height, height)
 }
 
-// getGasPrice returns the current gas price enforced by the transaction pool
-func (s *TXPoolServer) getGasPrice() uint64 {
+// GetGasPrice returns the current gas price enforced by the transaction pool
+func (s *TXPoolServer) GetGasPrice() uint64 {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
 	return s.gasPrice