Skip to content

Commit a18a329

Browse files
authored
Merge pull request #3043 from IntersectMBO/develop
GovTool - v2.0.12 - candidate
2 parents efa0db0 + 5167e71 commit a18a329

File tree

55 files changed

+525
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+525
-207
lines changed

.github/workflows/code_check_frontend.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v4
1919

2020
- name: Cache dependencies
21-
uses: actions/cache@v2
21+
uses: actions/cache@v4
2222
with:
2323
path: govtool/frontend/node_modules
2424
key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v4
4545

4646
- name: Cache dependencies
47-
uses: actions/cache@v2
47+
uses: actions/cache@v4
4848
with:
4949
path: govtool/frontend/node_modules
5050
key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}
@@ -70,7 +70,7 @@ jobs:
7070
uses: actions/checkout@v4
7171

7272
- name: Cache dependencies
73-
uses: actions/cache@v2
73+
uses: actions/cache@v4
7474
with:
7575
path: govtool/frontend/node_modules
7676
key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}

.github/workflows/frontend_sonar_scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
1818

1919
- name: Cache dependencies
20-
uses: actions/cache@v2
20+
uses: actions/cache@v4
2121
with:
2222
path: govtool/frontend/node_modules
2323
key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}

.github/workflows/merge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
uses: docker/setup-buildx-action@v2
103103

104104
- name: Cache Docker layers
105-
uses: actions/cache@v3
105+
uses: actions/cache@v4
106106
with:
107107
path: /tmp/.buildx-cache
108108
key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/pr.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ jobs:
7474
set -o pipefail
7575
sudo chmod +x lint.sh && ./lint.sh 2>&1 | tee code_lint_output.txt
7676
77-
7877
- name: Unit tests
7978
id: unit_tests
8079
run: |
@@ -90,7 +89,7 @@ jobs:
9089
uses: docker/setup-buildx-action@v2
9190

9291
- name: Cache Docker layers
93-
uses: actions/cache@v3
92+
uses: actions/cache@v4
9493
with:
9594
path: /tmp/.buildx-cache
9695
key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -127,19 +126,19 @@ jobs:
127126
VITE_IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
128127
IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}
129128
IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
130-
129+
131130
- name: Scan Docker image with Dockle
132131
id: dockle
133132
run: |
134-
wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
135-
tar zxf dockle_0.4.14_Linux-64bit.tar.gz
136-
sudo mv dockle /usr/local/bin
133+
wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
134+
tar zxf dockle_0.4.14_Linux-64bit.tar.gz
135+
sudo mv dockle /usr/local/bin
137136
138-
dockle --exit-code 1 --exit-level fatal -ak GHC_RELEASE_KEY -ak CABAL_INSTALL_RELEASE_KEY -ak STACK_RELEASE_KEY -ak KEY_SHA512 --format json --input '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
139-
rm -rf '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar'
140-
cat ${{ matrix.workdir }}/dockle_scan_output.json
137+
dockle --exit-code 1 --exit-level fatal -ak GHC_RELEASE_KEY -ak CABAL_INSTALL_RELEASE_KEY -ak STACK_RELEASE_KEY -ak KEY_SHA512 --format json --input '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
138+
rm -rf '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar'
139+
cat ${{ matrix.workdir }}/dockle_scan_output.json
141140
142-
echo "outcome=success" >> $GITHUB_OUTPUT
141+
echo "outcome=success" >> $GITHUB_OUTPUT
143142
144143
- name: Create PR comment
145144
if: always()

.github/workflows/test_integration_playwright.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ on:
3131
workflow_run:
3232
workflows: ["Build and deploy GovTool test stack"]
3333
types: [completed]
34-
34+
3535
concurrency:
3636
group: ${{ github.workflow }}-${{ github.ref }}
3737
cancel-in-progress: false
3838

3939
jobs:
4040
integration-tests:
4141
runs-on: ubuntu-latest
42-
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
42+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
4343
outputs:
4444
start_time: ${{ steps.set-pending-status.outputs.timestamp }}
4545
status: ${{ steps.run-test.outcome }}
@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
- uses: actions/checkout@v4
5151
with:
52-
ref: ${{ env.COMMIT_SHA }}
52+
ref: ${{ env.COMMIT_SHA }}
5353
- name: Set pending commit status
5454
id: set-pending-status
5555
run: |
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: Cache Playwright browsers
7272
id: cache-playwright-browsers
73-
uses: actions/cache@v3
73+
uses: actions/cache@v4
7474
with:
7575
path: |
7676
~/.cache/ms-playwright
@@ -132,7 +132,7 @@ jobs:
132132

133133
publish-report:
134134
runs-on: ubuntu-latest
135-
if: always() && needs.integration-tests.result != 'skipped'
135+
if: always() && needs.integration-tests.result != 'skipped'
136136
needs: integration-tests
137137
outputs:
138138
report_number: ${{ steps.report-details.outputs.report_number }}

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ changes.
2121
- Allow searching for yourself in DRep Directory [Issue 2993](https://github.com/IntersectMBO/govtool/issues/2993)
2222
- Add mathematical styling for governance actions [Issue 2984](https://github.com/IntersectMBO/govtool/issues/2984)
2323
- Add script to update GovTool version
24+
- Add `isStakeKeyRegistered` for the usage by pillars [Issue 2384](https://github.com/IntersectMBO/govtool/issues/2384)
25+
- Add server side compression for large assets
2426

2527
### Fixed
2628

@@ -29,12 +31,16 @@ changes.
2931
- Remove abstain votes (not auto abstain) from total DRep stake
3032
- Fix counting committee members [Issue 2948](https://github.com/IntersectMBO/govtool/issues/2948)
3133
- Fix refetching DRep list on every enter [Issue 2994](https://github.com/IntersectMBO/govtool/issues/2994)
34+
- Fix displaying helper buttons on governance action card details [Issue 3022](https://github.com/IntersectMBO/govtool/issues/3022)
3235

3336
### Changed
3437

3538
- Change threshold visual representation in governance action votes
3639
- Resize governance action details columns
3740
- Update @intersect.mbo/pdf-ui to v0.6.0
41+
- Bump actions/cache to v4 across workflows
42+
- Unify ADA Format across the application [Issue 3031](https://github.com/IntersectMBO/govtool/issues/3031)
43+
- Change default filtering for DRep directory to show the active DReps [Issue 3035](https://github.com/IntersectMBO/govtool/issues/3035)
3844

3945
### Removed
4046

CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* @Ryun1 @MSzalowski
55

66
# Frontend assets templates
7-
govtool/frontend/* @MSzalowski @jdyczka
8-
*.tsx @MSzalowski @jdyczka
9-
*.ts @MSzalowski @jdyczka
10-
*.css @MSzalowski @jdyczka
7+
govtool/frontend/* @MSzalowski
8+
*.tsx @MSzalowski
9+
*.ts @MSzalowski
10+
*.css @MSzalowski
1111

1212
# Backend
1313
govtool/backend/* @MSzalowski @jankun4

govtool/backend/README.md

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ This is a backend application of GovTool project.
55
## Prerequisites
66

77
In order to run `backend` your host machine will need access to the `cardano-db-sync` postgres database. To have this database running locally you'll need:
8-
* `cardano-node`
9-
* `cardano-db-sync`
10-
* PostgreSQL database
8+
9+
- `cardano-node`
10+
- `cardano-db-sync`
11+
- PostgreSQL database
1112

1213
You will need your `cardano-node` and `cardano-db-sync` to be compatible with Sancho testnet. Until these features will be merged to the master branch the new Sancho compatible versions are available as releases on [github](https://github.com/IntersectMBO/cardano-db-sync/releases). You will also need a correct `cardano-node` version. The release notes for `cardano-db-sync` usualy specify that.
1314

@@ -25,35 +26,50 @@ You can utilize the [docker-compose.node+dbsync.yml](../../scripts/govtool/docke
2526

2627
Due to problems with openapi3 package it's hard to build this project with plain `ghc` and `cabal-install`. Until the prolem is solved we reccomend using `nix` - this problem is fixed when you build your project from inside of the nix shell.
2728

28-
1. Get [Nix](https://nixos.org/download).
29+
1. Get [Nix](https://nixos.org/download).
30+
31+
2. Get [direnv](https://direnv.net/).
32+
33+
3. Set GHC version to 9.10.1:
34+
35+
```sh
36+
ghcup install ghc 9.10.1
37+
38+
ghcup set ghc 9.10.1
39+
```
40+
41+
4. Install cabal
2942

30-
2. Get [direnv](https://direnv.net/).
43+
```sh
44+
ghcup install cabal
45+
ghcup set cabal
46+
```
3147

32-
3. Enter `govtool/backend` directory:
48+
5. Enter `govtool/backend` directory:
3349

3450
```sh
3551
cd govtool/backend
3652
```
3753

38-
4. Allow direnv to setup your environment:
54+
6. Allow direnv to setup your environment:
3955

4056
```sh
4157
direnv allow
4258
```
4359

44-
5. Update cabal & build project
60+
7. Update cabal & build project
4561
```sh
4662
cabal update
4763
cabal build all
4864
```
49-
6. Create a config file. You can use `example-config.json` as a template.
65+
8. Create a config file. You can use `example-config.json` as a template.
5066

51-
7. Run project
52-
```sh
67+
9. Run project
68+
`sh
5369
cabal run vva-be -- --config <YOUR CONFIG FILE> start-app
54-
```
55-
> [!WARNING]
56-
> In the context of our ongoing project enhancements, it is assumed that the executable previously known as 'vva-be' should be now officially renamed to 'govtool-backend'. This change is necessary for aligning with the updated branding and functional scope of the application and it has to be implemented in the near future as a chore and refactoring ticket. Make sure that the documentation matches the actual name of the executable.
70+
`
71+
> [!WARNING]
72+
> In the context of our ongoing project enhancements, it is assumed that the executable previously known as 'vva-be' should be now officially renamed to 'govtool-backend'. This change is necessary for aligning with the updated branding and functional scope of the application and it has to be implemented in the near future as a chore and refactoring ticket. Make sure that the documentation matches the actual name of the executable.
5773

5874
## Development
5975

govtool/frontend/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ yarn dev
114114

115115
#### Using Nix and Direnv
116116

117-
1. Get [Nix](https://nixos.org/download).
117+
1. Get [Nix](https://nixos.org/download) (And/Or) Get [GHCUP](https://www.haskell.org/ghcup/).
118118

119119
2. Get [direnv](https://direnv.net/).
120120

govtool/frontend/package-lock.json

Lines changed: 35 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)