Merge pull request #1480 from input-output-hk/fix/LW-9675-conway-era-fixes

LW-9675 conway era fixes

Author: iccicci

packages/cardano-services/src/ChainHistory/DbSyncChainHistory/ChainHistoryBuilder.ts

@@ -1,4 +1,4 @@
-// cSpell:ignore descr
+// cSpell:ignore descr timelock
 
 import * as Queries from './queries';
 import {
@@ -60,6 +60,7 @@ import orderBy from 'lodash/orderBy.js';
 
 const {
   CredentialType,
+  FractionUtils,
   GovernanceActionType,
   NetworkId: { Mainnet, Testnet },
   RewardAccount,
@@ -77,26 +78,15 @@ const mapWithdrawals: (source: [{ credential: DbSyncCredential; network: string
   rewardAccount: Cardano.RewardAccount;
   coin: Cardano.Lovelace;
 } = ([{ credential, network }, coin]) => ({
-  // Due to https://github.com/IntersectMBO/cardano-db-sync/issues/1614
-  // this will be source of NOT CORRECT AMOUNT for amounts greater than
-  // Number.MAX_SAFE_INTEGER (most likely, never).
-  // In case such amount will be present in some networks before db-sync solve the
-  // issue, we need to query the amount from treasury_withdrawal table.
-  // In case the issue is solved before we need to touch this again, the next line
-  // will work as well and we just need to remove this comment.
   coin: BigInt(coin),
   rewardAccount: RewardAccount.fromCredential(
     credentialFromDbSync(credential),
     network === 'Mainnet' ? Mainnet : Testnet
   )
 });
 
-// eslint-disable-next-line sonarjs/cognitive-complexity, complexity
-const getGovernanceAction = ({
-  denominator,
-  description,
-  numerator
-}: ProposalProcedureModel): Cardano.GovernanceAction => {
+// eslint-disable-next-line complexity, @typescript-eslint/no-explicit-any
+const getGovernanceAction = (description: any): Cardano.GovernanceAction => {
   const { contents, tag } = description;
   const governanceActionId =
     contents && contents[0] ? { actionIndex: contents[0].govActionIx, id: contents[0].txId } : null;
@@ -115,10 +105,7 @@ const getGovernanceAction = ({
     case 'InfoAction':
       return { __typename: GovernanceActionType.info_action };
 
-    case 'NewCommittee':
-      // LW-9675
-      if (typeof contents[3] !== 'number') throw new Error('New db-sync version detected: ref LW-9675');
-
+    case 'UpdateCommittee':
       return {
         __typename: GovernanceActionType.update_committee,
         governanceActionId,
@@ -128,11 +115,8 @@ const getGovernanceAction = ({
             epoch: value as Cardano.EpochNo
           }))
         ),
-        membersToBeRemoved: new Set((contents[1] as DbSyncCredential[]).map(credentialFromDbSync)),
-        newQuorumThreshold: {
-          denominator: Number.parseInt(denominator!, 10),
-          numerator: Number.parseInt(numerator!, 10)
-        }
+        membersToBeRemoved: new Set(contents[1].map(credentialFromDbSync)),
+        newQuorumThreshold: typeof contents[3] === 'number' ? FractionUtils.toFraction(contents[3]) : contents[3]
       };
 
     case 'NewConstitution':
@@ -385,7 +369,7 @@ export class ChainHistoryBuilder {
     const result = new Map<Cardano.TransactionId, Cardano.ProposalProcedure[]>();
 
     for (const row of rows) {
-      const { data_hash, deposit, tx_id, url, view } = row;
+      const { data_hash, deposit, description, tx_id, url, view } = row;
       const txId = tx_id.toString('hex') as Cardano.TransactionId;
 
       const actions = (() => {
@@ -399,7 +383,7 @@ export class ChainHistoryBuilder {
       actions.push({
         anchor: mapAnchor(url, data_hash.toString('hex'))!,
         deposit: BigInt(deposit),
-        governanceAction: getGovernanceAction(row),
+        governanceAction: getGovernanceAction(description),
         rewardAccount: Cardano.RewardAccount(view)
       });
     }

packages/cardano-services/src/ChainHistory/DbSyncChainHistory/mappers.ts

@@ -142,10 +142,10 @@ const stubRedeemerData = Buffer.from('not implemented');
 const redeemerPurposeMap: Record<RedeemerModel['purpose'], Cardano.RedeemerPurpose> = {
   cert: Cardano.RedeemerPurpose.certificate,
   mint: Cardano.RedeemerPurpose.mint,
-  proposing: Cardano.RedeemerPurpose.propose,
+  propose: Cardano.RedeemerPurpose.propose,
   reward: Cardano.RedeemerPurpose.withdrawal,
   spend: Cardano.RedeemerPurpose.spend,
-  voting: Cardano.RedeemerPurpose.vote
+  vote: Cardano.RedeemerPurpose.vote
 };
 
 const mapRedeemerPurpose = (purpose: RedeemerModel['purpose']): Cardano.RedeemerPurpose =>
@@ -351,7 +351,7 @@ export const mapCertificate = (
   if (isResignCommitteeColdCertModel(certModel))
     return {
       __typename: Cardano.CertificateType.ResignCommitteeCold,
-      anchor: mapAnchor(certModel.url, certModel.data_hash),
+      anchor: mapAnchor(certModel.url, certModel.data_hash.toString('hex')),
       cert_index: certModel.cert_index,
       coldCredential: {
         hash: certModel.cold_key.toString('hex') as unknown as Crypto.Hash28ByteBase16,

packages/cardano-services/src/ChainHistory/DbSyncChainHistory/queries.ts

@@ -1,3 +1,5 @@
+// cSpell:ignore serialised
+
 export const DB_MAX_SAFE_INTEGER = 2_147_483_647;
 
 const selectTxInput = (collateral?: boolean) => `
@@ -224,14 +226,11 @@ export const findProposalProceduresByTxIds = `
 		ga.description,
 		va.url,
 		va.data_hash,
-		sa.view,
-		quorum_numerator AS numerator,
-		quorum_denominator AS denominator
+		sa.view
 	FROM tx
 	JOIN gov_action_proposal AS ga ON tx.id = ga.tx_id
 	JOIN voting_anchor AS va ON voting_anchor_id = va.id
 	JOIN stake_address AS sa ON ga.return_address = sa.id
-	LEFT JOIN new_committee AS nc ON gov_action_proposal_id = ga.id
 	WHERE tx.id = ANY($1)
 	ORDER BY ga.index`;
 

packages/cardano-services/src/ChainHistory/DbSyncChainHistory/types.ts

@@ -1,3 +1,5 @@
+// cSpell:ignore serialised timelock
+
 import { Cardano } from '@cardano-sdk/core';
 import { CostModelsParamModel } from '../../NetworkInfo/DbSyncNetworkInfoProvider/types';
 
@@ -105,7 +107,7 @@ export interface WithdrawalModel {
 
 export interface RedeemerModel {
   index: number;
-  purpose: 'cert' | 'mint' | 'spend' | 'reward' | 'voting' | 'proposing';
+  purpose: 'cert' | 'mint' | 'spend' | 'reward' | 'vote' | 'propose';
   script_hash: Buffer;
   unit_mem: string;
   unit_steps: string;
@@ -139,9 +141,6 @@ export interface ProposalProcedureModel {
   tx_id: Buffer;
   url: string;
   view: string;
-  // LW-9675
-  numerator?: string;
-  denominator?: string;
 }
 
 export interface CertificateModel {
@@ -235,7 +234,7 @@ export interface ResignCommitteeColdCertModel extends CertificateModel {
   cold_key: Buffer;
   cold_key_has_script: boolean;
   url: string;
-  data_hash: string;
+  data_hash: Buffer;
 }
 
 export interface TxIdModel {

packages/cardano-services/src/ChainHistory/DbSyncChainHistory/util.ts

@@ -86,8 +86,8 @@ export const applyPagination = (ids: Cardano.TransactionId[], { startAt, limit }
  * certificates_.
  *
  * Example: given an array of `reg_cert` and an array of `vote_deleg_cert`, the result is an array of:
- * - all input `reg_cert` which can't be neither `vote_reg_deleg_cert` nor `stake_vote_reg_deleg_cert,
- * - all input `vote_deleg_cert` which can't be neither `vote_reg_deleg_cert` nor `stake_vote_reg_deleg_cert,
+ * - all input `reg_cert` which can be neither `vote_reg_deleg_cert` nor `stake_vote_reg_deleg_cert`,
+ * - all input `vote_deleg_cert` which can be neither `vote_reg_deleg_cert` nor `stake_vote_reg_deleg_cert`,
  * - the array of `vote_reg_deleg_cert` (it includes also the partials `stake_vote_reg_deleg_cert`)
  *
  * @param certs1 the first certificates array

packages/cardano-services/test/ChainHistory/DbSyncChainHistoryProvider/mappers.test.ts

@@ -467,8 +467,8 @@ describe('chain history mappers', () => {
       ['mint' as const, Cardano.RedeemerPurpose.mint],
       ['cert' as const, Cardano.RedeemerPurpose.certificate],
       ['reward' as const, Cardano.RedeemerPurpose.withdrawal],
-      ['voting' as const, Cardano.RedeemerPurpose.vote],
-      ['proposing' as const, Cardano.RedeemerPurpose.propose]
+      ['vote' as const, Cardano.RedeemerPurpose.vote],
+      ['propose' as const, Cardano.RedeemerPurpose.propose]
     ])("maps '%p' redeemer", (dbSyncRedeemerPurpose, sdkRedeemerPurpose) => {
       const result = mappers.mapRedeemer({ ...redeemerModel, purpose: dbSyncRedeemerPurpose });
       expect(result).toEqual<Cardano.Redeemer>({