feat!: shift remaining protocol-contract addresses to 1-3 - #23218
Merged
Conversation
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 12, 2026 18:29
0476d27 to
46bc9fb
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
2 times, most recently
from
May 12, 2026 18:51
03da9c7 to
99b6f27
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 12, 2026 18:51
46bc9fb to
a7a90ef
Compare
This was referenced May 12, 2026
Merged
Contributor
Author
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 12, 2026 19:24
a7a90ef to
f693923
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
from
May 12, 2026 19:24
99b6f27 to
b48b0db
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 12, 2026 19:28
f693923 to
eff36bd
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
2 times, most recently
from
May 12, 2026 19:31
0c3de56 to
316c677
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 12, 2026 19:31
eff36bd to
d7df886
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
from
May 12, 2026 19:59
316c677 to
5e87cb1
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 12, 2026 19:59
d7df886 to
53526b7
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
from
May 12, 2026 20:26
5e87cb1 to
6c2f64d
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 12, 2026 20:26
53526b7 to
3a32119
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
from
May 13, 2026 17:27
aca64f3 to
9d5c878
Compare
dbanks12
changed the title
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
2 times, most recently
from
May 13, 2026 21:06
e07ba01 to
d2f6d24
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
from
May 14, 2026 13:42
d2f6d24 to
c662d17
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 14, 2026 13:42
9702def to
196e504
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
2 times, most recently
from
May 26, 2026 19:52
ec369c8 to
86793e4
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 26, 2026 20:11
5128c22 to
73d5b51
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
2 times, most recently
from
May 26, 2026 20:15
6c73e70 to
f4072aa
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 26, 2026 20:15
73d5b51 to
2a6a1e2
Compare
dbanks12
force-pushed
the
dbanks12/shift-protocol-addresses
branch
from
May 26, 2026 20:36
f4072aa to
2b125a3
Compare
dbanks12
force-pushed
the
dbanks12/demote-multicall-entrypoint
branch
from
May 26, 2026 20:36
2a6a1e2 to
08cf9b1
Compare
dbanks12
marked this pull request as ready for review
May 26, 2026 20:42
dbanks12
requested review from
LeilaWang,
MirandaWood,
jeanmon and
just-mitch
as code owners
May 26, 2026 20:42
IlyasRidhuan
approved these changes
May 27, 2026
Contributor
|
Guess it might just need a regen |
…COL_CONTRACTS unchanged)
The protocol-contract address renumbering (FEE_JUICE 5->3, class registry 3->1) changes the public-data-tree slots the AVM reads. The committed minimal_tx AVM test fixture was generated against the old addresses, so the C++ vm2 recursive verifier test (BoomerangTwoLayerAvmRecursiveVerifierTests) failed with a hinted merkle-DB miss. Regenerated via the C++ simulator with the shifted constants; verified the test passes against the new fixture.
…protocol addresses The protocol-contract address renumbering (FEE_JUICE 5->3, class registry 3->1) changes the fee-payer balance public-data slot (and other protocol-address-derived inputs), so the committed circuit Prover.toml fixtures went stale -- nargo execute on rollup-tx-base-private failed with 'Wrong leaf slot for fee payer balance'. Regenerated via AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 e2e full prover test; verified nargo execute on rollup-tx-base-private now solves the witness.
…egistry addresses The protocol-contract address shift (ContractClassRegistry 3->1) left the committed ContractClass/InstancePublishedEventData.hex fixtures embedding the old registry address, so isContractClassPublishedEvent rejected them and the archiver data_store_updater contract-data tests failed (class never stored). Regenerated both fixtures via the e2e contract_class_registration test and updated the dependent event-parsing snapshots. Verified archiver data_store_updater (10/10) and the protocol-contracts event-parsing tests pass.
The shared sponsored-FPC flow hardcoded the FeeJuice address as 0x...0005, which broke after the protocol-contract address shift moved FeeJuice to 0x...0003 (the cli-wallet flow failed with 'No contract instance found for address 0x...0005'). Use the registered `contracts:FeeJuice` alias instead of a hardcoded address so the flow tracks protocol-contract renumbering.
…ures for shift Completes the Prover.toml regeneration: the 6 circuits not exercised by the e2e full prover test (rollup-block-merge, rollup-block-root, rollup-block-root-single-tx, rollup-block-root-first-empty-tx, rollup-checkpoint-root, rollup-tx-merge) still carried the pre-shift vk_tree_root/protocol_contracts_hash. Regenerated via AZTEC_GENERATE_TEST_DATA=1 orchestrator_single_checkpoint; verified all 6 solve their witness with nargo execute.
This was referenced May 29, 2026
Closed
This was referenced Jun 6, 2026
Closed
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
2 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.
Shifts remaining protocol-contract addresses to consecutive values 1-3 and reduces MAX_PROTOCOL_CONTRACTS to 3.
Stacked on #23197.