refactored transaction and added public circuits (Lightprotocol#446)

Author: ananas-block

.github/workflows/e2e-tests.yml

@@ -38,7 +38,6 @@ jobs:
           - test: psp-examples-tests
             sub-tests: '[
               "@lightprotocol/streaming-payments:test",
-              "@lightprotocol/swap:test"
             ]'
     services:
       redis:

Cargo.lock

@@ -4,14 +4,17 @@
   "description": "",
   "license": "GPL-3.0",
   "scripts": {
-    "build-masp": "sh scripts/buildCircuit.sh Masp",
-    "build-app": "sh scripts/buildCircuit.sh App",
+    "build-private-2in": "sh scripts/buildCircuit.sh private 2 2",
+    "build-private-10in": "sh scripts/buildCircuit.sh private 10 2",
+    "build-private-4in-program": "sh scripts/buildCircuit.sh private 4 4 Program",
+    "build-public-2in": "sh scripts/buildCircuit.sh public 2 2 Program",
+    "build-public-10in": "sh scripts/buildCircuit.sh public 10 2",
     "test-elgamal": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 --require mocha-suppress-logs tests/elgamal-babyjubjub/circuits.test.ts --exit",
     "test-light-circuits": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/light-circuits.test.ts --exit",
     "test-build-light-circuits": "pnpm build-all && ./scripts/checkBuildCircuit.sh",
     "test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**/*.ts --exit",
     "format": "prettier --write \"tests/**/*.{ts,js,circom}\"",
-    "build-all": "pnpm build-app 4 && pnpm build-masp 2 && pnpm build-masp 10",
+    "build-all": "pnpm build-private-2in && pnpm build-private-10in && pnpm build-private-4in-program && pnpm build-public-2in && pnpm build-public-10in",
     "lint": "pnpm prettier \"tests/**/*.ts\" --check",
     "build": "pnpm tsc"
   },

circuit-lib/circuit-lib.circom/package.json

@@ -7,18 +7,20 @@ if [ ! -f ./ptau$POWERS_OF_TAU ]; then
   echo "Downloading powers of tau file"
   curl -L https://hermez.s3-eu-west-1.amazonaws.com/powersOfTau28_hez_final_$POWERS_OF_TAU.ptau --create-dirs -o ./ptau$POWERS_OF_TAU
 fi
+echo " $1$4Transaction$2In$3OutMain"
 
-circom --r1cs --wasm --sym src/light/transaction$1$2Main.circom -o ../../zk.js/build-circuits/ -l node_modules/circomlib/circuits
+circom --r1cs --wasm --sym src/transaction/$1$4Transaction$2In$3OutMain.circom -o ../../zk.js/build-circuits/ -l node_modules/circomlib/circuits
 
-pnpm snarkjs groth16 setup ../../zk.js/build-circuits/transaction$1$2Main.r1cs ./ptau$POWERS_OF_TAU ../../zk.js/build-circuits/tmp_transaction$1$2Main.zkey
-pnpm snarkjs zkey contribute ../../zk.js/build-circuits/tmp_transaction$1$2Main.zkey ../../zk.js/build-circuits/transaction$1$2Main.zkey -e="321432151325321543215"
-pnpm snarkjs zkey export verificationkey ../../zk.js/build-circuits/transaction$1$2Main.zkey verification_key_mainnet$2.json
-
-pnpm ts-node ./scripts/createRustVerifyingKey.ts $2 $1$2Main
+pnpm snarkjs groth16 setup ../../zk.js/build-circuits/$1$4Transaction$2In$3OutMain.r1cs ./ptau$POWERS_OF_TAU ../../zk.js/build-circuits/tmp_$1$4Transaction$2In$3OutMain.zkey
+pnpm snarkjs zkey contribute ../../zk.js/build-circuits/tmp_$1$4Transaction$2In$3OutMain.zkey ../../zk.js/build-circuits/$1$4Transaction$2In$3OutMain.zkey -e="321432151325321543215"
+pnpm snarkjs zkey export verificationkey ../../zk.js/build-circuits/$1$4Transaction$2In$3OutMain.zkey verification_key_mainnet$2.json
+echo "Creating verifying key"
+echo " 3 1 4  $2$3  $1 $4 "
+pnpm ts-node ./scripts/createRustVerifyingKey.ts $2 $3  $1 $4
 
 rm verification_key_mainnet$2.json
-rm ../../zk.js/build-circuits/transaction$1$2Main.sym
-rm ../../zk.js/build-circuits/transaction$1$2Main.r1cs
-rm ../../zk.js/build-circuits/tmp_transaction$1$2Main.zkey
-rm ../../zk.js/build-circuits/transaction$1$2Main_js/generate_witness.js
-rm ../../zk.js/build-circuits/transaction$1$2Main_js/witness_calculator.js
+rm ../../zk.js/build-circuits/$1$4Transaction$2In$3OutMain.sym
+rm ../../zk.js/build-circuits/$1$4Transaction$2In$3OutMain.r1cs
+rm ../../zk.js/build-circuits/tmp_$1$4Transaction$2In$3OutMain.zkey
+# rm ../../zk.js/build-circuits/$1$2Transaction$3In$4OutMain_js/generate_witness.js
+# rm ../../zk.js/build-circuits/$1$2Transaction$3In$4OutMain_js/witness_calculator.js