Skip to content

Commit 51fd5c1

Browse files
authored
Merge pull request #2475 from IntersectMBO/develop
GovTool - v1.0.29
2 parents b29a86c + fb87566 commit 51fd5c1

File tree

74 files changed

+509
-335
lines changed

Some content is hidden

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

74 files changed

+509
-335
lines changed

.github/workflows/test_backend.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,26 @@ jobs:
3333
run: |
3434
python -m pip install --upgrade pip
3535
pip install -r requirements.txt
36+
if [[ "${{ env.NETWORK }}" == "preprod" ]]; then
37+
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREPROD }}"
38+
elif [[ "${{ env.NETWORK }}" == "sanchonet" ]]; then
39+
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_SANCHONET }}"
40+
else
41+
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREVIEW }}"
42+
fi
3643
python ./setup.py
3744
python -m pytest --alluredir allure-results
45+
if [[ "${{ env.NETWORK }}" == "preprod" ]]; then
46+
echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_PREPROD }}" >> $GITHUB_ENV
47+
elif [[ "${{ env.NETWORK }}" == "sanchonet" ]]; then
48+
echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_SANCHONET }}" >> $GITHUB_ENV
49+
else
50+
echo "FAUCET_API_KEY=${{ secrets.FAUCET_API_KEY_PREVIEW }}" >> $GITHUB_ENV
51+
fi
3852
env:
3953
BASE_URL: https://${{inputs.deployment || 'govtool.cardanoapi.io/api' }}
40-
FAUCET_API_KEY: ${{ secrets.FAUCET_API_KEY }}
41-
KUBER_API_URL: https://kuber-govtool.cardanoapi.io
54+
NETWORK: ${{ vars.NETWORK }}
55+
KUBER_API_KEY: ${{ secrets.KUBER_API_KEY }}
4256

4357
- name: Upload report
4458
if: always()

.github/workflows/test_integration_playwright.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,18 @@ jobs:
5454
mkdir -p ./lib/_mock
5555
chmod +w ./lib/_mock
5656
npm run generate-wallets
57+
if [[ "${{ env.NETWORK }}" == "preprod" ]]; then
58+
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREPROD }}"
59+
export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_PREPROD }}"
60+
elif [[ "${{ env.NETWORK }}" == "sanchonet" ]]; then
61+
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_SANCHONET }}"
62+
export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_SANCHONET }}"
63+
else
64+
export FAUCET_API_KEY="${{ secrets.FAUCET_API_KEY_PREVIEW }}"
65+
export BLOCKFROST_API_KEY="${{ secrets.BLOCKFROST_API_KEY_PREVIEW }}"
66+
fi
5767
npm test
68+
5869
5970
- name: Upload report
6071
uses: actions/upload-artifact@v3
@@ -74,9 +85,6 @@ jobs:
7485
HOST_URL: https://${{inputs.deployment || 'govtool.cardanoapi.io' }}
7586
API_URL: https://${{inputs.deployment || 'govtool.cardanoapi.io' }}/api
7687
DOCS_URL: ${{ vars.DOCS_URL }}
77-
FAUCET_API_URL: ${{ vars.FAUCET_API_URL }}
78-
FAUCET_API_KEY: ${{secrets.FAUCET_API_KEY}}
79-
KUBER_API_URL: ${{vars.KUBER_API_URL}}
8088
KUBER_API_KEY: ${{secrets.KUBER_API_KEY}}
8189
TEST_WORKERS: ${{vars.TEST_WORKERS}}
8290
CI: ${{vars.CI}}

CHANGELOG.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,35 @@ changes.
1616

1717
### Fixed
1818

19+
-
20+
21+
### Changed
22+
23+
-
24+
25+
### Removed
26+
27+
-
28+
29+
## [v1.0.29](https://github.com/IntersectMBO/govtool/releases/tag/v1.0.29) 2024-12-05
30+
31+
### Added
32+
33+
- Add support for displaying CIP-119 DRep images [Issue 1806](https://github.com/IntersectMBO/govtool/issues/1806)
34+
35+
### Fixed
36+
1937
- Fix fetching voting power of newly registerd DRep [Issue 2407](https://github.com/IntersectMBO/govtool/issues/2407)
2038
- Fix inconsistent voting status [Issue 1713](https://github.com/IntersectMBO/govtool/issues/1713)
39+
- Fix removing a child (link) when is not registed in DOM [Issue 2398](https://github.com/IntersectMBO/govtool/issues/2398)
40+
- Fix blank screen on DRep delegation when UTXos are missing [Issue 2408](https://github.com/IntersectMBO/govtool/issues/2408)
41+
- Fix broken guides links [Issue 2417](https://github.com/IntersectMBO/govtool/issues/2417)
2142

2243
### Changed
2344

24-
-
45+
- Bump cardano-db-sync to 13.6.0.4 [Issue 2411](https://github.com/IntersectMBO/govtool/issues/2411)
46+
- Bump @intersect.mbo/pdf-ui to v0.5.3
47+
- Bump @intersect.mbo/pdf-ui to v0.5.4
2548

2649
### Removed
2750

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The Cardano GovTool enables ada holders to experience the governance features de
3636

3737
### Documentation
3838

39-
Learn more; [docs.gov.tools](https://docs.gov.tools/).
39+
Learn more; [docs.gov.tools](https://docs.gov.tools/cardano-govtool/using-govtool).
4040

4141
## 📍 Navigation
4242

docs/architecture/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ utility backend that serves validation of the governance actions metadata.
2323

2424
# Description
2525

26-
Frontend is a React application using Vite as a built tool to enhance development speed and optimize production builds. Frontend interacts with the backend service via REST API and with the Cardano blockchain via cardano-serialization-lib and connected supported wallets (for the list of compatible wallets go [here](https://docs.gov.tools/how-to-use-the-govtool/getting-started/get-a-compatible-wallet)).
26+
Frontend is a React application using Vite as a built tool to enhance development speed and optimize production builds. Frontend interacts with the backend service via REST API and with the Cardano blockchain via cardano-serialization-lib and connected supported wallets (for the list of compatible wallets go [here](https://docs.gov.tools/cardano-govtool/using-govtool/getting-started/compatible-wallets)).
2727

2828
# Components
2929

govtool/backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
44
WORKDIR /src
55
COPY . .
66
RUN cabal build
7-
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.28/x/vva-be/build/vva-be/vva-be /usr/local/bin
7+
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.29/x/vva-be/build/vva-be/vva-be /usr/local/bin

govtool/backend/Dockerfile.qovery

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
44
WORKDIR /src
55
COPY . .
66
RUN cabal build
7-
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.28/x/vva-be/build/vva-be/vva-be /usr/local/bin
7+
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.29/x/vva-be/build/vva-be/vva-be /usr/local/bin
88

99
# Expose the necessary port
1010
EXPOSE 9876

govtool/backend/app/Main.hs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import System.Clock (TimeSpec (TimeSpec))
5353
import System.IO (stderr)
5454
import System.Log.Raven (initRaven, register, silentFallback)
5555
import System.Log.Raven.Transport.HttpConduit (sendRecord)
56-
import System.Log.Raven.Types (SentryLevel (Error), SentryRecord (..))
56+
import System.Log.Raven.Types (SentryLevel (Error), SentryRecord (..), SentryService)
5757
import System.TimeManager (TimeoutThread (..))
5858

5959
import VVA.API
@@ -71,12 +71,18 @@ main :: IO ()
7171
main = do
7272
commandLineConfig <- execParser cmdParser
7373
vvaConfig <- loadVVAConfig (clcConfigPath commandLineConfig)
74+
sentryService <-
75+
initRaven
76+
(sentryDSN vvaConfig)
77+
id
78+
sendRecord
79+
silentFallback
7480
case clcCommand commandLineConfig of
75-
StartApp -> startApp vvaConfig
81+
StartApp -> startApp vvaConfig sentryService
7682
ShowConfig -> Text.putStrLn $ vvaConfigToText vvaConfig
7783

78-
startApp :: VVAConfig -> IO ()
79-
startApp vvaConfig = do
84+
startApp :: VVAConfig -> SentryService -> IO ()
85+
startApp vvaConfig sentryService = do
8086
let vvaPort = serverPort vvaConfig
8187
vvaHost = fromString (Text.unpack (serverHost vvaConfig))
8288
settings =
@@ -92,7 +98,7 @@ startApp vvaConfig = do
9298
++ show vvaPort
9399
)
94100
)
95-
$ setOnException (exceptionHandler vvaConfig) defaultSettings
101+
$ setOnException (exceptionHandler vvaConfig sentryService) defaultSettings
96102
cacheEnv <- do
97103
let newCache = Cache.newCache (Just $ TimeSpec (fromIntegral (cacheDurationSeconds vvaConfig)) 0)
98104
proposalListCache <- newCache
@@ -122,8 +128,8 @@ startApp vvaConfig = do
122128
server' <- mkVVAServer appEnv
123129
runSettings settings server'
124130

125-
exceptionHandler :: VVAConfig -> Maybe Request -> SomeException -> IO ()
126-
exceptionHandler vvaConfig mRequest exception = do
131+
exceptionHandler :: VVAConfig -> SentryService -> Maybe Request -> SomeException -> IO ()
132+
exceptionHandler vvaConfig sentryService mRequest exception = do
127133
print mRequest
128134
print exception
129135
let isNotTimeoutThread x = case fromException x of
@@ -135,12 +141,6 @@ exceptionHandler vvaConfig mRequest exception = do
135141
guard . isNotTimeoutThread $ exception
136142
guard . isNotConnectionClosedByPeer $ exception
137143
let env = sentryEnv vvaConfig
138-
sentryService <-
139-
initRaven
140-
(sentryDSN vvaConfig)
141-
id
142-
sendRecord
143-
silentFallback
144144
register
145145
sentryService
146146
"vva.be"

govtool/backend/vva-be.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.6
22
name: vva-be
3-
version: 1.0.28
3+
version: 1.0.29
44

55
-- A short (one-line) description of the package.
66
-- synopsis:

govtool/frontend/.env.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ VITE_IS_DEV=true
88
VITE_USERSNAP_SPACE_API_KEY=""
99
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'
1010
VITE_PDF_API_URL=""
11+
VITE_IPFS_GATEWAY=""
12+
VITE_IPFS_PROJECT_ID=""

0 commit comments

Comments
 (0)