Decode all swaps

.changeset/early-carrots-smell.md

@@ -0,0 +1,5 @@
+---
+'@3loop/transaction-interpreter': minor
+---
+
+Add default categorization of swaps into fallback interpreter

.changeset/lovely-trainers-destroy.md

@@ -0,0 +1,5 @@
+---
+'@3loop/transaction-decoder': patch
+---
+
+Improve decoder error displaying

packages/transaction-decoder/src/decoding/abi-decode.ts

@@ -5,8 +5,8 @@ import { Data, Effect } from 'effect'
 import { messageFromUnknown } from '../helpers/error.js'
 
 export class DecodeError extends Data.TaggedError('DecodeError')<{ message: string }> {
-  constructor(error: unknown) {
-    super({ message: `Failed to decode ${messageFromUnknown(error)}` })
+  constructor(message: string, error?: unknown) {
+    super({ message: `${message} ${messageFromUnknown(error)}` })
   }
 }
 
@@ -72,15 +72,15 @@ export const decodeMethod = (data: Hex, abi: Abi): Effect.Effect<DecodeResult |
   Effect.gen(function* () {
     const { functionName, args = [] } = yield* Effect.try({
       try: () => decodeFunctionData({ abi, data }),
-      catch: (error) => new DecodeError(error),
+      catch: (error) => new DecodeError(`Could not decode function data`, error),
     })
 
     const method = getAbiItem({ abi, name: functionName, args }) as AbiFunction | undefined
 
     if (method != null) {
       const signature = yield* Effect.try({
         try: () => formatAbiItem(method),
-        catch: (error) => new DecodeError(error),
+        catch: (error) => new DecodeError(`Could not format function data`, error),
       })
 
       const paramsTree = attachValues(method.inputs, args)

packages/transaction-decoder/src/decoding/calldata-decode.ts

@@ -107,7 +107,7 @@ const decodeGnosisMultisendParams = (
           abi: SAFE_MULTISEND_ABI,
           args: [txs],
         }),
-      catch: (error) => new AbiDecoder.DecodeError(error),
+      catch: (error) => new AbiDecoder.DecodeError(`Could not encode multisend transactions`, error),
     })
     const txsDecoded = yield* AbiDecoder.decodeMethod(txsEncoded, SAFE_MULTISEND_ABI)
 

packages/transaction-decoder/src/decoding/log-decode.ts

@@ -45,11 +45,7 @@ const decodedLog = (transaction: GetTransactionReturnType, logItem: Log) =>
           data: logItem.data,
           strict: false,
         }),
-      catch: (err) =>
-        Effect.gen(function* () {
-          yield* Effect.logError(`Could not decode log ${abiAddress} `, err)
-          return new AbiDecoder.DecodeError(`Could not decode log ${abiAddress}`)
-        }),
+      catch: (err) => new AbiDecoder.DecodeError(`Could not decode log ${abiAddress}`, err),
     })
 
     if (eventName == null) {
@@ -58,7 +54,12 @@ const decodedLog = (transaction: GetTransactionReturnType, logItem: Log) =>
 
     const args = args_ as any
 
-    const fragment = getAbiItem({ abi: abiItem, name: eventName })
+    const fragment = yield* Effect.try({
+      try: () => getAbiItem({ abi: abiItem, name: eventName }),
+      catch: () => {
+        Effect.logError(`Could not find fragment in ABI ${abiAddress} ${eventName}`)
+      },
+    })
 
     if (fragment == null) {
       return yield* new AbiDecoder.DecodeError(`Could not find fragment in ABI ${abiAddress} ${eventName}`)
@@ -136,8 +137,10 @@ export const decodeLogs = ({ logs, transaction }: { logs: readonly Log[]; transa
 
     const eithers = effects.map((e) => Effect.either(e))
 
-    return yield* Effect.all(eithers, {
+    const resp = yield* Effect.all(eithers, {
       concurrency: 'inherit',
       batching: 'inherit',
     })
+
+    return resp
   })

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],
   })

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],
   })

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],
   })

packages/transaction-interpreter/interpreters/blur.ts

@@ -1,4 +1,4 @@
-import { displayPayments, processNftTransfers, defaultEvent } from './std.js'
+import { displayAssets, processNftTransfers, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
@@ -16,7 +16,7 @@ export function transformEvent(event: DecodedTransaction): InterpretedTransactio
 
   const collection = nftTransfers[0].name ?? ''
   const numberOfNfts = nftTransfers.length > 1 ? ` ${nftTransfers.length} ${collection} NFTS` : ` 1 ${collection} NFT`
-  const payment = displayPayments(erc20Payments, nativePayments)
+  const payment = displayAssets([...erc20Payments, ...nativePayments])
 
   const sell = ['takeBidSingle', 'takeBid']
   const buy = ['takeAskSinglePool', 'takeAskSingle', 'takeAsk', 'takeAskPool', 'batchBuyWithETH', 'batchBuyWithERC20s']

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],
   })

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],
   })

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],
   })

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],
   })

packages/transaction-interpreter/interpreters/opensea.ts

@@ -1,4 +1,4 @@
-import { processNftTransfers, displayPayments, defaultEvent } from './std.js'
+import { processNftTransfers, displayAssets, defaultEvent } from './std.js'
 import type { InterpretedTransaction } from '@/types.js'
 import type { DecodedTransaction } from '@3loop/transaction-decoder'
 
@@ -15,7 +15,7 @@ export function transformEvent(event: DecodedTransaction): InterpretedTransactio
 
   const collection = nftTransfers[0].name ?? ''
   const numberOfNfts = nftTransfers.length > 1 ? ` ${nftTransfers.length} ${collection} NFTS` : ` 1 ${collection} NFT`
-  const payment = displayPayments(erc20Payments, nativePayments)
+  const payment = displayAssets([...erc20Payments, ...nativePayments])
 
   if (sendingAddresses.includes(event.fromAddress.toLowerCase())) {
     const from = receivingAddresses.length > 1 ? ` to ${receivingAddresses.length} users` : ''

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],
   })