wip

Author: Ciabas

govtool/backend/sql/list-proposals.sql

@@ -303,7 +303,18 @@ SELECT
     COALESCE(cv.ccNoVotes, 0) cc_no_votes,
     COALESCE(cv.ccAbstainVotes, 0) cc_abstain_votes,
     prev_gov_action.index as prev_gov_action_index,
-    encode(prev_gov_action_tx.hash, 'hex') as prev_gov_action_tx_hash
+    encode(prev_gov_action_tx.hash, 'hex') as prev_gov_action_tx_hash,
+    COALESCE(
+      json_agg(
+        json_build_object(
+          'name', off_chain_vote_author.name,
+          'witness_algorithm', off_chain_vote_author.witness_algorithm,
+          'public_key', off_chain_vote_author.public_key,
+          'signature', off_chain_vote_author.signature
+        )
+      ) FILTER (WHERE off_chain_vote_author.id IS NOT NULL),
+      '[]'
+    ) authors
 FROM
     gov_action_proposal
     JOIN ActiveProposals ON gov_action_proposal.id = ActiveProposals.id
@@ -314,6 +325,7 @@ FROM
     LEFT 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 off_chain_vote_author ON off_chain_vote_author.off_chain_vote_data_id = off_chain_vote_data.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 param_proposal AS proposal_params ON gov_action_proposal.param_proposal = proposal_params.id
     LEFT JOIN cost_model AS cost_model ON proposal_params.cost_model_id = cost_model.id

govtool/backend/src/VVA/API.hs

@@ -244,7 +244,9 @@ proposalToResponse timeZone Types.Proposal {..} =
     proposalResponseCcNoVotes = proposalCcNoVotes,
     proposalResponseCcAbstainVotes = proposalCcAbstainVotes,
     proposalResponsePrevGovActionIndex = proposalPrevGovActionIndex,
-    proposalResponsePrevGovActionTxHash = HexText <$> proposalPrevGovActionTxHash
+    proposalResponsePrevGovActionTxHash = HexText <$> proposalPrevGovActionTxHash,
+    proposalResponseAuthors = proposalAuthors
+    -- proposalResponseAuthors = ProposalAuthors <$> proposalAuthors
   }
 
 voteToResponse :: Types.Vote -> VoteParams

govtool/backend/src/VVA/API/Types.hs

@@ -401,9 +401,39 @@ data ProposalResponse
       , proposalResponseCcAbstainVotes      :: Integer
       , proposalResponsePrevGovActionIndex  :: Maybe Integer
       , proposalResponsePrevGovActionTxHash :: Maybe HexText
+      , proposalResponseAuthors             :: Maybe Value
       }
   deriving (Generic, Show)
 
+-- newtype ProposalAuthors = ProposalAuthors { getProposalAuthors :: Value }
+--   deriving newtype (Show)
+
+-- instance FromJSON ProposalAuthors where
+--   parseJSON v@(Array _) = pure $ ProposalAuthors v
+--   parseJSON _           = fail "ProposalAuthors must be a JSON array"
+
+-- instance ToJSON ProposalAuthors where
+--   toJSON (ProposalAuthors v) = v
+
+-- instance ToSchema ProposalAuthors where
+--   declareNamedSchema _ = pure $ NamedSchema (Just "ProposalAuthors") $ mempty
+--     & type_ ?~ OpenApiArray
+--     & description ?~ "A JSON array of proposal authors"
+--     & example ?~ toJSON
+--         [ object
+--             [ "name" .= ("Alice" :: Text)
+--             , "witness_algorithm" .= ("algo" :: Text)
+--             , "public_key" .= ("key" :: Text)
+--             , "signature" .= ("sig" :: Text)
+--             ]
+--         , object
+--             [ "name" .= ("Bob" :: Text)
+--             , "witness_algorithm" .= ("algo2" :: Text)
+--             , "public_key" .= ("key2" :: Text)
+--             , "signature" .= ("sig2" :: Text)
+--             ]
+--         ]
+
 deriveJSON (jsonOptions "proposalResponse") ''ProposalResponse
 
 exampleProposalResponse :: Text

govtool/backend/src/VVA/Types.hs

@@ -208,6 +208,7 @@ data Proposal
       , proposalCcAbstainVotes        :: Integer
       , proposalPrevGovActionIndex    :: Maybe Integer
       , proposalPrevGovActionTxHash   :: Maybe Text
+      , proposalAuthors               :: Maybe Value
       }
   deriving (Show)
 
@@ -241,6 +242,7 @@ instance FromRow Proposal where
       <*> (floor @Scientific <$> field) -- proposalCcAbstainVotes
       <*> field -- prevGovActionIndex
       <*> field -- prevGovActionTxHash
+      <*> field -- proposalAuthors
 
 data TransactionStatus = TransactionStatus
   { transactionConfirmed         :: Bool

govtool/frontend/src/hooks/queries/useGetProposalQuery.ts

@@ -16,6 +16,8 @@ export const useGetProposalQuery = (proposalId: string, enabled?: boolean) => {
     },
   );
 
+  console.log('useGetProposalQuery', { proposalId, dRepID, data, isLoading, isRefetching, error });
+
   return {
     data,
     isLoading,

govtool/frontend/src/pages/GovernanceActionDetails.tsx

@@ -57,6 +57,8 @@ export const GovernanceActionDetails = () => {
     (data ?? state)?.proposal as ProposalData,
   );
 
+  console.log('GovernanceActionDetails', { extendedProposal, data, state, untypedState });
+
   useEffect(() => {
     if (data?.proposal) {
       setExtendedProposal(data.proposal);

govtool/frontend/src/services/requests/getProposal.ts

@@ -19,5 +19,7 @@ export const getProposal = async (
     `/proposal/get/${encodedHash}?drepId=${drepId}`,
   );
 
+  console.log('-------------------getProposal', { proposalId, drepId, data });
+
   return data;
 };