Skip to content
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
masterfrom
feat/common-modules-and-fork-specific-folders
Closed

Feat/common modules and fork specific folders#649
amkCha wants to merge 20 commits into
masterfrom
feat/common-modules-and-fork-specific-folders

Conversation

@amkCha

@amkCha amkCha commented May 20, 2025

Copy link
Copy Markdown
Contributor
  • 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
    image

  • 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-fork whenever 2 files needed to be duplicated. For instance, in intruction-handling for push_pop
    image
    Or for miscellaneous file column
    image

  • In the Makefile, we now compile zkevm_london.bin and zkevm_shanghai.bin. To compile the Hub for one fork or the other, we just need to filter out _lon.lisp or _shan.lisp file depending on the case. For the London Hub for example

HUB_LON :=  $(filter-out %_shan.lisp, $(wildcard hub/*.lisp)) \
			$(filter-out %_shan.lisp, $(wildcard hub/**/*.lisp)) \
			$(filter-out %_shan.lisp, $(wildcard hub/**/**/*.lisp)) \
			$(filter-out %_shan.lisp, $(wildcard hub/**/**/**/*.lisp)) \
			$(filter-out %_shan.lisp, $(wildcard hub/**/**/**/**/*.lisp)) \
			$(filter-out %_shan.lisp, $(wildcard hub/**/**/**/**/**/*.lisp))

letypequividelespoubelles and others added 14 commits May 20, 2025 11:11
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>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
@amkCha amkCha force-pushed the feat/common-modules-and-fork-specific-folders branch from 66d450a to 8f50085 Compare May 20, 2025 13:34

@DavePearce DavePearce left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

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.

Comment thread Makefile Outdated
This tweaks the makefile so that it always builds all bin file targets.
This also factors out the common modules into a separate variable.
@DavePearce DavePearce force-pushed the feat/common-modules-and-fork-specific-folders branch from e05a053 to b2d2cb0 Compare May 20, 2025 22:11
@amkCha amkCha closed this May 21, 2025
@DavePearce DavePearce deleted the feat/common-modules-and-fork-specific-folders branch September 25, 2025 21:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants