fix: complete legacy oracle mappings for all pinned contracts (backport #21404)#21461
Closed
AztecBot wants to merge 7 commits intoclaudebox/backport-21281-reject-evict-txs-v4-nextfrom
Closed
Conversation
#20992 #21148) BEGIN_COMMIT_OVERRIDE fix: set wallet minFeePadding in BotFactory constructor (#20992) fix: increase minFeePadding in e2e_bot bridge resume tests and harden GasFees.mul() (#20962) fix: use dedicated L1 account for bot bridge resume tests to avoid nonce race (#21148) fix: remove stale fee snapshot from BotFactory account deployment END_COMMIT_OVERRIDE Backports three fixes from next and adds a fourth: 1. BotFactory constructor now calls wallet.setMinFeePadding() so all setup transactions (token deploy, minting) use the configured padding instead of the wallet default (0.5x). (#20992) 2. GasFees.mul() uses bigint arithmetic for integer scalars to avoid precision loss, and Math.ceil for non-integer scalars. (#20962) 3. Bridge resume tests use a dedicated L1 private key (index 7) instead of the default mnemonic shared with the sequencer, avoiding nonce races on approve/deposit calls. (#21148) 4. Remove explicit maxFeesPerGas snapshot from setupAccountWithPrivateKey. Let the wallet re-estimate fees at send() time via completeFeeOptions(), making the fee estimate fresh and 10x padding sufficient.
Resolved conflicts in: - docs/docs-developers/docs/resources/migration_notes.md - noir-projects/aztec-nr/aztec/src/macros/aztec.nr - noir-projects/noir-protocol-circuits/crates/types/src/constants.nr - noir-projects/noir-protocol-circuits/crates/types/src/constants_tests.nr - yarn-project/end-to-end/src/composed/ha/e2e_ha_full.test.ts
Remove yarn-project/end-to-end/src/spartan/block_capacity.test.ts which was deleted in v4-next but modified by the cherry-picked commit. The file does not exist on the target branch so the modification is dropped.
Adapted oracle method names to v4-next convention (utilityXxx/privateXxx instead of aztec_utl_/aztec_prv_ used on next). Removed legacy mappings for #21209 renames and signature changes that haven't landed on v4-next.
AztecBot
changed the base branch from
backport-to-v4-next-staging
to
claudebox/backport-21281-reject-evict-txs-v4-next
AztecBot
force-pushed
the
claudebox/backport-21404-legacy-oracle-mappings
branch
from
9fac715 to
913f3d0
Compare
Contributor
|
This was done in #21403. |
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
5 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.
Summary
Backport of #21404 to v4-next.
buildLegacyOracleCallbacksfor pinned protocol contracts whose artifacts are committed and cannot be changedisActualProtocolContract(only checked 3 contracts) withisProtocolContract(checks all) for oracle version check skipv4-next adaptations
On v4-next, oracle methods still use
utilityXxx/privateXxxnaming (not theaztec_utl_/aztec_prv_prefix used onnext), so:notifyRevertiblePhaseStart,inRevertiblePhase) and signature changes (validatePublicCalldata) that haven't landed on v4-nextutilityValidateAndStoreEnqueuedNotesAndEvents3→5 param adapter since v4-next still uses the 3-param signatureTest plan
aztec_utl_/aztec_prv_methodsClaudeBox log: https://claudebox.work/s/2809014acb6ffe82?run=2