fixup! feat(cardano-services): implement missing Blockfrost providers features and tests

Author: ginnun

packages/cardano-services/src/ChainHistory/BlockrostChainHistoryProvider/BlockfrostChainHistoryProvider.ts

@@ -194,6 +194,10 @@ export class BlockfrostChainHistoryProvider extends BlockfrostProvider implement
       const metadata = await this.fetchJsonMetadata(hash);
       const certificates = await this.fetchCertificates(response);
       const withdrawals = await this.fetchWithdrawals(response);
+      const inputSource: Cardano.InputSource = response.valid_contract
+        ? Cardano.InputSource.inputs
+        : Cardano.InputSource.collaterals;
+
       return {
         auxiliaryData: metadata
           ? {
@@ -221,11 +225,11 @@ export class BlockfrostChainHistoryProvider extends BlockfrostProvider implement
         },
         id: hash,
         index: response.index,
-        inputSource: inputs && inputs.length > 0 ? Cardano.InputSource.inputs : Cardano.InputSource.collaterals,
+        inputSource,
         txSize: response.size,
         witness: {
           redeemers: await this.fetchRedeemers(response),
-          signatures: new Map() // not available in blockfrost @todo check again
+          signatures: new Map() // not available in blockfrost
         }
       };
     } catch (error) {

packages/e2e/test/blockfrost/getAsset.test.ts

@@ -1,19 +1,11 @@
-import * as envalid from 'envalid';
+import { BlockfrostAssetProvider, util } from '@cardano-sdk/cardano-services';
 import { Cardano } from '@cardano-sdk/core';
-import { assetProviderFactory } from '../../src';
 import { logger } from '@cardano-sdk/util-dev';
 
-// Verify environment.
-export const env = envalid.cleanEnv(process.env, {
-  ASSET_PROVIDER: envalid.str(),
-  ASSET_PROVIDER_PARAMS: envalid.json({ default: {} })
-});
-
-describe('blockfrostAssetProvider', () => {
+describe('BlockfrostAssetProvider', () => {
   test('getAsset', async () => {
-    const asset = await (
-      await assetProviderFactory.create(env.ASSET_PROVIDER, env.ASSET_PROVIDER_PARAMS, logger)
-    ).getAsset({
+    const assetProvider = new BlockfrostAssetProvider({ blockfrost: util.getBlockfrostApi(), logger });
+    const asset = await assetProvider.getAsset({
       assetId: Cardano.AssetId(
         'b27160f0c50a9cf168bf945dcbfcabbfbee5c7a801e7b467093b41534d6574616c4d6f6e7374657230303036'
       ),

packages/e2e/test/blockfrost/queryTransactions.test.ts

@@ -1,23 +1,16 @@
-import * as envalid from 'envalid';
+import { BlockfrostChainHistoryProvider, util } from '@cardano-sdk/cardano-services';
 import { Cardano, ChainHistoryProvider } from '@cardano-sdk/core';
-import { chainHistoryProviderFactory } from '../../src/factories';
 import { logger } from '@cardano-sdk/util-dev';
 
-// Verify environment.
-export const env = envalid.cleanEnv(process.env, {
-  CHAIN_HISTORY_PROVIDER: envalid.str(),
-  CHAIN_HISTORY_PROVIDER_PARAMS: envalid.json({ default: {} })
-});
-
-describe.only('blockfrostChainHistoryProvider', () => {
+describe.only('BlockfrostChainHistoryProvider', () => {
   let chainHistoryProvider: ChainHistoryProvider;
-
+  let blockfrost;
   beforeAll(async () => {
-    chainHistoryProvider = await chainHistoryProviderFactory.create(
-      env.CHAIN_HISTORY_PROVIDER,
-      env.CHAIN_HISTORY_PROVIDER_PARAMS,
+    blockfrost = util.getBlockfrostApi();
+    chainHistoryProvider = new BlockfrostChainHistoryProvider({
+      blockfrost,
       logger
-    );
+    });
   });
 
   describe('transactionsByHashes', () => {
@@ -48,6 +41,14 @@ describe.only('blockfrostChainHistoryProvider', () => {
         txId: 'b6b1692fd22680e06b136a013f3867eb2b73125671fe4cbe61037f0a5e17ccaa'
       });
     });
+
+    it('has collaterals for failed contract', async () => {
+      const [tx] = await chainHistoryProvider.transactionsByHashes({
+        ids: [Cardano.TransactionId('3de3e581ead2b38d6ba1a82a282501e4447d7b6ae28e5fb4a340b9416d5ba6c5')]
+      });
+      expect(tx.inputSource).toBe(Cardano.InputSource.collaterals);
+    });
+
     it('has withdrawals', async () => {
       const [tx] = await chainHistoryProvider.transactionsByHashes({
         ids: [Cardano.TransactionId('5929a59b9bebad1622f021d13b3d143d88cc92cf2400472e36ed8dcdf598a7fa')]
@@ -277,18 +278,17 @@ describe.only('blockfrostChainHistoryProvider', () => {
       expect(response.totalResultCount).toBe(0);
     });
 
-    // @todo find a script failure in preprod
-    it.skip('queries successfully invalid transaction (script failure)', async () => {
+    it('queries successfully invalid transaction (script failure)', async () => {
       const response = await chainHistoryProvider.transactionsByAddresses({
-        addresses: [Cardano.PaymentAddress('addr_test1vr8nl4u0u6fmtfnawx2rxfz95dy7m46t6dhzdftp2uha87syeufdg')],
+        addresses: [Cardano.PaymentAddress('addr_test1vqtcml25xg7p6udz6tvyulcnxeysswq8et7r48k8fdzk5kgwlyqxc')],
         pagination: { limit: 20, startAt: 0 }
       });
 
       const invalidTx = response.pageResults.find(
-        (tx) => tx.id === Cardano.TransactionId('FHnt4NL7yPYH2vP2FLEfH2pt3K6meM7fgtjRiLBidaqpP5ogPzxLNsZy68e1KdW')
+        (tx) => tx.id === Cardano.TransactionId('3de3e581ead2b38d6ba1a82a282501e4447d7b6ae28e5fb4a340b9416d5ba6c5')
       );
       expect(invalidTx).toBeDefined();
-      expect(invalidTx?.body.outputs.length).toEqual(0);
+      expect(invalidTx?.inputSource).toBe(Cardano.InputSource.collaterals);
     });
 
     it('returns transactions starting from blockRange param', async () => {