Logging and gas calculation improvements

Author: m-Peter

api/api.go

@@ -832,6 +832,11 @@ func (b *BlockChainAPI) FeeHistory(
 		blockRewards := make([]*hexutil.Big, len(rewardPercentiles))
 		feeParams, err := b.feeParameters.Get()
 		if err != nil {
+			b.logger.Warn().
+				Uint64("height", blockHeight).
+				Err(err).
+				Msg("failed to get fee parameters for block in fee history")
+
 			continue
 		}
 		gasPrice := feeParams.CalculateGasPrice(b.config.GasPrice)
@@ -1021,9 +1026,9 @@ func (b *BlockChainAPI) Coinbase(ctx context.Context) (common.Address, error) {
 func (b *BlockChainAPI) GasPrice(ctx context.Context) (*hexutil.Big, error) {
 	feeParams, err := b.feeParameters.Get()
 	if err != nil {
-		return nil, err
+		b.logger.Warn().Err(err).Msg("fee parameters unavailable; falling back to base gas price")
+		return (*hexutil.Big)(b.config.GasPrice), nil
 	}
-
 	gasPrice := feeParams.CalculateGasPrice(b.config.GasPrice)
 	return (*hexutil.Big)(gasPrice), nil
 }
@@ -1068,9 +1073,9 @@ func (b *BlockChainAPI) GetUncleByBlockNumberAndIndex(
 func (b *BlockChainAPI) MaxPriorityFeePerGas(ctx context.Context) (*hexutil.Big, error) {
 	feeParams, err := b.feeParameters.Get()
 	if err != nil {
-		return nil, err
+		b.logger.Warn().Err(err).Msg("fee parameters unavailable; falling back to base gas price")
+		return (*hexutil.Big)(b.config.GasPrice), nil
 	}
-
 	gasPrice := feeParams.CalculateGasPrice(b.config.GasPrice)
 	return (*hexutil.Big)(gasPrice), nil
 }

bootstrap/bootstrap.go

@@ -653,6 +653,8 @@ func setupStorage(
 		if err := feeParameters.Store(models.DefaultFeeParameters, batch); err != nil {
 			return nil, nil, fmt.Errorf("failed to bootstrap fee parameters: %w", err)
 		}
+	} else if err != nil {
+		return nil, nil, fmt.Errorf("failed to load latest fee parameters: %w", err)
 	}
 
 	if batch.Count() > 0 {

models/fee_parameters.go

@@ -29,8 +29,14 @@ func (f *FeeParameters) ToBytes() ([]byte, error) {
 }
 
 func (f *FeeParameters) CalculateGasPrice(currentGasPrice *big.Int) *big.Int {
-	gasPrice := new(big.Int).SetUint64(currentGasPrice.Uint64() * uint64(f.SurgeFactor))
-	return new(big.Int).Div(gasPrice, surgeFactorScale)
+	if currentGasPrice == nil {
+		return new(big.Int) // zero
+	}
+
+	// gasPrice = (currentGasPrice * surgeFactor) / feeParamsPrecision
+	surgeFactor := new(big.Int).SetUint64(uint64(f.SurgeFactor))
+	gasPrice := new(big.Int).Mul(currentGasPrice, surgeFactor)
+	return new(big.Int).Quo(gasPrice, surgeFactorScale)
 }
 
 func NewFeeParametersFromBytes(data []byte) (*FeeParameters, error) {

tests/web3js/eth_gas_price_surge_test.js

@@ -17,7 +17,8 @@ it('should update the value of eth_MaxPriorityFeePerGas', async () => {
     )
     assert.equal(response.status, 200)
     assert.isDefined(response.body.result)
-    let maxPriorityFeePerGas = utils.hexToNumber(response.body.result)
+    // Convert hex quantity to BigInt (e.g., "0x3a98" -> 15000n)
+    const maxPriorityFeePerGas = BigInt(response.body.result)
     // The surge factor was last set to 100.0
     assert.equal(maxPriorityFeePerGas, 100n * conf.minGasPrice)
 })