Updates for general transaction and block fetching.

backend/src/api/bitcoin/bitcoin-api.ts

@@ -6,6 +6,7 @@ import { IEsploraApi } from './esplora-api.interface';
 import blocks from '../blocks';
 import bitcoinBaseApi from './bitcoin-base.api';
 import mempool from '../mempool';
+import { TransactionExtended } from '../../mempool.interfaces';
 
 class BitcoinApi implements AbstractBitcoinApi {
   private rawMempoolCache: IBitcoinApi.RawMempool | null = null;
@@ -32,6 +33,11 @@ class BitcoinApi implements AbstractBitcoinApi {
   }
 
   $getRawTransaction(txId: string, skipConversion = false, addPrevout = false): Promise<IEsploraApi.Transaction> {
+    // If the transaction is in the mempool we also already fetched the fee, just prevouts are missing
+    const txInMempool = mempool.getMempool()[txId];
+    if (txInMempool && addPrevout) {
+      return this.$addPrevouts(txInMempool);
+    }
     return this.bitcoindClient.getRawTransaction(txId, true)
       .then((transaction: IBitcoinApi.Transaction) => {
         if (skipConversion) {
@@ -55,7 +61,12 @@ class BitcoinApi implements AbstractBitcoinApi {
     return this.bitcoindClient.getBlockHash(height);
   }
 
-  $getBlock(hash: string): Promise<IEsploraApi.Block> {
+  async $getBlock(hash: string): Promise<IEsploraApi.Block> {
+    const foundBlock = blocks.getBlocks().find((block) => block.id === hash);
+    if (foundBlock) {
+      return foundBlock;
+    }
+
     return this.bitcoindClient.getBlock(hash)
       .then((block: IBitcoinApi.Block) => this.convertBlock(block));
   }
@@ -163,6 +174,9 @@ class BitcoinApi implements AbstractBitcoinApi {
   }
 
   private async $appendMempoolFeeData(transaction: IEsploraApi.Transaction): Promise<IEsploraApi.Transaction> {
+    if (transaction.fee) {
+      return transaction;
+    }
     let mempoolEntry: IBitcoinApi.MempoolEntry;
     if (!mempool.isInSync() && !this.rawMempoolCache) {
       this.rawMempoolCache = await bitcoinBaseApi.$getRawMempoolVerbose();
@@ -176,6 +190,17 @@ class BitcoinApi implements AbstractBitcoinApi {
     return transaction;
   }
 
+  protected async $addPrevouts(transaction: TransactionExtended): Promise<TransactionExtended> {
+    for (const vin of transaction.vin) {
+      if (vin.prevout) {
+        continue;
+      }
+      const innerTx = await this.$getRawTransaction(vin.txid, false);
+      vin.prevout = innerTx.vout[vin.vout];
+    }
+    return transaction;
+  }
+
   private async $calculateFeeFromInputs(transaction: IEsploraApi.Transaction, addPrevout: boolean): Promise<IEsploraApi.Transaction> {
     if (transaction.vin[0].is_coinbase) {
       transaction.fee = 0;

backend/src/api/bitcoin/electrum-api.ts

@@ -8,6 +8,7 @@ import * as sha256 from 'crypto-js/sha256';
 import * as hexEnc from 'crypto-js/enc-hex';
 import BitcoinApi from './bitcoin-api';
 import bitcoinBaseApi from './bitcoin-base.api';
+import mempool from '../mempool';
 class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
   private electrumClient: any;
 
@@ -27,6 +28,10 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
   }
 
   async $getRawTransaction(txId: string, skipConversion = false, addPrevout = false): Promise<IEsploraApi.Transaction> {
+    const txInMempool = mempool.getMempool()[txId];
+    if (txInMempool && addPrevout) {
+      return this.$addPrevouts(txInMempool);
+    }
     const transaction: IBitcoinApi.Transaction = await this.electrumClient.blockchain_transaction_get(txId, true);
     if (!transaction) {
       throw new Error('Unable to get transaction: ' + txId);
@@ -93,7 +98,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
     const history = await this.$getScriptHashHistory(addressInfo.scriptPubKey);
     const transactions: IEsploraApi.Transaction[] = [];
     for (const h of history) {
-      const tx = await this.$getRawTransaction(h.tx_hash);
+      const tx = await this.$getRawTransaction(h.tx_hash, false, true);
       if (tx) {
         transactions.push(tx);
       }