feat(avm)!: protocol contracts #16949
Merged
Conversation
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
Contributor
Author
This stack of pull requests is managed by Graphite. Learn more about stacking. |
IlyasRidhuan
changed the title
IlyasRidhuan
force-pushed
the
ir/avm-protocol-contracts
branch
2 times, most recently
from
456e151 to
39a42f9
Compare
IlyasRidhuan
commented
Sep 11, 2025
barretenberg/cpp/src/barretenberg/vm2/simulation/protocol_contracts.cpp
Outdated
Show resolved
Hide resolved
IlyasRidhuan
requested review from
Maddiaa0,
dbanks12,
fcarreiro,
jeanmon and
sirasistant
as code owners
sirasistant
reviewed
Sep 11, 2025
barretenberg/cpp/src/barretenberg/vm2/simulation/protocol_contracts.cpp
Outdated
Show resolved
Hide resolved
barretenberg/cpp/src/barretenberg/vm2/simulation/protocol_contracts.cpp
Outdated
Show resolved
Hide resolved
barretenberg/cpp/src/barretenberg/vm2/tracegen/contract_instance_retrieval_trace.cpp
Show resolved
Hide resolved
IlyasRidhuan
force-pushed
the
ir/avm-protocol-contracts
branch
from
39a42f9 to
b81188f
Compare
fcarreiro
reviewed
Sep 11, 2025
dbanks12
reviewed
Sep 11, 2025
Contributor
dbanks12
left a comment
dbanks12
left a comment
There was a problem hiding this comment.
Overall looking good once others' concerns are addressed
IlyasRidhuan
force-pushed
the
ir/avm-protocol-contracts
branch
2 times, most recently
from
cf0917e to
498f6c9
Compare
sirasistant
reviewed
Sep 12, 2025
barretenberg/cpp/pil/vm2/bytecode/contract_instance_retrieval.pil
Outdated
Show resolved
Hide resolved
barretenberg/cpp/src/barretenberg/vm2/simulation/protocol_contracts.cpp
Outdated
Show resolved
Hide resolved
IlyasRidhuan
force-pushed
the
ir/avm-protocol-contracts
branch
from
498f6c9 to
4e4f4ce
Compare
IlyasRidhuan
force-pushed
the
ir/avm-protocol-contracts
branch
from
4e4f4ce to
f36563d
Compare
IlyasRidhuan
force-pushed
the
ir/avm-protocol-contracts
branch
2 times, most recently
from
fbb4bfc to
5e7e9eb
Compare
sirasistant
approved these changes
Sep 15, 2025
Contributor
sirasistant
left a comment
sirasistant
left a comment
There was a problem hiding this comment.
Looks good on my side
IlyasRidhuan
force-pushed
the
ir/avm-protocol-contracts
branch
from
5e7e9eb to
6f7b4ad
Compare
Merged
mralj
pushed a commit
that referenced
this pull request
Oct 13, 2025
PR changes the approach for handling protocol contracts in the AVM. Introduces a `ProtocolContractSetInterface` that manages the static (per rollup deployment) set of protocol contract's derived addresses. The current implementation of this set is as an indexed merkle tree - although hopefully we are able to migrate to a simpler (non-indexed tree) structure. When retrieving the derived address for a protocol contract, we also produce a merkle membership path that is checked against the L1 public contracts tree root (currently unconstrained). This will eventually be included in the public inputs of the AVM. There is a new corresponding subtrace for the protocol contracts derived address retrieval The map of canonical address to derived address is hinted via TS as part of `AvmExecutionHints`
ludamad
pushed a commit
that referenced
this pull request
Dec 16, 2025
PR changes the approach for handling protocol contracts in the AVM. Introduces a `ProtocolContractSetInterface` that manages the static (per rollup deployment) set of protocol contract's derived addresses. The current implementation of this set is as an indexed merkle tree - although hopefully we are able to migrate to a simpler (non-indexed tree) structure. When retrieving the derived address for a protocol contract, we also produce a merkle membership path that is checked against the L1 public contracts tree root (currently unconstrained). This will eventually be included in the public inputs of the AVM. There is a new corresponding subtrace for the protocol contracts derived address retrieval The map of canonical address to derived address is hinted via TS as part of `AvmExecutionHints`
ludamad
pushed a commit
that referenced
this pull request
Dec 16, 2025
PR changes the approach for handling protocol contracts in the AVM. Introduces a `ProtocolContractSetInterface` that manages the static (per rollup deployment) set of protocol contract's derived addresses. The current implementation of this set is as an indexed merkle tree - although hopefully we are able to migrate to a simpler (non-indexed tree) structure. When retrieving the derived address for a protocol contract, we also produce a merkle membership path that is checked against the L1 public contracts tree root (currently unconstrained). This will eventually be included in the public inputs of the AVM. There is a new corresponding subtrace for the protocol contracts derived address retrieval The map of canonical address to derived address is hinted via TS as part of `AvmExecutionHints`
ludamad
pushed a commit
that referenced
this pull request
Dec 16, 2025
PR changes the approach for handling protocol contracts in the AVM. Introduces a `ProtocolContractSetInterface` that manages the static (per rollup deployment) set of protocol contract's derived addresses. The current implementation of this set is as an indexed merkle tree - although hopefully we are able to migrate to a simpler (non-indexed tree) structure. When retrieving the derived address for a protocol contract, we also produce a merkle membership path that is checked against the L1 public contracts tree root (currently unconstrained). This will eventually be included in the public inputs of the AVM. There is a new corresponding subtrace for the protocol contracts derived address retrieval The map of canonical address to derived address is hinted via TS as part of `AvmExecutionHints`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR changes the approach for handling protocol contracts in the AVM.
Introduces a
ProtocolContractSetInterfacethat manages the static (per rollup deployment) set of protocol contract's derived addresses. The current implementation of this set is as an indexed merkle tree - although hopefully we are able to migrate to a simpler (non-indexed tree) structure.When retrieving the derived address for a protocol contract, we also produce a merkle membership path that is checked against the L1 public contracts tree root (currently unconstrained). This will eventually be included in the public inputs of the AVM. There is a new corresponding subtrace for the protocol contracts derived address retrieval
The map of canonical address to derived address is hinted via TS as part of
AvmExecutionHints