Rate-Limiting-Nullifier · mhchia · Apr 13, 2023 · Apr 19, 2023 · Apr 19, 2023 · Apr 19, 2023
diff --git a/.github/scripts/deploy.sh b/.github/scripts/deploy.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 set -x
-
+
+environment=$1
+
 COMMIT_HASH=$(git rev-parse HEAD)
-DEPLOY_ID=$(aws deploy create-deployment --application-name zkchat --deployment-group-name zkchat-group --github-location repository=$GITHUB_REPOSITORY,commitId=$COMMIT_HASH --ignore-application-stop-failures --file-exists OVERWRITE --output text)
+DEPLOY_ID=$(aws deploy create-deployment --application-name zkchat-$environment --deployment-group-name zkchat-$environment-group --github-location repository=$GITHUB_REPOSITORY,commitId=$COMMIT_HASH --ignore-application-stop-failures --file-exists OVERWRITE --output text)
 
 while true; do
   STATUS=$(aws deploy get-deployment --deployment-id $DEPLOY_ID --query 'deploymentInfo.status' --output text)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,6 +12,14 @@ on:
         options:
         - enable
         - disable
+      environment:
+        description: "Environment"
+        required: true
+        default: "enable"
+        type: choice
+        options:
+        - prod
+        - dev
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,6 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DATA: ${{ github.event.inputs.build }}
+      DATA_ENV: ${{ github.event.inputs.environment }}
     permissions:
       id-token: write
       contents: read
@@ -32,6 +41,15 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Check branch and environment
+        run: |
+          if [ "${{ env.DATA_ENV }}" = "prod" ]; then
+            if [ "$GITHUB_BASE_REF" != "main" ]; then
+              echo "Operation not permitted"
+              exit 1
+            fi
+          fi
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:
@@ -45,4 +63,4 @@ jobs:
 
       - name: Create Deployment
         run: |
-          .github/scripts/deploy.sh
+          .github/scripts/deploy.sh ${{ env.DATA_ENV }}
diff --git a/app/.env.example b/app/.env.example
@@ -1,5 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true
-PORT=3000
-REACT_APP_SERVER_HOST=http://localhost:8080
-REACT_APP_SOCKET_HOST=ws://localhost:8081
-REACT_APP_ENV=http://localhost:3000
+PORT=5566
+REACT_APP_SERVER_HOST=https://zkchat.mhchia.com:8080
+REACT_APP_SOCKET_HOST=wss://zkchat.mhchia.com:8081
+REACT_APP_ENV=https://zkchat.mhchia.com:5566
diff --git a/app/circuitFiles/rln/rln.wasm b/app/circuitFiles/rln/rln.wasm
diff --git a/app/circuitFiles/rln/rln_final.zkey b/app/circuitFiles/rln/rln_final.zkey
diff --git a/app/circuitFiles/rln/verification_key.json b/app/circuitFiles/rln/verification_key.json
@@ -0,0 +1,114 @@
+{
+ "protocol": "groth16",
+ "curve": "bn128",
+ "nPublic": 5,
+ "vk_alpha_1": [
+  "20491192805390485299153009773594534940189261866228447918068658471970481763042",
+  "9383485363053290200918347156157836566562967994039712273449902621266178545958",
+  "1"
+ ],
+ "vk_beta_2": [
+  [
+   "6375614351688725206403948262868962793625744043794305715222011528459656738731",
+   "4252822878758300859123897981450591353533073413197771768651442665752259397132"
+  ],
+  [
+   "10505242626370262277552901082094356697409835680220590971873171140371331206856",
+   "21847035105528745403288232691147584728191162732299865338377159692350059136679"
+  ],
+  [
+   "1",
+   "0"
+  ]
+ ],
+ "vk_gamma_2": [
+  [
+   "10857046999023057135944570762232829481370756359578518086990519993285655852781",
+   "11559732032986387107991004021392285783925812861821192530917403151452391805634"
+  ],
+  [
+   "8495653923123431417604973247489272438418190587263600148770280649306958101930",
+   "4082367875863433681332203403145435568316851327593401208105741076214120093531"
+  ],
+  [
+   "1",
+   "0"
+  ]
+ ],
+ "vk_delta_2": [
+  [
+   "8804911247767743718582746182478817918330124079736727004921853200288163523142",
+   "6653518272868907124249134260279067650948116751796597374984090931574452724344"
+  ],
+  [
+   "4289260481290368283859566071595686774015143711765997065849324601720881606188",
+   "18881861710269294750472671400972421342425334984858038435471651022146723199983"
+  ],
+  [
+   "1",
+   "0"
+  ]
+ ],
+ "vk_alphabeta_12": [
+  [
+   [
+    "2029413683389138792403550203267699914886160938906632433982220835551125967885",
+    "21072700047562757817161031222997517981543347628379360635925549008442030252106"
+   ],
+   [
+    "5940354580057074848093997050200682056184807770593307860589430076672439820312",
+    "12156638873931618554171829126792193045421052652279363021382169897324752428276"
+   ],
+   [
+    "7898200236362823042373859371574133993780991612861777490112507062703164551277",
+    "7074218545237549455313236346927434013100842096812539264420499035217050630853"
+   ]
+  ],
+  [
+   [
+    "7077479683546002997211712695946002074877511277312570035766170199895071832130",
+    "10093483419865920389913245021038182291233451549023025229112148274109565435465"
+   ],
+   [
+    "4595479056700221319381530156280926371456704509942304414423590385166031118820",
+    "19831328484489333784475432780421641293929726139240675179672856274388269393268"
+   ],
+   [
+    "11934129596455521040620786944827826205713621633706285934057045369193958244500",
+    "8037395052364110730298837004334506829870972346962140206007064471173334027475"
+   ]
+  ]
+ ],
+ "IC": [
+  [
+   "21245767436323310498849811602404578935106041268557716518170092969683557427022",
+   "1213884936807149462109807656412200533191299163229146611054071808178183458413",
+   "1"
+  ],
+  [
+   "18918285612126485260632299226369290849398931955460583791434273697096747446843",
+   "4249003838522302297001105594846547434289852327219703307894847167138232160092",
+   "1"
+  ],
+  [
+   "21131658339185658088093556861306418236805038262556197407580399419902487697625",
+   "5386386468756985708669825529724308439093753222660934460701014058899174604413",
+   "1"
+  ],
+  [
+   "18069268769796561519681091164429972843385730470565406637067874672398809598927",
+   "616648665079672138683902077923207794820803708902120406822937751718367418986",
+   "1"
+  ],
+  [
+   "10958383820320663513827315124914669815120228317480235889587788076650559040047",
+   "20130063098730806362220354043618677403032047167996551848609475247065044064058",
+   "1"
+  ],
+  [
+   "1308064321846506082463084434058009031577104372690966188531318892539766962085",
+   "8205255831339720983923535788260434278529437037844159146692971472590880706967",
+   "1"
+  ]
+ ]
+}
diff --git a/app/package.json b/app/package.json
@@ -8,6 +8,9 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.1.16",
+    "@pcd/pcd-types": "0.4.0",
+    "@semaphore-protocol/group": "^3.2.3",
+    "@semaphore-protocol/identity": "^3.2.3",
     "@types/file-saver": "^2.0.4",
     "@types/history": "^4.7.9",
     "@types/redux-pack": "^0.1.6",
@@ -23,20 +26,23 @@
     "react-scripts": "4.0.3",
     "react-toastify": "^8.2.0",
     "react-tooltip": "^4.2.21",
-    "reactstrap": "^9.0.1",
+    "reactstrap": "^9.1.9",
     "redux": "^4.1.2",
     "redux-devtools-extension": "^2.13.9",
     "redux-pack": "^0.1.5",
     "redux-thunk": "^2.4.0",
-    "zk-chat-client": "1.0.4",
+    "rlnjs": "2.0.8",
     "sass": "^1.43.4",
     "styled-components": "^5.3.3",
+    "test-pcd-semaphore-group-pcd": "^0.7.2",
+    "test-zk-chat-client": "1.0.34",
     "typescript": "^4.1.2",
     "web-vitals": "^1.0.1"
   },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
+    "build-with-lib": "cd ../zk-chat-client-lib; LIB_VERSION=`npm version patch` && yarn && yarn build && npm publish && cd ../app && yarn upgrade test-zk-chat-client@$LIB_VERSION && yarn && yarn build",
     "prettier": "prettier -c src",
     "prettier:fix": "prettier -w src"
   },

diff --git a/app/src/components/AppWrapper/index.tsx b/app/src/components/AppWrapper/index.tsx
@@ -1,4 +1,3 @@
-import React from "react"
 import PublicRoomInvitedScreen from "../PublicRoomInvitedScreen"
 import RegisterOrRecover from "../RegisterOrRecover"
 import Dashboard from "../Dashboard"
@@ -18,9 +17,9 @@ import { ToastContainer } from "react-toastify"
 
 import 'react-toastify/dist/ReactToastify.css';
 import { generateProof } from "../../util/util";
-import "react-toastify/dist/ReactToastify.css"
-import { init, receive_message, get_rooms, IRooms } from 'zk-chat-client';
+import { init, receive_message, get_rooms, IRooms } from 'test-zk-chat-client';
 import { useAppSelector } from "../../redux/hooks/useAppSelector"
+import AuthPopup from "../Passport/popup"
 
 const AppWrapper = () => {
   const navigate = useNavigate()
@@ -53,7 +52,9 @@ const AppWrapper = () => {
           })
         )
       })
+      console.log("!@# AppWrapper/index.tsx: after init")
     } catch (error) {
+      console.log("!@# AppWrapper/index.tsx: error =", error)
       navigate("/r-procedure")
     }
   }
@@ -86,6 +87,7 @@ const AppWrapper = () => {
           <Routes>
             <Route path="/r-procedure" element={<RegisterOrRecover />} />
             <Route path="/dashboard" element={<Dashboard />} />
+            <Route path="/popup" element={<AuthPopup />} />
             <Route
               path="/public/:roomId"
               element={<PublicRoomInvitedScreen />}

diff --git a/app/src/components/ChatMessages/ChatMessagesWrapper.tsx b/app/src/components/ChatMessages/ChatMessagesWrapper.tsx
@@ -118,8 +118,11 @@ const ChatMessagesWrapper = ({
   ) : (
     <StyledMessagesWrapper ref={chatRef}>
       {sortedHistory.length > 0 &&
-        sortedHistory.map((messageObj) => (
-          <StyledSingleMessage isUserSender={userHandle === messageObj.sender}>
+        sortedHistory.map((messageObj, index) => (
+          <StyledSingleMessage
+            key={ 'message-'+index }
+            isUserSender={userHandle === messageObj.sender}
+          >
             <StyledMessageSender
               isUserSender={userHandle === messageObj.sender}
             >

diff --git a/app/src/components/ChatMessages/index.tsx b/app/src/components/ChatMessages/index.tsx
@@ -14,7 +14,7 @@ import { useAppSelector } from "../../redux/hooks/useAppSelector"
 import Input from "../Input"
 import ReactTooltip from "react-tooltip"
 import ChatMessagesWrapper from "./ChatMessagesWrapper"
-import { delete_messages_for_room } from "zk-chat-client"
+import { delete_messages_for_room } from "test-zk-chat-client"
 
 const StyledChatContainer = styled.div`
   background: white;

diff --git a/app/src/components/Input/index.tsx b/app/src/components/Input/index.tsx
@@ -4,7 +4,7 @@ import styled from "styled-components"
 import * as Colors from "../../constants/colors"
 import { faPaperPlane } from "@fortawesome/free-solid-svg-icons"
 import { Room } from "../../redux/actions/actionCreator"
-import { send_message } from "zk-chat-client"
+import { send_message } from "test-zk-chat-client"
 import { toast } from "react-toastify"
 
 const StyledInput = styled.input`

diff --git a/app/src/components/Modals/exchangeKeysModal.tsx b/app/src/components/Modals/exchangeKeysModal.tsx
@@ -8,7 +8,7 @@ import ReactTooltip from "react-tooltip"
 import {
   generate_encrypted_invite_direct_room,
   update_direct_room_key
-} from "zk-chat-client"
+} from "test-zk-chat-client"
 import { useAppSelector } from "../../redux/hooks/useAppSelector"
 
 const StyledButton = styled.button`

diff --git a/app/src/components/Modals/generatePublicKey.tsx b/app/src/components/Modals/generatePublicKey.tsx
@@ -5,7 +5,7 @@ import * as Colors from "../../constants/colors"
 import { faCopy } from "@fortawesome/free-solid-svg-icons"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import ReactTooltip from "react-tooltip"
-import { get_public_key } from "zk-chat-client"
+import { get_public_key } from "test-zk-chat-client"
 
 const StyledTextarea = styled.textarea`
   border: 1px solid #f0f2f5;

diff --git a/app/src/components/Modals/inviteModal.tsx b/app/src/components/Modals/inviteModal.tsx
@@ -5,7 +5,7 @@ import * as Colors from "../../constants/colors";
 import { faCopy } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import ReactTooltip from "react-tooltip";
-import { invite_private_room } from "zk-chat-client";
+import { invite_private_room } from "test-zk-chat-client";
 import { useAppSelector } from "../../redux/hooks/useAppSelector";
 import { Room } from "../../redux/actions/actionCreator";
 import TrustedContactsList from "./trustedContactsList";
@@ -84,7 +84,7 @@ const InviteModal = ({
 
   return (
     <Modal centered isOpen={toggleInviteModal}>
-      <ModalHeader 
+      <ModalHeader
         toggle={() => {
           setToggleInviteModal(false);
           setKeyValue("");

diff --git a/app/src/components/Modals/recoverModal.tsx b/app/src/components/Modals/recoverModal.tsx
@@ -10,7 +10,7 @@ import {
   receive_message,
   recover_profile,
   IRooms
-} from "zk-chat-client";
+} from "test-zk-chat-client";
 import { serverUrl, socketUrl } from "../../constants/constants";
 import { generateProof } from "../../util/util";
 import {
@@ -93,6 +93,7 @@ const RecoverModal = ({
         );
       });
     } catch (error) {
+      console.log("!@# Modals/recoverModal.tsx: error=", error);
       navigate("/r-procedure");
     }
   };

diff --git a/app/src/components/Modals/trustedContactsModal.tsx b/app/src/components/Modals/trustedContactsModal.tsx
@@ -10,7 +10,7 @@ import {
   get_contact,
   insert_contact,
   update_contact
-} from "zk-chat-client"
+} from "test-zk-chat-client"
 import { useAppDispatch } from "../../redux/hooks/useAppDispatch"
 import { getTrustedContacts } from "../../redux/actions/actionCreator"
 import { useAppSelector } from "../../redux/hooks/useAppSelector"

diff --git a/app/src/components/Modals/updateUsernameModal.tsx b/app/src/components/Modals/updateUsernameModal.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react"
 import { Modal, ModalBody, ModalHeader } from "reactstrap"
-import { update_username, get_username } from "zk-chat-client"
+import { update_username, get_username } from "test-zk-chat-client"
 import styled from "styled-components"
 import * as Colors from "../../constants/colors"
 import { getUserHandle } from "../../redux/actions/actionCreator"
@@ -52,7 +52,7 @@ const UpdateUsernameModal = ({
             const currentUsername = get_username()
             setUsername(currentUsername)
         }
-       
+
     }, [toggleUpdateUsername])
 
     const handleUsernameUpdate = () => {