Fix issue: client.BlockByNumber failed in ETH L2

10gic · Mar 13, 2024 · 050b128 · 050b128
1 parent 5de7363
commit 050b128
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cmd/common.go b/cmd/common.go
@@ -518,11 +518,11 @@ func getEIP1559GasPrice(client *ethclient.Client) (*big.Int, *big.Int, error) {
 	// maxPriorityFeePerGas = tip * 113%
 	maxPriorityFeePerGas := new(big.Int).Add(tip, buffer)
 
-	block, err := client.BlockByNumber(context.Background(), nil)
+	header, err := client.HeaderByNumber(context.Background(), nil)
 	if err != nil {
-		return nil, nil, fmt.Errorf("BlockByNumber failed: %w", err)
+		return nil, nil, fmt.Errorf("HeaderByNumber failed: %w", err)
 	}
-	baseFee := block.Header().BaseFee
+	baseFee := header.BaseFee
 	var maxFeePerGas *big.Int
 	if baseFee == nil {
 		maxFeePerGas = maxPriorityFeePerGas
@@ -613,11 +613,11 @@ func getEIP1559GasPriceByFeeHistory(client *ethclient.Client) (*big.Int, *big.In
 	maxPriorityFeePerGasEstimate = &average
 	// log.Printf("maxPriorityFeePerGasEstimate = %v", maxPriorityFeePerGasEstimate.String())
 
-	pendingBlock, err := client.BlockByNumber(context.Background(), nil)
+	header, err := client.HeaderByNumber(context.Background(), nil)
 	if err != nil {
-		return nil, nil, fmt.Errorf("BlockByNumber failed: %w", err)
+		return nil, nil, fmt.Errorf("HeaderByNumber failed: %w", err)
 	}
-	maxFeePerGasEstimate = maxFeePerGasEstimate.Add(pendingBlock.BaseFee(), maxPriorityFeePerGasEstimate)
+	maxFeePerGasEstimate = maxFeePerGasEstimate.Add(header.BaseFee, maxPriorityFeePerGasEstimate)
 	// log.Printf("maxFeePerGasEstimate = %v", maxFeePerGasEstimate.String())
 
 	return maxFeePerGasEstimate, maxPriorityFeePerGasEstimate, nil