Skip to content

feat: make london and paris the same zkevm #763

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

Merged
merged 4 commits into from
Sep 19, 2025
+6 −13
Merged

feat: make london and paris the same zkevm #763

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d54ef6
feat: make london and paris the same zkevm
letypequividelespoubelles Sep 18, 2025
f78e12b
ras: move comment to make it compile
letypequividelespoubelles Sep 18, 2025
27e3172
ras
letypequividelespoubelles Sep 18, 2025
51ddffd
fix Dave's comment
letypequividelespoubelles Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,8 @@ ZKEVM_MODULES_LONDON := ${ZKEVM_MODULES_COMMON} \
${RLP_TXN_LONDON} \
${TXN_DATA_LONDON}

ZKEVM_MODULES_PARIS := ${ZKEVM_MODULES_COMMON} \
${CONSTANTS_LONDON} \
${TABLES_LONDON} \
${BLOCKDATA_PARIS} \
${HUB_LONDON} \
${LOG_INFO_LONDON} \
${MMIO_LONDON} \
${MXP_LONDON} \
${OOB_LONDON} \
${RLP_TXN_LONDON} \
${TXN_DATA_LONDON}

# ZKEVM_MODULES_PARIS := ZKEVM_MODULES_LONDON

ZKEVM_MODULES_SHANGHAI := ${ZKEVM_MODULES_COMMON} \
${CONSTANTS_LONDON} \
Expand Down Expand Up @@ -213,8 +204,10 @@ zkevm_london.bin: ${ZKEVM_MODULES_LONDON}
${GO_CORSET_COMPILE} -o $@ ${ZKEVM_MODULES_LONDON}
@$(call warn_lispX)

zkevm_paris.bin: ${ZKEVM_MODULES_PARIS}
${GO_CORSET_COMPILE} -o $@ ${ZKEVM_MODULES_PARIS}
#This is not a typo:
# only a column name change between Paris and London n BLOCK_DATA that blocks us to have a conflation with London and Paris blocks
zkevm_paris.bin: ${ZKEVM_MODULES_LONDON}
${GO_CORSET_COMPILE} -o $@ ${ZKEVM_MODULES_LONDON}
@$(call warn_lispX)

zkevm_shanghai.bin: ${ZKEVM_MODULES_SHANGHAI}
Expand Down
Loading