arnaucube/circom
1
0
Fork 0
mirror of https://github.com/arnaucube/circom.git synced 2026-02-06 18:56:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Error in wasm generation of big circuits

Browse Source
This commit is contained in:
Jordi Baylina
2020-04-07 12:53:58 +02:00
parent 96776d2374
commit c7c6b799ad
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -592,9 +592,9 @@
} }
}, },
"ffjavascript": { "ffjavascript": {
"version": "0.0.4", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.0.4.tgz", "resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.0.5.tgz",
"integrity": "sha512-6eiRvy+YuGCRjH4U8KdJbRel5VBW0zeuUL1FXQ+fFxTp5xv2ClqTfCYf5ClUtq0voGpd9XJAdUCvgIxHDbAQ0Q==", "integrity": "sha512-7je6PydOWLDUj3vU8JeCUgeezg4yrG/6qjlukQNuPHeeavnM4REcrN9LA2+xtqIMIPdx/wdUkPMQpixsz+CdIw==",
"requires": { "requires": {
"big-integer": "^1.6.48" "big-integer": "^1.6.48"
} }

2
package.json
View File

@@ -33,7 +33,7 @@
"chai": "^4.2.0", "chai": "^4.2.0",
"circom_runtime": "0.0.3", "circom_runtime": "0.0.3",
"ffiasm": "0.0.2", "ffiasm": "0.0.2",
"ffjavascript": "0.0.4", "ffjavascript": "0.0.5",
"ffwasm": "0.0.6", "ffwasm": "0.0.6",
"fnv-plus": "^1.3.1", "fnv-plus": "^1.3.1",
"r1csfile": "0.0.3", "r1csfile": "0.0.3",

32
ports/wasm/builder.js
View File

@@ -923,41 +923,41 @@ class BuilderWasm {
} }
_buildComponents(module) { _buildComponents(module) {
const bytes = []; const bytes = new Array(this.components.length*5*4);
bytes.length=0;
for (let i=0; i<this.components.length; i++) { for (let i=0; i<this.components.length; i++) {
const c = this.components[i]; const c = this.components[i];
bytes.push(intToBytes32(this.hashMaps[c.hashMapName].pointer)); bytes.push(...intToBytes32(this.hashMaps[c.hashMapName].pointer));
bytes.push(intToBytes32(this.componentEntriesTables[c.entryTableName].pointer)); bytes.push(...intToBytes32(this.componentEntriesTables[c.entryTableName].pointer));
bytes.push(intToBytes32(i)); bytes.push(...intToBytes32(i));
bytes.push(intToBytes32(c.nInSignals)); bytes.push(...intToBytes32(c.nInSignals));
bytes.push(intToBytes32(c.newThread ? 1 : 0)); bytes.push(...intToBytes32(c.newThread ? 1 : 0));
module.addFunctionToTable(c.functionName); module.addFunctionToTable(c.functionName);
} }
const fBytes = [].concat(...bytes); this.pComponents = module.alloc(bytes);
this.pComponents = module.alloc(fBytes);
} }
_buildMapIsInput(module) { _buildMapIsInput(module) {
const bytes = []; const bytes = new Array(this.mapIsInput.length*4);
bytes.length=0;
for (let i=0; i<this.mapIsInput.length; i++) { for (let i=0; i<this.mapIsInput.length; i++) {
bytes.push(intToBytes32(this.mapIsInput[i])); bytes.push(...intToBytes32(this.mapIsInput[i]));
} }
const fBytes = [].concat(...bytes); this.pMapIsInput = module.alloc(bytes);
this.pMapIsInput = module.alloc(fBytes);
} }
_buildWit2Sig(module) { _buildWit2Sig(module) {
const bytes = []; const bytes = new Array(this.wit2sig.length*4);
bytes.length =0;
for (let i=0; i<this.wit2sig.length; i++) { for (let i=0; i<this.wit2sig.length; i++) {
bytes.push(intToBytes32(this.wit2sig[i])); bytes.push(...intToBytes32(this.wit2sig[i]));
} }
const fBytes = [].concat(...bytes); this.pWit2sig = module.alloc(bytes);
this.pWit2sig = module.alloc(fBytes);
} }
_buildCircuitVar(module) { _buildCircuitVar(module) {