CryptKeeperZK/snarkjs
1
0
Fork 0
mirror of https://github.com/CryptKeeperZK/snarkjs.git synced 2026-01-09 17:07:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: convert to @cryptkeeperzk/ejs

Browse Source
This commit is contained in:
isk
2023-08-18 13:01:42 +02:00
committed by 0xmad
parent 41f5895ef0
commit 303a92f6b4
10 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/cli.cjs
View File

@@ -12,7 +12,7 @@ var readline = require('readline');
var crypto = require('crypto');
var path = require('path');
var binFileUtils = require('@iden3/binfileutils');
var ejs = require('ejs');
var ejs = require('@cryptkeeperzk/ejs');
var circom_runtime = require('circom_runtime');
var jsSha3 = require('js-sha3');
var bfj = require('bfj');
@@ -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.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");
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");
} else {
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");
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");
}
const verifierCode = await exportSolidityVerifier(zkeyName, templates, logger);

2
build/main.cjs
View File

@@ -10,7 +10,7 @@ var crypto = require('crypto');
var fastFile = require('fastfile');
var circom_runtime = require('circom_runtime');
var r1csfile = require('r1csfile');
var ejs = require('ejs');
var ejs = require('@cryptkeeperzk/ejs');
var jsSha3 = require('js-sha3');
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

12
cli.js
View File

@@ -635,13 +635,13 @@ async function zkeyExportSolidityVerifier(params, options) {
const templates = {};
if (await fileExists(path.join(__dirname, "templates"))) {
templates.groth16 = await fs.promises.readFile(path.join(__dirname, "templates", "verifier_groth16.sol.ejs"), "utf8");
templates.plonk = await fs.promises.readFile(path.join(__dirname, "templates", "verifier_plonk.sol.ejs"), "utf8");
templates.fflonk = await fs.promises.readFile(path.join(__dirname, "templates", "verifier_fflonk.sol.ejs"), "utf8");
templates.groth16 = await fs.promises.readFile(path.join(__dirname, "templates", "verifier_groth16.sol.@cryptkeeperzk/ejs"), "utf8");
templates.plonk = await fs.promises.readFile(path.join(__dirname, "templates", "verifier_plonk.sol.@cryptkeeperzk/ejs"), "utf8");
templates.fflonk = await fs.promises.readFile(path.join(__dirname, "templates", "verifier_fflonk.sol.@cryptkeeperzk/ejs"), "utf8");
} else {
templates.groth16 = await fs.promises.readFile(path.join(__dirname, "..", "templates", "verifier_groth16.sol.ejs"), "utf8");
templates.plonk = await fs.promises.readFile(path.join(__dirname, "..", "templates", "verifier_plonk.sol.ejs"), "utf8");
templates.fflonk = await fs.promises.readFile(path.join(__dirname, "..", "templates", "verifier_fflonk.sol.ejs"), "utf8");
templates.groth16 = await fs.promises.readFile(path.join(__dirname, "..", "templates", "verifier_groth16.sol.@cryptkeeperzk/ejs"), "utf8");
templates.plonk = await fs.promises.readFile(path.join(__dirname, "..", "templates", "verifier_plonk.sol.@cryptkeeperzk/ejs"), "utf8");
templates.fflonk = await fs.promises.readFile(path.join(__dirname, "..", "templates", "verifier_fflonk.sol.@cryptkeeperzk/ejs"), "utf8");
}
const verifierCode = await zkey.exportSolidityVerifier(zkeyName, templates, logger);

2
config/rollup.iife.config.js
View File

@@ -33,7 +33,7 @@ export default {
os: empty,
crypto: empty,
readline: empty,
ejs: empty,
"@cryptkeeperzk/ejs": empty,
events: empty,
stream: empty,
util: empty,

50
package-lock.json generated
View File

@@ -1,20 +1,20 @@
{
"name": "@cryptkeeperzk/snarkjs",
"version": "0.7.0",
"version": "0.7.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@cryptkeeperzk/snarkjs",
"version": "0.7.0",
"version": "0.7.1",
"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.24",
"ejs": "^3.1.6",
"fastfile": "0.0.20",
"js-sha3": "^0.8.0",
"logplease": "^1.2.15",
@@ -151,6 +151,20 @@
"node": ">=4"
}
},
"node_modules/@cryptkeeperzk/ejs": {
"version": "3.1.9",
"resolved": "https://registry.npmjs.org/@cryptkeeperzk/ejs/-/@cryptkeeperzk/ejs-3.1.9.tgz",
"integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
"dependencies": {
"jake": "^10.8.5"
},
"bin": {
"ejs": "bin/cli.js"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/@cryptkeeperzk/ffjavascript": {
"version": "0.2.59",
"resolved": "https://registry.npmjs.org/@cryptkeeperzk/ffjavascript/-/ffjavascript-0.2.59.tgz",
@@ -907,20 +921,6 @@
"node": ">=6.0.0"
}
},
"node_modules/ejs": {
"version": "3.1.9",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
"integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
"dependencies": {
"jake": "^10.8.5"
},
"bin": {
"ejs": "bin/cli.js"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -2679,6 +2679,14 @@
}
}
},
"@cryptkeeperzk/ejs": {
"version": "3.1.9",
"resolved": "https://registry.npmjs.org/@cryptkeeperzk/ejs/-/@cryptkeeperzk/ejs-3.1.9.tgz",
"integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
"requires": {
"jake": "^10.8.5"
}
},
"@cryptkeeperzk/ffjavascript": {
"version": "0.2.59",
"resolved": "https://registry.npmjs.org/@cryptkeeperzk/ffjavascript/-/ffjavascript-0.2.59.tgz",
@@ -3244,14 +3252,6 @@
"esutils": "^2.0.2"
}
},
"ejs": {
"version": "3.1.9",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
"integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
"requires": {
"jake": "^10.8.5"
}
},
"emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",

4
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@cryptkeeperzk/snarkjs",
"type": "module",
"version": "0.7.1",
"version": "0.7.2",
"description": "zkSNARKs implementation in JavaScript, is a forked version from the main `iden3/snarkjs` repo to make it work with CryptKeeper Browser Extension using `@cryptkeeperzk/ffjavascript` forked version.",
"publishConfig": {
"access": "public"
@@ -56,7 +56,7 @@
"bfj": "^7.0.2",
"blake2b-wasm": "^2.4.0",
"circom_runtime": "0.1.24",
"ejs": "^3.1.6",
"@cryptkeeperzk/ejs": "^3.1.6",
"fastfile": "0.0.20",
"js-sha3": "^0.8.0",
"logplease": "^1.2.15",

2
smart_contract_tests/package-lock.json generated
View File

@@ -26,7 +26,7 @@
"bfj": "^7.0.2",
"blake2b-wasm": "^2.4.0",
"circom_runtime": "0.1.22",
"ejs": "^3.1.6",
"@cryptkeeperzk/ejs": "^3.1.6",
"fastfile": "0.0.20",
"@cryptkeeperzk/ffjavascript": "0.2.59",
"js-sha3": "^0.8.0",

6
smart_contract_tests/test/smart_contracts.test.js
View File

@@ -16,9 +16,9 @@ describe("Smart contracts test suite", function () {
// Load templates
const templates = {};
templates.groth16 = fs.readFileSync(path.join("../templates", "verifier_groth16.sol.ejs"), "utf8");
templates.plonk = fs.readFileSync(path.join("../templates", "verifier_plonk.sol.ejs"), "utf8");
templates.fflonk = fs.readFileSync(path.join("../templates", "verifier_fflonk.sol.ejs"), "utf8");
templates.groth16 = fs.readFileSync(path.join("../templates", "verifier_groth16.sol.@cryptkeeperzk/ejs"), "utf8");
templates.plonk = fs.readFileSync(path.join("../templates", "verifier_plonk.sol.@cryptkeeperzk/ejs"), "utf8");
templates.fflonk = fs.readFileSync(path.join("../templates", "verifier_fflonk.sol.@cryptkeeperzk/ejs"), "utf8");
let verifierContract;
let curve;

2
src/fflonk_export_solidity_verifier.js
View File

@@ -17,7 +17,7 @@
along with snarkJS. If not, see <https://www.gnu.org/licenses/>.
*/
import ejs from "ejs";
import ejs from "@cryptkeeperzk/ejs";
import {getCurveFromName} from "./curves.js";
import {utils} from "@cryptkeeperzk/ffjavascript";

2
src/zkey_export_solidityverifier.js
View File

@@ -1,4 +1,4 @@
import ejs from "ejs";
import ejs from "@cryptkeeperzk/ejs";
import exportVerificationKey from "./zkey_export_verificationkey.js";
import fflonkExportSolidityVerifierCmd from "./fflonk_export_solidity_verifier.js";