Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Zero bin merge #279

Merged
merged 212 commits into from
Jun 18, 2024
Merged

Zero bin merge #279

merged 212 commits into from
Jun 18, 2024

Conversation

BGluth
Copy link
Contributor

@BGluth BGluth commented Jun 17, 2024

Merged zero_bin into this repo. Also needed to change some deps around in order for everything to align (eg. some deps can now be workplace deps).

  • Also took this opportunity to make any deps into workspace deps where possible.
  • zero_bin/common is now zero_bin/zero_bin_common since a sub-crate called common implies that it's for the entire crate (zk_evm) when it's really just for zero-bin.

cpubot and others added 30 commits October 11, 2023 21:51
@cpubot
Initial commit
8e20a9a
@cpubot
Add CI
90efff4
@cpubot
Add note about http mode
3626eba
@cpubot
Remove unnecessary with_state
9b5de54
@BGluth
Updated deps
187958d
@cpubot
Instrument with paladin
67702d1
@cpubot
Add dockerfiles
d5a6625
@cpubot
Remove unused dependencies
f1c6919
@cpubot
Integrate proof_protocol_decoder
dd914e4
@cpubot
Update ProverInput to expect BlockTrace
19d7dbb
@cpubot
bump paladin
5ba2b25
@cpubot
Add jerigon run mode
6c58533
@cpubot
bump protocol deps
a0636d4
@cpubot
Avoid running CI twice on PR
3e5a485
@cpubot
Write proof output to directory in http mode
5154771
@cpubot
Pin nightly version to avoid regression
3d2779d
@cpubot
Pin CI workflow to working nightly version
25416ea
@cpubot
Write proof results to stdout for jerigon and stdio modes
98bae3d
@cpubot
Add verifier binary
e659366
@cpubot
Improve error logging in rpc module
015db1d
@cpubot
Add RPC command
5cf87a2
@cpubot
bump protocol deps (fixes de/serialization of contract writes)
4bfd9a5
@BGluth
Now includes dummy previous block hashes
584222d
@cpubot
Move toolchain back to standard nightly
2b91692
@cpubot
Update leader.Dockerfile
3d2da54
@cpubot
bump protocol deps
c96ddd8
@BGluth
Dep bump
47d1818
@cpubot
Add support for paladin num-workers flag
acc9215
@cpubot
Retrieve chain_id from RPC node
39c0339
@cpubot
Upgrade to paladin 0.2.0. Use fatal error strategy
50d0e73
BGluth added 3 commits June 17, 2024 14:53
@BGluth
A few dep updates to get zero-bin to build
236e2a4
@BGluth
cargo autoinherit pass
9b61f59 
- Also manually sorted dep names.
@BGluth
A few more dep changes to move to workspace deps
1bafd90 
- Switched all internal deps to use workspace deps where possible.
- Also needed to move `zero_bin/common` --> `zero_bin/zero_bin_common`
  because having a dep name of just "common" wasn't really clear that
  this dep was just for `zero-bin`.
@github-actions github-actions bot added crate: trace_decoder Anything related to the trace_decoder crate. crate: proof_gen Anything related to the proof_gen crate. crate: evm_arithmetization Anything related to the evm_arithmetization crate. crate: mpt_trie Anything related to the mpt_trie crate. labels Jun 17, 2024
Nashtare
Nashtare reviewed Jun 17, 2024
View reviewed changes
Copy link
Collaborator

@Nashtare Nashtare left a comment

Choose a reason for hiding this comment

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

Thank a bunch @BGluth!
Additionally now that zero-bin is here, we should remove Cargo.lock from .gitignore.

evm_arithmetization/Cargo.toml
serde_json = { workspace = true }

# Local dependencies
mpt_trie = { version = "0.3.0", path = "../mpt_trie" }
mpt_trie = { workspace = true }
Copy link
Collaborator

Choose a reason for hiding this comment

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

any reason why the version is removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mistake, I'll re-add this, thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually yeah I was missing version in the root Cargo.toml, but here I think we can just use workspace = true since it will pull from that version (I think right?).

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think it's easier for version publishing to have version numbers. But regardless, I don't understand why it would complain now for crates that were already here before?

proof_gen/Cargo.toml Show resolved Hide resolved
trace_decoder/Cargo.toml Show resolved Hide resolved
zero_bin/.github/CODEOWNERS Outdated Show resolved Hide resolved
zero_bin/.env Outdated Show resolved Hide resolved
zero_bin/.gitignore Outdated Show resolved Hide resolved
zero_bin/LICENSE-APACHE Outdated Show resolved Hide resolved
zero_bin/LICENSE-MIT Outdated Show resolved Hide resolved
zero_bin/.github/workflows/ci.yml Outdated Show resolved Hide resolved
Nashtare
Nashtare reviewed Jun 17, 2024
View reviewed changes
zero_bin/rustfmt.toml Outdated Show resolved Hide resolved
zero_bin/rust-toolchain.toml Outdated Show resolved Hide resolved
@BGluth
Requested PR changes for #279
0fb571d 
- Also a `clippy` pass.
@BGluth BGluth requested a review from Nashtare June 18, 2024 07:11
@atanmarko
Copy link
Member

@Nashtare @muursh @BGluth We should enable merge commit here to keep history

@muursh
Copy link
Contributor

muursh commented Jun 18, 2024

@Nashtare @muursh @BGluth We should enable merge commit here to keep history

Yep

Nashtare
Nashtare approved these changes Jun 18, 2024
View reviewed changes
.gitignore Outdated Show resolved Hide resolved
@Nashtare
Copy link
Collaborator

@Nashtare @muursh @BGluth We should enable merge commit here to keep history

Yeah, I've re-enabled them temporarily.

@Nashtare Nashtare merged commit da9383c into develop Jun 18, 2024
10 checks passed
@Nashtare Nashtare deleted the zero_bin_merge branch June 18, 2024 12:50
@Nashtare
Copy link
Collaborator

AArgh, I had mentioned to remove Cargo.lock from .gitignore, thought it had been taken care of while addressing the other comments. Will open a PR right away.

@Nashtare Nashtare mentioned this pull request Jun 18, 2024
Merged
@BGluth
Copy link
Contributor Author

BGluth commented Jun 18, 2024

AArgh, I had mentioned to remove Cargo.lock from .gitignore, thought it had been taken care of while addressing the other comments. Will open a PR right away.

Sorry about that! That was the one that I missed...

BGluth added a commit that referenced this pull request Jun 24, 2024
@BGluth
Removed non-existing dep public __compat_primitive_types
2fd7a10 
- Something happened in the merge `zero_bin` PR (#279) where a
  local-renamed dep (something that is not on `crates.io`) got set just
  with a semver. Somehow `Cargo` is still able to build fine (not sure
  how...), but `rust-analyzer` (at least on my end) fails to make it past
  parsing the root `Cargo.toml`. This PR fixes this issue.
@BGluth BGluth mentioned this pull request Jun 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nashtare Nashtare Nashtare approved these changes

@atanmarko atanmarko atanmarko approved these changes

@wborgeaud wborgeaud Awaiting requested review from wborgeaud

@muursh muursh Awaiting requested review from muursh

Assignees
No one assigned
Labels
crate: evm_arithmetization Anything related to the evm_arithmetization crate. crate: mpt_trie Anything related to the mpt_trie crate. crate: proof_gen Anything related to the proof_gen crate. crate: trace_decoder Anything related to the trace_decoder crate.
Projects
Zero EVM
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.