chore: update with upstream

This commit is contained in:
0xmad
2023-10-19 14:28:39 -05:00
parent 3a6b571e76
commit 0aea419a89
9 changed files with 17783 additions and 2155 deletions

View File

@@ -512,7 +512,7 @@ npm install snarkjs
```
```js
const snarkjs = require("snarkjs");
const snarkjs = require("@cryptkeeperzk/snarkjs");
const fs = require("fs");
async function run() {

View File

@@ -6,7 +6,7 @@ var fs = require('fs');
var url = require('url');
var r1csfile = require('r1csfile');
var fastFile = require('fastfile');
var ffjavascript = require('ffjavascript');
var ffjavascript = require('@cryptkeeperzk/ffjavascript');
var Blake2b = require('blake2b-wasm');
var readline = require('readline');
var crypto = require('crypto');
@@ -13077,13 +13077,13 @@ async function zkeyExportSolidityVerifier(params, options) {
const templates = {};
if (await fileExists(path__default["default"].join(__dirname$1, "templates"))) {
templates.groth16 = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "templates", "verifier_groth16.sol.@cryptkeeperzk/ejs"), "utf8");
templates.plonk = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "templates", "verifier_plonk.sol.@cryptkeeperzk/ejs"), "utf8");
templates.fflonk = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "templates", "verifier_fflonk.sol.@cryptkeeperzk/ejs"), "utf8");
templates.groth16 = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "templates", "verifier_groth16.sol.ejs"), "utf8");
templates.plonk = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "templates", "verifier_plonk.sol.ejs"), "utf8");
templates.fflonk = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "templates", "verifier_fflonk.sol.ejs"), "utf8");
} else {
templates.groth16 = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "..", "templates", "verifier_groth16.sol.@cryptkeeperzk/ejs"), "utf8");
templates.plonk = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "..", "templates", "verifier_plonk.sol.@cryptkeeperzk/ejs"), "utf8");
templates.fflonk = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "..", "templates", "verifier_fflonk.sol.@cryptkeeperzk/ejs"), "utf8");
templates.groth16 = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "..", "templates", "verifier_groth16.sol.ejs"), "utf8");
templates.plonk = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "..", "templates", "verifier_plonk.sol.ejs"), "utf8");
templates.fflonk = await fs__default["default"].promises.readFile(path__default["default"].join(__dirname$1, "..", "templates", "verifier_fflonk.sol.ejs"), "utf8");
}
const verifierCode = await exportSolidityVerifier(zkeyName, templates, logger);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

38
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@cryptkeeperzk/snarkjs",
"version": "0.7.1",
"version": "0.7.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@cryptkeeperzk/snarkjs",
"version": "0.7.1",
"version": "0.7.2",
"license": "GPL-3.0",
"dependencies": {
"@cryptkeeperzk/ejs": "^3.1.6",
@@ -176,6 +176,14 @@
"web-worker": "^1.2.0"
}
},
"node_modules/@cryptkeeperzk/ffjavascript/node_modules/wasmcurves": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/wasmcurves/-/wasmcurves-0.2.1.tgz",
"integrity": "sha512-9ciO7bUE5bgpbOcdK7IO3enrSVIKHwrQmPibok4GLJWaCA7Wyqc9PRYnu5HbiFv9NDFNqVKPtU5R6Is5KujBLg==",
"dependencies": {
"wasmbuilder": "0.0.16"
}
},
"node_modules/@eslint-community/eslint-utils": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
@@ -2467,14 +2475,6 @@
"resolved": "https://registry.npmjs.org/wasmbuilder/-/wasmbuilder-0.0.16.tgz",
"integrity": "sha512-Qx3lEFqaVvp1cEYW7Bfi+ebRJrOiwz2Ieu7ZG2l7YyeSJIok/reEQCQCuicj/Y32ITIJuGIM9xZQppGx5LrQdA=="
},
"node_modules/wasmcurves": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/wasmcurves/-/wasmcurves-0.2.2.tgz",
"integrity": "sha512-JRY908NkmKjFl4ytnTu5ED6AwPD+8VJ9oc94kdq7h5bIwbj0L4TDJ69mG+2aLs2SoCmGfqIesMWTEJjtYsoQXQ==",
"dependencies": {
"wasmbuilder": "0.0.16"
}
},
"node_modules/web-worker": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.2.0.tgz",
@@ -2696,6 +2696,16 @@
"wasmbuilder": "0.0.16",
"wasmcurves": "0.2.1",
"web-worker": "^1.2.0"
},
"dependencies": {
"wasmcurves": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/wasmcurves/-/wasmcurves-0.2.1.tgz",
"integrity": "sha512-9ciO7bUE5bgpbOcdK7IO3enrSVIKHwrQmPibok4GLJWaCA7Wyqc9PRYnu5HbiFv9NDFNqVKPtU5R6Is5KujBLg==",
"requires": {
"wasmbuilder": "0.0.16"
}
}
}
},
"@eslint-community/eslint-utils": {
@@ -4381,14 +4391,6 @@
"resolved": "https://registry.npmjs.org/wasmbuilder/-/wasmbuilder-0.0.16.tgz",
"integrity": "sha512-Qx3lEFqaVvp1cEYW7Bfi+ebRJrOiwz2Ieu7ZG2l7YyeSJIok/reEQCQCuicj/Y32ITIJuGIM9xZQppGx5LrQdA=="
},
"wasmcurves": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/wasmcurves/-/wasmcurves-0.2.2.tgz",
"integrity": "sha512-JRY908NkmKjFl4ytnTu5ED6AwPD+8VJ9oc94kdq7h5bIwbj0L4TDJ69mG+2aLs2SoCmGfqIesMWTEJjtYsoQXQ==",
"requires": {
"wasmbuilder": "0.0.16"
}
},
"web-worker": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.2.0.tgz",

View File

@@ -51,12 +51,12 @@
"url": "https://github.com/iden3/snarkjs.git"
},
"dependencies": {
"@cryptkeeperzk/ejs": "^3.1.6",
"@cryptkeeperzk/ffjavascript": "^0.2.59",
"@iden3/binfileutils": "0.0.11",
"bfj": "^7.0.2",
"blake2b-wasm": "^2.4.0",
"circom_runtime": "0.1.24",
"@cryptkeeperzk/ejs": "^3.1.6",
"fastfile": "0.0.20",
"js-sha3": "^0.8.0",
"logplease": "^1.2.15",

View File

@@ -6,32 +6,34 @@
"": {
"name": "snarkjs-smart-contract-tests",
"devDependencies": {
"@cryptkeeperzk/ffjavascript": "0.2.59",
"@cryptkeeperzk/snarkjs": "file:..",
"@nomiclabs/hardhat-ethers": "^2.2.3",
"@nomiclabs/hardhat-waffle": "^2.0.5",
"chai": "^4.3.7",
"ethereum-waffle": "^4.0.10",
"ethers": "^5.7.2",
"@cryptkeeperzk/ffjavascript": "0.2.59",
"hardhat": "^2.14.0",
"mocha": "^10.2.0",
"snarkjs": "file:.."
"mocha": "^10.2.0"
}
},
"..": {
"version": "0.6.11",
"name": "@cryptkeeperzk/snarkjs",
"version": "0.7.2",
"dev": true,
"license": "GPL-3.0",
"dependencies": {
"@cryptkeeperzk/ejs": "^3.1.6",
"@cryptkeeperzk/ffjavascript": "^0.2.59",
"@iden3/binfileutils": "0.0.11",
"bfj": "^7.0.2",
"blake2b-wasm": "^2.4.0",
"circom_runtime": "0.1.22",
"@cryptkeeperzk/ejs": "^3.1.6",
"circom_runtime": "0.1.24",
"fastfile": "0.0.20",
"@cryptkeeperzk/ffjavascript": "0.2.59",
"ffjavascript": "^0.2.60",
"js-sha3": "^0.8.0",
"logplease": "^1.2.15",
"r1csfile": "0.0.45"
"r1csfile": "0.0.47"
},
"bin": {
"snarkjs": "build/cli.cjs"
@@ -75,6 +77,22 @@
"case": "^1.6.3"
}
},
"node_modules/@cryptkeeperzk/ffjavascript": {
"version": "0.2.59",
"resolved": "https://registry.npmjs.org/@cryptkeeperzk/ffjavascript/-/ffjavascript-0.2.59.tgz",
"integrity": "sha512-K5G1dummndLEOVmxmeT9eHx2+R6GK6TM1ClVmWDAXPYi9fS8IkZQHEvMV2mI2AMhAZcnMgIKzoanAhrFOiEPGg==",
"dev": true,
"dependencies": {
"base64-js": "^1.5.1",
"wasmbuilder": "0.0.16",
"wasmcurves": "0.2.1",
"web-worker": "^1.2.0"
}
},
"node_modules/@cryptkeeperzk/snarkjs": {
"resolved": "..",
"link": true
},
"node_modules/@ensdomains/ens": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/@ensdomains/ens/-/ens-0.4.5.tgz",
@@ -3607,17 +3625,6 @@
"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
"dev": true
},
"node_modules/ffjavascript": {
"version": "0.2.59",
"resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.2.59.tgz",
"integrity": "sha512-QssOEUv+wilz9Sg7Zaj6KWAm7QceOAEsFuEBTltUsDo1cjn11rA/LGYvzFBPbzNfxRlZxwgJ7uxpCQcdDlrNfw==",
"dev": true,
"dependencies": {
"wasmbuilder": "0.0.16",
"wasmcurves": "0.2.1",
"web-worker": "^1.2.0"
}
},
"node_modules/fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -6684,10 +6691,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/snarkjs": {
"resolved": "..",
"link": true
},
"node_modules/solc": {
"version": "0.8.15",
"resolved": "https://registry.npmjs.org/solc/-/solc-0.8.15.tgz",
@@ -7629,4 +7632,4 @@
}
}
}
}
}

View File

@@ -14,6 +14,6 @@
"@cryptkeeperzk/ffjavascript": "0.2.59",
"hardhat": "^2.14.0",
"mocha": "^10.2.0",
"snarkjs": "file:.."
"@cryptkeeperzk/snarkjs": "file:.."
}
}

View File

@@ -5,7 +5,7 @@ import path from "path";
import hardhat from "hardhat";
const { ethers, run } = hardhat;
import * as snarkjs from "snarkjs";
import * as snarkjs from "@cryptkeeperzk/snarkjs";
import fs from "fs";