Fix sqrt

iden3 · Apr 1, 2022 · 6eba608 · 6eba608
1 parent e7eeb24
commit 6eba608
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -15,6 +15,18 @@
             "args": [
                 "${workspaceFolder}/test/bn128.js"
             ]
+        },
+        {
+            "type": "pwa-node",
+            "request": "launch",
+            "name": "Test Algebra",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": [
+                "${workspaceFolder}/test/algebra.js"
+            ]
         }
     ]
 }
diff --git a/build/main.cjs b/build/main.cjs
@@ -1661,8 +1661,8 @@ class FFT {
         this.G = G;
         this.opMulGF = opMulGF;
 
-        let rem = F.sqrt_t;
-        let s = F.sqrt_s;
+        let rem = F.sqrt_t || F.t;
+        let s = F.sqrt_s || F.s;
 
         let nqr = F.one;
         while (F.eq(F.pow(nqr, F.half), F.one)) nqr = F.add(nqr, F.one);
@@ -1694,7 +1694,7 @@ class FFT {
             this.roots.push(rootsi);
         }
         */
-        this._setRoots(15);
+        this._setRoots(Math.min(s, 15));
     }
 
     _setRoots(n) {

diff --git a/src/fft.js b/src/fft.js
@@ -30,8 +30,8 @@ export default class FFT {
         this.G = G;
         this.opMulGF = opMulGF;
 
-        let rem = F.sqrt_t;
-        let s = F.sqrt_s;
+        let rem = F.sqrt_t || F.t;
+        let s = F.sqrt_s || F.s;
 
         let nqr = F.one;
         while (F.eq(F.pow(nqr, F.half), F.one)) nqr = F.add(nqr, F.one);
@@ -63,7 +63,7 @@ export default class FFT {
             this.roots.push(rootsi);
         }
         */
-        this._setRoots(15);
+        this._setRoots(Math.min(s, 15));
     }
 
     _setRoots(n) {

diff --git a/test/bn128.js b/test/bn128.js
@@ -16,6 +16,7 @@ describe("bn128", async function () {
     let bn128;
     before( async() => {
         bn128 = await buildBn128();
+        console.log(bn128.Fr.toString(bn128.Fr.w[28]));
     });
     after( async() => {
         bn128.terminate();