refactor(ogmios-block-type-mapping): add block type; transaction cbor

Author: will-break-it

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

@@ -492,6 +492,7 @@ export const mapBlock = (
     : Cardano.SlotLeader(blockModel.slot_leader_hash.toString('hex')),
   totalOutput: BigInt(blockOutputModel?.output ?? 0),
   txCount: Number(blockModel.tx_count),
+  type: blockModel.type,
   vrf: blockModel.vrf as unknown as Cardano.VrfVkBech32
 });
 

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

@@ -19,6 +19,7 @@ export interface BlockModel {
   slot_no: string;
   time: string;
   tx_count: string;
+  type: Cardano.BlockType;
   vrf: string;
 }
 

packages/core/src/Cardano/types/Block.ts

@@ -77,6 +77,8 @@ VrfVkBech32.fromHex = (value: string) => {
   return VrfVkBech32(BaseEncoding.bech32.encode('vrf_vk', words, 1023));
 };
 
+export type BlockType = 'bft' | 'praos';
+
 /** Minimal Block type meant as a base for the more complete version `Block`  */
 // TODO: optionals (except previousBlock) are there because they are not calculated for Byron yet.
 // Remove them once calculation is done and remove the Required<BlockMinimal> from interface Block
@@ -89,6 +91,7 @@ export interface BlockInfo {
   /** Byron blocks size not calculated yet */
   size?: BlockSize;
   previousBlock?: BlockId;
+  type: BlockType;
   vrf?: VrfVkBech32;
   /**
    * This is the operational cold verification key of the stake pool

packages/core/src/Cardano/types/Transaction.ts

@@ -11,6 +11,7 @@ import { PlutusData } from './PlutusData';
 import { ProposalProcedure, VotingProcedures } from './Governance';
 import { RewardAccount } from '../Address';
 import { Script } from './Script';
+import { Serialization } from '../..';
 
 /** transaction hash as hex string */
 export type TransactionId = OpaqueString<'TransactionId'>;
@@ -151,6 +152,7 @@ export interface OnChainTx<TBody extends TxBody = TxBody>
   extends Omit<TxWithInputSource<TBody>, 'witness' | 'auxiliaryData'> {
   witness: Omit<Witness, 'scripts'>;
   auxiliaryData?: Omit<AuxiliaryData, 'scripts'>;
+  cbor?: Serialization.TxCBOR;
 }
 
 export interface HydratedTx extends TxWithInputSource<HydratedTxBody> {

packages/ogmios/src/ogmiosToCore/block.ts

@@ -74,6 +74,7 @@ const mapByronBlock = (block: Schema.BlockBFT): Cardano.Block => ({
   size: mapBlockSize(block),
   totalOutput: mapTotalOutputs(block),
   txCount: mapTxCount(block),
+  type: block.type,
   vrf: undefined // no vrf key for byron. DbSync doesn't have one either
 });
 
@@ -86,6 +87,7 @@ const mapCommonBlock = (block: CommonBlock): Cardano.Block => ({
   size: mapBlockSize(block),
   totalOutput: mapTotalOutputs(block),
   txCount: mapTxCount(block),
+  type: block.type,
   vrf: mapCommonVrf(block)
 });
 

packages/ogmios/test/CardanoNode/__snapshots__/ObservableOgmiosCardanoNode.test.ts.snap

@@ -258,6 +258,7 @@ Array [
       "size": 1880,
       "totalOutput": 29999998493561943n,
       "txCount": 1,
+      "type": "praos",
       "vrf": "vrf_vk1ny8dyz3pa9u7v7h8l5evsmxxjq07dk6j5uda60lxe3zsya5ea20s2c6jph",
     },
     "eventType": 0,

packages/ogmios/test/ogmiosToCore/__snapshots__/block.test.ts.snap

@@ -632,6 +632,7 @@ Object {
   "size": 8511,
   "totalOutput": 29698651346n,
   "txCount": 6,
+  "type": "praos",
   "vrf": "vrf_vk1afy7gefvgc9eaek64lhunxw2velmuh4467n6a2aalah7r8q68j0s4f2sa9",
 }
 `;
@@ -711,6 +712,7 @@ Object {
   "size": 1193,
   "totalOutput": 29699998493147869n,
   "txCount": 1,
+  "type": "praos",
   "vrf": "vrf_vk1wpa9axwwassnadt8drdrzptxm285latvhhvsgv0t6zhp0akgej9sfgecvl",
 }
 `;
@@ -790,6 +792,7 @@ Object {
   "size": 1152,
   "totalOutput": 29699998492735907n,
   "txCount": 1,
+  "type": "praos",
   "vrf": "vrf_vk1aw6s04lqkquell8drg6jjusrzd8c5259kctvxkgug5kta7nphz9qfqtr4w",
 }
 `;
@@ -846,6 +849,7 @@ Object {
   "size": 908,
   "totalOutput": 1000000n,
   "txCount": 1,
+  "type": "bft",
   "vrf": undefined,
 }
 `;
@@ -925,6 +929,7 @@ Object {
   "size": 1151,
   "totalOutput": 29699998492941888n,
   "txCount": 1,
+  "type": "praos",
   "vrf": "vrf_vk1aw6s04lqkquell8drg6jjusrzd8c5259kctvxkgug5kta7nphz9qfqtr4w",
 }
 `;
@@ -1157,6 +1162,7 @@ Object {
   "size": 1880,
   "totalOutput": 29999998493561943n,
   "txCount": 1,
+  "type": "praos",
   "vrf": "vrf_vk1ny8dyz3pa9u7v7h8l5evsmxxjq07dk6j5uda60lxe3zsya5ea20s2c6jph",
 }
 `;