Merge b55ca42 into 0cc8c84

DeFiCh · Sep 18, 2023 · a546c65 · a546c65
2 parents 0cc8c84 + b55ca42
commit a546c65
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 8 deletions.
diff --git a/apps/whale-api/src/module.indexer/helper.ts b/apps/whale-api/src/module.indexer/helper.ts
@@ -0,0 +1,10 @@
+import { blockchain } from '@defichain/jellyfish-api-core'
+
+function checkIfEvmTx (txn: blockchain.Transaction): boolean {
+  // To identify that the transaction is evmtx, it has to have exactly 2 null transaction ids
+  return txn.vin.length === 2 && txn.vin.every(vin => vin.txid === '0000000000000000000000000000000000000000000000000000000000000000')
+}
+
+export {
+  checkIfEvmTx
+}
diff --git a/apps/whale-api/src/module.indexer/model/script.activity.ts b/apps/whale-api/src/module.indexer/model/script.activity.ts
@@ -5,6 +5,7 @@ import { HexEncoder } from '../../module.model/_hex.encoder'
 import { TransactionVout } from '../../module.model/transaction.vout'
 import { VoutFinder } from './_vout_finder'
 import { NotFoundIndexerError } from '../error'
+import { checkIfEvmTx } from '../helper'
 
 @Injectable()
 export class ScriptActivityIndexer extends Indexer {
@@ -17,11 +18,12 @@ export class ScriptActivityIndexer extends Indexer {
 
   async index (block: RawBlock): Promise<void> {
     for (const txn of block.tx) {
+      const isEvmTx = checkIfEvmTx(txn)
+
       for (const vin of txn.vin) {
-        if (vin.coinbase !== undefined) {
+        if (vin.coinbase !== undefined || isEvmTx) {
           continue
         }
-
         const vout = await this.voutFinder.findVout(block, vin.txid, vin.vout)
         if (vout === undefined) {
           throw new NotFoundIndexerError('index', 'TransactionVout', `${vin.txid} - ${vin.vout}`)
@@ -40,8 +42,10 @@ export class ScriptActivityIndexer extends Indexer {
 
   async invalidate (block: RawBlock): Promise<void> {
     for (const txn of block.tx) {
+      const isEvmTx = checkIfEvmTx(txn)
+
       for (const vin of txn.vin) {
-        if (vin.coinbase !== undefined) {
+        if (vin.coinbase !== undefined || isEvmTx) {
           continue
         }
 

diff --git a/apps/whale-api/src/module.indexer/model/script.aggregation.ts b/apps/whale-api/src/module.indexer/model/script.aggregation.ts
@@ -5,6 +5,7 @@ import { VoutFinder } from './_vout_finder'
 import { HexEncoder } from '../../module.model/_hex.encoder'
 import BigNumber from 'bignumber.js'
 import { NotFoundIndexerError } from '../error'
+import { checkIfEvmTx } from '../helper'
 
 @Injectable()
 export class ScriptAggregationIndexer extends Indexer {
@@ -27,8 +28,10 @@ export class ScriptAggregationIndexer extends Indexer {
     }
 
     for (const txn of block.tx) {
+      const isEvmTx = checkIfEvmTx(txn)
+
       for (const vin of txn.vin) {
-        if (vin.coinbase !== undefined) {
+        if (vin.coinbase !== undefined || isEvmTx) {
           continue
         }
 
@@ -76,8 +79,10 @@ export class ScriptAggregationIndexer extends Indexer {
     const hidList = new Set<string>()
 
     for (const txn of block.tx) {
+      const isEvmTx = checkIfEvmTx(txn)
+
       for (const vin of txn.vin) {
-        if (vin.coinbase !== undefined) {
+        if (vin.coinbase !== undefined || isEvmTx) {
           continue
         }
 

diff --git a/apps/whale-api/src/module.indexer/model/script.unspent.ts b/apps/whale-api/src/module.indexer/model/script.unspent.ts
@@ -5,6 +5,7 @@ import { HexEncoder } from '../../module.model/_hex.encoder'
 import { TransactionVout, TransactionVoutMapper } from '../../module.model/transaction.vout'
 import { Transaction, TransactionMapper } from '../../module.model/transaction'
 import { NotFoundIndexerError } from '../error'
+import { checkIfEvmTx } from '../helper'
 
 @Injectable()
 export class ScriptUnspentIndexer extends Indexer {
@@ -18,8 +19,10 @@ export class ScriptUnspentIndexer extends Indexer {
 
   async index (block: RawBlock): Promise<void> {
     for (const txn of block.tx) {
+      const isEvmTx = checkIfEvmTx(txn)
+
       for (const vin of txn.vin) {
-        if (vin.coinbase !== undefined) {
+        if (vin.coinbase !== undefined || isEvmTx) {
           continue
         }
         await this.unspentMapper.delete(vin.txid + HexEncoder.encodeVoutIndex(vin.vout))
@@ -33,8 +36,10 @@ export class ScriptUnspentIndexer extends Indexer {
 
   async invalidate (block: RawBlock): Promise<void> {
     for (const txn of block.tx) {
+      const isEvmTx = checkIfEvmTx(txn)
+
       for (const vin of txn.vin) {
-        if (vin.coinbase !== undefined) {
+        if (vin.coinbase !== undefined || isEvmTx) {
           continue
         }
 

diff --git a/apps/whale-api/src/module.indexer/model/transaction.vin.ts b/apps/whale-api/src/module.indexer/model/transaction.vin.ts
@@ -5,6 +5,7 @@ import { TransactionVout } from '../../module.model/transaction.vout'
 import { HexEncoder } from '../../module.model/_hex.encoder'
 import { VoutFinder } from './_vout_finder'
 import { NotFoundIndexerError } from '../error'
+import { checkIfEvmTx } from '../helper'
 
 @Injectable()
 export class TransactionVinIndexer extends Indexer {
@@ -17,8 +18,10 @@ export class TransactionVinIndexer extends Indexer {
 
   async index (block: RawBlock): Promise<void> {
     for (const txn of block.tx) {
+      const isEvmTx = checkIfEvmTx(txn)
+
       for (const vin of txn.vin) {
-        if (vin.coinbase !== undefined) {
+        if (vin.coinbase !== undefined || isEvmTx) {
           await this.vinMapper.put(this.map(txn, vin, undefined))
         } else {
           const vout = await this.voutFinder.findVout(block, vin.txid, vin.vout)