Skip to content

fix: cap cloned n_tps fees within sponsored FPC balance #23770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilWindle merged 2 commits into from
Jun 1, 2026
+19 −13
Merged

fix: cap cloned n_tps fees within sponsored FPC balance #23770

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec9b912
fix: cap cloned n_tps fees within sponsored FPC balance
spypsy Jun 1, 2026
2de7a73
ensure highValueTps isn't 0
spypsy Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions yarn-project/end-to-end/src/spartan/n_tps.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { RunningPromise } from '@aztec/foundation/promise';
import { retryUntil } from '@aztec/foundation/retry';
import { sleep } from '@aztec/foundation/sleep';
import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
import { type Gas, GasFees } from '@aztec/stdlib/gas';
import { type Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
import { deriveSigningKey } from '@aztec/stdlib/keys';
import { TopicType } from '@aztec/stdlib/p2p';
import { Tx, TxHash } from '@aztec/stdlib/tx';
Expand Down Expand Up @@ -623,7 +623,8 @@ describe('sustained N TPS test', () => {
};

let index = 0;
logger.info('Waiting for high-value txs to be mined', { totalSent: sentTxHashes.length });
const totalHighValueSent = sentTxHashes.length;
logger.info('Waiting for high-value txs to be mined', { totalSent: totalHighValueSent });
while (sentTxHashes.length > 0) {
const chunk = sentTxHashes.splice(0, 10);
await Promise.all(chunk.map((txHash, idx) => waitForTx(txHash, `highValueTx_${idx + 1 + index}`)));
Expand Down Expand Up @@ -664,6 +665,13 @@ describe('sustained N TPS test', () => {
const inclusionStats = metrics.inclusionTimeInSeconds(txInclusionGroup);
logger.info(`Transaction inclusion summary: ${successCount} succeeded, ${failureCount} failed`);
logger.info('Inclusion time stats', inclusionStats);

if (totalHighValueSent === 0 && highValueTps > 0) {
throw new Error('No high-value txs were sent; check earlier submission errors');
}
if (successCount !== totalHighValueSent) {
logger.error(`Only ${successCount}/${totalHighValueSent} high-value txs were included; ${failureCount} failed`);
}
});
});

Expand Down Expand Up @@ -747,17 +755,15 @@ async function cloneTx(tx: ProvenTx, priorityFee: GasFees, logger: Logger): Prom
const clonedTxData = Tx.clone(tx, false);
const t1 = performance.now();

// effective_priority = min(maxPriorityFeesPerGas, maxFeesPerGas - baseFeePerGas).
// The prototype was built at simulate-time with maxFeesPerGas ≈ current baseFee + margin.
// As baseFee ratchets up under sustained load, the (maxFees - baseFee) term shrinks below
// our maxPriorityFees bid, so effective_priority collapses and we trip the mempool min
// priority-fee check. Override maxFeesPerGas with a huge static value — sponsor pays, so
// over-capping is free. 1000× the priority gives us >> any conceivable baseFee growth.
(clonedTxData.data.constants.txContext.gasSettings as any).maxPriorityFeesPerGas = priorityFee;
(clonedTxData.data.constants.txContext.gasSettings as any).maxFeesPerGas = new GasFees(
priorityFee.feePerDaGas * 1000n,
priorityFee.feePerL2Gas * 1000n,
);
// The tx pool orders txs by priority fee capped by maxFeesPerGas. Keep the cap at the bid:
// raising it further only increases the upfront fee limit reserved from the sponsored FPC.
const gasSettings = clonedTxData.data.constants.txContext.gasSettings;
clonedTxData.data.constants.txContext.gasSettings = GasSettings.from({
gasLimits: gasSettings.gasLimits,
teardownGasLimits: gasSettings.teardownGasLimits,
maxFeesPerGas: priorityFee,

@spalladino spalladino Jun 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heads up this works only because we're computing the priority fee as 10x the base fee in L388, which is a bit odd. Also, if the network is loaded, base fees will keep growing, so this may eventually fail. Maybe we can leave a 10x instead of 1000x just for safety?

@PhilWindle PhilWindle Jun 1, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just query the node for the current base fee at the point of cloning/submission and then differentiate high/low fee txs via the priority fee?

maxPriorityFeesPerGas: priorityFee,
});

if (clonedTxData.data.forRollup) {
for (let i = 0; i < clonedTxData.data.forRollup?.end.nullifiers.length; i++) {
Expand Down
Loading