The last resubmission should be with the maximum allowed gas cost

We were never hitting the maximum, stopping before the maximum was
reached.

Author: pdyraga

pkg/chain/ethereum/ethutil/mine_waiter.go

@@ -104,17 +104,22 @@ func (mw MiningWaiter) ForceMining(
 			return
 		}
 
-		// transaction not yet mined, add 20% to the previous gas price
+		// transaction not yet mined, if the previous gas price was the maximum
+		// one, we no longer resubmit
 		gasPrice := transaction.GasPrice()
+		if gasPrice.Cmp(mw.maxGasPrice) == 0 {
+			logger.Infof("reached the maximum allowed gas price; stopping resubmissions")
+			return
+		}
+
+		// if we still have some margin, add 20% to the previous gas price
 		twentyPercent := new(big.Int).Div(gasPrice, big.NewInt(5))
 		gasPrice = new(big.Int).Add(gasPrice, twentyPercent)
 
-		// transaction not yet mined but we reached the maximum allowed gas
-		// price; giving up, we need to wait for the last submitted TX to be
-		// mined
+		// if we reached the maximum allowed gas price, submit one more time
+		// with the maximum
 		if gasPrice.Cmp(mw.maxGasPrice) > 0 {
-			logger.Infof("reached the maximum allowed gas price; stopping resubmissions")
-			return
+			gasPrice = mw.maxGasPrice
 		}
 
 		// transaction not yet mined and we are still under the maximum allowed

pkg/chain/ethereum/ethutil/mine_waiter_test.go

@@ -126,14 +126,13 @@ func TestForceMining_MaxAllowedPriceReached(t *testing.T) {
 
 	var resubmissionGasPrices []*big.Int
 
-	expectedAttempts := 4
+	expectedAttempts := 5
 	expectedResubmissionGasPrices := []*big.Int{
 		big.NewInt(24000000000), // + 20%
 		big.NewInt(28800000000), // + 20%
 		big.NewInt(34560000000), // + 20%
 		big.NewInt(41472000000), // + 20%
-		// the next one would be 49766400000 but since maxGasPrice = 45 Gwei
-		// resubmissions should stop here
+		big.NewInt(45000000000), // max allowed
 	}
 
 	resubmitFn := func(gasPrice *big.Int) (*types.Transaction, error) {