Fix fee per gas calculation.

Author: mcdee

main.go

@@ -56,7 +56,7 @@ import (
 )
 
 // ReleaseVersion is the release version for the code.
-var ReleaseVersion = "0.4.7"
+var ReleaseVersion = "0.4.8"
 
 func main() {
 	os.Exit(main2())

services/blocks/batch/handler.go

@@ -303,11 +303,11 @@ func (s *Service) compileTransaction(ctx context.Context,
 		maxPriorityFeePerGas := tx.MaxPriorityFeePerGas()
 		dbTransaction.MaxPriorityFeePerGas = &maxPriorityFeePerGas
 		// Calculate the gas price.
-		feePerGas := maxPriorityFeePerGas
-		if maxPriorityFeePerGas > maxFeePerGas-block.BaseFeePerGas() {
-			feePerGas = maxFeePerGas - block.BaseFeePerGas()
+		priorityFeePerGas := maxFeePerGas - block.BaseFeePerGas()
+		if priorityFeePerGas > maxPriorityFeePerGas {
+			priorityFeePerGas = maxPriorityFeePerGas
 		}
-		dbTransaction.GasPrice = feePerGas
+		dbTransaction.GasPrice = block.BaseFeePerGas() + priorityFeePerGas
 	}
 
 	return dbTransaction

services/blocks/individual/handler.go

@@ -250,11 +250,11 @@ func (s *Service) compileTransaction(ctx context.Context,
 		maxPriorityFeePerGas := tx.MaxPriorityFeePerGas()
 		dbTransaction.MaxPriorityFeePerGas = &maxPriorityFeePerGas
 		// Calculate the gas price.
-		feePerGas := maxPriorityFeePerGas
-		if maxPriorityFeePerGas > maxFeePerGas-block.BaseFeePerGas() {
-			feePerGas = maxFeePerGas - block.BaseFeePerGas()
+		priorityFeePerGas := maxFeePerGas - block.BaseFeePerGas()
+		if priorityFeePerGas > maxPriorityFeePerGas {
+			priorityFeePerGas = maxPriorityFeePerGas
 		}
-		dbTransaction.GasPrice = feePerGas
+		dbTransaction.GasPrice = block.BaseFeePerGas() + priorityFeePerGas
 	}
 
 	return dbTransaction