Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dappname to call structure #983

Draft
wants to merge 1 commit into
base: humanizer-remove-async-ops
Choose a base branch
from
Draft

Add dappname to call structure #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libs/accountOp/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ export interface Call {
// multiple calls can be associated with the same user request, for example
// when a batching request is made
fromUserRequestId?: UserRequest['id']
meta?: { dapp?: { name?: string; icon?: string } }
}
70 changes: 33 additions & 37 deletions src/libs/humanizer/modules/FallbackHumanizer/fallBackHumanizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Interface, isAddress, ZeroAddress } from 'ethers'

import { AccountOp } from '../../../accountOp/accountOp'
import {
AbiFragment,
HumanizerCallModule,
HumanizerMeta,
HumanizerVisualization,
Expand Down Expand Up @@ -35,60 +36,55 @@ function extractAddresses(data: string, _selector: string): string[] {
}

export const fallbackHumanizer: HumanizerCallModule = (
accountOp: AccountOp,
_: AccountOp,
currentIrCalls: IrCall[],
humanizerMeta: HumanizerMeta
) => {
const newCalls = currentIrCalls.map((call) => {
if (call.fullVisualization && !checkIfUnknownAction(call?.fullVisualization)) return call

const knownSigHashes: HumanizerMeta['abis']['NO_ABI'] = Object.values(
humanizerMeta.abis as HumanizerMeta['abis']
).reduce((a, b) => ({ ...a, ...b }), {})

const dappName = call?.meta?.dapp?.name
const visualization: Array<HumanizerVisualization> = []
if (call.data !== '0x') {
let extractedAddresses: string[] = []
if (knownSigHashes[call.data.slice(0, 10)]?.signature) {
let knownSigHash: AbiFragment | undefined
Object.values(humanizerMeta.abis).some((abi) => {
Object.values(abi).some((s) => {
if (s.selector === call.data.slice(0, 10)) {
knownSigHash = s
return true
}
return false
})
return !!knownSigHash
})

if (knownSigHash?.signature) {
let extractedAddresses: string[] = []
const functionName = knownSigHash.signature
.split('function ')
.filter((x) => x !== '')[0]
.split('(')
.filter((x) => x !== '')[0]
try {
extractedAddresses = extractAddresses(
call.data,
knownSigHashes[call.data.slice(0, 10)].signature
extractedAddresses = extractAddresses(call.data, knownSigHash.signature)
visualization.push(
...extractedAddresses.map((a) => ({ ...getToken(a, 0n), isHidden: true }))
)
} catch (e) {
console.error('Humanizer: fallback: Could not decode addresses from calldata')
}
visualization.push(
getAction(
`Call ${
// from function asd(address asd) returns ... => asd(address asd)
knownSigHashes[call.data.slice(0, 10)].signature
.split('function ')
.filter((x) => x !== '')[0]
.split(' returns')
.filter((x) => x !== '')[0]
}`
),
getLabel('from'),
getAddressVisualization(call.to),
...extractedAddresses.map(
(a): HumanizerVisualization => ({ ...getToken(a, 0n), isHidden: true })
)
)
if (dappName) visualization.push(getAction(`${dappName}: ${functionName}`))
else visualization.push(getAction(`Call ${functionName} function`))
} else {
visualization.push(
getAction('Unknown action'),
getLabel('to'),
getAddressVisualization(call.to)
)
// eslint-disable-next-line no-lonely-if
if (dappName) visualization.push(getAction(`${dappName}: unknown call`))
else visualization.push(getAction('Unknown call to'), getAddressVisualization(call.to))
}
}
if (call.value) {
if (call.data !== '0x') visualization.push(getLabel('and'))
visualization.push(getAction('Send'), getToken(ZeroAddress, call.value))
if (call.data === '0x') visualization.push(getLabel('to'), getAddressVisualization(call.to))
if (call.data !== '0x')
visualization.push(getLabel('with'), getToken(ZeroAddress, call.value))
else visualization.push(getAction('Send'), getLabel('to'), getAddressVisualization(call.to))
}

return {
...call,
fullVisualization: visualization.length
Expand Down
11 changes: 10 additions & 1 deletion src/libs/main/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,16 @@ export const makeBasicAccountOpAction = ({
nonce,
signature: account.associatedKeys[0] ? generateSpoofSig(account.associatedKeys[0]) : null,
accountOpToExecuteBefore: null, // @TODO from pending recoveries
calls: calls.map((call) => ({ ...call, fromUserRequestId: userRequest.id }))
calls: calls.map((call) => ({
...call,
fromUserRequestId: userRequest.id,
meta: {
dapp: {
name: userRequest?.dappPromise?.session?.name,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems wrong to put so many ? here, this is operator abuse. At least userREquest must be present.

icon: userRequest?.dappPromise?.session?.icon
}
}
}))
}

return {
Expand Down