Merge branch 'main' into 30-csp-traefik

.github/pull_request_template.md

@@ -1,12 +1,12 @@
 ## List of changes
 
-- Added / Fixed / Changed / Removed
+- Add / Fix / Change / Remove
 
 ## Checklist
 
 - [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
+- [ ] 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

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

@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -53,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
@@ -80,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
@@ -112,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"
@@ -186,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"

.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,22 +19,22 @@ 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
@@ -47,7 +47,7 @@ jobs:
 
             
       - name: Publish reports
-        working-directory: ./src/vva-fe
+        working-directory: ./govtool/frontend
         if: github.repository_owner == 'IntersectMBO'
         run: |
             lhci assert  --preset lighthouse:recommended || echo "LightHouse Assertion error ignored ..."

.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

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src
+        working-directory: ./scripts/govtool
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -52,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

@@ -10,8 +10,18 @@ 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
 

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

CONTRIBUTING.md

@@ -115,11 +115,21 @@ To get something merged we usually require:
 - Quality of changes is ensured - through new or updated automated tests
 - Change is related to an issue, feature (idea) or bug report - ideally discussed beforehand
 - Well-scoped - we prefer multiple PRs, rather than a big one
+- Add changes to changelog, see [Changelog](#changelog).
+
+Please reuse the branch naming for the pull request naming.
 
 ### Branch Naming
 
 - When creating your branches please create informative names.
-- using prefixes such as `feat/`, `fix/`, `chore/`, `docs/` for branch names are a good start.
+- Using prefixes such as `feat/`, `fix/`, `chore/`, `docs/` for branch names are a good start.
+- Using the related issue number after the prefix is required.
+
+Examples:
+- `feat/123-added-ability-for-dreps-to-change-drep-id`
+- `fix/312-fixed-drep-ids-being-reversed`
+- `chore/567-bumped-cardano-node-version-to-9`
+- `docs/88-tweak-contributing-pr-template-codeowners`
 
 ### Commit Messages
 

src/vva-be/.gitignore → govtool/backend/.gitignore

@@ -1,3 +1,3 @@
-# other
-.vscode
+# other
+.vscode
 dev-config.json

src/vva-be/misc/schema2.sql:Zone.Identifier → govtool/backend/misc/schema2.sql:Zone.Identifier

@@ -1,3 +1,3 @@
-[ZoneTransfer]
-ZoneId=3
-HostUrl=https://files.slack.com/files-pri/T02GP5QUP-F05KTJ0MV5Z/download/schema2.sql?origin_team=T02GP5QUP
+[ZoneTransfer]
+ZoneId=3
+HostUrl=https://files.slack.com/files-pri/T02GP5QUP-F05KTJ0MV5Z/download/schema2.sql?origin_team=T02GP5QUP

src/vva-be/sql/get-current-delegation.sql → govtool/backend/sql/get-current-delegation.sql

@@ -1,6 +1,6 @@
 select
   case
-    when drep_hash.raw = '\x00000000000000000000000000000000000000000000000000000000' then drep_hash.view
+    when drep_hash.raw is NULL then drep_hash.view
     else encode(drep_hash.raw,'hex')
   end
 from delegation_vote