Fix twitter: contracts and frontend

README.md

@@ -122,6 +122,7 @@ cd dizkus-scripts/
 # optional: ./6_gen_proof_rapidsnark.sh
 
 # This part is to upload the zkeys, not critical
+# Remember to change bucket_name in upload_to_s3.py
 aws configure # Only needs to be run once
 pip3 install boto3
 python3 upload_to_s3.py
@@ -371,10 +372,10 @@ Since circom is GPL, we are forced to use the GPL license, which is still a high
 
 ## To-Do
 
--   Make the frontend Solidity calls work
--   Make a general method to get formatted signatures and bodies from all email clients
--   Make versions for different size RSA keys
--   Add ENS DNSSEC code (possibly SNARKed), so anyone can add a website's RSA key via DNS record
--   Design the NFT/POAP to have the user's domain/verified identity on it
--   Make a testnet faucet as a PoC for Sybil resistance and to get developers interested
--   Dynamically tradeoff between gzip (2x faster decompression) and xz (30% smaller file size): https://www.rootusers.com/gzip-vs-bzip2-vs-xz-performance-comparison/ based on internet speed (i.e. minimize download time + unzip time)
+- Make the frontend Solidity calls work
+- Make a general method to get formatted signatures and bodies from all email clients
+- Make versions for different size RSA keys
+- Add ENS DNSSEC code (possibly SNARKed), so anyone can add a website's RSA key via DNS record
+- Design the NFT/POAP to have the user's domain/verified identity on it
+- Make a testnet faucet as a PoC for Sybil resistance and to get developers interested
+- Dynamically tradeoff between gzip (2x faster decompression) and xz (30% smaller file size): https://www.rootusers.com/gzip-vs-bzip2-vs-xz-performance-comparison/ based on internet speed (i.e. minimize download time + unzip time)

dizkus-scripts/3_gen_both_zkeys.sh

@@ -16,12 +16,16 @@ fi
 
 # First, chunked snarkjs
 yarn remove snarkjs
+mv ../yarn.lock ../yarn.lock_old
+rm -rf ../node_modules_old
+mv ../node_modules ../node_modules_old
 yarn add snarkjs@git+https://github.com/vb7401/snarkjs.git#24981febe8826b6ab76ae4d76cf7f9142919d2b8
+yarn
 
 echo "****GENERATING ZKEY 0****"
 start=$(date +%s)
 set -x
-NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs groth16 setup "$R1CS_FILE" "$PHASE1" "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_0.zkey -e $ENTROPY1
+NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs groth16 setup "$R1CS_FILE" "$PHASE1" "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_0.zkey -e=$ENTROPY1
 { set +x; } 2>/dev/null
 end=$(date +%s)
 echo "DONE ($((end - start))s)"
@@ -30,7 +34,7 @@ echo
 echo "****GENERATING ZKEY 1****"
 start=$(date +%s)
 set -x
-NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs zkey contribute "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_0.zkey "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_1.zkey --name="1st Contributor Name" -v $ENTROPY2
+NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs zkey contribute "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_0.zkey "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_1.zkey --name="1st Contributor Name" -e=$ENTROPY2
 { set +x; } 2>/dev/null
 end=$(date +%s)
 echo "DONE ($((end - start))s)"
@@ -40,20 +44,23 @@ echo "****GENERATING FINAL ZKEY****"
 start=$(date +%s)
 set -x
 # hashlib.sha256(b"sampritiaayush").hexdigest().upper()
-NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs zkey beacon "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_1.zkey "$BUILD_DIR"/"$CIRCUIT_NAME".zkey AFAE5390CE7790A5EFA03DD74189A4C56DDA1AB8D3D322142C4AE3A14858D6E0 10 -n="Final Beacon phase2"
+NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs zkey beacon "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_1.zkey "$BUILD_DIR"/"$CIRCUIT_NAME".zkey $BEACON 10 -n="Final Beacon phase2"
 { set +x; } 2>/dev/null
 end=$(date +%s)
 echo "DONE ($((end - start))s)"
 echo
 
 # Then, nonchunked snarkjs
 yarn remove snarkjs
+mv ../yarn.lock ../yarn.lock_old2
+rm -rf ../node_modules_old2
+mv ../node_modules ../node_modules_old2
 yarn add snarkjs@latest
 
 echo "****GENERATING ZKEY NONCHUNKED 0****"
 start=$(date +%s)
 set -x
-NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs groth16 setup "$R1CS_FILE" "$PHASE1" "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_0.zkey -e $ENTROPY1
+NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs groth16 setup "$R1CS_FILE" "$PHASE1" "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_0.zkey -e=$ENTROPY1
 { set +x; } 2>/dev/null
 end=$(date +%s)
 echo "DONE ($((end - start))s)"
@@ -62,7 +69,7 @@ echo
 echo "****GENERATING ZKEY NONCHUNKED 1****"
 start=$(date +%s)
 set -x
-NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs zkey contribute "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_0.zkey "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_1.zkey --name="1st Contributor Name" -v -e $ENTROPY2
+NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs zkey contribute "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_0.zkey "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_1.zkey --name="1st Contributor Name" -v -e=$ENTROPY2
 { set +x; } 2>/dev/null
 end=$(date +%s)
 echo "DONE ($((end - start))s)"
@@ -71,8 +78,15 @@ echo
 echo "****GENERATING ZKEY NONCHUNKED FINAL****"
 start=$(date +%s)
 set -x
-NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs zkey beacon "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_1.zkey "$BUILD_DIR"/"$CIRCUIT_NAME"_nonchunked.zkey AFAE5390CE7790A5EFA03DD74189A4C56DDA1AB8D3D322142C4AE3A14858D6E0 10 -n="Final Beacon phase2"
+NODE_OPTIONS='--max-old-space-size=56000' node ../node_modules/.bin/snarkjs zkey beacon "$PARTIAL_ZKEYS"/"$CIRCUIT_NAME"_1.zkey "$BUILD_DIR"/"$CIRCUIT_NAME"_nonchunked.zkey $BEACON 10 -n="Final Beacon phase2"
 { set +x; } 2>/dev/null
 end=$(date +%s)
 echo "DONE ($((end - start))s)"
 echo
+
+yarn remove snarkjs
+mv ../yarn.lock ../yarn.lock_old3
+rm -rf ../node_modules_old3
+mv ../node_modules ../node_modules_old3
+yarn add snarkjs@git+https://github.com/vb7401/snarkjs.git#24981febe8826b6ab76ae4d76cf7f9142919d2b8
+yarn

dizkus-scripts/entropy.env.example

@@ -1,2 +1,3 @@
 ENTROPY1=
 ENTROPY2=
+BEACON=

dizkus-scripts/upload_to_s3.py

@@ -16,7 +16,7 @@
 
 
 def upload_to_s3(filename, dir=""):
-    with open(d ir + filename, 'rb') as file:
+    with open(dir + filename, 'rb') as file:
         print("Starting upload...")
         s3.upload_fileobj(file, bucket_name, filename, ExtraArgs={
                           'ACL': 'public-read', 'ContentType': 'binary/octet-stream'})

docs/README.md

@@ -1,6 +1,6 @@
 # ZK Email
 
-ZK Email is an app for you to anonymously verifiy email signatures yet mask whatever
+ZK Email is an app for you to anonymously verify email signatures yet mask whatever
 data you would like. Each email can either be verified to be to/from specific domains
 or subsets of domains, or have some specific text in the body. These can be used for
 web2 interoperability, decentralized anonymous KYC, or interesting on-chain anonymity

package.json

@@ -62,7 +62,8 @@
     "test:e2e-zkp": "CI=true react-scripts test --runInBand --testPathPattern='e2e-dl-zkp' --reporters=default --reporters=jest-junit",
     "eject": "react-scripts eject",
     "compile": "node circuits/scripts/compile.js",
-    "compile-all": "npx tsx src/scripts/generate_input.ts && yarn compile email true"
+    "gen-input": "npx tsx src/scripts/generate_input.ts",
+    "compile-all": "yarn gen-input && yarn compile email true"
   },
   "eslintConfig": {
     "extends": [

regex_to_circom/gen.py

@@ -10,7 +10,6 @@
 # Incoming Nodes
 rev_graph = [[] for i in range(N)]
 accept_nodes = set()
-
 for i in range(N):
     for k in graph_json[i]['edges']:
         # assert len(k) == 1

src/contracts/foundry.toml

@@ -3,3 +3,4 @@ src = 'src'
 out = 'out'
 libs = ['lib']  # See more config options https://github.com/foundry-rs/foundry/tree/master/config
 remappings = ['ds-test=lib/ds-test/', 'forge-std/=lib/forge-std/']
+libraries = ["src/NFTSVG.sol:NFTSVG:0xC2610931017f044EC88F6867842D5cD6a4A31B20", "src/hexStrings.sol:HexStrings:0xaA8989aFfba4D72B14959E92a132587C3FD4977F"]