Skip to content

Commit 0f8ae6a

Browse files
MSzalowskiMSzalowski
authored
Merge pull request #2153 from IntersectMBO/test
chore: bump GovTool to v1.0.21; fix: fix stake key sql error
2 parents a8e0e61 + e344eac commit 0f8ae6a

File tree

12 files changed

+263
-212
lines changed

12 files changed

+263
-212
lines changed

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,24 @@ changes.
1616

1717
### Fixed
1818

19+
-
20+
21+
### Changed
22+
23+
-
24+
25+
### Removed
26+
27+
-
28+
29+
## [v1.0.21](https://github.com/IntersectMBO/govtool/releases/tag/v1.0.21) 2024-10-15
30+
31+
### Added
32+
33+
-
34+
35+
### Fixed
36+
1937
- Fix counting epoch boundaries for Governance Actions [Issue 2125](https://github.com/IntersectMBO/govtool/issues/2125)
2038
- Fix displaying the SPO Votes [Issue 2085](https://github.com/IntersectMBO/govtool/issues/2085)
2139
- Fix counting ada holder voting power [Issue 2000](https://github.com/IntersectMBO/govtool/issues/2000)

‎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.20/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.21/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.20/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.21/x/vva-be/build/vva-be/vva-be /usr/local/bin
88

99
# Expose the necessary port
1010
EXPOSE 9876

‎govtool/backend/sql/get-stake-key-voting-power.sql‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
SELECT COALESCE(SUM(utxo_view.value::numeric), 0) + COALESCE(SUM(reward_rest.amount), 0) AS total_value,
1+
SELECT COALESCE(SUM(utxo_view.value::numeric), 0) + COALESCE(reward_sum.total_reward, 0) AS total_value,
22
encode(stake_address.hash_raw, 'hex')
33
FROM stake_address
44
JOIN utxo_view ON utxo_view.stake_address_id = stake_address.id
5-
LEFT JOIN reward_rest ON reward_rest.addr_id = stake_address.id
6-
WHERE reward_rest.earned_epoch IS NULL
5+
LEFT JOIN (
6+
SELECT addr_id, SUM(reward_rest.amount) AS total_reward
7+
FROM reward_rest
8+
GROUP BY addr_id
9+
) AS reward_sum ON reward_sum.addr_id = stake_address.id
710
WHERE stake_address.hash_raw = decode(?, 'hex')
8-
GROUP BY stake_address.hash_raw;
11+
GROUP BY stake_address.hash_raw, reward_sum.total_reward;

‎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.20
3+
version: 1.0.21
44

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

‎govtool/frontend/package-lock.json‎

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

‎govtool/frontend/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@govtool/frontend",
33
"private": true,
4-
"version": "1.0.20",
4+
"version": "1.0.21",
55
"type": "module",
66
"scripts": {
77
"build": "vite build",
@@ -109,5 +109,5 @@
109109
"typescript": "^5.0.2"
110110
},
111111
"readme": "ERROR: No README data found!",
112-
"_id": "[email protected].20"
112+
"_id": "[email protected].21"
113113
}

‎govtool/frontend/yarn.lock‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,20 +1448,20 @@
14481448
resolved "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-asmjs/-/cardano-serialization-lib-asmjs-12.1.0.tgz"
14491449
integrity sha512-LVClEWmZmTvaXTBUpSOdyAYr10PlnfEycG1Z5m96aHWN08mdQH/x2LyZxuCjWVSusrG3ZwFnsOYZCHLel7tu4g==
14501450

1451-
"@esbuild/darwin-arm64@0.18.20":
1451+
"@esbuild/linux-x64@0.18.20":
14521452
version "0.18.20"
1453-
resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz"
1454-
integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
1453+
resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz"
1454+
integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
14551455

1456-
"@esbuild/darwin-arm64@0.19.12":
1456+
"@esbuild/linux-x64@0.19.12":
14571457
version "0.19.12"
1458-
resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz"
1459-
integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
1458+
resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz"
1459+
integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
14601460

1461-
"@esbuild/darwin-arm64@0.21.5":
1461+
"@esbuild/linux-x64@0.21.5":
14621462
version "0.21.5"
1463-
resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz"
1464-
integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
1463+
resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz"
1464+
integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
14651465

14661466
"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
14671467
version "4.4.0"
@@ -2666,10 +2666,15 @@
26662666
estree-walker "^2.0.2"
26672667
picomatch "^2.3.1"
26682668

2669-
"@rollup/rollup-darwin-arm64@4.21.2":
2669+
"@rollup/rollup-linux-x64-gnu@4.21.2":
26702670
version "4.21.2"
2671-
resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz"
2672-
integrity sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==
2671+
resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz"
2672+
integrity sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==
2673+
2674+
"@rollup/[email protected]":
2675+
version "4.21.2"
2676+
resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz"
2677+
integrity sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==
26732678

26742679
"@rushstack/eslint-patch@^1.1.0":
26752680
version "1.10.4"
@@ -3690,10 +3695,15 @@
36903695
"@svgr/plugin-svgo" "^5.5.0"
36913696
loader-utils "^2.0.0"
36923697

3693-
"@swc/[email protected]":
3698+
"@swc/[email protected]":
3699+
version "1.7.22"
3700+
resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.22.tgz"
3701+
integrity sha512-639kA7MXrWqWYfwuSJ+XTg21VYb/5o99R1zJrndoEjEX6m7Wza/sXssQKU5jbbkPoSEKVKNP3n/gazLWiUKgiQ==
3702+
3703+
"@swc/[email protected]":
36943704
version "1.7.22"
3695-
resolved "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.7.22.tgz"
3696-
integrity sha512-B2Bh2W+C7ALdGwDxRWAJ+UtNExfozvwyayGiNkbR3wmDKXXeQfhGM5MK+QYUWKu7UQ6ATq69OyZrxofDobKUug==
3705+
resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.7.22.tgz"
3706+
integrity sha512-f3zfGgY8EJQUOk3ve25ZTkNkhB/kHo9QlN2r+0exaE1g9W7X8IS6J8pWzF3hJrV2P9dBi6ofMOt+opVA89JKHA==
36973707

36983708
"@swc/core@*", "@swc/core@^1.3.18":
36993709
version "1.7.22"
@@ -8455,16 +8465,6 @@ fs.realpath@^1.0.0:
84558465
resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
84568466
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
84578467

8458-
fsevents@^2.3.2, fsevents@~2.3.2, fsevents@~2.3.3:
8459-
version "2.3.3"
8460-
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
8461-
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
8462-
8463-
[email protected]:
8464-
version "2.3.2"
8465-
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
8466-
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
8467-
84688468
function-bind@^1.1.2:
84698469
version "1.1.2"
84708470
resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"

‎govtool/metadata-validation/package-lock.json‎

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

‎govtool/metadata-validation/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@govtool/metadata-validation",
3-
"version": "1.0.20",
3+
"version": "1.0.21",
44
"description": "",
55
"author": "",
66
"private": true,

0 commit comments

Comments
 (0)