feat: allow custom addresses to be prefunded with fee juice in local network#21000
Merged
mverzilli merged 1 commit intomerge-train/fairiesfrom Mar 2, 2026
Merged
Conversation
mverzilli
changed the title
spalladino
approved these changes
Mar 2, 2026
| const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map(a => AztecAddress.fromString(a)); | ||
| const fundedAddresses = [ | ||
| ...initialAccounts.map(a => a.address), | ||
| ...(initialAccounts.length ? [bananaFPC, sponsoredFPC] : []), |
Contributor
There was a problem hiding this comment.
The bananaFPC is still a think when users start our local network? Wow.
Comment on lines
+264
to
+273
| prefundAddresses: { | ||
| env: 'PREFUND_ADDRESSES', | ||
| description: 'Comma-separated list of Aztec addresses to prefund with fee juice at genesis.', | ||
| parseEnv: (val: string) => | ||
| val | ||
| .split(',') | ||
| .map(a => a.trim()) | ||
| .filter(a => a.length > 0), | ||
| defaultValue: [], | ||
| }, |
Contributor
There was a problem hiding this comment.
I'd rather make this a list of AztecAddress rather than strings, and have the AztecAddress.fromString run as part of the parseEnv. But it's just a nit. And I don't recall if the package dependencies will allow you to do it.
Contributor
Author
There was a problem hiding this comment.
We'd end up with circular deps indeed (without further refactoring)
Comment on lines
+40
to
+49
| prefundAddresses: { | ||
| env: 'PREFUND_ADDRESSES', | ||
| description: 'Comma-separated list of Aztec addresses to prefund with fee juice at genesis.', | ||
| parseEnv: (val: string) => | ||
| val | ||
| .split(',') | ||
| .map(a => a.trim()) | ||
| .filter(a => a.length > 0), | ||
| defaultValue: [], | ||
| }, |
Contributor
There was a problem hiding this comment.
I hate that we have duplicate config across the board.
Collaborator
|
❌ Failed to cherry-pick to |
ludamad
pushed a commit
that referenced
this pull request
Mar 2, 2026
…network (backport #21000) (#21004) ## Summary Backport of #21000 to v4. ### Commit 1: Cherry-pick with conflict markers Applied PR #21000 diff to v4. The `start_node.ts` import section has conflict markers where the `AztecAddress` import could not be cleanly applied (the surrounding import context differs between `next` and `v4` — v4 has additional imports like `RegistryContract`, `sleep`, `EthAddress` that were removed on `next`). ### Commit 2: Resolve conflict Added `import { AztecAddress } from '@aztec/stdlib/aztec-address'` in the correct location for v4 and removed the conflict markers. Original PR by @mverzilli.
mverzilli
pushed a commit
that referenced
this pull request
Mar 2, 2026
…network (backport #21000) (#21004) ## Summary Backport of #21000 to v4. ### Commit 1: Cherry-pick with conflict markers Applied PR #21000 diff to v4. The `start_node.ts` import section has conflict markers where the `AztecAddress` import could not be cleanly applied (the surrounding import context differs between `next` and `v4` — v4 has additional imports like `RegistryContract`, `sleep`, `EthAddress` that were removed on `next`). ### Commit 2: Resolve conflict Added `import { AztecAddress } from '@aztec/stdlib/aztec-address'` in the correct location for v4 and removed the conflict markers. Original PR by @mverzilli.
This was referenced Mar 2, 2026
ludamad
added a commit
that referenced
this pull request
Mar 3, 2026
BEGIN_COMMIT_OVERRIDE fix(aztec-nr): account for AES PKCS#7 padding in message plaintext length (#20840) feat: remove epk sign from message payload (#20926) chore: increase mainnet local ejection threshold to 190k (#20884) feat: add pinned-build support for protocol contracts in noir-contracts (v4) (#20982) fix!: undo bad fix (#20987) chore: backport #20967 to v4 (metric on how many epochs validator has been on committee) (#20989) chore(sequencer): e2e tests for invalid signature recovery in checkpoint attestations (#20971) feat: allow custom addresses to be prefunded with fee juice in local network (backport #21000) (#21004) chore: increase max fee bots use in tests (#20867) END_COMMIT_OVERRIDE
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 3, 2026
BEGIN_COMMIT_OVERRIDE feat: allow custom addresses to be prefunded with fee juice in local network (#21000) docs(claude): add Noir early return idiom to CLAUDE.md (#21021) feat: add compile-time size check for events and error code links (#21024) feat: use warn_log_format for discarded messages (#21053) END_COMMIT_OVERRIDE
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes F-282 (see #19890)