halo2
halo2 copied to clipboard
privacy-scaling-explorations
Open a new branch for zkevm related adaptation
I found that we're directly pushing commits into the main branch. I suggest that we open a new branch, e.g., zkevm, to add zkEVM-related adaptation. The benefit is that it can keep a clean main branch and make it easier to pull the latest changes from zcash in the future.
Sorry, just seeing this issue now. I was the one who proposed the idea that it would be easy to see our zkEVM-related adaptation in the default branch.
We could maintain an upstream branch to keep track of the zcash branch. We'll have to keep sending pull requests to merge upstream changes constantly. It would look like this https://github.com/etclabscore/core-geth/pull/432.
An alternative is to keep rebasing our changes on top of upstream, but that would cause all fork maintainers' constantly nuke their local branches. It would also be harder to do releases since we assume we add tags on an ever-growing branch.
I'm also very interested in avoiding a persistent fork if possible (it's something we didn't manage for bellman, and I want to learn from that experience and get ahead of it this time round). To that end, I'd like to figure out a workflow that enables changes you'd like to see upstream to be reviewed by us. We've been unfortunately flat out on non-halo2 NU5 work for the last few months, but with that drawing to a close soon (I hope!), I want to figure this out, not least because I want to try and avoid API drift between downstream forks that could make merging changes upstream much harder.
