From 6b5678c0e3deb514a00ce926db0d8aa1aac5a2a8 Mon Sep 17 00:00:00 2001
From: Daniele Ricci <daniele.icc@gmail.com>
Date: Tue, 19 Nov 2024 15:20:22 +0100
Subject: [PATCH] refactor: rework #245 taking advantage from #268

---
 README.md                    |  3 +--
 src/events.ts                |  1 -
 src/types/response.ts        |  1 -
 src/types/transactions.ts    |  1 -
 src/utils/transaction.ts     | 18 +++---------------
 test/unit/fixtures/events.ts |  8 ++------
 6 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index a3808a56..3d9aba0e 100644
--- a/README.md
+++ b/README.md
@@ -333,7 +333,6 @@ Response:
         };
         address: string;
         txHash: string;
-        txCbor?: string;
       }[];
       txids?: string[];            // List of transaction ids, available with details set to "txids"
     };
@@ -747,6 +746,7 @@ Event:
       asset_mint_or_burn_count: number;
       redeemer_count: number;
       valid_contract: boolean;
+      cbor?: string;
     };
     txUtxos: {
       hash: string;
@@ -779,7 +779,6 @@ Event:
         data_hash: string | null;
       }[];
     };
-    txCbor?: string;
   }[];
 }
 ```
diff --git a/src/events.ts b/src/events.ts
index d26a14ff..ddfb3053 100644
--- a/src/events.ts
+++ b/src/events.ts
@@ -164,7 +164,6 @@ export const onBlock = async (
             txData: enhancedTx.txData,
             txUtxos: enhancedTx.txUtxos,
             txHash: enhancedTx.txData.hash,
-            txCbor: enhancedTx.txCbor,
           });
         }
       }
diff --git a/src/types/response.ts b/src/types/response.ts
index 58f7d68f..1648f0e2 100644
--- a/src/types/response.ts
+++ b/src/types/response.ts
@@ -72,7 +72,6 @@ export interface TxNotification {
   txHash: string;
   txData: TransformedTransaction;
   txUtxos: TransformedTransactionUtxo;
-  txCbor?: string;
 }
 
 export interface BalanceHistoryData {
diff --git a/src/types/transactions.ts b/src/types/transactions.ts
index 646dc015..bdd04ecc 100644
--- a/src/types/transactions.ts
+++ b/src/types/transactions.ts
@@ -4,7 +4,6 @@ export interface TxIdsToTransactionsResponse {
   txData: TransformedTransaction;
   address: string;
   txHash: string;
-  txCbor?: string;
 }
 
 export interface TransformedTransactionUtxo {
diff --git a/src/utils/transaction.ts b/src/utils/transaction.ts
index 555dab9c..77cb71a1 100644
--- a/src/utils/transaction.ts
+++ b/src/utils/transaction.ts
@@ -70,27 +70,15 @@ export interface GetTransactionsDetails {
 
 export const getTransactionsWithDetails = async (
   txs: GetTransactionsDetails[],
-): Promise<Pick<TxIdsToTransactionsResponse, 'txData' | 'txUtxos' | 'txCbor'>[]> => {
-  const txsData = await Promise.all(txs.map(({ txId }) => fetchTransactionData(txId)));
+): Promise<Pick<TxIdsToTransactionsResponse, 'txData' | 'txUtxos'>[]> => {
+  const txsData = await Promise.all(txs.map(({ txId, cbor }) => fetchTransactionData(txId, cbor)));
   const txsUtxo = await Promise.all(
     txs.map(({ txId }) =>
       limiter(() => blockfrostAPI.txsUtxos(txId).then(data => transformTransactionUtxo(data))),
     ),
   );
-  const txsCbors = await Promise.all(
-    txs.map(({ txId, cbor }) =>
-      cbor
-        ? limiter(() => blockfrostAPI.txsCbor(txId).then(data => data.cbor))
-        : // eslint-disable-next-line unicorn/no-useless-undefined
-          Promise.resolve<undefined>(undefined),
-    ),
-  );
 
-  return txs.map((_tx, index) => ({
-    txData: txsData[index],
-    txUtxos: txsUtxo[index],
-    txCbor: txsCbors[index],
-  }));
+  return txs.map((_tx, index) => ({ txData: txsData[index], txUtxos: txsUtxo[index] }));
 };
 
 export const transformTransactionData = async (
diff --git a/test/unit/fixtures/events.ts b/test/unit/fixtures/events.ts
index 1da4100d..1aae839d 100644
--- a/test/unit/fixtures/events.ts
+++ b/test/unit/fixtures/events.ts
@@ -181,6 +181,7 @@ export const onBlock = [
             asset_mint_or_burn_count: 1,
             redeemer_count: 4,
             valid_contract: true,
+            cbor: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
           },
           txUtxos: {
             hash: '4d5beb45fe37b44b46f839811a3d3a1ac4a20911850740867a64f77d09372d0b',
@@ -354,9 +355,6 @@ export const onBlock = [
               },
             ],
           },
-          txCbor: {
-            cbor: '0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef',
-          },
         },
       ],
     },
@@ -438,6 +436,7 @@ export const onBlock = [
               asset_mint_or_burn_count: 1,
               redeemer_count: 4,
               valid_contract: true,
+              cbor: '0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef',
             },
             txUtxos: {
               hash: '4d5beb45fe37b44b46f839811a3d3a1ac4a20911850740867a64f77d09372d0b',
@@ -612,9 +611,6 @@ export const onBlock = [
               ],
             },
             txHash: '4d5beb45fe37b44b46f839811a3d3a1ac4a20911850740867a64f77d09372d0b',
-            txCbor: {
-              cbor: '0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef',
-            },
           },
         ],
       },