fix: remove rawProposerAddress, refactor

src/lib/pages/block-details/data.ts

@@ -21,10 +21,13 @@ export const useBlockDataWithValidatorLcd = (
   const validator = useMemo<Nullable<Validator>>(() => {
     if (!blockData || !validators) return null;
 
+    const { proposerAddress } = blockData.block;
+    if (!proposerAddress) return null;
+
     const found = validators.find(
       (each) =>
         consensusPubkeyToHexAddress(each.consensusPubkey) ===
-        toHex(fromBase64(blockData.rawProposerAddress)).toUpperCase()
+        toHex(fromBase64(proposerAddress)).toUpperCase()
     );
     if (!found) return null;
     return {
@@ -43,7 +46,6 @@ export const useBlockDataWithValidatorLcd = (
           },
           transactions: blockData.transactions,
           pagination: blockData.pagination,
-          rawProposerAddress: blockData.rawProposerAddress,
         }
       : undefined,
     isLoading: isLoadingBlockData || isLoadingValidators,

src/lib/services/types/block.ts

@@ -102,7 +102,6 @@ export const zBlockDataResponseLcd = zBlockLcd
     block: BlockData;
     transactions: Transaction[];
     pagination: Pagination;
-    rawProposerAddress: string;
   }>((val) => {
     // 1. Create Tx Hashes
     const txHashes = val.block.data.txs.map(createTxHash);
@@ -144,6 +143,7 @@ export const zBlockDataResponseLcd = zBlockLcd
       height: val.block.header.height,
       timestamp: val.block.header.time,
       proposer: null, // NOTE: Will be filled in the next step
+      proposerAddress: val.block.header.proposerAddress,
       gasLimit: undefined,
       gasUsed: undefined,
     };
@@ -152,7 +152,6 @@ export const zBlockDataResponseLcd = zBlockLcd
       block,
       transactions,
       pagination: val.pagination,
-      rawProposerAddress: val.block.header.proposerAddress,
     };
   });
 

src/lib/types/block.ts

@@ -7,6 +7,7 @@ export interface Block {
   timestamp: Date;
   txCount: number;
   proposer: Nullable<Validator>;
+  proposerAddress?: string; // Base64
 }
 
 export interface BlockData extends Omit<Block, "txCount"> {

src/lib/types/validator.ts

@@ -3,8 +3,10 @@ import { z } from "zod";
 import { snakeToCamel } from "lib/utils/formatter/snakeToCamel";
 import { formatUrl } from "lib/utils/formatter/url";
 
+import type { BechAddr20, ValidatorAddr } from "./addrs";
 import { zBechAddr20, zValidatorAddr } from "./addrs";
 import { zBig } from "./big";
+import type { Nullable, Option } from "./common";
 import { zRatio } from "./currency";
 import type { Ratio } from "./currency";
 
@@ -21,6 +23,26 @@ export const zValidator = z
   }));
 export type Validator = z.infer<typeof zValidator>;
 
+export type ValidatorData = {
+  rank: Nullable<number>;
+  validatorAddress: ValidatorAddr;
+  accountAddress: BechAddr20;
+  identity: string;
+  moniker: string;
+  details: string;
+  commissionRate: Ratio<number>;
+  // NOTE: consensusPubkey is present only in the lcd response
+  consensusPubkey: Option<{
+    "@type": string;
+    key: string;
+  }>;
+  isJailed: boolean;
+  isActive: boolean;
+  votingPower: Big;
+  uptime?: number;
+  website: string;
+};
+
 export const zValidatorData = z
   .object({
     rank: z.number().nullable(),
@@ -36,16 +58,11 @@ export const zValidatorData = z
     uptime: z.number().optional(),
     website: z.string(),
   })
-  .transform(({ website, ...val }) => ({
+  .transform<ValidatorData>(({ website, ...val }) => ({
     ...snakeToCamel(val),
     website: formatUrl(website),
-    // TODO: add from api
-    consensusPubkey: {
-      "@type": "",
-      key: "",
-    },
+    consensusPubkey: undefined,
   }));
-export type ValidatorData = z.infer<typeof zValidatorData>;
 
 export enum BlockVote {
   PROPOSE = "PROPOSE",