@@ -18,7 +18,7 @@
## 🌄 Purpose
-The Voltaire GovTool enables ada holders to experience the governance features described in [CIP-1694](https://github.com/cardano-foundation/CIPs/blob/master/CIP-1694/README.md).
+The Cardano GovTool enables ada holders to experience the governance features described in [CIP-1694](https://github.com/cardano-foundation/CIPs/blob/master/CIP-1694/README.md).
### Instances
@@ -48,7 +48,7 @@ Learn more; [docs.gov.tools](https://docs.gov.tools/).
### Utilities
-- [Governance Action Loader](./governance-action-loader/)
+- [Governance Action Loader](./gov-action-loader/)
### Backend
diff --git a/docs/GOVERNANCE_ACTION_SUBMISSION.md b/docs/GOVERNANCE_ACTION_SUBMISSION.md
index 2262d5dd..c2aa0825 100644
--- a/docs/GOVERNANCE_ACTION_SUBMISSION.md
+++ b/docs/GOVERNANCE_ACTION_SUBMISSION.md
@@ -15,7 +15,15 @@ For creating the Governance Action, you need to consume 2 utility methods provid
### Types
```typescript
-import { VotingProposalBuilder } from "@emurgo/cardano-serialization-lib-nodejs";
+import {
+ VotingProposalBuilder,
+ Costmdls,
+ DrepVotingThresholds,
+ ExUnitPrices,
+ UnitInterval,
+ ExUnits,
+ PoolVotingThresholds,
+} from "@emurgo/cardano-serialization-lib-nodejs";
interface GovernanceAction {
title: string;
@@ -37,6 +45,48 @@ interface TreasuryProps {
url: string;
}
+type ProtocolParamsUpdate = {
+ adaPerUtxo: string;
+ collateralPercentage: number;
+ committeeTermLimit: number;
+ costModels: Costmdls;
+ drepDeposit: string;
+ drepInactivityPeriod: number;
+ drepVotingThresholds: DrepVotingThresholds;
+ executionCosts: ExUnitPrices;
+ expansionRate: UnitInterval;
+ governanceActionDeposit: string;
+ governanceActionValidityPeriod: number;
+ keyDeposit: string;
+ maxBlockBodySize: number;
+ maxBlockExUnits: ExUnits;
+ maxBlockHeaderSize: number;
+ maxCollateralInputs: number;
+ maxEpoch: number;
+ maxTxExUnits: ExUnits;
+ maxTxSize: number;
+ maxValueSize: number;
+ minCommitteeSize: number;
+ minPoolCost: string;
+ minFeeA: string;
+ minFeeB: string;
+ nOpt: number;
+ poolDeposit: string;
+ poolPledgeInfluence: UnitInterval;
+ poolVotingThresholds: PoolVotingThresholds;
+ refScriptCoinsPerByte: UnitInterval;
+ treasuryGrowthRate: UnitInterval;
+};
+
+interface ProtocolParameterChangeProps {
+ prevGovernanceActionHash: string;
+ prevGovernanceActionIndex: number;
+ url: string;
+ hash: string;
+
+ protocolParamsUpdate: Partial
;
+}
+
const createGovernanceActionJsonLD: (
governanceAction: GovernanceAction
) => NodeObject;
@@ -111,10 +161,14 @@ Example:
```typescript
// When used within a CardanoProvider
-const { buildSignSubmitConwayCertTx, buildNewInfoGovernanceAction } =
- useCardano();
-
-// hash of the generated Governance Action metadata, url of the metadata
+const {
+ buildSignSubmitConwayCertTx,
+ buildNewInfoGovernanceAction,
+ buildProtocolParameterChangeGovernanceAction,
+ buildHardForkInitiationGovernanceAction,
+} = useCardano();
+
+// Info Governance Action
const govActionBuilder = await buildNewInfoGovernanceAction({ hash, url });
// sign and submit the transaction
@@ -123,7 +177,7 @@ await buildSignSubmitConwayCertTx({
type: "createGovAction",
});
-// or if you want to use the Treasury Governance Action
+// Treasury Governance Action
const { buildTreasuryGovernanceAction } = useCardano();
// hash of the generated Governance Action metadata, url of the metadata, amount of the transaction, receiving address is the stake key address
@@ -134,6 +188,31 @@ const govActionBuilder = await buildTreasuryGovernanceAction({
receivingAddress,
});
+// Protocol Parameter Change Governance Action
+const { buildProtocolParameterChangeGovernanceAction } = useCardano();
+
+// hash of the previous Governance Action, index of the previous Governance Action, url of the metadata, hash of the metadata, and the updated protocol parameters
+const govActionBuilder = await buildProtocolParameterChangeGovernanceAction({
+ prevGovernanceActionHash,
+ prevGovernanceActionIndex,
+ url,
+ hash,
+ protocolParamsUpdate,
+});
+
+// Hard Fork Initiation Governance Action
+const { buildHardForkInitiationGovernanceAction } = useCardano();
+
+// hash of the previous Governance Action, index of the previous Governance Action, url of the metadata, hash of the metadata, and the major and minor numbers of the hard fork initiation
+const govActionBuilder = await buildHardForkInitiationGovernanceAction({
+ prevGovernanceActionHash,
+ prevGovernanceActionIndex,
+ url,
+ hash,
+ major,
+ minor,
+});
+
// sign and submit the transaction
await buildSignSubmitConwayCertTx({
govActionBuilder,
diff --git a/govtool/backend/Dockerfile b/govtool/backend/Dockerfile
index fbeb614a..38c09931 100644
--- a/govtool/backend/Dockerfile
+++ b/govtool/backend/Dockerfile
@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
WORKDIR /src
COPY . .
RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.13/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.17/x/vva-be/build/vva-be/vva-be /usr/local/bin
diff --git a/govtool/backend/Dockerfile.base b/govtool/backend/Dockerfile.base
index 8f4e4c35..6dd3c75a 100644
--- a/govtool/backend/Dockerfile.base
+++ b/govtool/backend/Dockerfile.base
@@ -6,5 +6,13 @@
FROM haskell:9.2.7-buster
WORKDIR /src
+
+RUN apt-get update && \
+ apt-get install -y wget lsb-release && \
+ sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
+ wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+ apt-get update && \
+ apt-get install -y postgresql-14 libpq-dev
+
COPY . .
RUN cabal update && cabal configure && cabal install --only-dependencies && rm -rf /src/*
diff --git a/govtool/backend/Dockerfile.qovery b/govtool/backend/Dockerfile.qovery
index a6789ec6..cdf1acc7 100644
--- a/govtool/backend/Dockerfile.qovery
+++ b/govtool/backend/Dockerfile.qovery
@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
WORKDIR /src
COPY . .
RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.13/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.17/x/vva-be/build/vva-be/vva-be /usr/local/bin
# Expose the necessary port
EXPOSE 9876
diff --git a/govtool/backend/sql/get-drep-info.sql b/govtool/backend/sql/get-drep-info.sql
index 2e8ee08f..ca4505d6 100644
--- a/govtool/backend/sql/get-drep-info.sql
+++ b/govtool/backend/sql/get-drep-info.sql
@@ -176,7 +176,14 @@ SELECT
DRepRegister.tx_hash,
DRepRetire.tx_hash,
SoleVoterRegister.tx_hash,
- SoleVoterRetire.tx_hash
+ SoleVoterRetire.tx_hash,
+ off_chain_vote_drep_data.payment_address,
+ off_chain_vote_drep_data.given_name,
+ off_chain_vote_drep_data.objectives,
+ off_chain_vote_drep_data.motivations,
+ off_chain_vote_drep_data.qualifications,
+ off_chain_vote_drep_data.image_url,
+ off_chain_vote_drep_data.image_hash
FROM
IsRegisteredAsDRep
CROSS JOIN IsRegisteredAsSoleVoter
@@ -189,3 +196,6 @@ FROM
CROSS JOIN DRepRetire
CROSS JOIN SoleVoterRegister
CROSS JOIN SoleVoterRetire
+ CROSS JOIN LatestRegistrationEntry
+ LEFT JOIN off_chain_vote_data ON off_chain_vote_data.voting_anchor_id = LatestRegistrationEntry.voting_anchor_id
+ LEFT JOIN off_chain_vote_drep_data ON off_chain_vote_drep_data.off_chain_vote_data_id = off_chain_vote_data.id
diff --git a/govtool/backend/sql/get-votes.sql b/govtool/backend/sql/get-votes.sql
index 7a875aba..31aaba85 100644
--- a/govtool/backend/sql/get-votes.sql
+++ b/govtool/backend/sql/get-votes.sql
@@ -11,6 +11,6 @@ on gov_action_tx.id = gov_action_proposal.tx_id
join tx as vote_tx
on vote_tx.id = voting_procedure.tx_id
join block
-on block.id = gov_action_tx.block_id
+on block.id = vote_tx.block_id
where drep_hash.raw = decode(?, 'hex')
order by voting_procedure.gov_action_proposal_id, voting_procedure.drep_voter, voting_procedure.id desc
diff --git a/govtool/backend/sql/list-dreps.sql b/govtool/backend/sql/list-dreps.sql
index 399b5087..917f0641 100644
--- a/govtool/backend/sql/list-dreps.sql
+++ b/govtool/backend/sql/list-dreps.sql
@@ -29,7 +29,14 @@ SELECT
encode(dr_voting_anchor.tx_hash, 'hex') AS tx_hash,
newestRegister.time AS last_register_time,
COALESCE(latestDeposit.deposit, 0),
- non_deregister_voting_anchor.url IS NOT NULL AS has_non_deregister_voting_anchor
+ non_deregister_voting_anchor.url IS NOT NULL AS has_non_deregister_voting_anchor,
+ off_chain_vote_drep_data.payment_address,
+ off_chain_vote_drep_data.given_name,
+ off_chain_vote_drep_data.objectives,
+ off_chain_vote_drep_data.motivations,
+ off_chain_vote_drep_data.qualifications,
+ off_chain_vote_drep_data.image_url,
+ off_chain_vote_drep_data.image_hash
FROM
drep_hash dh
JOIN (
@@ -89,6 +96,8 @@ FROM
AND DRepDistr.rn = 1
LEFT JOIN voting_anchor va ON va.id = dr_voting_anchor.voting_anchor_id
LEFT JOIN voting_anchor non_deregister_voting_anchor on non_deregister_voting_anchor.id = dr_non_deregister_voting_anchor.voting_anchor_id
+ LEFT JOIN off_chain_vote_data ON off_chain_vote_data.voting_anchor_id = va.id
+ LEFT JOIN off_chain_vote_drep_data on off_chain_vote_drep_data.off_chain_vote_data_id = off_chain_vote_data.id
CROSS JOIN DRepActivity
LEFT JOIN voting_procedure AS voting_procedure ON voting_procedure.drep_voter = dh.id
LEFT JOIN tx AS tx ON tx.id = voting_procedure.tx_id
@@ -128,4 +137,11 @@ GROUP BY
dr_voting_anchor.tx_hash,
newestRegister.time,
latestDeposit.deposit,
- non_deregister_voting_anchor.url
+ non_deregister_voting_anchor.url,
+ off_chain_vote_drep_data.payment_address,
+ off_chain_vote_drep_data.given_name,
+ off_chain_vote_drep_data.objectives,
+ off_chain_vote_drep_data.motivations,
+ off_chain_vote_drep_data.qualifications,
+ off_chain_vote_drep_data.image_url,
+ off_chain_vote_drep_data.image_hash
diff --git a/govtool/backend/sql/list-proposals-my.sql b/govtool/backend/sql/list-proposals-my.sql
deleted file mode 100644
index fd2454ae..00000000
--- a/govtool/backend/sql/list-proposals-my.sql
+++ /dev/null
@@ -1,113 +0,0 @@
-WITH LatestDrepDistr AS (
- SELECT
- *,
- ROW_NUMBER() OVER (PARTITION BY hash_id ORDER BY epoch_no DESC) AS rn
- FROM
- drep_distr
-),
-EpochUtils AS (
- SELECT
- (Max(end_time) - Min(end_time)) / (Max(NO) - Min(NO)) AS epoch_duration,
- Max(NO) AS last_epoch_no,
- Max(end_time) AS last_epoch_end_time
- FROM
- epoch
-),
-always_no_confidence_voting_power AS (
- SELECT
- coalesce((
- SELECT
- amount
- FROM drep_hash
- LEFT JOIN drep_distr ON drep_hash.id = drep_distr.hash_id
- WHERE
- drep_hash.view = 'drep_always_no_confidence' ORDER BY epoch_no DESC LIMIT 1), 0) AS amount
-),
-always_abstain_voting_power AS (
- SELECT
- coalesce((
- SELECT
- amount
- FROM drep_hash
- LEFT JOIN drep_distr ON drep_hash.id = drep_distr.hash_id
- WHERE
- drep_hash.view = 'drep_always_abstain' ORDER BY epoch_no DESC LIMIT 1), 0) AS amount
-)
-SELECT
- gov_action_proposal.id AS proposal_id,
- encode(creator_tx.hash, 'hex') AS tx_hash,
- gov_action_proposal.index,
- gov_action_proposal.type::text,
- CASE
- WHEN gov_action_proposal.type = 'TreasuryWithdrawals' THEN
- json_build_object('Reward Address', stake_address.view, 'Amount', treasury_withdrawal.amount)
- WHEN gov_action_proposal.type::text = 'InfoAction' THEN
- json_build_object()
- ELSE
- NULL
- END AS description,
- epoch_utils.last_epoch_end_time + epoch_utils.epoch_duration * (gov_action_proposal.expiration - epoch_utils.last_epoch_no) AS expiry_date,
- gov_action_proposal.expiration AS expiry_epoch_no,
- creator_block.time AS created_date,
- creator_block.epoch_no AS created_epoch_no,
- voting_anchor.url,
- encode(voting_anchor.data_hash, 'hex') AS metadata_hash,
- off_chain_vote_gov_action_data.title,
- off_chain_vote_gov_action_data.abstract,
- off_chain_vote_gov_action_data.motivation,
- off_chain_vote_gov_action_data.rationale,
- coalesce(Sum(ldd.amount) FILTER (WHERE voting_procedure.vote::text = 'Yes'), 0) +
- CASE
- WHEN gov_action_proposal.type = 'NoConfidence' THEN always_no_confidence_voting_power.amount
- ELSE 0
- END AS yes_votes,
- coalesce(Sum(ldd.amount) FILTER (WHERE voting_procedure.vote::text = 'No'), 0) +
- CASE
- WHEN gov_action_proposal.type = 'NoConfidence' THEN 0
- ELSE always_no_confidence_voting_power.amount
- END AS no_votes,
- coalesce(Sum(ldd.amount) FILTER (WHERE voting_procedure.vote::text = 'Abstain'), 0) + always_abstain_voting_power.amount AS abstain_votes
-FROM
- gov_action_proposal
- LEFT JOIN treasury_withdrawal ON gov_action_proposal.id = treasury_withdrawal.gov_action_proposal_id
- LEFT JOIN stake_address ON stake_address.id = treasury_withdrawal.stake_address_id
- CROSS JOIN EpochUtils AS epoch_utils
- CROSS JOIN always_no_confidence_voting_power
- CROSS JOIN always_abstain_voting_power
- CROSS JOIN off_chain_vote_gov_action_data ON off_chain_vote_gov_action_data.off_chain_vote_data_id = off_chain_vote_data.id
- JOIN tx AS creator_tx ON creator_tx.id = gov_action_proposal.tx_id
- JOIN block AS creator_block ON creator_block.id = creator_tx.block_id
- LEFT JOIN voting_anchor ON voting_anchor.id = gov_action_proposal.voting_anchor_id
- LEFT JOIN off_chain_vote_data ON off_chain_vote_data.voting_anchor_id = voting_anchor.id
- LEFT JOIN voting_procedure ON voting_procedure.gov_action_proposal_id = gov_action_proposal.id
- LEFT JOIN LatestDrepDistr ldd ON ldd.hash_id = voting_procedure.drep_voter AND ldd.rn = 1
-WHERE (NOT ?
- OR (concat(encode(creator_tx.hash, 'hex'), '#', gov_action_proposal.index) IN ?))
-AND gov_action_proposal.expiration > (
- SELECT
- Max(NO)
- FROM
- epoch)
- AND gov_action_proposal.ratified_epoch IS NULL
- AND gov_action_proposal.enacted_epoch IS NULL
- AND gov_action_proposal.expired_epoch IS NULL
- AND gov_action_proposal.dropped_epoch IS NULL
-GROUP BY
- (gov_action_proposal.id,
- stake_address.view,
- treasury_withdrawal.amount,
- creator_block.epoch_no,
- off_chain_vote_gov_action_data.title,
- off_chain_vote_gov_action_data.abstract,
- off_chain_vote_gov_action_data.motivation,
- off_chain_vote_gov_action_data.rationale,
- gov_action_proposal.index,
- creator_tx.hash,
- creator_block.time,
- epoch_utils.epoch_duration,
- epoch_utils.last_epoch_no,
- epoch_utils.last_epoch_end_time,
- voting_anchor.url,
- voting_anchor.data_hash,
- always_no_confidence_voting_power.amount,
- always_abstain_voting_power.amount)
diff --git a/govtool/backend/sql/list-proposals.sql b/govtool/backend/sql/list-proposals.sql
index f09ec6f6..7926fd6b 100644
--- a/govtool/backend/sql/list-proposals.sql
+++ b/govtool/backend/sql/list-proposals.sql
@@ -44,6 +44,12 @@ SELECT
when gov_action_proposal.type::text = 'InfoAction' then
json_build_object()
+
+ when gov_action_proposal.type::text = 'HardForkInitiation' then
+ json_build_object(
+ 'major', (gov_action_proposal.description->'contents'->1->>'major')::int,
+ 'minor', (gov_action_proposal.description->'contents'->1->>'minor')::int
+ )
else
null
end
@@ -54,23 +60,32 @@ SELECT
creator_block.epoch_no,
voting_anchor.url,
encode(voting_anchor.data_hash, 'hex'),
+ ROW_TO_JSON(proposal_params),
off_chain_vote_gov_action_data.title,
off_chain_vote_gov_action_data.abstract,
off_chain_vote_gov_action_data.motivation,
off_chain_vote_gov_action_data.rationale,
- coalesce(Sum(ldd.amount) FILTER (WHERE voting_procedure.vote::text = 'Yes'), 0) +(
+ coalesce(Sum(ldd_drep.amount) FILTER (WHERE voting_procedure.vote::text = 'Yes'), 0) +(
CASE WHEN gov_action_proposal.type = 'NoConfidence' THEN
always_no_confidence_voting_power.amount
ELSE
0
END) "yes_votes",
- coalesce(Sum(ldd.amount) FILTER (WHERE voting_procedure.vote::text = 'No'), 0) +(
+ coalesce(Sum(ldd_drep.amount) FILTER (WHERE voting_procedure.vote::text = 'No'), 0) +(
CASE WHEN gov_action_proposal.type = 'NoConfidence' THEN
0
ELSE
always_no_confidence_voting_power.amount
END) "no_votes",
- coalesce(Sum(ldd.amount) FILTER (WHERE voting_procedure.vote::text = 'Abstain'), 0) + always_abstain_voting_power.amount "abstain_votes"
+ coalesce(Sum(ldd_drep.amount) FILTER (WHERE voting_procedure.vote::text = 'Abstain'), 0) + always_abstain_voting_power.amount "abstain_votes",
+ coalesce(vp_by_pool.poolYesVotes, 0),
+ coalesce(vp_by_pool.poolNoVotes, 0),
+ coalesce(vp_by_pool.poolAbstainVotes, 0),
+ coalesce(vp_by_cc.ccYesVotes, 0),
+ coalesce(vp_by_cc.ccNoVotes, 0),
+ coalesce(vp_by_cc.ccAbstainVotes, 0),
+ prev_gov_action.index as prev_gov_action_index,
+ encode(prev_gov_action_tx.hash, 'hex') as prev_gov_action_tx_hash
FROM
gov_action_proposal
LEFT JOIN treasury_withdrawal
@@ -83,11 +98,47 @@ FROM
JOIN tx AS creator_tx ON creator_tx.id = gov_action_proposal.tx_id
JOIN block AS creator_block ON creator_block.id = creator_tx.block_id
LEFT JOIN voting_anchor ON voting_anchor.id = gov_action_proposal.voting_anchor_id
+ LEFT JOIN param_proposal as proposal_params ON gov_action_proposal.param_proposal = proposal_params.id
LEFT JOIN off_chain_vote_data ON off_chain_vote_data.voting_anchor_id = voting_anchor.id
LEFT JOIN off_chain_vote_gov_action_data ON off_chain_vote_gov_action_data.off_chain_vote_data_id = off_chain_vote_data.id
LEFT JOIN voting_procedure ON voting_procedure.gov_action_proposal_id = gov_action_proposal.id
- LEFT JOIN LatestDrepDistr ldd ON ldd.hash_id = voting_procedure.drep_voter
- AND ldd.rn = 1
+ LEFT JOIN LatestDrepDistr ldd_drep ON ldd_drep.hash_id = voting_procedure.drep_voter
+ AND ldd_drep.rn = 1
+ LEFT JOIN
+ (
+ SELECT
+ gov_action_proposal_id,
+ SUM(CASE WHEN vote = 'Yes' THEN 1 ELSE 0 END) AS poolYesVotes,
+ SUM(CASE WHEN vote = 'No' THEN 1 ELSE 0 END) AS poolNoVotes,
+ SUM(CASE WHEN vote = 'Abstain' THEN 1 ELSE 0 END) AS poolAbstainVotes
+ FROM
+ voting_procedure
+ WHERE
+ pool_voter IS NOT NULL
+ GROUP BY
+ gov_action_proposal_id
+ ) vp_by_pool
+ ON gov_action_proposal.id = vp_by_pool.gov_action_proposal_id
+ LEFT JOIN
+ (
+ SELECT
+ gov_action_proposal_id,
+ SUM(CASE WHEN vote = 'Yes' THEN 1 ELSE 0 END) AS ccYesVotes,
+ SUM(CASE WHEN vote = 'No' THEN 1 ELSE 0 END) AS ccNoVotes,
+ SUM(CASE WHEN vote = 'Abstain' THEN 1 ELSE 0 END) AS ccAbstainVotes
+ FROM
+ voting_procedure
+ WHERE
+ committee_voter IS NOT NULL
+ GROUP BY
+ gov_action_proposal_id
+ ) vp_by_cc
+ ON gov_action_proposal.id = vp_by_cc.gov_action_proposal_id
+
+ LEFT JOIN LatestDrepDistr ldd_cc ON ldd_cc.hash_id = voting_procedure.committee_voter
+ AND ldd_cc.rn = 1
+ LEFT JOIN gov_action_proposal AS prev_gov_action ON gov_action_proposal.prev_gov_action_proposal = prev_gov_action.id
+ LEFT JOIN tx AS prev_gov_action_tx ON prev_gov_action.tx_id = prev_gov_action_tx.id
WHERE (NOT ?
OR (concat(encode(creator_tx.hash, 'hex'), '#', gov_action_proposal.index) IN ?))
AND gov_action_proposal.expiration >(
@@ -108,13 +159,22 @@ GROUP BY
off_chain_vote_gov_action_data.abstract,
off_chain_vote_gov_action_data.motivation,
off_chain_vote_gov_action_data.rationale,
+ vp_by_pool.poolYesVotes,
+ vp_by_pool.poolNoVotes,
+ vp_by_pool.poolAbstainVotes,
+ vp_by_cc.ccYesVotes,
+ vp_by_cc.ccNoVotes,
+ vp_by_cc.ccAbstainVotes,
gov_action_proposal.index,
creator_tx.hash,
creator_block.time,
epoch_utils.epoch_duration,
epoch_utils.last_epoch_no,
epoch_utils.last_epoch_end_time,
+ proposal_params,
voting_anchor.url,
voting_anchor.data_hash,
always_no_confidence_voting_power.amount,
- always_abstain_voting_power.amount)
\ No newline at end of file
+ always_abstain_voting_power.amount,
+ prev_gov_action.index,
+ prev_gov_action_tx.hash)
\ No newline at end of file
diff --git a/govtool/backend/src/VVA/API.hs b/govtool/backend/src/VVA/API.hs
index 702af1b7..64f6236d 100644
--- a/govtool/backend/src/VVA/API.hs
+++ b/govtool/backend/src/VVA/API.hs
@@ -22,6 +22,7 @@ import Data.Ord (Down (..))
import Data.Text hiding (any, drop, elem, filter, length, map, null, take)
import qualified Data.Text as Text
import qualified Data.Vector as V
+import Data.Time.LocalTime (TimeZone, getCurrentTimeZone)
import Numeric.Natural (Natural)
@@ -44,6 +45,7 @@ import qualified VVA.Types as Types
import VVA.Types (App, AppEnv (..),
AppError (CriticalError, InternalError, ValidationError),
CacheEnv (..))
+import Data.Time (TimeZone, localTimeToUTC)
type VVAApi =
"drep" :> "list"
@@ -112,7 +114,14 @@ drepRegistrationToDrep Types.DRepRegistration {..} =
dRepStatus = mapDRepStatus dRepRegistrationStatus,
dRepType = mapDRepType dRepRegistrationType,
dRepLatestTxHash = HexText <$> dRepRegistrationLatestTxHash,
- dRepLatestRegistrationDate = dRepRegistrationLatestRegistrationDate
+ dRepLatestRegistrationDate = dRepRegistrationLatestRegistrationDate,
+ dRepPaymentAddress = dRepRegistrationPaymentAddress,
+ dRepGivenName = dRepRegistrationGivenName,
+ dRepObjectives = dRepRegistrationObjectives,
+ dRepMotivations = dRepRegistrationMotivations,
+ dRepQualifications = dRepRegistrationQualifications,
+ dRepImageUrl = dRepRegistrationImageUrl,
+ dRepImageHash = HexText <$> dRepRegistrationImageHash
}
delegationToResponse :: Types.Delegation -> DelegationResponse
@@ -179,27 +188,36 @@ getVotingPower (unHexText -> dRepId) = do
CacheEnv {dRepVotingPowerCache} <- asks vvaCache
cacheRequest dRepVotingPowerCache dRepId $ DRep.getVotingPower dRepId
-proposalToResponse :: Types.Proposal -> ProposalResponse
-proposalToResponse Types.Proposal {..} =
+proposalToResponse :: TimeZone -> Types.Proposal -> ProposalResponse
+proposalToResponse timeZone Types.Proposal {..} =
ProposalResponse
{ proposalResponseId = pack $ show proposalId,
proposalResponseTxHash = HexText proposalTxHash,
proposalResponseIndex = proposalIndex,
proposalResponseType = fromMaybe InfoAction $ readMaybe $ unpack proposalType,
proposalResponseDetails = GovernanceActionDetails <$> proposalDetails,
- proposalResponseExpiryDate = proposalExpiryDate,
+ proposalResponseExpiryDate = localTimeToUTC timeZone <$> proposalExpiryDate,
proposalResponseExpiryEpochNo = proposalExpiryEpochNo,
- proposalResponseCreatedDate = proposalCreatedDate,
+ proposalResponseCreatedDate = localTimeToUTC timeZone proposalCreatedDate,
proposalResponseCreatedEpochNo = proposalCreatedEpochNo,
proposalResponseUrl = proposalUrl,
proposalResponseMetadataHash = HexText proposalDocHash,
+ proposalResponseProtocolParams = ProtocolParams <$> proposalProtocolParams,
proposalResponseTitle = proposalTitle,
proposalResponseAbstract = proposalAbstract,
proposalResponseMotivation = proposalMotivation,
proposalResponseRationale = proposalRationale,
- proposalResponseYesVotes = proposalYesVotes,
- proposalResponseNoVotes = proposalNoVotes,
- proposalResponseAbstainVotes = proposalAbstainVotes
+ proposalResponseDRepYesVotes = proposalDRepYesVotes,
+ proposalResponseDRepNoVotes = proposalDRepNoVotes,
+ proposalResponseDRepAbstainVotes = proposalDRepAbstainVotes,
+ proposalResponsePoolYesVotes = proposalPoolYesVotes,
+ proposalResponsePoolNoVotes = proposalPoolNoVotes,
+ proposalResponsePoolAbstainVotes = proposalPoolAbstainVotes,
+ proposalResponseCcYesVotes = proposalCcYesVotes,
+ proposalResponseCcNoVotes = proposalCcNoVotes,
+ proposalResponseCcAbstainVotes = proposalCcAbstainVotes,
+ proposalResponsePrevGovActionIndex = proposalPrevGovActionIndex,
+ proposalResponsePrevGovActionTxHash = HexText <$> proposalPrevGovActionTxHash
}
voteToResponse :: Types.Vote -> VoteParams
@@ -222,7 +240,9 @@ mapSortAndFilterProposals
-> [Types.Proposal]
-> m [ProposalResponse]
mapSortAndFilterProposals selectedTypes sortMode proposals = do
- let mappedProposals = map proposalToResponse proposals
+ timeZone <- liftIO getCurrentTimeZone
+
+ let mappedProposals = map (proposalToResponse timeZone) proposals
let filteredProposals =
if null selectedTypes
then mappedProposals
@@ -232,11 +252,14 @@ mapSortAndFilterProposals selectedTypes sortMode proposals = do
proposalResponseType `elem` selectedTypes
)
mappedProposals
+
+ let totalYesVotes (ProposalResponse{..}) = proposalResponseDRepYesVotes + proposalResponsePoolYesVotes + proposalResponseCcYesVotes
+
let sortedProposals = case sortMode of
Nothing -> filteredProposals
Just NewestCreated -> sortOn (Down . proposalResponseCreatedDate) filteredProposals
Just SoonestToExpire -> sortOn proposalResponseExpiryDate filteredProposals
- Just MostYesVotes -> sortOn (Down . proposalResponseYesVotes) filteredProposals
+ Just MostYesVotes -> sortOn (Down . totalYesVotes) filteredProposals
return sortedProposals
getVotes :: App m => HexText -> [GovernanceActionType] -> Maybe GovernanceActionSortMode -> Maybe Text -> m [VoteResponse]
@@ -270,6 +293,13 @@ drepInfo (unHexText -> dRepId) = do
, dRepInfoResponseDRepRetireTxHash = HexText <$> dRepInfoDRepRetireTx
, dRepInfoResponseSoleVoterRegisterTxHash = HexText <$> dRepInfoSoleVoterRegisterTx
, dRepInfoResponseSoleVoterRetireTxHash = HexText <$> dRepInfoSoleVoterRetireTx
+ , dRepInfoResponsePaymentAddress = dRepInfoPaymentAddress
+ , dRepInfoResponseGivenName = dRepInfoGivenName
+ , dRepInfoResponseObjectives = dRepInfoObjectives
+ , dRepInfoResponseMotivations = dRepInfoMotivations
+ , dRepInfoResponseQualifications = dRepInfoQualifications
+ , dRepInfoResponseImageUrl = dRepInfoImageUrl
+ , dRepInfoResponseImageHash = HexText <$> dRepInfoImageHash
}
getCurrentDelegation :: App m => HexText -> m (Maybe DelegationResponse)
@@ -346,7 +376,10 @@ getProposal g@(GovActionId govActionTxHash govActionIndex) mDrepId' = do
let mDrepId = unHexText <$> mDrepId'
CacheEnv {getProposalCache} <- asks vvaCache
proposal@Types.Proposal {proposalUrl, proposalDocHash} <- cacheRequest getProposalCache (unHexText govActionTxHash, govActionIndex) (Proposal.getProposal (unHexText govActionTxHash) govActionIndex)
- let proposalResponse = proposalToResponse proposal
+
+ timeZone <- liftIO getCurrentTimeZone
+
+ let proposalResponse = proposalToResponse timeZone proposal
voteResponse <- case mDrepId of
Nothing -> return Nothing
Just drepId -> do
diff --git a/govtool/backend/src/VVA/API/Types.hs b/govtool/backend/src/VVA/API/Types.hs
index a2c410d6..308c1766 100644
--- a/govtool/backend/src/VVA/API/Types.hs
+++ b/govtool/backend/src/VVA/API/Types.hs
@@ -111,103 +111,6 @@ instance ToSchema AnyValue where
& example
?~ toJSON exampleAnyValue
-data MetadataValidationStatus = IncorrectFormat | IncorrectJSONLD | IncorrectHash | UrlNotFound deriving
- ( Eq
- , Show
- )
-
-instance ToJSON MetadataValidationStatus where
- toJSON IncorrectFormat = "INCORRECT_FORMTAT"
- toJSON IncorrectJSONLD = "INVALID_JSONLD"
- toJSON IncorrectHash = "INVALID_HASH"
- toJSON UrlNotFound = "URL_NOT_FOUND"
-
-instance FromJSON MetadataValidationStatus where
- parseJSON (String s) = case s of
- "INCORRECT_FORMTAT" -> pure IncorrectFormat
- "INVALID_JSONLD" -> pure IncorrectJSONLD
- "INVALID_HASH" -> pure IncorrectHash
- "URL_NOT_FOUND" -> pure UrlNotFound
- _ -> fail "Invalid MetadataValidationStatus"
- parseJSON _ = fail "Invalid MetadataValidationStatus"
-
-instance ToSchema MetadataValidationStatus where
- declareNamedSchema _ = pure $ NamedSchema (Just "MetadataValidationStatus") $ mempty
- & type_ ?~ OpenApiString
- & description ?~ "Metadata Validation Status"
- & enum_ ?~ map toJSON [IncorrectFormat, IncorrectJSONLD, IncorrectHash, UrlNotFound]
-
-
-
-data InternalMetadataValidationResponse
- = InternalMetadataValidationResponse
- { internalMetadataValidationResponseStatus :: Maybe MetadataValidationStatus
- , internalMmetadataValidationResponseValid :: Bool
- }
- deriving (Generic, Show)
-
-deriveJSON (jsonOptions "internalMetadataValidationResponse") ''InternalMetadataValidationResponse
-
-instance ToSchema InternalMetadataValidationResponse where
- declareNamedSchema _ = do
- NamedSchema name_ schema_ <-
- genericDeclareNamedSchema
- ( fromAesonOptions $ jsonOptions "internalMetadataValidationResponse" )
- (Proxy :: Proxy InternalMetadataValidationResponse)
- return $
- NamedSchema name_ $
- schema_
- & description ?~ "Metadata Validation Response"
- & example
- ?~ toJSON ("{\"status\": \"INCORRECT_FORMTAT\", \"valid\":false, \"raw\":{\"some\":\"key\"}}" :: Text)
-
-
-data MetadataValidationResponse
- = MetadataValidationResponse
- { metadataValidationResponseStatus :: Maybe Text
- , metadataValidationResponseValid :: Bool
- }
- deriving (Generic, Show)
-
-deriveJSON (jsonOptions "metadataValidationResponse") ''MetadataValidationResponse
-
-instance ToSchema MetadataValidationResponse where
- declareNamedSchema _ = do
- NamedSchema name_ schema_ <-
- genericDeclareNamedSchema
- ( fromAesonOptions $ jsonOptions "metadataValidationResponse" )
- (Proxy :: Proxy MetadataValidationResponse)
- return $
- NamedSchema name_ $
- schema_
- & description ?~ "Metadata Validation Response"
- & example
- ?~ toJSON ("{\"status\": \"INCORRECT_FORMTAT\", \"valid\":false}" :: Text)
-
-data MetadataValidationParams
- = MetadataValidationParams
- { metadataValidationParamsUrl :: Text
- , metadataValidationParamsHash :: HexText
- }
- deriving (Generic, Show)
-
-deriveJSON (jsonOptions "metadataValidationParams") ''MetadataValidationParams
-
-instance ToSchema MetadataValidationParams where
- declareNamedSchema proxy = do
- NamedSchema name_ schema_ <-
- genericDeclareNamedSchema
- ( fromAesonOptions $ jsonOptions "metadataValidationParams" )
- proxy
- return $
- NamedSchema name_ $
- schema_
- & description ?~ "Metadata Validation Params"
- & example
- ?~ toJSON ("{\"url\": \"https://metadata.xyz\", \"hash\": \"9af10e89979e51b8cdc827c963124a1ef4920d1253eef34a1d5cfe76438e3f11\"}" :: Text)
-
-
-
data GovActionId
= GovActionId
{ govActionIdTxHash :: HexText
@@ -414,6 +317,45 @@ instance ToSchema GovernanceActionMetadata where
?~ toJSON
("{\"some_key\": \"some value\", \"some_key2\": [1,2,3]}" :: Text)
+newtype GetCurrentEpochParamsResponse
+ = GetCurrentEpochParamsResponse { getCurrentEpochParamsResponse :: Maybe Value }
+ deriving newtype (Show)
+
+instance FromJSON GetCurrentEpochParamsResponse where
+ parseJSON = pure . GetCurrentEpochParamsResponse . Just
+
+instance ToJSON GetCurrentEpochParamsResponse where
+ toJSON (GetCurrentEpochParamsResponse Nothing) = Null
+ toJSON (GetCurrentEpochParamsResponse (Just params)) = toJSON params
+
+exampleGetCurrentEpochParamsResponse :: Text
+exampleGetCurrentEpochParamsResponse =
+ "{ \"id\":90,\"epoch_no\":90,\"min_fee_a\":44,\"min_fee_b\":155381,\"max_block_size\":90112,\"max_tx_size\":16384,\"max_bh_size\":1100,\"key_deposit\":2000000,\"pool_deposit\":500000000,\"max_epoch\":18,\"optimal_pool_count\":5\r\n00,\"influence\":0.3,\"monetary_expand_rate\":0.003,\"treasury_growth_rate\":0.2,\"decentralisation\":0,\"protocol_major\":8,\"protocol_minor\":0,\"min_utxo_value\":0,\"min_pool_cost\":340000000,\"nonce\":\"\\\\x664c2d0eedc1c\r\n9ee7fc8b4f242c8d13ba17fd31454c84357fa8f1ac62f682cf9\",\"cost_model_id\":2,\"price_mem\":0.0577,\"price_step\":7.21e-05,\"max_tx_ex_mem\":14000000,\"max_tx_ex_steps\":10000000000,\"max_block_ex_mem\":62000000,\"max_bloc\r\nk_ex_steps\":20000000000,\"max_val_size\":5000,\"collateral_percent\":150,\"max_collateral_inputs\":3,\"block_id\":387943,\"extra_entropy\":null,\"coins_per_utxo_size\":4310}"
+
+instance ToSchema GetCurrentEpochParamsResponse where
+ declareNamedSchema _ = pure $ NamedSchema (Just "GetCurrentEpochParamsResponse") $ mempty
+ & type_ ?~ OpenApiObject
+ & description ?~ "Protocol parameters encoded as JSON"
+ & example
+ ?~ toJSON exampleGetCurrentEpochParamsResponse
+
+
+newtype ProtocolParams
+ = ProtocolParams { getProtocolParams :: Value }
+ deriving newtype (Show)
+
+instance FromJSON ProtocolParams where
+ parseJSON = pure . ProtocolParams
+
+instance ToJSON ProtocolParams where
+ toJSON (ProtocolParams params) = toJSON params
+
+instance ToSchema ProtocolParams where
+ declareNamedSchema _ = pure $ NamedSchema (Just "ProtocolParams") $ mempty
+ & type_ ?~ OpenApiObject
+ & description ?~ "Protocol parameters encoded as JSON"
+ & example
+ ?~ toJSON exampleGetCurrentEpochParamsResponse
newtype GovernanceActionReferences
@@ -435,28 +377,35 @@ instance ToSchema GovernanceActionReferences where
?~ toJSON
("[{\"uri\": \"google.com\", \"@type\": \"Other\", \"label\": \"example label\"}]" :: Text)
-
-
data ProposalResponse
= ProposalResponse
- { proposalResponseId :: Text
- , proposalResponseTxHash :: HexText
- , proposalResponseIndex :: Integer
- , proposalResponseType :: GovernanceActionType
- , proposalResponseDetails :: Maybe GovernanceActionDetails
- , proposalResponseExpiryDate :: Maybe UTCTime
- , proposalResponseExpiryEpochNo :: Maybe Integer
- , proposalResponseCreatedDate :: UTCTime
- , proposalResponseCreatedEpochNo :: Integer
- , proposalResponseUrl :: Text
- , proposalResponseMetadataHash :: HexText
- , proposalResponseTitle :: Maybe Text
- , proposalResponseAbstract :: Maybe Text
- , proposalResponseMotivation :: Maybe Text
- , proposalResponseRationale :: Maybe Text
- , proposalResponseYesVotes :: Integer
- , proposalResponseNoVotes :: Integer
- , proposalResponseAbstainVotes :: Integer
+ { proposalResponseId :: Text
+ , proposalResponseTxHash :: HexText
+ , proposalResponseIndex :: Integer
+ , proposalResponseType :: GovernanceActionType
+ , proposalResponseDetails :: Maybe GovernanceActionDetails
+ , proposalResponseExpiryDate :: Maybe UTCTime
+ , proposalResponseExpiryEpochNo :: Maybe Integer
+ , proposalResponseCreatedDate :: UTCTime
+ , proposalResponseCreatedEpochNo :: Integer
+ , proposalResponseUrl :: Text
+ , proposalResponseMetadataHash :: HexText
+ , proposalResponseProtocolParams :: Maybe ProtocolParams
+ , proposalResponseTitle :: Maybe Text
+ , proposalResponseAbstract :: Maybe Text
+ , proposalResponseMotivation :: Maybe Text
+ , proposalResponseRationale :: Maybe Text
+ , proposalResponseDRepYesVotes :: Integer
+ , proposalResponseDRepNoVotes :: Integer
+ , proposalResponseDRepAbstainVotes :: Integer
+ , proposalResponsePoolYesVotes :: Integer
+ , proposalResponsePoolNoVotes :: Integer
+ , proposalResponsePoolAbstainVotes :: Integer
+ , proposalResponseCcYesVotes :: Integer
+ , proposalResponseCcNoVotes :: Integer
+ , proposalResponseCcAbstainVotes :: Integer
+ , proposalResponsePrevGovActionIndex :: Maybe Integer
+ , proposalResponsePrevGovActionTxHash :: Maybe HexText
}
deriving (Generic, Show)
@@ -474,13 +423,22 @@ exampleProposalResponse = "{ \"id\": \"proposalId123\","
<> "\"createdEpochNo\": 0,"
<> "\"url\": \"https://proposal.metadata.xyz\","
<> "\"metadataHash\": \"9af10e89979e51b8cdc827c963124a1ef4920d1253eef34a1d5cfe76438e3f11\","
+ <> "\"protocolParams\": " <> exampleGetCurrentEpochParamsResponse <> ","
<> "\"title\": \"Proposal Title\","
<> "\"abstract\": \"Proposal About\","
<> "\"motivation\": \"Proposal Motivation\","
<> "\"rationale\": \"Proposal Rationale\","
- <> "\"yesVotes\": 0,"
- <> "\"noVotes\": 0,"
- <> "\"abstainVotes\": 0}"
+ <> "\"dRepYesVotes\": 0,"
+ <> "\"dRepNoVotes\": 0,"
+ <> "\"dRepAbstainVotes\": 0,"
+ <> "\"poolYesVotes\": 0,"
+ <> "\"poolNoVotes\": 0,"
+ <> "\"poolAbstainVotes\": 0,"
+ <> "\"cCYesVotes\": 0,"
+ <> "\"cCNoVotes\": 0,"
+ <> "\"cCAbstainVotes\": 0,"
+ <> "\"prevGovActionIndex\": 0,"
+ <> "\"prevGovActionTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\"}"
instance ToSchema ProposalResponse where
declareNamedSchema proxy = do
@@ -615,6 +573,13 @@ data DRepInfoResponse
, dRepInfoResponseDRepRetireTxHash :: Maybe HexText
, dRepInfoResponseSoleVoterRegisterTxHash :: Maybe HexText
, dRepInfoResponseSoleVoterRetireTxHash :: Maybe HexText
+ , dRepInfoResponsePaymentAddress :: Maybe Text
+ , dRepInfoResponseGivenName :: Maybe Text
+ , dRepInfoResponseObjectives :: Maybe Text
+ , dRepInfoResponseMotivations :: Maybe Text
+ , dRepInfoResponseQualifications :: Maybe Text
+ , dRepInfoResponseImageUrl :: Maybe Text
+ , dRepInfoResponseImageHash :: Maybe HexText
}
deriving (Generic, Show)
@@ -633,7 +598,14 @@ exampleDRepInfoResponse =
<> "\"dRepRegisterTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\","
<> "\"dRepRetireTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\","
<> "\"soleVoterRegisterTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\","
- <> "\"soleVoterRetireTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\"}"
+ <> "\"soleVoterRetireTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\","
+ <> "\"paymentAddress\": \"addr1qy49kr45ue0wq78d34dpg79syx3yekxryjadv9ykzczhjwm09pmyt6f6xvq5x9yah2vrxyg0np44ynm6n7hzafl2rqxs4v6nn3\","
+ <> "\"givenName\": \"John Doe\","
+ <> "\"objectives\": \"Objectives of the DRep\","
+ <> "\"motivations\": \"Motivations of the DRep\","
+ <> "\"qualifications\": \"Qualifications of the DRep\","
+ <> "\"imageUrl\": \"https://drep.image.xyz\","
+ <> "\"imageHash\": \"9af10e89979e51b8cdc827c963124a1ef4920d1253eef34a1d5cfe76438e3f11\"}"
instance ToSchema DRepInfoResponse where
declareNamedSchema proxy = do
@@ -648,7 +620,6 @@ instance ToSchema DRepInfoResponse where
& example
?~ toJSON exampleDRepInfoResponse
-
data GetProposalResponse
= GetProposalResponse
{ getProposalResponseVote :: Maybe VoteParams
@@ -661,7 +632,6 @@ exampleGetProposalResponse =
"{\"vote\": " <> exampleVoteParams <> ","
<> "\"proposal\": " <> exampleProposalResponse <> "}"
-
deriveJSON (jsonOptions "getProposalResponse") ''GetProposalResponse
instance ToSchema GetProposalResponse where
@@ -679,29 +649,6 @@ instance ToSchema GetProposalResponse where
& example
?~ toJSON exampleGetProposalResponse
-
-newtype GetCurrentEpochParamsResponse
- = GetCurrentEpochParamsResponse { getCurrentEpochParamsResponse :: Maybe Value }
- deriving newtype (Show)
-
-instance FromJSON GetCurrentEpochParamsResponse where
- parseJSON = pure . GetCurrentEpochParamsResponse . Just
-
-instance ToJSON GetCurrentEpochParamsResponse where
- toJSON (GetCurrentEpochParamsResponse Nothing) = Null
- toJSON (GetCurrentEpochParamsResponse (Just params)) = toJSON params
-
-exampleGetCurrentEpochParamsResponse :: Text
-exampleGetCurrentEpochParamsResponse =
- "{ \"id\":90,\"epoch_no\":90,\"min_fee_a\":44,\"min_fee_b\":155381,\"max_block_size\":90112,\"max_tx_size\":16384,\"max_bh_size\":1100,\"key_deposit\":2000000,\"pool_deposit\":500000000,\"max_epoch\":18,\"optimal_pool_count\":5\r\n00,\"influence\":0.3,\"monetary_expand_rate\":0.003,\"treasury_growth_rate\":0.2,\"decentralisation\":0,\"protocol_major\":8,\"protocol_minor\":0,\"min_utxo_value\":0,\"min_pool_cost\":340000000,\"nonce\":\"\\\\x664c2d0eedc1c\r\n9ee7fc8b4f242c8d13ba17fd31454c84357fa8f1ac62f682cf9\",\"cost_model_id\":2,\"price_mem\":0.0577,\"price_step\":7.21e-05,\"max_tx_ex_mem\":14000000,\"max_tx_ex_steps\":10000000000,\"max_block_ex_mem\":62000000,\"max_bloc\r\nk_ex_steps\":20000000000,\"max_val_size\":5000,\"collateral_percent\":150,\"max_collateral_inputs\":3,\"block_id\":387943,\"extra_entropy\":null,\"coins_per_utxo_size\":4310}"
-
-instance ToSchema GetCurrentEpochParamsResponse where
- declareNamedSchema _ = pure $ NamedSchema (Just "GetCurrentEpochParamsResponse") $ mempty
- & type_ ?~ OpenApiObject
- & description ?~ "Protocol parameters encoded as JSON"
- & example
- ?~ toJSON exampleGetCurrentEpochParamsResponse
-
newtype GetTransactionStatusResponse
= GetTransactionStatusResponse { getTransactionstatusResponseTransactionConfirmed :: Bool }
deriving (Generic, Show)
@@ -784,8 +731,6 @@ instance ToParamSchema DRepStatus where
& type_ ?~ OpenApiString
& enum_ ?~ map toJSON (enumFromTo minBound maxBound :: [DRepStatus])
-
-
data DRepType = NormalDRep | SoleVoter
instance Show DRepType where
@@ -823,6 +768,13 @@ data DRep
, dRepType :: DRepType
, dRepLatestTxHash :: Maybe HexText
, dRepLatestRegistrationDate :: UTCTime
+ , dRepPaymentAddress :: Maybe Text
+ , dRepGivenName :: Maybe Text
+ , dRepObjectives :: Maybe Text
+ , dRepMotivations :: Maybe Text
+ , dRepQualifications :: Maybe Text
+ , dRepImageUrl :: Maybe Text
+ , dRepImageHash :: Maybe HexText
}
deriving (Generic, Show)
@@ -840,7 +792,15 @@ exampleDrep =
<> "\"status\": \"Active\","
<> "\"type\": \"DRep\","
<> "\"latestTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\","
- <> "\"latestRegistrationDate\": \"1970-01-01T00:00:00Z\"}"
+ <> "\"latestRegistrationDate\": \"1970-01-01T00:00:00Z\","
+ <> "\"paymentAddress\": \"addr1qy49kr45ue0wq78d34dpg79syx3yekxryjadv9ykzczhjwm09pmyt6f6xvq5x9yah2vrxyg0np44ynm6n7hzafl2rqxs4v6nn3\","
+ <> "\"givenName\": \"John Doe\","
+ <> "\"objectives\": \"Some Objectives\","
+ <> "\"motivations\": \"Some Motivations\","
+ <> "\"qualifications\": \"Some Qualifications\","
+ <> "\"qualifications\": \"Some Qualifications\","
+ <> "\"imageUrl\": \"https://image.url\","
+ <> "\"imageHash\": \"9198b1b204273ba5c67a13310b5a806034160f6a063768297e161d9b759cad61\"}"
-- ToSchema instance for DRep
instance ToSchema DRep where
diff --git a/govtool/backend/src/VVA/DRep.hs b/govtool/backend/src/VVA/DRep.hs
index 07b20408..fd262bc9 100644
--- a/govtool/backend/src/VVA/DRep.hs
+++ b/govtool/backend/src/VVA/DRep.hs
@@ -61,8 +61,26 @@ listDReps = withPool $ \conn -> do
results <- liftIO $ SQL.query_ conn listDRepsSql
timeZone <- liftIO getCurrentTimeZone
return
- [ DRepRegistration drepHash drepView url dataHash (floor @Scientific deposit) votingPower status drepType txHash (localTimeToUTC timeZone date)
- | (drepHash, drepView, url, dataHash, deposit, votingPower, isActive, txHash, date, latestDeposit, latestNonDeregisterVotingAnchorWasNotNull) <- results
+ [ DRepRegistration drepHash drepView url dataHash (floor @Scientific deposit) votingPower status drepType txHash (localTimeToUTC timeZone date) paymentAddress givenName objectives motivations qualifications imageUrl imageHash
+ | ( drepHash
+ , drepView
+ , url
+ , dataHash
+ , deposit
+ , votingPower
+ , isActive
+ , txHash
+ , date
+ , latestDeposit
+ , latestNonDeregisterVotingAnchorWasNotNull
+ , paymentAddress
+ , givenName
+ , objectives
+ , motivations
+ , qualifications
+ , imageUrl
+ , imageHash
+ ) <- results
, let status = case (isActive, deposit) of
(_, d) | d < 0 -> Retired
(isActive, d) | d >= 0 && isActive -> Active
@@ -125,6 +143,13 @@ getDRepInfo drepId = withPool $ \conn -> do
, drepRetireTx
, soleVoterRegisterTx
, soleVoterRetireTx
+ , paymentAddress
+ , givenName
+ , objectives
+ , motivations
+ , qualifications
+ , imageUrl
+ , imageHash
)] ->
return $ DRepInfo
{ dRepInfoIsRegisteredAsDRep = fromMaybe False isRegisteredAsDRep
@@ -139,5 +164,12 @@ getDRepInfo drepId = withPool $ \conn -> do
, dRepInfoDRepRetireTx = drepRetireTx
, dRepInfoSoleVoterRegisterTx = soleVoterRegisterTx
, dRepInfoSoleVoterRetireTx = soleVoterRetireTx
+ , dRepInfoPaymentAddress = paymentAddress
+ , dRepInfoGivenName = givenName
+ , dRepInfoObjectives = objectives
+ , dRepInfoMotivations = motivations
+ , dRepInfoQualifications = qualifications
+ , dRepInfoImageUrl = imageUrl
+ , dRepInfoImageHash = imageHash
}
- [] -> return $ DRepInfo False False False False Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
+ [] -> return $ DRepInfo False False False False Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
diff --git a/govtool/backend/src/VVA/Proposal.hs b/govtool/backend/src/VVA/Proposal.hs
index b68074e0..bc9fb6a2 100644
--- a/govtool/backend/src/VVA/Proposal.hs
+++ b/govtool/backend/src/VVA/Proposal.hs
@@ -64,53 +64,7 @@ getProposals ::
(Has ConnectionPool r, Has VVAConfig r, MonadReader r m, MonadIO m, MonadFail m, MonadError AppError m) =>
Maybe [Text] ->
m [Proposal]
-getProposals mProposalIds = withPool $ \conn -> do
- proposalResults <- liftIO $ case mProposalIds of
+getProposals mProposalIds = withPool $ \conn ->
+ liftIO $ case mProposalIds of
Nothing -> SQL.query @(Bool, SQL.In [Text]) conn listProposalsSql (False, SQL.In [])
Just proposalIds -> SQL.query conn listProposalsSql (True, SQL.In proposalIds)
-
- timeZone <- liftIO getCurrentTimeZone
- return $ map
- ( \( id'
- , txHash'
- , index'
- , type'
- , details'
- , expiryDate'
- , expiryEpochNo'
- , createdDate'
- , createdEpochNo'
- , url'
- , docHash'
- , title'
- , about'
- , motivation'
- , rationale'
- , yesVotes'
- , noVotes'
- , abstainVotes'
- ) ->
- let eDate = localTimeToUTC timeZone <$> expiryDate'
- cDate = localTimeToUTC timeZone createdDate'
- in
- Proposal
- id'
- txHash'
- (floor @Scientific index')
- type'
- details'
- eDate
- expiryEpochNo'
- cDate
- createdEpochNo'
- url'
- docHash'
- title'
- about'
- motivation'
- rationale'
- (floor @Scientific yesVotes')
- (floor @Scientific noVotes')
- (floor @Scientific abstainVotes')
- )
- proposalResults
diff --git a/govtool/backend/src/VVA/Types.hs b/govtool/backend/src/VVA/Types.hs
index c23eae9f..d3965ff3 100644
--- a/govtool/backend/src/VVA/Types.hs
+++ b/govtool/backend/src/VVA/Types.hs
@@ -3,6 +3,7 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE TypeApplications #-}
module VVA.Types where
@@ -18,9 +19,11 @@ import qualified Data.Cache as Cache
import Data.Has
import Data.Pool (Pool)
import Data.Text (Text)
-import Data.Time (UTCTime)
+import Data.Time (UTCTime, LocalTime)
+import Data.Scientific
import Database.PostgreSQL.Simple (Connection)
+import Database.PostgreSQL.Simple.FromRow
import VVA.Cache
import VVA.Config
@@ -81,6 +84,13 @@ data DRepInfo
, dRepInfoDRepRetireTx :: Maybe Text
, dRepInfoSoleVoterRegisterTx :: Maybe Text
, dRepInfoSoleVoterRetireTx :: Maybe Text
+ , dRepInfoPaymentAddress :: Maybe Text
+ , dRepInfoGivenName :: Maybe Text
+ , dRepInfoObjectives :: Maybe Text
+ , dRepInfoMotivations :: Maybe Text
+ , dRepInfoQualifications :: Maybe Text
+ , dRepInfoImageUrl :: Maybe Text
+ , dRepInfoImageHash :: Maybe Text
}
data DRepStatus = Active | Inactive | Retired deriving (Eq, Ord)
@@ -99,31 +109,78 @@ data DRepRegistration
, dRepRegistrationType :: DRepType
, dRepRegistrationLatestTxHash :: Maybe Text
, dRepRegistrationLatestRegistrationDate :: UTCTime
+ , dRepRegistrationPaymentAddress :: Maybe Text
+ , dRepRegistrationGivenName :: Maybe Text
+ , dRepRegistrationObjectives :: Maybe Text
+ , dRepRegistrationMotivations :: Maybe Text
+ , dRepRegistrationQualifications :: Maybe Text
+ , dRepRegistrationImageUrl :: Maybe Text
+ , dRepRegistrationImageHash :: Maybe Text
}
data Proposal
= Proposal
- { proposalId :: Integer
- , proposalTxHash :: Text
- , proposalIndex :: Integer
- , proposalType :: Text
- , proposalDetails :: Maybe Value
- , proposalExpiryDate :: Maybe UTCTime
- , proposalExpiryEpochNo :: Maybe Integer
- , proposalCreatedDate :: UTCTime
- , proposalCreatedEpochNo :: Integer
- , proposalUrl :: Text
- , proposalDocHash :: Text
- , proposalTitle :: Maybe Text
- , proposalAbstract :: Maybe Text
- , proposalMotivation :: Maybe Text
- , proposalRationale :: Maybe Text
- , proposalYesVotes :: Integer
- , proposalNoVotes :: Integer
- , proposalAbstainVotes :: Integer
+ { proposalId :: Integer
+ , proposalTxHash :: Text
+ , proposalIndex :: Integer
+ , proposalType :: Text
+ , proposalDetails :: Maybe Value
+ , proposalExpiryDate :: Maybe LocalTime
+ , proposalExpiryEpochNo :: Maybe Integer
+ , proposalCreatedDate :: LocalTime
+ , proposalCreatedEpochNo :: Integer
+ , proposalUrl :: Text
+ , proposalDocHash :: Text
+ , proposalProtocolParams :: Maybe Value
+ , proposalTitle :: Maybe Text
+ , proposalAbstract :: Maybe Text
+ , proposalMotivation :: Maybe Text
+ , proposalRationale :: Maybe Text
+ , proposalDRepYesVotes :: Integer
+ , proposalDRepNoVotes :: Integer
+ , proposalDRepAbstainVotes :: Integer
+ , proposalPoolYesVotes :: Integer
+ , proposalPoolNoVotes :: Integer
+ , proposalPoolAbstainVotes :: Integer
+ , proposalCcYesVotes :: Integer
+ , proposalCcNoVotes :: Integer
+ , proposalCcAbstainVotes :: Integer
+ , proposalPrevGovActionIndex :: Maybe Integer
+ , proposalPrevGovActionTxHash :: Maybe Text
}
deriving (Show)
+instance FromRow Proposal where
+ fromRow =
+ Proposal
+ <$> field
+ <*> field
+ <*> (floor @Scientific <$> field)
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> field
+ <*> (floor @Scientific <$> field)
+ <*> (floor @Scientific <$> field)
+ <*> (floor @Scientific <$> field)
+ <*> (floor @Scientific <$> field)
+ <*> (floor @Scientific <$> field)
+ <*> (floor @Scientific <$> field)
+ <*> (floor @Scientific <$> field)
+ <*> (floor @Scientific <$> field)
+ <*> (floor @Scientific <$> field)
+ <*> field
+ <*> field
+
data TransactionStatus = TransactionConfirmed | TransactionUnconfirmed
data CacheEnv
diff --git a/govtool/backend/vva-be.cabal b/govtool/backend/vva-be.cabal
index 022b13ac..97e5c569 100644
--- a/govtool/backend/vva-be.cabal
+++ b/govtool/backend/vva-be.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.6
name: vva-be
-version: 1.0.13
+version: 1.0.17
-- A short (one-line) description of the package.
-- synopsis:
diff --git a/govtool/frontend/index.html b/govtool/frontend/index.html
index e3ff6728..8032b4a3 100644
--- a/govtool/frontend/index.html
+++ b/govtool/frontend/index.html
@@ -10,7 +10,7 @@
rel="stylesheet"
/>
- Voltaire Govtool
+ Cardano Govtool