Skip to content
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

fix: set gas settings in bench #5796

Merged
merged 1 commit into from
Apr 16, 2024
Merged

fix: set gas settings in bench #5796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,15 +551,15 @@ jobs:
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

# bench-tx-size:
# steps:
# - *checkout
# - *setup_env
# - run:
# name: "Benchmark"
# command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_tx_size_fees.test.ts ENABLE_GAS=1 DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
# aztec_manifest_key: end-to-end
# <<: *defaults_e2e_test
bench-tx-size:
steps:
- *checkout
- *setup_env
- run:
name: "Benchmark"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_tx_size_fees.test.ts ENABLE_GAS=1 DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

build-docs:
machine:
Expand Down Expand Up @@ -900,12 +900,12 @@ workflows:
# Benchmark jobs.
- bench-publish-rollup: *e2e_test
- bench-process-history: *e2e_test
# - bench-tx-size: *e2e_test
- bench-tx-size: *e2e_test
- bench-summary:
requires:
- bench-publish-rollup
- bench-process-history
# - bench-tx-size
- bench-tx-size
<<: *defaults

# Production releases.
Expand Down
10 changes: 8 additions & 2 deletions yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
PublicFeePaymentMethod,
TxStatus,
} from '@aztec/aztec.js';
import { GasSettings } from '@aztec/circuits.js';
import { Fr, GasSettings } from '@aztec/circuits.js';
import { FPCContract, GasTokenContract, TokenContract } from '@aztec/noir-contracts.js';
import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';

Expand Down Expand Up @@ -68,9 +68,15 @@ describe('benchmarks/tx_size_fees', () => {
() => Promise.resolve(new PrivateFeePaymentMethod(token.address, fpc.address, aliceWallet)),
])('sends a tx with a fee', async createPaymentMethod => {
const paymentMethod = await createPaymentMethod();
const gasSettings = GasSettings.new({
da: { gasLimit: 5, teardownGasLimit: 3, maxFeePerGas: Fr.ONE },
l1: { gasLimit: 5, teardownGasLimit: 3, maxFeePerGas: Fr.ONE },
l2: { gasLimit: 5, teardownGasLimit: 3, maxFeePerGas: Fr.ONE },
inclusionFee: new Fr(6),
});
const tx = await token.methods
.transfer(aliceWallet.getAddress(), bobAddress, 1n, 0)
.send({ fee: paymentMethod ? { gasSettings: GasSettings.empty(), paymentMethod } : undefined })
.send({ fee: paymentMethod ? { gasSettings, paymentMethod } : undefined })
.wait();

expect(tx.status).toEqual(TxStatus.MINED);
Expand Down
Loading