Refactoring

anastasiarods · anastasiarods · commit 27635568f51f · 2024-11-28T14:38:46.000+07:00
diff --git a/packages/transaction-interpreter/interpreters/0x.ts b/packages/transaction-interpreter/interpreters/0x.ts
diff --git a/packages/transaction-interpreter/interpreters/1inch.ts b/packages/transaction-interpreter/interpreters/1inch.ts
@@ -1,16 +1,16 @@
-import { displayAsset, getPayments, isSwap, defaultEvent } from './std.js'
+import { displayAsset, getNetTransfers, isSwap, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
 
-  const netSent = getPayments({
+  const netSent = getNetTransfers({
     transfers: event.transfers,
     fromAddresses: [event.fromAddress],
   })
 
-  const netReceived = getPayments({
+  const netReceived = getNetTransfers({
     transfers: event.transfers,
     toAddresses: [event.fromAddress],
   })
diff --git a/packages/transaction-interpreter/interpreters/aerodrom.ts b/packages/transaction-interpreter/interpreters/aerodrom.ts
@@ -1,16 +1,16 @@
-import { displayAsset, getPayments, isSwap, defaultEvent } from './std.js'
+import { displayAsset, getNetTransfers, isSwap, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
 
-  const netSent = getPayments({
+  const netSent = getNetTransfers({
     transfers: event.transfers,
     fromAddresses: [event.fromAddress],
   })
 
-  const netReceived = getPayments({
+  const netReceived = getNetTransfers({
     transfers: event.transfers,
     toAddresses: [event.fromAddress],
   })
diff --git a/packages/transaction-interpreter/interpreters/banana-gun.ts b/packages/transaction-interpreter/interpreters/banana-gun.ts
@@ -1,16 +1,16 @@
-import { displayAsset, getPayments, isSwap, defaultEvent } from './std.js'
+import { displayAsset, getNetTransfers, isSwap, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
 
-  const netSent = getPayments({
+  const netSent = getNetTransfers({
     transfers: event.transfers,
     fromAddresses: [event.fromAddress],
   })
 
-  const netReceived = getPayments({
+  const netReceived = getNetTransfers({
     transfers: event.transfers,
     toAddresses: [event.fromAddress],
   })
diff --git a/packages/transaction-interpreter/interpreters/friend-tech.ts b/packages/transaction-interpreter/interpreters/friend-tech.ts
@@ -1,16 +1,16 @@
-import { displayAddress, displayAsset, getPayments, defaultEvent } from './std.js'
+import { displayAddress, displayAsset, getNetTransfers, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
 
-  const netSent = getPayments({
+  const netSent = getNetTransfers({
     transfers: event.transfers,
     fromAddresses: [event.fromAddress],
   })
 
-  const netReceived = getPayments({
+  const netReceived = getNetTransfers({
     transfers: event.transfers,
     toAddresses: [event.fromAddress],
   })
diff --git a/packages/transaction-interpreter/interpreters/kyberswap.ts b/packages/transaction-interpreter/interpreters/kyberswap.ts
@@ -1,16 +1,16 @@
-import { displayAsset, getPayments, isSwap, defaultEvent } from './std.js'
+import { displayAsset, getNetTransfers, isSwap, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
 
-  const netSent = getPayments({
+  const netSent = getNetTransfers({
     transfers: event.transfers,
     fromAddresses: [event.fromAddress],
   })
 
-  const netReceived = getPayments({
+  const netReceived = getNetTransfers({
     transfers: event.transfers,
     toAddresses: [event.fromAddress],
   })
diff --git a/packages/transaction-interpreter/interpreters/metamaskRouter.ts b/packages/transaction-interpreter/interpreters/metamaskRouter.ts
@@ -1,16 +1,16 @@
-import { displayAsset, getPayments, isSwap, defaultEvent } from './std.js'
+import { displayAsset, getNetTransfers, isSwap, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
 
-  const netSent = getPayments({
+  const netSent = getNetTransfers({
     transfers: event.transfers,
     fromAddresses: [event.fromAddress],
   })
 
-  const netReceived = getPayments({
+  const netReceived = getNetTransfers({
     transfers: event.transfers,
     toAddresses: [event.fromAddress],
   })
diff --git a/packages/transaction-interpreter/interpreters/okx.ts b/packages/transaction-interpreter/interpreters/okx.ts
@@ -1,16 +1,16 @@
-import { displayAsset, getPayments, isSwap, defaultEvent } from './std.js'
+import { displayAsset, getNetTransfers, isSwap, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
 
-  const netSent = getPayments({
+  const netSent = getNetTransfers({
     transfers: event.transfers,
     fromAddresses: [event.fromAddress],
   })
 
-  const netReceived = getPayments({
+  const netReceived = getNetTransfers({
     transfers: event.transfers,
     toAddresses: [event.fromAddress],
   })
diff --git a/packages/transaction-interpreter/interpreters/pendle.ts b/packages/transaction-interpreter/interpreters/pendle.ts
@@ -1,16 +1,16 @@
-import { displayAsset, getPayments, isSwap, defaultEvent } from './std.js'
+import { displayAsset, getNetTransfers, isSwap, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
 
-  const netSent = getPayments({
+  const netSent = getNetTransfers({
     transfers: event.transfers,
     fromAddresses: [event.fromAddress],
   })
 
-  const netReceived = getPayments({
+  const netReceived = getNetTransfers({
     transfers: event.transfers,
     toAddresses: [event.fromAddress],
   })
diff --git a/packages/transaction-interpreter/interpreters/std.ts b/packages/transaction-interpreter/interpreters/std.ts
@@ -65,14 +65,16 @@ export function assetsReceived(transfers: Asset[], address: string): AssetTransf
   return filtered.filter((t) => t.to.toLowerCase() === address.toLowerCase()).map(toAssetTransfer)
 }
 
-export function getPayments({
+export function getNetTransfers({
   transfers,
   fromAddresses,
   toAddresses,
+  type,
 }: {
   transfers: Asset[]
   fromAddresses?: string[]
   toAddresses?: string[]
+  type?: string | string[]
 }): Payment[] {
   const fromAddressFilter = fromAddresses?.map((a) => a.toLowerCase())
   const toAddressFilter = toAddresses?.map((a) => a.toLowerCase())
@@ -86,6 +88,14 @@ export function getPayments({
     filteredTransfers = filteredTransfers.filter((t) => toAddressFilter.includes(t.to.toLowerCase()))
   }
 
+  if (type) {
+    if (Array.isArray(type)) {
+      filteredTransfers = filteredTransfers.filter((t) => type.includes(t.type))
+    } else {
+      filteredTransfers = filteredTransfers.filter((t) => t.type === type)
+    }
+  }
+
   return Object.values(
     filteredTransfers.reduce<Record<string, Payment>>((acc, t) => {
       const address = t.address
@@ -139,12 +149,12 @@ export function processNftTransfers(transfers: Asset[]) {
     }
   })
 
-  const erc20Payments = getPayments({
+  const erc20Payments = getNetTransfers({
     transfers: erc20Transfers,
     fromAddresses: Array.from(receivingAddresses),
   })
 
-  const nativePayments = getPayments({
+  const nativePayments = getNetTransfers({
     transfers: nativeTransfers,
     fromAddresses: Array.from(receivingAddresses),
   })
@@ -332,12 +342,12 @@ export function categorizedDefaultEvent(event: DecodedTransaction): InterpretedT
   }
 
   if (isSwap(event)) {
-    const netSent = getPayments({
+    const netSent = getNetTransfers({
       transfers: event.transfers,
       fromAddresses: [event.fromAddress],
     })
 
-    const netReceived = getPayments({
+    const netReceived = getNetTransfers({
       transfers: event.transfers,
       toAddresses: [event.fromAddress],
     })
diff --git a/packages/transaction-interpreter/interpreters/uniswapv3.ts b/packages/transaction-interpreter/interpreters/uniswapv3.ts
@@ -1,19 +1,26 @@
-import { displayAsset, defaultEvent } from './std.js'
+import { displayAsset, defaultEvent, getNetTransfers, isSwap } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
 export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
   const newEvent = defaultEvent(event)
   const hasSwap = event.traceCalls.some((call) => call.name === 'swap')
 
-  if (hasSwap && newEvent.assetsSent.length === 1 && newEvent.assetsReceived.length === 1) {
-    const from = displayAsset(newEvent.assetsSent[0])
-    const to = displayAsset(newEvent.assetsReceived[0])
+  if (hasSwap && isSwap(event)) {
+    const netSent = getNetTransfers({
+      transfers: event.transfers,
+      fromAddresses: [event.fromAddress],
+    })
+
+    const netReceived = getNetTransfers({
+      transfers: event.transfers,
+      toAddresses: [event.fromAddress],
+    })
 
     return {
       ...newEvent,
       type: 'swap',
-      action: 'Swapped ' + from + ' for ' + to,
+      action: 'Swapped ' + displayAsset(netSent[0]) + ' for ' + displayAsset(netReceived[0]),
     }
   }
 
diff --git a/packages/transaction-interpreter/interpreters/zeroEx.ts b/packages/transaction-interpreter/interpreters/zeroEx.ts
@@ -0,0 +1,42 @@
+import { categorizedDefaultEvent, displayAsset, getNetTransfers } from './std.js'
+import type { InterpretedTransaction } from '@/types.js'
+import type { DecodedTransaction } from '@3loop/transaction-decoder'
+
+export function transformEvent(event: DecodedTransaction): InterpretedTransaction {
+  const newEvent = categorizedDefaultEvent(event)
+
+  if (newEvent.type !== 'unknown') return newEvent
+
+  const netSent = getNetTransfers({
+    transfers: event.transfers,
+    fromAddresses: [event.fromAddress],
+    type: ['ERC20', 'native'],
+  })
+
+  const netReceived = getNetTransfers({
+    transfers: event.transfers,
+    toAddresses: [event.fromAddress],
+    type: ['ERC20', 'native'],
+  })
+
+  if (netSent.length === 1 && netReceived.length === 1) {
+    return {
+      ...newEvent,
+      type: 'swap',
+      action: 'Swapped ' + displayAsset(netSent[0]) + ' for ' + displayAsset(netReceived[0]),
+    }
+  }
+
+  return newEvent
+}
+
+export const contracts = [
+  //Exchange Proxy
+  '1:0xDef1C0ded9bec7F1a1670819833240f027b25EfF',
+  '10:0xDef1C0ded9bec7F1a1670819833240f027b25EfF',
+  '42161:0xDef1C0ded9bec7F1a1670819833240f027b25EfF',
+  '8453:0xDef1C0ded9bec7F1a1670819833240f027b25EfF',
+
+  //Settlers
+  '8453:0xbc3c5ca50b6a215edf00815965485527f26f5da8',
+]
