chore: update develop branch with recent main

.github/ISSUE_TEMPLATE/config.yml

@@ -1,13 +1,13 @@
 blank_issues_enabled: true
 contact_links:
   - name: Contributing guidelines
-    url: https://github.com/input-output-hk/voltaire-era/blob/master/CONTRIBUTING.md
+    url: https://github.com/IntersectMBO/govtool/blob/master/CONTRIBUTING.md
     about: Some rules & processes we honor.
 
   - name: Feature ideas
-    url: https://github.com/input-output-hk/voltaire-era/discussions/categories/ideas
+    url: https://github.com/IntersectMBO/govtool/discussions/categories/ideas
     about: Maybe someone else had the same or a similar idea already?
 
   - name: All issues
-    url: https://github.com/input-output-hk/voltaire-era/issues
+    url: https://github.com/IntersectMBO/govtool/issues
     about: Check whether your issue is not already covered here.

.github/ISSUE_TEMPLATE/feature_idea.yml

@@ -8,7 +8,7 @@ body:
       value: |
         **Thank you for contributing to our project!** :green_heart:
 
-        Instead of opening this issue, consider [starting a new idea discussion](https://github.com/input-output-hk/voltaire-era/discussions/new?category=ideas).
+        Instead of opening this issue, consider [starting a new idea discussion](https://github.com/IntersectMBO/govtool/discussions/new?category=ideas).
         That way, we can discuss & refine your idea together, before we adopt it as a feature into the roadmap.
 
   - type: textarea

.github/pull_request_template.md

@@ -1,17 +1,12 @@
 ## List of changes
 
-Please include a summary of the changes and the related issue.
-
-- I created a blue button
-- When pressed the button turns purple 
+- Add / Fix / Change / Remove
 
 ## Checklist
 
-- [ ] My code follows the style guidelines of this project
-- [ ] I have performed a self-review of my code
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have made corresponding changes to the documentation
+- [related issue](https://github.com/IntersectMBO/govtool/issues/)
 - [ ] My changes generate no new warnings
+- [ ] My code follows the [style guidelines](https://github.com/IntersectMBO/govtool/tree/main/docs/style-guides) of this project
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the [changelog](https://github.com/IntersectMBO/govtool/blob/main/CHANGELOG.md)
 - [ ] I have added tests that prove my fix is effective or that my feature works
-
-## Screenshots of change (for FE)

.github/workflows/build-and-deploy.yml

@@ -7,9 +7,8 @@ on:
       cardano_network:
         required: true
         type: choice
-        default: "preprod"
+        default: "sanchonet"
         options:
-          - "preprod"
           - "sanchonet"
       environment:
         required: true
@@ -24,18 +23,22 @@ on:
         required: true
         type: boolean
         default: false
+      resync_cardano_node_and_db:
+        required: true
+        type: boolean
+        default: false
 
 env:
   ENVIRONMENT: ${{ inputs.environment || 'dev' }}
-  CARDANO_NETWORK: ${{ inputs.cardano_network || 'preprod' }}
+  CARDANO_NETWORK: ${{ inputs.cardano_network || 'sanchonet' }}
 
 jobs:
   check_environment_exists:
     name: Check if target environment exists before proceeding
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -50,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -77,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -109,7 +112,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     env:
       DBSYNC_POSTGRES_DB: "cexplorer"
       DBSYNC_POSTGRES_USER: "postgres"
@@ -120,6 +123,7 @@ jobs:
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
+      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
       TRAEFIK_LE_EMAIL: "[email protected]"
     steps:
@@ -141,10 +145,17 @@ jobs:
           ssh-private-key: ${{ secrets.GHA_SSH_PRIVATE_KEY }}
       - name: Prepare and upload app config
         run: |
-          make prepare-config
           if [[ "${{ inputs.environment }}" == "staging" ]]; then export DOMAIN=staging.govtool.byron.network; fi;
           if [[ "${{ inputs.environment }}" == "beta" ]]; then export DOMAIN=sanchogov.tools; fi;
+          export DOMAIN=${DOMAIN:-$ENVIRONMENT-$CARDANO_NETWORK.govtool.byron.network}
+          make prepare-config
           make upload-config
+      - name: Destroy Cardano Node, DB sync and Postgres if required
+        if: ${{ inputs.resync_cardano_node_and_db }}
+        run: |
+          if [[ "${{ inputs.environment }}" == "staging" ]]; then export DOMAIN=staging.govtool.byron.network; fi;
+          if [[ "${{ inputs.environment }}" == "beta" ]]; then export DOMAIN=sanchogov.tools; fi;
+          make destroy-cardano-node-and-dbsync;
       - name: Deploy app
         run: |
           make docker-login
@@ -175,7 +186,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     env:
       DBSYNC_POSTGRES_DB: "cexplorer"
       DBSYNC_POSTGRES_USER: "postgres"
@@ -186,6 +197,7 @@ jobs:
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
+      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
       TRAEFIK_LE_EMAIL: "[email protected]"
     steps:
@@ -207,10 +219,17 @@ jobs:
           ssh-private-key: ${{ secrets.GHA_SSH_PRIVATE_KEY }}
       - name: Prepare and upload app config
         run: |
-          make prepare-config
           if [[ "${{ inputs.environment }}" == "staging" ]]; then export DOMAIN=staging.govtool.byron.network; fi;
           if [[ "${{ inputs.environment }}" == "beta" ]]; then export DOMAIN=sanchogov.tools; fi;
+          export DOMAIN=${DOMAIN:-$ENVIRONMENT-$CARDANO_NETWORK.govtool.byron.network}
+          make prepare-config
           make upload-config
+      - name: Destroy Cardano Node, DB sync and Postgres if required
+        if: ${{ inputs.resync_cardano_node_and_db }}
+        run: |
+          if [[ "${{ inputs.environment }}" == "staging" ]]; then export DOMAIN=staging.govtool.byron.network; fi;
+          if [[ "${{ inputs.environment }}" == "beta" ]]; then export DOMAIN=sanchogov.tools; fi;
+          make destroy-cardano-node-and-dbsync;
       - name: Deploy app
         run: |
           make docker-login

.github/workflows/frontend_sonar_scan.yml

@@ -3,7 +3,7 @@ name: SonarQube Static Analysis
 on:
   push:
     paths:
-      - src/vva-fe/**
+      - govtool/frontend/**
       - .github/workflows/frontend_sonar_scan.yml
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
     - uses: sonarsource/sonarqube-scan-action@master
       with:
-        projectBaseDir: src/vva-fe
+        projectBaseDir: govtool/frontend
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}

.github/workflows/lighthouse.yml

@@ -3,7 +3,7 @@ name: Lighthouse
 on:
   push:
     paths:
-      - src/vva-fe/**
+      - govtool/frontend/**
       - .github/workflows/lighthouse.yml
 
 jobs:
@@ -19,36 +19,36 @@ jobs:
 
       - name: Install dependencies
         run: npm install
-        working-directory: ./src/vva-fe
+        working-directory: ./govtool/frontend
 
       - name: Cache npm dependencies
         id: npm-cache
         uses: actions/cache@v3
         with:
           path: |
             ~/.npm
-          key: ${{ runner.os }}-npm-${{ hashFiles('src/vva-fe/package-lock.json', 'tests/vva-fe/package-lock.json') }}
+          key: ${{ runner.os }}-npm-${{ hashFiles('govtool/frontend/package-lock.json', 'tests/vva-fe/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-npm-
 
       - run: npm install -g @lhci/[email protected]
 
       - name: Run build  and lighthouse task
-        working-directory: ./src/vva-fe
+        working-directory: ./govtool/frontend
         run: |
             npm install
             VITE_BASE_URL=https://staging.govtool.byron.network/api npm run build
             lhci collect
 
       - name: Evaluate reports
-        if: github.repository_owner != 'input-output-hk'
+        if: github.repository_owner != 'IntersectMBO'
         run: |
             lhci assert  --preset "lighthouse:recommended"
 
 
       - name: Publish reports
-        working-directory: ./src/vva-fe
-        if: github.repository_owner == 'input-output-hk'
+        working-directory: ./govtool/frontend
+        if: github.repository_owner == 'IntersectMBO'
         run: |
             lhci assert  --preset lighthouse:recommended || echo "LightHouse Assertion error ignored ..."
             lhci upload --githubAppToken="${{ secrets.LHCI_GITHUB_APP_TOKEN }}" --token="${{ secrets.LHCI_SERVER_TOKEN }}" --serverBaseUrl=https://lighthouse.cardanoapi.io --ignoreDuplicateBuildFailure

.github/workflows/test_integration_cypress.yml

@@ -14,7 +14,6 @@ on:
         type: choice
         default: "sanchonet"
         options:
-          - "preprod"
           - "sanchonet"
       deployment:
         required: true

.github/workflows/test_storybook.yml

@@ -3,12 +3,12 @@ name: Storybook Test
 on:
   push:
     paths:
-      - src/vva-fe/**
+      - govtool/frontend/**
       - .github/workflows/test_storybook.yml
 
 defaults:
   run:
-    working-directory: ./src/vva-fe
+    working-directory: ./govtool/frontend
 
 jobs:
   storybook:

.github/workflows/toggle-maintenance.yml

@@ -7,9 +7,8 @@ on:
       cardano_network:
         required: true
         type: choice
-        default: "preprod"
+        default: "sanchonet"
         options:
-          - "preprod"
           - "sanchonet"
       environment:
         required: true
@@ -30,15 +29,15 @@ on:
 
 env:
   ENVIRONMENT: ${{ inputs.environment || 'dev' }}
-  CARDANO_NETWORK: ${{ inputs.cardano_network || 'preprod' }}
+  CARDANO_NETWORK: ${{ inputs.cardano_network || 'sanchonet' }}
 
 jobs:
   check_environment_exists:
     name: Check if target environment exists before proceeding
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -53,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.gitignore

@@ -120,13 +120,13 @@ treefmt.toml
 local/
 
 # used by haskell
-src/vva-be/dist-newstyle/
+govtool/backend/dist-newstyle/
 
 # target environment config dir
-src/config/target
+scripts/govtool/config/target
 
 # terraform
-src/terraform/.terraform*
+infra/terraform/.terraform*
 
 # local env files
 .env

CHANGELOG.md

@@ -8,19 +8,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
+## [Unreleased]
+
+### Added
+-
+
+### Fixed
+- Fixed vote calculation problems related to NoConfidence DRep [Issue 59](https://github.com/IntersectMBO/govtool/issues/59)
+- Fixed ada-holder/get-current-delegation error when delegated to NoConfidence or AlwaysAbstain dreps. [Issue 82](https://github.com/IntersectMBO/govtool/issues/82)
+
+### Changed
+- Changed and improved working conventions docs, PR template and codeowners file, addressing [Issue 88](https://github.com/IntersectMBO/govtool/issues/88).
+
+### Removed
+-
+
 ## [sancho-v1.0.1](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.1) 2023-12-XX
 
 ### Added
-- 
+-
 
 ### Fixed
-- 
+-
 
 ### Changed
-- 
+- Changed Node version from 8.7.1-pre to 8.7.2 and Db-sync version from sancho-2-3-0 to sancho-3-0-0.
+- (`docs/update-working-conventions`) Addressing [Issue 25](https://github.com/IntersectMBO/govtool/issues/25) changed working conventions documentation to improve intended flows.
 
 ### Removed
-- 
+-
 
 ## [sancho-v1.0.0](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.0) 2023-12-17
 

CODEOWNERS

@@ -4,21 +4,19 @@
 * @Ryun1 @kickloop
 
 # Frontend assets templates
-src/vva-fe/*                                                                @Sworzen1 @JanJaroszczak @kickloop
+govtool/frontend/*                                                          @Sworzen1 @JanJaroszczak @kickloop
 *.tsx                                                                       @Sworzen1 @JanJaroszczak @kickloop
 *.ts                                                                        @Sworzen1 @JanJaroszczak @kickloop
 *.css                                                                       @Sworzen1 @JanJaroszczak @kickloop
 
 # Backend
-src/vva-be/*                                                                @jankun4 @kickloop
+govtool/backend/*                                                           @jankun4 @kickloop
 
 # DevOps
-.github/workflows/*                                                         @adgud @placek @kickloop
-src/config/*                                                                @adgud @placek @kickloop
-src/scripts/*                                                               @adgud @placek @kickloop
-src/terraform/*                                                             @adgud @placek @kickloop
+.github/workflows/*                                                         @adgud @kickloop
+config/govtool/*                                                            @adgud @kickloop
+infra/terraform/*                                                           @adgud @kickloop
 
 # Testing
-src/load-testing/*                                                          @mesudip @kickloop
-src/governance-action-loader/*                                              @mesudip @kickloop
-tests/*                                                                     @mesudip @kickloop
+gov-action-loader/*                                                         @IntersectMBO/govtool-test @kickloop
+tests/*                                                                     @IntersectMBO/govtool-test @kickloop