Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

MPT: merge with main only #1530

Merged
merged 2 commits into from
Aug 9, 2023
Merged

MPT: merge with main only #1530

merged 2 commits into from
Aug 9, 2023

Conversation

Brechtpd
Copy link
Collaborator

@Brechtpd Brechtpd commented Jul 15, 2023

Description

Just merges the MPT branch with the master, without fixing any issues (and so breaks the code). The actual merge is done in #1531, the only purpose of this PR is to have a nicer diff for the other PR without breaking the code in the current mpt2 branch.

Issue Link

[link issue here]

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Contents

  • [item]

Rationale

[design decisions and extended information]

How Has This Been Tested?

@github-actions github-actions bot added CI Issues related to the Continuous Integration mechanisms of the repository. crate-bus-mapping Issues related to the bus-mapping workspace member crate-circuit-benchmarks Issues related to the circuit-benchmarks workspace member crate-eth-types Issues related to the eth-types workspace member crate-gadgets Issues related to the gadgets workspace member crate-integration-tests Issues related to the integration-tests workspace member crate-mock Issues related to the mock workspace member crate-zkevm-circuits Issues related to the zkevm-circuits workspace member T-bench Type: benchmark improvements labels Jul 15, 2023
Copy link
Collaborator

@ChihChengLiang ChihChengLiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, as this is a merging main PR.

@ChihChengLiang
Copy link
Collaborator

Hi @Brechtpd, what's the status of this PR? Anything we can help?

@Brechtpd
Copy link
Collaborator Author

Brechtpd commented Aug 7, 2023

This PR could be merged into the mpt2 branch, it's just that without merging in #1531 into this PR first, that would break the mpt2 branch.

So I was thinking merging #1531 first so the branch mpt-main-sync in this PR gets updated and then merge this PR into mpt-2 is a way to do the merging without breaking any branches, but if you prefer something else let me know.

@ChihChengLiang
Copy link
Collaborator

Wonderful. Merging #1531 first sounds good.

#1531)

This PR is currently against to intermediate PR
#1530
that just merges in the main, so the diff is cleaner.

- Updates the MPT branch for the latest main
- lo/hi support
- Challenge API integration
- keccak endianness change
- Added preimage checks for keys used in the tree paths
- Performance improvements (expressions degree can and is reduced to 5)
- Misc other small improvements
@Brechtpd Brechtpd merged commit 912e497 into mpt2 Aug 9, 2023
18 checks passed
@Brechtpd Brechtpd deleted the mpt-main-sync branch August 9, 2023 14:51
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
CI Issues related to the Continuous Integration mechanisms of the repository. crate-bus-mapping Issues related to the bus-mapping workspace member crate-circuit-benchmarks Issues related to the circuit-benchmarks workspace member crate-eth-types Issues related to the eth-types workspace member crate-gadgets Issues related to the gadgets workspace member crate-integration-tests Issues related to the integration-tests workspace member crate-mock Issues related to the mock workspace member crate-zkevm-circuits Issues related to the zkevm-circuits workspace member T-bench Type: benchmark improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants