refactor: improve Tip type to use the new BlockId type

input-output-hk · Nov 25, 2021 · c020610 · c020610
1 parent 28f2ccf
commit c020610
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/packages/blockfrost/src/BlockfrostToCore.ts b/packages/blockfrost/src/BlockfrostToCore.ts
@@ -19,7 +19,7 @@ export const BlockfrostToCore = {
 
   blockToTip: (block: Responses['block_content']): Cardano.Tip => ({
     blockNo: block.height!,
-    hash: block.hash,
+    hash: Cardano.BlockId(block.hash),
     slot: block.slot!
   }),
 

diff --git a/packages/core/src/Cardano/types/Block.ts b/packages/core/src/Cardano/types/Block.ts
@@ -1,4 +1,4 @@
-import { BlockAlonzo, BlockSize } from '@cardano-ogmios/schema';
+import { BlockAlonzo, BlockNo, BlockSize, Slot } from '@cardano-ogmios/schema';
 import { Cardano } from '../..';
 import { Epoch, Lovelace, PoolId } from '.';
 import { Hash32ByteBase16 } from '../util';
@@ -8,6 +8,12 @@ import { Hash32ByteBase16 } from '../util';
  */
 export type BlockId = Hash32ByteBase16<'BlockId'>;
 
+export interface Tip {
+  slot: Slot;
+  hash: BlockId;
+  blockNo: BlockNo;
+}
+
 /**
  * @param {string} value block hash as hex string
  * @throws InvalidStringError

diff --git a/packages/core/src/Cardano/types/index.ts b/packages/core/src/Cardano/types/index.ts
@@ -2,7 +2,7 @@ import * as Ogmios from '@cardano-ogmios/schema';
 import { CustomError } from 'ts-custom-error';
 import { util } from '../../util';
 
-export { Hash64, Epoch, Tip, Slot, ExUnits } from '@cardano-ogmios/schema';
+export { Epoch, Slot, ExUnits } from '@cardano-ogmios/schema';
 export { Hash32ByteBase16, Hash28ByteBase16 } from '../util';
 export * from './Address';
 export * from './RewardAccount';