Sign acc op call func names

src/controllers/contractInfo/contractInfo.ts

@@ -128,8 +128,9 @@ export class ContractInfoController extends EventEmitter implements IContractInf
         return
       }
 
-      Object.entries(result.data).forEach(([selector, signatures]) => {
-        const mappedFoundSignatures = signatures.map((s) => ({ signature: s }))
+      selectorsToFetch.forEach((selector) => {
+        const signatures = result.data[selector]
+        const mappedFoundSignatures = (signatures || []).map((s) => ({ signature: s }))
 
         if (mappedFoundSignatures.length)
           this.selectors[selector] = {

src/libs/humanizer/index.test.ts

@@ -5,7 +5,6 @@ import { describe, test } from '@jest/globals'
 import { DEFAULT_ACCOUNT_LABEL } from '../../consts/account'
 import { Account } from '../../interfaces/account'
 import { Key } from '../../interfaces/keystore'
-import { TypedMessage } from '../../interfaces/userRequest'
 import { AccountOp } from '../accountOp/accountOp'
 import { humanizeAccountOp, humanizeMessage } from './index'
 import { compareHumanizerVisualizations, compareVisualizations } from './testHelpers'
@@ -241,25 +240,17 @@ describe('Humanizer main function', () => {
         getAction('Send'),
         getToken('0x0000000000000000000000000000000000000000', 1000000000000000000n),
         getLabel('to'),
-        getAddressVisualization('0xc4ce03b36f057591b2a360d773edb9896255051e'),
-        getToken('0xc4ce03b36f057591b2a360d773edb9896255051e', 0n, true)
+        getAddressVisualization('0xc4ce03b36f057591b2a360d773edb9896255051e')
       ],
       [
         getAction('Grant approval'),
         getLabel('for'),
         getToken(
           '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-          115792089237316195423570985008687907853269984665640564039457584007913129639935n,
-          undefined,
-          undefined,
-          {
-            callId: 'generic-one',
-            spenderAddr: '0xE5c783EE536cf5E63E792988335c4255169be4E1'
-          }
+          115792089237316195423570985008687907853269984665640564039457584007913129639935n
         ),
         getLabel('to'),
-        getAddressVisualization('0xe5c783ee536cf5e63e792988335c4255169be4e1'),
-        getToken('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', 0n, true)
+        getAddressVisualization('0xe5c783ee536cf5e63e792988335c4255169be4e1')
       ]
     ]
 
@@ -277,38 +268,25 @@ describe('Humanizer main function', () => {
         getLabel('and'),
         getAction('Grant approval'),
         getLabel('for'),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 10n ** 9n, undefined, undefined, {
-          callId: 'erc20-0',
-          spenderAddr: '0x46705dfff24256421A05D056c29E81Bdc09723B8'
-        }),
+        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 10n ** 9n),
         getLabel('to'),
-        getAddressVisualization('0x46705dfff24256421a05d056c29e81bdc09723b8'),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 0n, true)
+        getAddressVisualization('0x46705dfff24256421a05d056c29e81bdc09723b8')
       ],
       [
         getAction('Grant approval'),
         getLabel('for'),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 1000000000n, undefined, undefined, {
-          callId: 'erc20-1',
-          spenderAddr: '0x46705dfff24256421A05D056c29E81Bdc09723B8'
-        }),
+        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 1000000000n),
         getLabel('to'),
-        getAddressVisualization('0x46705dfff24256421a05d056c29e81bdc09723b8'),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 0n, true)
+        getAddressVisualization('0x46705dfff24256421a05d056c29e81bdc09723b8')
       ],
       [
         getAction('Grant approval'),
         getLabel('for'),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 1000000000n, undefined, undefined, {
-          callId: 'erc20-2',
-          spenderAddr: '0x46705dfff24256421A05D056c29E81Bdc09723B8'
-        }),
+        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 1000000000n),
         getLabel('to'),
-        getAddressVisualization('0x46705dfff24256421a05d056c29e81bdc09723b8'),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 0n, true)
+        getAddressVisualization('0x46705dfff24256421a05d056c29e81bdc09723b8')
       ]
     ]
-
     accountOp.calls = [...transactions.erc20.slice(0, 3)]
     const irCalls = humanizeAccountOp(accountOp)
     compareHumanizerVisualizations(irCalls, expectedVisualizations)
@@ -318,10 +296,9 @@ describe('Humanizer main function', () => {
     // const ir: Ir = []
     const expectedVisualizations = [
       [
-        getAction('Call multicall'),
-        getLabel('from'),
-        getAddressVisualization('0x87870bca3f3fd6335c3f4ce8392d69350b4fa4e2'),
-        getToken('0x87870bca3f3fd6335c3f4ce8392d69350b4fa4e2', 0n, true)
+        getAction('Interacting'),
+        getLabel('with'),
+        getAddressVisualization('0x87870bca3f3fd6335c3f4ce8392d69350b4fa4e2')
       ]
     ]
 
@@ -351,7 +328,7 @@ describe('TypedMessages', () => {
       spender: address2,
       sigDeadline: 968187600n
     }
-    const tmTemplate: TypedMessage = {
+    const tmTemplate: any = {
       kind: 'typedMessage',
       domain: {
         name: 'random contract',
@@ -398,24 +375,16 @@ describe('with (Account | Key)[] arg', () => {
       [
         getAction('Grant approval'),
         getLabel('for'),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 1000000000n, undefined, undefined, {
-          callId: 'key-0',
-          spenderAddr: accounts[0]!.addr
-        }),
+        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 1000000000n),
         getLabel('to'),
-        getAddressVisualization(accounts[0]!.addr.toLowerCase()),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 0n, true)
+        getAddressVisualization(accounts[0]!.addr.toLowerCase())
       ],
       [
         getAction('Grant approval'),
         getLabel('for'),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 1000000000n, undefined, undefined, {
-          callId: 'key-1',
-          spenderAddr: keys[0]!.addr
-        }),
+        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 1000000000n),
         getLabel('to'),
-        getAddressVisualization(keys[0]!.addr.toLowerCase()),
-        getToken('0xdac17f958d2ee523a2206206994597c13d831ec7', 0n, true)
+        getAddressVisualization(keys[0]!.addr.toLowerCase())
       ]
     ]
     accountOp.calls = [...transactions.accountOrKeyArg]

src/libs/humanizer/interfaces.ts

@@ -32,7 +32,6 @@ export type HumanizerVisualization = (
       chainId?: bigint
     }
 ) & {
-  isHidden?: boolean
   id: number
   content?: string
   isBold?: boolean
@@ -41,6 +40,7 @@ export type HumanizerVisualization = (
 export interface IrCall extends Omit<Call, 'to'> {
   fullVisualization?: HumanizerVisualization[]
   warnings?: HumanizerWarning[]
+  isFallback?: boolean
   to?: string
 }
 export interface IrMessage extends Message {

src/libs/humanizer/modules/FallbackHumanizer/fallBackHumanizer.ts

@@ -1,105 +1,83 @@
 /* eslint-disable no-await-in-loop */
-import { Interface, isAddress, ZeroAddress } from 'ethers'
+import { ZeroAddress } from 'ethers'
 
-import humanizerMeta from '../../../../consts/humanizer/humanizerInfo.json'
 import { AccountOp } from '../../../accountOp/accountOp'
-import {
-  HumanizerCallModule,
-  HumanizerMeta,
-  HumanizerVisualization,
-  IrCall
-} from '../../interfaces'
+import { HumanizerCallModule, IrCall } from '../../interfaces'
 import { getAction, getAddressVisualization, getLabel, getToken } from '../../utils'
 
-function extractAddresses(data: string, _selector: string): string[] {
-  const selector = _selector.startsWith('function') ? _selector : `function ${_selector}`
-  const iface = new Interface([selector])
-  const args = iface.decodeFunctionData(selector, data)
-  const deepSearchForAddress = (obj: { [prop: string]: any }): string[] => {
-    return (
-      Object.values(obj)
-        .map((o: any): string[] | undefined => {
-          if (typeof o === 'string' && isAddress(o)) return [o] as string[]
-          if (typeof o === 'object') return deepSearchForAddress(o).filter((x) => x) as string[]
-          return undefined
-        })
-        .filter((x) => x) as string[][]
-    ).flat() as string[]
-  }
-  return deepSearchForAddress(args)
-}
-
-const knownSigHashes: HumanizerMeta['abis']['NO_ABI'] = Object.values(
-  (humanizerMeta as HumanizerMeta).abis as HumanizerMeta['abis']
-).reduce((a, b) => ({ ...a, ...b }), {})
-
 export const fallbackHumanizer: HumanizerCallModule = (
   accountOp: AccountOp,
   currentIrCalls: IrCall[]
 ) => {
-  const newCalls = currentIrCalls.map((call) => {
-    let fullVisualization = []
-    if (!call.to) fullVisualization = [getAction('Deploy contract')]
-    else if (call.fullVisualization?.length) fullVisualization = call.fullVisualization
-    else {
-      if (call.data !== '0x') {
-        let extractedAddresses: string[] = []
-        const foundSignature = knownSigHashes[call.data.slice(0, 10)]?.signature
-        if (foundSignature && typeof foundSignature === 'string') {
-          try {
-            extractedAddresses = extractAddresses(call.data, foundSignature)
-          } catch (e) {
-            console.error('Humanizer: fallback: Could not decode addresses from calldata')
-          }
-          fullVisualization.push(
-            getAction(
-              `Call ${
-                //  from function asd(address asd) returns ... => asd(address asd)
-                foundSignature
-                  .split('function ')
-                  .filter((x) => x !== '')[0]
-                  ?.split('(')
-                  .filter((x) => x !== '')[0]
-                  ?.split(' returns')
-                  .filter((x) => x !== '')[0]
-              }`
-            ),
-            getLabel('from'),
-            getAddressVisualization(call.to),
-            ...extractedAddresses.map(
-              (a): HumanizerVisualization => ({ ...getToken(a, 0n), isHidden: true })
-            )
-          )
-        } else {
-          fullVisualization.push(
-            getAction('Interacting'),
-            getLabel('with'),
-            getAddressVisualization(call.to)
-          )
-        }
-      }
-    }
-
-    if (
-      call.value &&
-      (!fullVisualization.length ||
-        !['Swap', 'Bridge', 'Swap/Bridge', 'Supply', 'Deposit', 'Supply to vault', 'Wrap'].includes(
-          fullVisualization[0]?.content || ''
-        ))
-    ) {
-      if (fullVisualization.length) fullVisualization.unshift(getLabel('and'))
-      fullVisualization.unshift(getAction('Send'), getToken(ZeroAddress, call.value))
-      if (call.data === '0x' && call.to)
-        fullVisualization.push(getLabel('to'), getAddressVisualization(call.to))
-    }
+  const newCalls = currentIrCalls.map((call): IrCall => {
+    const dataKey = !call.data || call.data === '0x' ? 'no-data' : 'has-data'
+    const valueKey = call.value ? 'has-value' : 'no-value'
+    const toKey = call.to ? 'has-to' : 'no-to'
 
-    return {
-      ...call,
-      fullVisualization: fullVisualization.length
-        ? fullVisualization
-        : call.to
-          ? [getAction('Empty call to'), getAddressVisualization(call.to)]
-          : [getAction('Empty call')]
+    switch (`${toKey}:${valueKey}:${dataKey}`) {
+      case 'no-to:no-value:no-data':
+      case 'no-to:no-value:has-data':
+        return { ...call, fullVisualization: [getAction('Deploy'), getLabel('contract')] }
+      case 'no-to:has-value:no-data':
+      case 'no-to:has-value:has-data':
+        return {
+          ...call,
+          fullVisualization: [
+            getAction('Deploy'),
+            getLabel('contract'),
+            getLabel('and'),
+            getAction('Burn', { warning: true }),
+            getToken(ZeroAddress, call.value)
+          ]
+        }
+      case 'has-to:no-value:no-data':
+        return {
+          ...call,
+          fullVisualization: [getAction('Empty call to'), getAddressVisualization(call.to!)]
+        }
+      case 'has-to:has-value:no-data':
+        return {
+          ...call,
+          fullVisualization: [
+            getAction('Send'),
+            getToken(ZeroAddress, call.value),
+            getLabel('to'),
+            getAddressVisualization(call.to!)
+          ]
+        }
+      case 'has-to:no-value:has-data':
+      case 'has-to:has-value:has-data':
+        let fullVisualization = call.fullVisualization || [
+          getAction('Interacting'),
+          getLabel('with'),
+          getAddressVisualization(call.to!)
+        ]
+        if (
+          call.value &&
+          ![
+            'Swap',
+            'Bridge',
+            'Swap/Bridge',
+            'Supply',
+            'Deposit',
+            'Supply to vault',
+            'Wrap'
+          ].includes(fullVisualization[0]?.content || '')
+        ) {
+          fullVisualization = [
+            getAction('Send'),
+            getToken(ZeroAddress, call.value),
+            getLabel('and'),
+            ...fullVisualization
+          ]
+        }
+        return {
+          ...call,
+          isFallback: !call.fullVisualization,
+          fullVisualization
+        }
+      default:
+        return { ...call, fullVisualization: [getAction('Empty call')] }
     }
   })