Merge pull request #226 from santiment/internalTxFullOrdering

Internal transaction position offers full ordering

Author: YordanPavlov

src/blockchains/eth/lib/util.ts

@@ -23,7 +23,7 @@ export function transactionOrder(a: ETHTransfer | EOB, b: ETHTransfer | EOB) {
   return internalTxPositionA - internalTxPositionB
 }
 
-const ethTransferKey = (transfer: ETHTransfer) => `${transfer.blockNumber}-${transfer.transactionHash ?? ''}-${transfer.transactionPosition ?? ''}-${transfer.from}-${transfer.to}`
+const ethTransferKey = (transfer: ETHTransfer) => `${transfer.blockNumber}-${transfer.transactionHash ?? ''}`
 
 export function assignInternalTransactionPosition(transfers: ETHTransfer[], groupByKey: (transfer: ETHTransfer) => string = ethTransferKey): void {
   const grouped = groupBy(transfers, groupByKey)

src/lib/kafka_storage.ts

@@ -369,8 +369,10 @@ export class Exporter {
     try {
       if (BLOCKCHAIN === 'utxo') {
         await this.sendData(events, 'height', signalRecord);
-      } else if (BLOCKCHAIN === 'receipts' || BLOCKCHAIN === 'eth') {
+      } else if (BLOCKCHAIN === 'receipts') {
         await this.sendData(events, 'transactionHash', signalRecord);
+      } else if (BLOCKCHAIN === 'eth') {
+        await this.sendData(events, null, signalRecord);
       }
       else {
         await this.sendData(events, 'primaryKey', signalRecord);