This repository was archived by the owner on May 21, 2026. It is now read-only.
Feat/common modules and fork specific folders#649
Closed
amkCha wants to merge 20 commits into
Closed
Conversation
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch> Signed-off-by: François Bojarski <54240434+letypequividelespoubelles@users.noreply.github.com> Co-authored-by: Olivier Bégassat <38285177+OlivierBBB@users.noreply.github.com> Co-authored-by: David Pearce <david.pearce@consensys.net> Co-authored-by: DavePearce <dave01001110@gmail.com>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch> Co-authored-by: F Bojarski <ceciestunepoubelle@protonmail.ch> Co-authored-by: François Bojarski <54240434+letypequividelespoubelles@users.noreply.github.com>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
…ename hubshan to hub
66d450a to
8f50085
Compare
DavePearce
reviewed
May 20, 2025
DavePearce
left a comment
Collaborator
There was a problem hiding this comment.
It looks good to me, and I only have minor comments. I personally would have thought a naming scheme such as e.g. txndata/london is preferable to txndata/txndata-lon. But, its not a big deal at all!!
Also (just another suggestion) you have e.g. this:
hub/constraints/create/push-pop-fork/push_pop_lon.lisp
hub/constraints/create/push-pop-fork/push_pop_shan.lisp
I would do this instead:
hub/constraints/create/london/push_pop.lisp
hub/constraints/create/shanghai/push_pop.lisp
I would actually probably go further even. I'd move all the stuff in create/constraints into just create and then you could have generalities_lon.lisp as create/london/generalities.lisp, etc.
This tweaks the makefile so that it always builds all bin file targets. This also factors out the common modules into a separate variable.
e05a053 to
b2d2cb0
Compare
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
OOB modules has a difference in the array's size of one of the columns between London and Shanghai. The files impacted are therefore :

columns.lisp+constancies.lisp+create.lisp=> for OOB, there are now 2 subfolders
the HUB module is a much bigger module. The impact of Shanghai comes from the difference in the OOB module as well as the instruction-handling of PUSH0


=> for the HUB, the folder is not duplicated. I've added a subfolder called
xxx-forkwhenever 2 files needed to be duplicated. For instance, inintruction-handlingfor push_popOr for miscellaneous file column
In the Makefile, we now compile
zkevm_london.binandzkevm_shanghai.bin. To compile the Hub for one fork or the other, we just need to filter out_lon.lispor_shan.lispfile depending on the case. For the London Hub for example