Fix/round matching

.env.template

@@ -0,0 +1,2 @@
+MY_URL="https://mydomain.com"
+IP_WHITELIST="0.0.0.0/0"

.github/workflows/main-deploy-only.yml

@@ -0,0 +1,23 @@
+name: main-deploy-only
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH and Redeploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.PRODUCTION_HOST }}
+          username: ${{ secrets.PRODUCTION_USERNAME }}
+          key: ${{ secrets.PRODUCTION_PRIVATE_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          script: |
+            cd QAcc-BE
+            git checkout main
+            git pull
+            docker compose -f docker-compose-production.yml pull
+            docker compose -f docker-compose-production.yml up --force-recreate -d
+            docker image prune -a --force

.github/workflows/master-pipeline.yml → .github/workflows/main-pipeline.yml

@@ -1,16 +1,41 @@
-name: master-pipeline
+name: main-pipeline
 
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
+  run-linters:
+    name: Run linters
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 20.11.0
+
+      # ESLint and Prettier must be in `package.json`
+      - name: Install Node.js dependencies
+        run: npm ci
+
+      - name: Run linters
+        uses: wearerequired/lint-action@v2
+        with:
+          eslint: true
+          #prettier: true
+          continue_on_error: true
+
   test:
     runs-on: ubuntu-latest
+    needs: run-linters
     services:
       # Label used to access the service container
       redis:
@@ -30,7 +55,7 @@ jobs:
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: givethio
+          POSTGRES_DB: qacc
           PGDATA: /var/lib/postgresql/data/pgdata
         options: >-
           --health-cmd pg_isready
@@ -43,22 +68,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          aws-access-key-id: ${{ secrets.AWS_S3_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_S3_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_S3_REGION }}
-
-      - name: Download latest DB backup from S3
-        run: |
-          FILENAME=$(aws s3 ls ${{ secrets.AWS_S3_BUCKET_PATH_PROD }}/ | sort | tail -n 1 | awk '{print $4}')
-          aws s3 cp ${{ secrets.AWS_S3_BUCKET_PATH_PROD }}/$FILENAME /tmp/db_backup.zip
-
-      - name: Unzip DB backup
-        run: |
-          unzip /tmp/db_backup.zip -d /tmp
-          mv /tmp/backups/givethio-db/*.sql /tmp/backups/givethio-db/db_backup.sql
 
       - name: Wait for PostgreSQL to become ready
         run: |
@@ -69,9 +78,6 @@ jobs:
             sleep 1
           done
 
-      - name: Restore DB backup
-        run: PGPASSWORD=postgres psql -h localhost -p 5443 -U postgres -d givethio < /tmp/backups/givethio-db/db_backup.sql
-
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
@@ -108,32 +114,36 @@ jobs:
           ZKEVM_CARDONA_SCAN_API_KEY: ${{ secrets.ZKEVM_CARDONA_SCAN_API_KEY }}
           MORDOR_ETC_TESTNET: ${{ secrets.MORDOR_ETC_TESTNET }}
           ETC_NODE_HTTP_URL: ${{ secrets.ETC_NODE_HTTP_URL }}
-          DROP_DATABASE: ${{ secrets.DROP_DATABASE_DURING_TEST_PROD }}
+          DROP_DATABASE: ${{ secrets.DROP_DATABASE_DURING_TEST_STAGING }}
           SOLANA_TEST_NODE_RPC_URL: ${{ secrets.SOLANA_TEST_NODE_RPC_URL }}
           SOLANA_DEVNET_NODE_RPC_URL: ${{ secrets.SOLANA_DEVNET_NODE_RPC_URL }}
           SOLANA_MAINNET_NODE_RPC_URL: ${{ secrets.SOLANA_MAINNET_NODE_RPC_URL }}
           MPETH_GRAPHQL_PRICES_URL: ${{ secrets.MPETH_GRAPHQL_PRICES_URL }}
-          GIV_POWER_SUBGRAPH_URL: ${{ secrets.GIV_POWER_SUBGRAPH_URL }}
-
+          PRIVADO_VERIFIER_NETWORK_ID: ${{ secrets.PRIVADO_VERIFIER_NETWORK_ID }}
+          
   publish:
     needs: test
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
     steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Build image and push to GitHub Packages
-        uses: docker/build-push-action@v1
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
           registry: ghcr.io
-          repository: giveth/impact-graph
-          add_git_labels: true
-          # Add branch name to docker image tag @see{@link https://github.com/docker/build-push-action/tree/releases/v1#tag_with_ref}
-          tag_with_ref: true
-          # Add commit hash to docker image tag @see{@link https://github.com/docker/build-push-action/tree/releases/v1#tag_with_sha}
-          tag_with_sha: true
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/generalmagicio/qacc-be:main
 
   deploy:
     needs: publish
@@ -142,13 +152,14 @@ jobs:
       - name: SSH and Redeploy
         uses: appleboy/[email protected]
         with:
-          host: ${{ secrets.PROD_HOST_ALL }}
-          username: ${{ secrets.PROD_USERNAME_ALL }}
-          key: ${{ secrets.PROD_PRIVATE_KEY_ALL }}
+          host: ${{ secrets.PRODUCTION_HOST }}
+          username: ${{ secrets.PRODUCTION_USERNAME }}
+          key: ${{ secrets.PRODUCTION_PRIVATE_KEY }}
           port: ${{ secrets.SSH_PORT }}
           script: |
-            cd giveth-all
-            docker compose stop impact-graph
-            docker compose pull impact-graph
-            docker compose up -d impact-graph
+            cd QAcc-BE
+            git checkout main
+            git pull
+            docker compose -f docker-compose-production.yml pull
+            docker compose -f docker-compose-production.yml up -d
             docker image prune -a --force

.github/workflows/main-publish-deploy.yml

@@ -0,0 +1,70 @@
+name: publish-deploy-main-branch
+
+on:
+  workflow_dispatch:
+
+jobs:
+  run-linters:
+    name: Run linters
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 20.11.0
+
+      # ESLint and Prettier must be in `package.json`
+      - name: Install Node.js dependencies
+        run: npm ci
+
+      - name: Run linters
+        uses: wearerequired/lint-action@v2
+        with:
+          eslint: true
+          #prettier: true
+          continue_on_error: true
+
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/generalmagicio/qacc-be:main
+
+  deploy:
+    needs: publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH and Redeploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.PRODUCTION_HOST }}
+          username: ${{ secrets.PRODUCTION_USERNAME }}
+          key: ${{ secrets.PRODUCTION_PRIVATE_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          script: |
+            cd QAcc-BE
+            git checkout main
+            git pull
+            docker compose -f docker-compose-production.yml pull
+            docker compose -f docker-compose-production.yml up --force-recreate -d
+            docker image prune -a --force