@@ -23,6 +23,49 @@ BLOCKDATA_CANCUN := blockdata/cancun
23
23
24
24
BLOCKHASH := blockhash
25
25
26
+ BLS_CANCUN := $(wildcard blsdata/cancun/* .lisp) \
27
+ $(wildcard blsdata/cancun/generalities/cancun_restriction.lisp) \
28
+ $(wildcard blsdata/cancun/generalities/constancy_conditions.lisp) \
29
+ $(wildcard blsdata/cancun/generalities/constraining_address_sum.lisp) \
30
+ $(wildcard blsdata/cancun/generalities/constraining_flag_sum.lisp) \
31
+ $(wildcard blsdata/cancun/generalities/constraints_for_bls_stamp.lisp) \
32
+ $(wildcard blsdata/cancun/generalities/constraints_for_ct.lisp) \
33
+ $(wildcard blsdata/cancun/generalities/id_increment_constraints.lisp) \
34
+ $(wildcard blsdata/cancun/generalities/legal_transition_constraints.lisp) \
35
+ $(wildcard blsdata/cancun/generalities/setting_acc_inputs.lisp) \
36
+ $(wildcard blsdata/cancun/generalities/setting_ct_max.lisp) \
37
+ $(wildcard blsdata/cancun/generalities/setting_index_max.lisp) \
38
+ $(wildcard blsdata/cancun/generalities/setting_index.lisp) \
39
+ $(wildcard blsdata/cancun/generalities/setting_is_first_input_and_is_second_input.lisp) \
40
+ $(wildcard blsdata/cancun/generalities/setting_phase.lisp) \
41
+ $(wildcard blsdata/cancun/generalities/setting_total_size.lisp) \
42
+ $(wildcard blsdata/cancun/generalities/shorthands.lisp) \
43
+ $(wildcard blsdata/cancun/lookups/* .lisp) \
44
+ $(wildcard blsdata/cancun/specialized_constraints/* .lisp) \
45
+ $(wildcard blsdata/cancun/top_level_flags_mint_mext_wtrv_wnon/* .lisp) \
46
+ $(wildcard blsdata/cancun/utilities/* .lisp) \
47
+
48
+ BLS_PRAGUE := $(wildcard blsdata/cancun/* .lisp) \
49
+ $(wildcard blsdata/cancun/generalities/constancy_conditions.lisp) \
50
+ $(wildcard blsdata/cancun/generalities/constraining_address_sum.lisp) \
51
+ $(wildcard blsdata/cancun/generalities/constraining_flag_sum.lisp) \
52
+ $(wildcard blsdata/cancun/generalities/constraints_for_bls_stamp.lisp) \
53
+ $(wildcard blsdata/cancun/generalities/constraints_for_ct.lisp) \
54
+ $(wildcard blsdata/cancun/generalities/id_increment_constraints.lisp) \
55
+ $(wildcard blsdata/cancun/generalities/legal_transition_constraints.lisp) \
56
+ $(wildcard blsdata/cancun/generalities/setting_acc_inputs.lisp) \
57
+ $(wildcard blsdata/cancun/generalities/setting_ct_max.lisp) \
58
+ $(wildcard blsdata/cancun/generalities/setting_index_max.lisp) \
59
+ $(wildcard blsdata/cancun/generalities/setting_index.lisp) \
60
+ $(wildcard blsdata/cancun/generalities/setting_is_first_input_and_is_second_input.lisp) \
61
+ $(wildcard blsdata/cancun/generalities/setting_phase.lisp) \
62
+ $(wildcard blsdata/cancun/generalities/setting_total_size.lisp) \
63
+ $(wildcard blsdata/cancun/generalities/shorthands.lisp) \
64
+ $(wildcard blsdata/cancun/lookups/* .lisp) \
65
+ $(wildcard blsdata/cancun/specialized_constraints/* .lisp) \
66
+ $(wildcard blsdata/cancun/top_level_flags_mint_mext_wtrv_wnon/* .lisp) \
67
+ $(wildcard blsdata/cancun/utilities/* .lisp) \
68
+
26
69
CONSTANTS := constants/constants.lisp
27
70
28
71
CONSTANTS_LONDON := constants/london/constants.lisp
@@ -67,7 +110,30 @@ OOB_LONDON := oob/london
67
110
68
111
OOB_SHANGHAI := oob/shanghai
69
112
70
- OOB_CANCUN := oob/cancun
113
+ OOB_CANCUN := $(wildcard oob/cancun/lookups/* .lisp) \
114
+ $(wildcard oob/cancun/opcodes/* .lisp) \
115
+ $(wildcard oob/cancun/precompiles/* .lisp) \
116
+ $(wildcard oob/cancun/binarities.lisp) \
117
+ $(wildcard oob/cancun/cancun_restriction.lisp) \
118
+ $(wildcard oob/cancun/columns.lisp) \
119
+ $(wildcard oob/cancun/constancies.lisp) \
120
+ $(wildcard oob/cancun/constants.lisp) \
121
+ $(wildcard oob/cancun/decoding.lisp) \
122
+ $(wildcard oob/cancun/heartbeat.lisp) \
123
+ $(wildcard oob/cancun/shorthands.lisp) \
124
+ $(wildcard oob/cancun/specialized.lisp) \
125
+
126
+ OOB_PRAGUE := $(wildcard oob/cancun/lookups/* .lisp) \
127
+ $(wildcard oob/cancun/opcodes/* .lisp) \
128
+ $(wildcard oob/cancun/precompiles/* .lisp) \
129
+ $(wildcard oob/cancun/binarities.lisp) \
130
+ $(wildcard oob/cancun/columns.lisp) \
131
+ $(wildcard oob/cancun/constancies.lisp) \
132
+ $(wildcard oob/cancun/constants.lisp) \
133
+ $(wildcard oob/cancun/decoding.lisp) \
134
+ $(wildcard oob/cancun/heartbeat.lisp) \
135
+ $(wildcard oob/cancun/shorthands.lisp) \
136
+ $(wildcard oob/cancun/specialized.lisp) \
71
137
72
138
RLP_ADDR := rlpaddr
73
139
@@ -93,9 +159,12 @@ TABLES_LONDON := reftables/*.lisp \
93
159
reftables/london/inst_decoder.lisp
94
160
95
161
TABLES_CANCUN := reftables/*.lisp \
162
+ reftables/cancun/bls_reftable.lisp \
96
163
reftables/cancun/inst_decoder.lisp \
97
164
reftables/cancun/power.lisp
98
165
166
+ # reftables/cancun/bls_reftable.lisp is only used in PRAGUE, but adding it in CANCUN already allows to do not duplicate OOB
167
+
99
168
TRM := trm
100
169
101
170
TXN_DATA_LONDON := txndata/london
@@ -174,6 +243,7 @@ ZKEVM_MODULES_CANCUN := ${ZKEVM_MODULES_COMMON} \
174
243
${CONSTANTS_CANCUN} \
175
244
${TABLES_CANCUN} \
176
245
${BLOCKDATA_CANCUN} \
246
+ ${BLS_CANCUN} \
177
247
${HUB_CANCUN} \
178
248
${LOG_INFO_CANCUN} \
179
249
${MMIO_CANCUN} \
@@ -187,11 +257,12 @@ ZKEVM_MODULES_PRAGUE := ${ZKEVM_MODULES_COMMON} \
187
257
${CONSTANTS_PRAGUE} \
188
258
${TABLES_CANCUN} \
189
259
${BLOCKDATA_CANCUN} \
260
+ ${BLS_PRAGUE} \
190
261
${HUB_CANCUN} \
191
262
${LOG_INFO_CANCUN} \
192
263
${MMIO_CANCUN} \
193
264
${MXP_CANCUN} \
194
- ${OOB_CANCUN } \
265
+ ${OOB_PRAGUE } \
195
266
${RLP_TXN_CANCUN} \
196
267
${RLP_UTILS_CANCUN} \
197
268
${TXN_DATA_CANCUN}
0 commit comments