Fix e2e tests on alfajores

core/txpool/validation.go

@@ -157,7 +157,7 @@ func ValidateTransaction(tx *types.Transaction, head *types.Header, signer types
 		return err
 	}
 	if tx.GasTipCapIntCmp(minTip) < 0 {
-		return fmt.Errorf("%w: gas tip cap %v, minimum needed %v", ErrUnderpriced, tx.GasTipCap(), opts.MinTip)
+		return fmt.Errorf("%w: gas tip cap %v, minimum needed %v", ErrUnderpriced, tx.GasTipCap(), minTip)
 	}
 	if tx.Type() == types.BlobTxType {
 		// Ensure the blob fee cap satisfies the minimum blob gas price

e2e_test/js-tests/test_viem_tx.mjs

@@ -5,12 +5,12 @@ import {
 } from "viem";
 import { publicClient, walletClient } from "./viem_setup.mjs"
 
-// Returns the base fee per gas for the current block multiplied by 2 to account for any increase in the subsequent block.
-async function getGasFees(publicClient, tip, feeCurrency) {
+// Returns the base fee per gas for the current block in the given fee currency.
+async function getGasFees(publicClient, feeCurrency, tip) {
 	const rate = await getRate(feeCurrency);
 	const b = await publicClient.getBlock();
-	const tipInFeeCurrency = rate.toFeeCurrency(tip);
-	return [rate.toFeeCurrency(b.baseFeePerGas) + tipInFeeCurrency, tipInFeeCurrency];
+	const convertedTip = rate.toFeeCurrency(tip);
+	return [ rate.toFeeCurrency(b.baseFeePerGas)+convertedTip, convertedTip];
 }
 
 const testNonceBump = async (
@@ -99,14 +99,21 @@ describe("viem send tx", () => {
 	}).timeout(10_000);
 
 	it("send fee currency tx with explicit gas fields and check receipt", async () => {
-		const [maxFeePerGas, tip] = await getGasFees(publicClient, 2n, process.env.FEE_CURRENCY);
+		// Our execution nodes are configured by default with a min tip of 1 wei in
+		// celo, which when converted to fee currency could be a higher value, so
+		// we need to ensure we use the min tip in fee currency when submitting a
+		// tx with fee a fee currency.
+		const [maxFeePerGasInFeeCurrency, tipInFeeCurrency] = await getGasFees(publicClient, process.env.FEE_CURRENCY, 1n);
+
 		const request = await walletClient.prepareTransactionRequest({
 			to: "0x00000000000000000000000000000000DeaDBeef",
 			value: 2,
 			gas: 171000,
 			feeCurrency: process.env.FEE_CURRENCY,
-			maxFeePerGas: maxFeePerGas,
-			maxPriorityFeePerGas: tip,
+			// We multiply the maxFeePerGas by 10 here to account for fluctuations in
+			// the base fee, since these tests can be run against a live network.
+			maxFeePerGas: maxFeePerGasInFeeCurrency*10n,
+			maxPriorityFeePerGas: tipInFeeCurrency,
 		});
 		const signature = await walletClient.signTransaction(request);
 		const hash = await walletClient.sendRawTransaction({
@@ -195,15 +202,15 @@ describe("viem send tx", () => {
 	// more liable to result in a failure.
 	it("send overlapping nonce tx in different currencies", async () => {
 		// Note the threshold for a price bump to be accepted is 10%, i.e >= oldPrice * 1.1
-		const priceBump = 1.1; // minimum bump percentage to replace a transaction
+		const priceBump = 1.11; // minimum bump percentage to replace a transaction
 		const priceNearBump = 1.09; // slightly lower percentage than the price bump
 
 		const rate = await getRate(process.env.FEE_CURRENCY);
 		// Native to FEE_CURRENCY
 		const nativeCap = 30_000_000_000;
-		const bumpCurrencyCap = rate.toFeeCurrency(BigInt(Math.round(nativeCap * priceBump)));
+		const bumpCurrencyCap = rate.toFeeCurrency(BigInt(Math.ceil(nativeCap * priceBump)));
 		const failToBumpCurrencyCap = rate.toFeeCurrency(BigInt(
-			Math.round(nativeCap * priceNearBump)
+			Math.floor(nativeCap * priceNearBump)
 		));
 		const tokenCurrency = process.env.FEE_CURRENCY;
 		const nativeCurrency = null;
@@ -224,9 +231,9 @@ describe("viem send tx", () => {
 
 		// FEE_CURRENCY to Native
 		const currencyCap = 60_000_000_000;
-		const bumpNativeCap = rate.toNative(BigInt(Math.round(currencyCap * priceBump)));
+		const bumpNativeCap = rate.toNative(BigInt(Math.ceil(currencyCap * priceBump)));
 		const failToBumpNativeCap = rate.toNative(BigInt(
-			Math.round(currencyCap * priceNearBump)
+			Math.floor(currencyCap * priceNearBump)
 		));
 		await testNonceBump(
 			currencyCap,