Merge branch 'develop' into fix/tidy-unused-params

Ethernal-Tech · Mar 12, 2024 · c7aeb11 · c7aeb11
2 parents 8fac1d0 + 9e1e2a7
commit c7aeb11
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/jsonrpc/eth_endpoint.go b/jsonrpc/eth_endpoint.go
@@ -590,7 +590,13 @@ func (e *Eth) EstimateGas(arg *txnArgs, rawNum *BlockNumber) (interface{}, error
 		highEnd = header.GasLimit
 	}
 
-	gasPriceInt := new(big.Int).Set(transaction.GasPrice())
+	gasPriceInt := big.NewInt(0)
+	gasprice := transaction.GasPrice()
+
+	if gasprice != nil { // if dynamic transaction this will be nil
+		gasPriceInt.Set(gasprice)
+	}
+
 	valueInt := new(big.Int).Set(transaction.Value())
 
 	var availableBalance *big.Int