Skip to content

Commit 6efca05

Browse files
authored
Merge pull request #367 from 0xPolygonHermez/fix/audit-durian
fix the audit issues (comments and unused constants) issues: 1,2,3
2 parents aded945 + 5aba3eb commit 6efca05

File tree

4 files changed

+22
-29
lines changed

4 files changed

+22
-29
lines changed

pil/arith.pil

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
EQ3: s * s - x1 - x2 - x3 + (q1 * p1) x3 1+2 2,3 ARITH_ECADD_DIFFERENT, ARITH_ECADD_SAME
1010
EQ4: s * x1 - s * x3 - y1 - y3 + (q2 * p1) y3 1+2 2,3 ARITH_ECADD_DIFFERENT, ARITH_ECADD_SAME
1111

12-
EQ5: x1 * x2 - y1 * y2 - x3 + (q1 * p2) 4 4 ARITH_BN254_MULFP2
13-
EQ6: y1 * x2 + x1 * y2 - y3 + (q2 * p2) 4 4 ARITH_BN254_MULFP2
12+
EQ5: x1 * x2 - y1 * y2 - x3 + (q1 * p2) 3 4 ARITH_BN254_MULFP2
13+
EQ6: y1 * x2 + x1 * y2 - y3 + (q2 * p2) 3 4 ARITH_BN254_MULFP2
1414

15-
EQ7: x1 + x2 - x3 + (q1 * p2) 5 5 ARITH_BN254_ADDFP2
16-
EQ8: y1 + y2 - y3 + (q2 * p2) 5 5 ARITH_BN254_ADDFP2
15+
EQ7: x1 + x2 - x3 + (q1 * p2) 4 5 ARITH_BN254_ADDFP2
16+
EQ8: y1 + y2 - y3 + (q2 * p2) 4 5 ARITH_BN254_ADDFP2
1717

18-
EQ9: x1 - x2 - x3 + (q1 * p2) 6 6 ARITH_BN254_SUBFP2
19-
EQ10: y1 - y2 - y3 + (q2 * p2) 6 6 ARITH_BN254_SUBFP2
18+
EQ9: x1 - x2 - x3 + (q1 * p2) 5 6 ARITH_BN254_SUBFP2
19+
EQ10: y1 - y2 - y3 + (q2 * p2) 5 6 ARITH_BN254_SUBFP2
2020

21-
EQ11: s * x2 - s * x1 - y2 + y1 + (q0 * p3) lambda - ADD 7 7 ARITH_SECP256R1_ECADD_DIFFERENT
22-
EQ12: 2 * s * y1 - 3 * x1 * x1 - a + (q0 * p3) lambda - DBL 8 8 ARITH_SECP256R1_ECADD_SAME
23-
EQ13: s * s - x1 - x2 - x3 + (q1 * p3) x3 7+8 7,8 ARITH_SECP256R1_ECADD_DIFFERENT, ARITH_SECP256R1_ECADD_SAME
24-
EQ14: s * x1 - s * x3 - y1 - y3 + (q2 * p3) y3 7+8 7,8 ARITH_SECP256R1_ECADD_DIFFERENT, ARITH_SECP256R1_ECADD_SAME
21+
EQ11: s * x2 - s * x1 - y2 + y1 + (q0 * p3) lambda - ADD 6 7 ARITH_SECP256R1_ECADD_DIFFERENT
22+
EQ12: 2 * s * y1 - 3 * x1 * x1 - a + (q0 * p3) lambda - DBL 7 8 ARITH_SECP256R1_ECADD_SAME
23+
EQ13: s * s - x1 - x2 - x3 + (q1 * p3) x3 6+7 7,8 ARITH_SECP256R1_ECADD_DIFFERENT, ARITH_SECP256R1_ECADD_SAME
24+
EQ14: s * x1 - s * x3 - y1 - y3 + (q2 * p3) y3 6+7 7,8 ARITH_SECP256R1_ECADD_DIFFERENT, ARITH_SECP256R1_ECADD_SAME
2525

2626
where p1 refers to the base field order of:
2727
· Secp256k1: 0xFFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFE FFFF FC2F

pil/rom.pil

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Rom(%N);
2323

2424
/*
2525
comment genereated with:
26-
node tools/pil_pol_table/bits_compose.js "arith,arithSame12,arithUseE,assert,bin,hashK,hashKDigest,hashKLen,hashP,hashPDigest,hashPLen,ind,indRR,isMem,isStack,JMP,JMPC,JMPN,memAlignRD,memAlignWR,memAlignWR8,mOp,mWR,repeat,setA,setB,setC,setCTX,setD,setE,setGAS,setHASHPOS,setPC,setRCX,setRR,setSP,setSR,sRD,sWR,useCTX,useJmpAddr,JMPZ,call,return,hashK1,hashP1,useElseAddr,hashS,hashSDigest,hashSLen,hashS1"
26+
node tools/pil_pol_table/bits_compose.js "arith,arithSame12,arithUseE,assert,bin,hashK,hashKDigest,hashKLen,hashP,hashPDigest,hashPLen,ind,indRR,isMem,isStack,JMP,JMPC,JMPN,memAlignRD,memAlignWR,memAlignWR8,mOp,mWR,repeat,setA,setB,setC,setCTX,setD,setE,setGAS,setHASHPOS,setPC,setRCX,setRR,setSP,setSR,sRD,sWR,useCTX,useJmpAddr,JMPZ,call,return,hashK1,hashP1,useElseAddr,hashS,hashSDigest,hashSLen,hashS1,assumeFree"
2727

2828
operations =
2929
2**0 * arith + 2**1 * arithSame12 + 2**2 * arithUseE + 2**3 * assert
@@ -38,6 +38,5 @@ namespace Rom(%N);
3838
+ 2**36 * setSR + 2**37 * sRD + 2**38 * sWR + 2**39 * useCTX
3939
+ 2**40 * useJmpAddr + 2**41 * JMPZ + 2**42 * call + 2**43 * return
4040
+ 2**44 * hashK1 + 2**45 * hashP1 + 2**46 * useElseAddr + 2**47 * hashS
41-
+ 2**48 * hashSDigest + 2**49 * hashSLen + 2**50 * hashS1;
42-
41+
+ 2**48 * hashSDigest + 2**49 * hashSLen + 2**50 * hashS1 + 2**51 * assumeFree;
4342
*/

src/sm/sm_rom.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ module.exports.buildConstants = async function buildConstants(pols, rom) {
1010

1111
const N = pols.offset.length;
1212

13-
const twoTo31 = Scalar.e(0x80000000);
14-
const maxInt = 2147483647;
15-
const minInt = -2147483648;
16-
const maxUInt = 0xFFFFFFFF;
17-
const minUInt = 0;
18-
1913
if (rom.program.length>N) throw new Error("Rom is too big for this N");
2014

2115
for (let i=0; i<N; i++) {

tools/arith/arith.ejs.pil

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
EQ3: s * s - x1 - x2 - x3 + (q1 * p1) x3 1+2 2,3 ARITH_ECADD_DIFFERENT, ARITH_ECADD_SAME
1010
EQ4: s * x1 - s * x3 - y1 - y3 + (q2 * p1) y3 1+2 2,3 ARITH_ECADD_DIFFERENT, ARITH_ECADD_SAME
1111

12-
EQ5: x1 * x2 - y1 * y2 - x3 + (q1 * p2) 4 4 ARITH_BN254_MULFP2
13-
EQ6: y1 * x2 + x1 * y2 - y3 + (q2 * p2) 4 4 ARITH_BN254_MULFP2
12+
EQ5: x1 * x2 - y1 * y2 - x3 + (q1 * p2) 3 4 ARITH_BN254_MULFP2
13+
EQ6: y1 * x2 + x1 * y2 - y3 + (q2 * p2) 3 4 ARITH_BN254_MULFP2
1414

15-
EQ7: x1 + x2 - x3 + (q1 * p2) 5 5 ARITH_BN254_ADDFP2
16-
EQ8: y1 + y2 - y3 + (q2 * p2) 5 5 ARITH_BN254_ADDFP2
15+
EQ7: x1 + x2 - x3 + (q1 * p2) 4 5 ARITH_BN254_ADDFP2
16+
EQ8: y1 + y2 - y3 + (q2 * p2) 4 5 ARITH_BN254_ADDFP2
1717

18-
EQ9: x1 - x2 - x3 + (q1 * p2) 6 6 ARITH_BN254_SUBFP2
19-
EQ10: y1 - y2 - y3 + (q2 * p2) 6 6 ARITH_BN254_SUBFP2
18+
EQ9: x1 - x2 - x3 + (q1 * p2) 5 6 ARITH_BN254_SUBFP2
19+
EQ10: y1 - y2 - y3 + (q2 * p2) 5 6 ARITH_BN254_SUBFP2
2020

21-
EQ11: s * x2 - s * x1 - y2 + y1 + (q0 * p3) lambda - ADD 7 7 ARITH_SECP256R1_ECADD_DIFFERENT
22-
EQ12: 2 * s * y1 - 3 * x1 * x1 - a + (q0 * p3) lambda - DBL 8 8 ARITH_SECP256R1_ECADD_SAME
23-
EQ13: s * s - x1 - x2 - x3 + (q1 * p3) x3 7+8 7,8 ARITH_SECP256R1_ECADD_DIFFERENT, ARITH_SECP256R1_ECADD_SAME
24-
EQ14: s * x1 - s * x3 - y1 - y3 + (q2 * p3) y3 7+8 7,8 ARITH_SECP256R1_ECADD_DIFFERENT, ARITH_SECP256R1_ECADD_SAME
21+
EQ11: s * x2 - s * x1 - y2 + y1 + (q0 * p3) lambda - ADD 6 7 ARITH_SECP256R1_ECADD_DIFFERENT
22+
EQ12: 2 * s * y1 - 3 * x1 * x1 - a + (q0 * p3) lambda - DBL 7 8 ARITH_SECP256R1_ECADD_SAME
23+
EQ13: s * s - x1 - x2 - x3 + (q1 * p3) x3 6+7 7,8 ARITH_SECP256R1_ECADD_DIFFERENT, ARITH_SECP256R1_ECADD_SAME
24+
EQ14: s * x1 - s * x3 - y1 - y3 + (q2 * p3) y3 6+7 7,8 ARITH_SECP256R1_ECADD_DIFFERENT, ARITH_SECP256R1_ECADD_SAME
2525

2626
where p1 refers to the base field order of:
2727
· Secp256k1: 0xFFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFE FFFF FC2F

0 commit comments

Comments
 (0)