Skip to content

Commit 7a98e32

Browse files
authored
fix: avoid passing stamp from blake2fmodexp operation to unsignedByte and back to int (#2368)
1 parent 163b45e commit 7a98e32

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

arithmetization/src/main/java/net/consensys/linea/zktracer/module/blake2fmodexpdata/BlakeModexpDataOperation.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,29 +85,29 @@ void trace(Trace.Blake2fmodexpdata trace, final int stamp) {
8585
final UnsignedByte stampByte = UnsignedByte.of(stamp);
8686

8787
if (modexpMetaData.isPresent()) {
88-
traceBase(trace, stampByte);
89-
traceExponent(trace, stampByte);
90-
traceModulus(trace, stampByte);
91-
traceModexpResult(trace, stampByte);
88+
traceBase(trace, stamp);
89+
traceExponent(trace, stamp);
90+
traceModulus(trace, stamp);
91+
traceModexpResult(trace, stamp);
9292
return;
9393
}
9494

9595
if (blake2fComponents.isPresent()) {
96-
traceData(trace, stampByte);
97-
traceParameter(trace, stampByte);
98-
traceBlakeResult(trace, stampByte);
96+
traceData(trace, stamp);
97+
traceParameter(trace, stamp);
98+
traceBlakeResult(trace, stamp);
9999
}
100100
}
101101

102-
private void traceData(Trace.Blake2fmodexpdata trace, UnsignedByte stamp) {
102+
private void traceData(Trace.Blake2fmodexpdata trace, int stamp) {
103103
final Bytes input = blake2fComponents.get().getHashInput();
104104
for (int index = 0; index <= INDEX_MAX_BLAKE_DATA; index++) {
105105
commonTrace(trace, stamp, index, input, INDEX_MAX_BLAKE_DATA);
106106
trace.phase(UnsignedByte.of(PHASE_BLAKE_DATA)).isBlakeData(true).fillAndValidateRow();
107107
}
108108
}
109109

110-
private void traceParameter(Trace.Blake2fmodexpdata trace, UnsignedByte stamp) {
110+
private void traceParameter(Trace.Blake2fmodexpdata trace, int stamp) {
111111
// r
112112
commonTrace(
113113
trace, stamp, 0, leftPadTo(blake2fComponents.get().r(), LLARGE), INDEX_MAX_BLAKE_PARAMS);
@@ -123,23 +123,23 @@ private void traceParameter(Trace.Blake2fmodexpdata trace, UnsignedByte stamp) {
123123
trace.phase(UnsignedByte.of(PHASE_BLAKE_PARAMS)).isBlakeParams(true).fillAndValidateRow();
124124
}
125125

126-
private void traceBlakeResult(Trace.Blake2fmodexpdata trace, UnsignedByte stamp) {
126+
private void traceBlakeResult(Trace.Blake2fmodexpdata trace, int stamp) {
127127
final Bytes hash = computeBlake2fResult();
128128
for (int index = 0; index <= INDEX_MAX_BLAKE_RESULT; index++) {
129129
commonTrace(trace, stamp, index, hash, INDEX_MAX_BLAKE_RESULT);
130130
trace.phase(UnsignedByte.of(PHASE_BLAKE_RESULT)).isBlakeResult(true).fillAndValidateRow();
131131
}
132132
}
133133

134-
private void traceBase(Trace.Blake2fmodexpdata trace, final UnsignedByte stamp) {
134+
private void traceBase(Trace.Blake2fmodexpdata trace, final int stamp) {
135135
final Bytes input = leftPadTo(modexpMetaData.get().base(), MODEXP_COMPONENT_BYTE_SIZE);
136136
for (int index = 0; index <= INDEX_MAX_MODEXP_BASE; index++) {
137137
commonTrace(trace, stamp, index, input, INDEX_MAX_MODEXP_BASE);
138138
trace.phase(UnsignedByte.of(PHASE_MODEXP_BASE)).isModexpBase(true).fillAndValidateRow();
139139
}
140140
}
141141

142-
private void traceExponent(Trace.Blake2fmodexpdata trace, final UnsignedByte stamp) {
142+
private void traceExponent(Trace.Blake2fmodexpdata trace, final int stamp) {
143143
final Bytes input = leftPadTo(modexpMetaData.get().exp(), MODEXP_COMPONENT_BYTE_SIZE);
144144
for (int index = 0; index <= INDEX_MAX_MODEXP_EXPONENT; index++) {
145145
commonTrace(trace, stamp, index, input, INDEX_MAX_MODEXP_EXPONENT);
@@ -150,15 +150,15 @@ private void traceExponent(Trace.Blake2fmodexpdata trace, final UnsignedByte sta
150150
}
151151
}
152152

153-
private void traceModulus(Trace.Blake2fmodexpdata trace, final UnsignedByte stamp) {
153+
private void traceModulus(Trace.Blake2fmodexpdata trace, final int stamp) {
154154
final Bytes input = leftPadTo(modexpMetaData.get().mod(), MODEXP_COMPONENT_BYTE_SIZE);
155155
for (int index = 0; index <= INDEX_MAX_MODEXP_MODULUS; index++) {
156156
commonTrace(trace, stamp, index, input, INDEX_MAX_MODEXP_MODULUS);
157157
trace.phase(UnsignedByte.of(PHASE_MODEXP_MODULUS)).isModexpModulus(true).fillAndValidateRow();
158158
}
159159
}
160160

161-
private void traceModexpResult(Trace.Blake2fmodexpdata trace, final UnsignedByte stamp) {
161+
private void traceModexpResult(Trace.Blake2fmodexpdata trace, final int stamp) {
162162
final Bytes input = leftPadTo(modexpMetaData.get().rawResult(), MODEXP_COMPONENT_BYTE_SIZE);
163163
for (int index = 0; index <= INDEX_MAX_MODEXP_RESULT; index++) {
164164
commonTrace(trace, stamp, index, input, INDEX_MAX_MODEXP_RESULT);
@@ -167,9 +167,9 @@ private void traceModexpResult(Trace.Blake2fmodexpdata trace, final UnsignedByte
167167
}
168168

169169
private void commonTrace(
170-
Trace.Blake2fmodexpdata trace, UnsignedByte stamp, int index, Bytes input, int indexMax) {
170+
Trace.Blake2fmodexpdata trace, int stamp, int index, Bytes input, int indexMax) {
171171
trace
172-
.stamp(stamp.toInteger())
172+
.stamp(stamp)
173173
.id(id)
174174
.index(UnsignedByte.of(index))
175175
.indexMax(UnsignedByte.of(indexMax))

linea-constraints

0 commit comments

Comments
 (0)