Merge pull request #33 from lifinance/better-dest-calldata

feat: names for destination calldata fields

src/parser/build-parameter-map.ts

@@ -2,7 +2,7 @@ import { ParamType, Result } from 'ethers'
 
 import { AbiCache } from '../abi-cache/abi-cache'
 
-import { ParameterMap } from './parameter-map'
+import { ParameterMap, SwapDataStruct } from './parameter-map'
 import { parseParameterValue } from './parse-parameter-value'
 
 export const buildParameterMap = (
@@ -23,3 +23,18 @@ export const buildParameterMap = (
 
     return parameterMap
   }, {})
+
+export const listToSwapData = (list: unknown[]): SwapDataStruct => {
+  if (!(list.length === 7))
+    throw new Error('Cannot parse swap data. Incorrect amount of fields.')
+
+  return {
+    callTo: list[0],
+    approveTo: list[1],
+    sendingAssetId: list[2],
+    receivingAssetId: list[3],
+    fromAmount: (list[4] as bigint).toString(),
+    callData: list[5],
+    requiresDeposit: list[6],
+  } as unknown as SwapDataStruct
+}

src/parser/calldata-parsers/parse-amarok.ts

@@ -2,6 +2,7 @@ import { AbiCoder } from 'ethers'
 
 import { hexify } from '../hexify'
 import { CallDataInformation } from '../parameter-map'
+import { listToSwapData } from '..'
 
 import { AMAROK_PAYLOAD_ABI } from './abis/amarok'
 
@@ -35,11 +36,19 @@ export const parseAmarok = (
       return []
     }
 
+    // We know that amaroks first param is a list of SwapData[] so we can treat it as such
+    const swapDatas = functionParameters[0].map(listToSwapData)
+    const receiver = functionParameters[1] as string
+    const massagedFunctionParams = {
+      swaps: swapDatas,
+      receiver,
+    }
+
     return [
       {
         functionName: 'unnamed (amarok)',
         rawCallData: encodedCallData,
-        functionParameters,
+        functionParameters: massagedFunctionParams,
       } as CallDataInformation,
     ]
   } catch (e) {

src/parser/calldata-parsers/parse-stargate.ts

@@ -2,6 +2,7 @@ import { AbiCoder } from 'ethers'
 
 import { hexify } from '../hexify'
 import { CallDataInformation } from '../parameter-map'
+import { listToSwapData } from '../build-parameter-map'
 
 import { STARGATE_PAYLOAD_ABI } from './abis/stargate'
 
@@ -34,11 +35,24 @@ export const parseStargate = (
       return []
     }
 
+    const txId = functionParameters[0] as string
+    // We know that stargates second param is a list of SwapData[] so we can treat it as such
+    const swapDatas = functionParameters[1].map(listToSwapData)
+
+    const assetId = functionParameters[2] as string
+    const receiver = functionParameters[3] as string
+    const massagedFunctionParams = {
+      transactionId: txId,
+      swaps: swapDatas,
+      assetId,
+      receiver,
+    }
+
     return [
       {
         functionName: 'unnamed (stargate)',
         rawCallData: encodedCallData,
-        functionParameters,
+        functionParameters: massagedFunctionParams,
       } as CallDataInformation,
     ]
   } catch (e) {

src/parser/parser.acceptance.test.ts

@@ -21,6 +21,7 @@ import {
   StargateDataStruct,
   SwapDataStruct,
 } from './parameter-map'
+import { listToSwapData } from './build-parameter-map'
 
 const validateAndExtract = (
   results: CallDataInformation[]
@@ -140,7 +141,12 @@ describe('Acceptance tests', () => {
       rawCallData
     )
 
-    expect(toolCallData.functionParameters).toStrictEqual(parsed)
+    expect(toolCallData.functionParameters).toStrictEqual({
+      transactionId: parsed[0],
+      swaps: parsed[1].map(listToSwapData),
+      assetId: parsed[2],
+      receiver: parsed[3],
+    })
   })
 
   it('swap + amarok + swap transfer', () => {
@@ -161,6 +167,9 @@ describe('Acceptance tests', () => {
       rawCallData
     )
 
-    expect(toolCallData.functionParameters).toStrictEqual(parsed)
+    expect(toolCallData.functionParameters).toStrictEqual({
+      swaps: parsed[0].map(listToSwapData),
+      receiver: parsed[1],
+    })
   })
 })