Merge pull request #8 from terraswap/fix/sorted-transfer

fix: sorted transfer

.env.example

@@ -9,7 +9,7 @@ TERRASWAP_FACTORY=
 
 DB_HOST=
 DB_PORT=
-DB_USER=
+DB_USERNAME=
 DB_PASSWORD=
 DB_NAME=
 

src/collector/indexer/index.ts

@@ -7,12 +7,25 @@ import { TxHistoryIndexer } from './txHistoryIndexer'
 import { NativeTransferIndexer, NonnativeTransferIndexer } from './transferIndexer'
 import { factoryAddress } from 'lib/terraswap/'
 import logRules from '../log-finder/log-rules'
+import { EventKV } from '@terra-money/terra.js'
 
 
 const createPairLF = createCreatePairLogFinders(factoryAddress)
 const nativeTransferLF = createNativeTransferLogFinders()
 const nonnativeTransferLF = createNonnativeTransferLogFinder()
 
+function sortNativeTransferAttributes(attrs: EventKV[]): EventKV[] {
+  let startIdx = 0
+  const splitEvery = 3
+  const sorted: EventKV[] = []
+
+  while (startIdx < attrs.length) {
+    sorted.push(...(attrs.slice(startIdx, startIdx + splitEvery).sort((a, b) => a.key < b.key ? -1 : 1)))
+    startIdx += splitEvery
+  }
+  return sorted
+}
+
 export async function runIndexers(
   manager: EntityManager,
   txs: Tx[],
@@ -41,10 +54,13 @@ export async function runIndexers(
 
           spwfLogFounds.length > 0 && await TxHistoryIndexer(manager, exchangeRate, timestamp, txHash, spwfLogFounds)
 
-          // native transfer
-          const nativeTransferLogFounds = nativeTransferLF(event)
+          if (event.type === "transfer") {
+            event.attributes = sortNativeTransferAttributes(event.attributes)
+            // native transfer
+            const nativeTransferLogFounds = nativeTransferLF(event)
 
-          await NativeTransferIndexer(pairList, manager, exchangeRate, timestamp, nativeTransferLogFounds)
+            await NativeTransferIndexer(pairList, manager, exchangeRate, timestamp, nativeTransferLogFounds)
+          }
 
           // nonnative transfer
           const nonnativeTransferLogFounds = nonnativeTransferLF(event)

src/collector/log-finder/log-rules.ts

@@ -61,10 +61,10 @@ function nonnativeTransferRuleFromV2(): LogFinderRule {
   }
 }
 
-function nativeTransferRuleV2(): LogFinderRule {
+function sortedNativeTransferRuleFinderRule(): LogFinderRule {
   return {
     type: 'transfer',
-    attributes: [['recipient'], ['sender'], ['amount']],
+    attributes: [['amount'], ['recipient'], ['sender']],
   }
 }
 
@@ -73,7 +73,7 @@ const phoenix = {
   spwRule: spwRuleV2,
   nonnativeTransferRule: nonnativeTransferRuleV2,
   nonnativeTransferRuleFrom: nonnativeTransferRuleFromV2,
-  nativeTransferRule: nativeTransferRuleV2,
+  nativeTransferRule: sortedNativeTransferRuleFinderRule,
 }
 
 
@@ -137,10 +137,10 @@ function nonnativeTransferRuleFrom(): LogFinderRule {
   }
 }
 
-function nativeTransferRule(): LogFinderRule {
+function sortedNativeTransferRule(): LogFinderRule {
   return {
     type: 'transfer',
-    attributes: [['recipient'], ['sender'], ['amount']],
+    attributes: [['amount'], ['recipient'], ['sender']],
   }
 }
 
@@ -149,7 +149,7 @@ const classic = {
   spwRule: spwRule,
   nonnativeTransferRule: nonnativeTransferRule,
   nonnativeTransferRuleFrom: nonnativeTransferRuleFrom,
-  nativeTransferRule: nativeTransferRule,
+  nativeTransferRule: sortedNativeTransferRule,
 }
 
 
@@ -213,10 +213,10 @@ export function col4NonnativeTransferRuleFrom(): LogFinderRule {
   }
 }
 
-export function col4NativeTransferRule(): LogFinderRule {
+export function col4SortedNativeTransferRule(): LogFinderRule {
   return {
     type: 'transfer',
-    attributes: [['recipient'], ['sender'], ['amount']],
+    attributes: [['amount'], ['recipient'], ['sender']],
   }
 }
 
@@ -226,7 +226,7 @@ const columbus4 = {
   spwRule: col4SpwRule,
   nonnativeTransferRule: col4NonnativeTransferRule,
   nonnativeTransferRuleFrom: col4NonnativeTransferRuleFrom,
-  nativeTransferRule: col4NativeTransferRule,
+  nativeTransferRule: col4SortedNativeTransferRule,
 }
 
 const target = process.env.TERRA_CHAIN_ID?.includes("phoenix") ? phoenix : process.env.TERRA_CHAIN_ID?.includes("columbus-4") ? columbus4 : classic

src/collector/log-finder/nativeTransferLF.ts

@@ -7,14 +7,31 @@ export function createNativeTransferLogFinders(): ReturningLogFinderMapper<
   NativeTransferTransformed[]
 > {
   return createReturningLogFinder(logRules.nativeTransferRule(), (_, match) => {
-    if (!match[2].value) {
+    let amountString = ''
+    let sender = ''
+    let recipient = ''
+
+    match.forEach(m => {
+      if (m.key === 'amount') {
+        amountString = m.value
+      }
+      if (m.key === 'sender') {
+        sender = m.value
+      }
+      if (m.key === 'recipient') {
+        recipient = m.value
+      }
+    })
+
+    if (!amountString) {
       return
     }
-    const assetsInfo = trimAssets(match[2].value, true)
+
+    const assetsInfo = trimAssets(amountString, true)
     return assetsInfo.map((asset) => {
       return {
-        recipient: match[0].value,
-        sender: match[1].value,
+        recipient,
+        sender,
         assets: asset,
       }
     })