Skip to content

Commit 24d5c09

Browse files
anastasiarodsanastasiarods
authored
Better way to decode AA txs (#232)
1 parent 0294025 commit 24d5c09

6 files changed

Lines changed: 278 additions & 19 deletions

File tree

‎.changeset/ninety-mice-marry.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@3loop/transaction-decoder': minor
3+
---
4+
5+
Add decoding of Account Abstraciton user operations

‎apps/web/src/app/data.ts‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,27 @@ export const EXAMPLE_TXS = {
6363
],
6464
'Account Abstraction': [
6565
{
66-
name: 'handleOps',
67-
hash: '0xcc1f4e40e1186503bb19b5716c8527947ab4c7e972b79d3d64ad8a015cf10ff8',
68-
chainID: 1,
66+
name: 'Gnosis 1',
67+
hash: '0xc7e7f073a1a92008ca40b2fabda1a03dd6911b421c6389e902f1b09bd8f7a7a0',
68+
chainID: 100,
69+
interpreter: 'aa',
70+
},
71+
{
72+
name: 'Gnosis 2',
73+
hash: '0xba2f3cc1e570d98368ec3d2a5e5cf5a80afc45f00639f7317ee19d00b8be6f09',
74+
chainID: 100,
75+
interpreter: 'aa',
76+
},
77+
{
78+
name: 'Base 1',
79+
hash: '0xc78ddb79bd7b9b1994b2680fbe51a33cc5e46a89edae6e3476ed1356277a1ad0',
80+
chainID: 8453,
81+
interpreter: 'aa',
82+
},
83+
{
84+
name: 'Base 2',
85+
hash: '0xe3fe2af860750fff01d1cc3a88e03daecd9fbb56b6894a9a2bdcb4d6f81cf0a3',
86+
chainID: 8453,
6987
interpreter: 'aa',
7088
},
7189
],
@@ -147,6 +165,12 @@ export const supportedChains: {
147165
rpcUrl: process.env.BASE_RPC_URL as string,
148166
traceAPI: 'geth',
149167
},
168+
{
169+
name: 'Gnosis mainnet',
170+
chainID: 100,
171+
rpcUrl: process.env.GNOSIS_RPC_URL as string,
172+
// traceAPI: 'geth',
173+
},
150174
{
151175
name: 'Polygon Mainnet',
152176
chainID: 137,
@@ -165,12 +189,6 @@ export const supportedChains: {
165189
rpcUrl: process.env.ARBITRUM_RPC_URL as string,
166190
traceAPI: 'geth',
167191
},
168-
{
169-
name: 'Manta pacific',
170-
chainID: 169,
171-
rpcUrl: (process.env.MANTA_RPC_URL as string) ?? 'https://pacific-rpc.manta.network/http',
172-
traceAPI: 'geth',
173-
},
174192
]
175193

176194
export const defaultTrasaction = EXAMPLE_TXS['AAVE V2'][0]

‎packages/transaction-decoder/src/abi-loader.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { Effect, Either, RequestResolver, Request, Array, pipe, Data, PrimaryKey
22
import { ContractABI } from './abi-strategy/request-model.js'
33
import { Abi } from 'viem'
44
import * as AbiStore from './abi-store.js'
5+
import { AA_ABIS, SAFE_MULTISEND_ABI } from './decoding/constants.js'
6+
import { SAFE_MULTISEND_SIGNATURE } from './decoding/constants.js'
57

68
interface LoadParameters {
79
readonly chainID: number
@@ -253,6 +255,14 @@ export const getAndCacheAbi = (params: AbiStore.AbiParams) =>
253255
return yield* Effect.fail(new EmptyCalldataError(params))
254256
}
255257

258+
if (params.signature && params.signature === SAFE_MULTISEND_SIGNATURE) {
259+
return yield* Effect.succeed(SAFE_MULTISEND_ABI)
260+
}
261+
262+
if (params.signature && AA_ABIS[params.signature]) {
263+
return yield* Effect.succeed(AA_ABIS[params.signature])
264+
}
265+
256266
return yield* Effect.request(new AbiLoader(params), AbiLoaderRequestResolver)
257267
}).pipe(
258268
Effect.withSpan('AbiLoader.GetAndCacheAbi', {

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { getAndCacheAbi, MissingABIError } from '../abi-loader.js'
44
import * as AbiDecoder from './abi-decode.js'
55
import { TreeNode } from '../types.js'
66
import { PublicClient, RPCFetchError, UnknownNetwork } from '../public-client.js'
7-
import { SAFE_MULTISEND_ABI, SAFE_MULTISEND_SIGNATURE } from './constants.js'
7+
import { SAFE_MULTISEND_SIGNATURE, SAFE_MULTISEND_NESTED_ABI } from './constants.js'
88
import { getProxyImplementation } from './proxies.js'
99
import * as AbiStore from '../abi-store.js'
1010

11-
const callDataKeys = ['callData', 'data', '_data']
12-
const addressKeys = ['to', 'target', '_target']
11+
const callDataKeys = ['callData', 'data', '_data', 'targetCallData']
12+
const addressKeys = ['to', 'target', '_target', 'sender']
1313

1414
const decodeBytesRecursively = (
1515
node: TreeNode,
@@ -112,12 +112,12 @@ const decodeGnosisMultisendParams = (
112112
const txsEncoded = yield* Effect.try({
113113
try: () =>
114114
encodeFunctionData({
115-
abi: SAFE_MULTISEND_ABI,
115+
abi: SAFE_MULTISEND_NESTED_ABI,
116116
args: [txs],
117117
}),
118118
catch: (error) => new AbiDecoder.DecodeError(`Could not encode multisend transactions`, error),
119119
})
120-
const txsDecoded = yield* AbiDecoder.decodeMethod(txsEncoded, SAFE_MULTISEND_ABI)
120+
const txsDecoded = yield* AbiDecoder.decodeMethod(txsEncoded, SAFE_MULTISEND_NESTED_ABI)
121121

122122
if (!txsDecoded || !txsDecoded.params) {
123123
return inputParams
@@ -159,7 +159,6 @@ export const decodeMethod = ({
159159
let implementationAddress: Address | undefined
160160

161161
if (isAddress(contractAddress)) {
162-
//if contract is a proxy, get the implementation address
163162
const implementation = yield* getProxyImplementation({ address: getAddress(contractAddress), chainID })
164163

165164
if (implementation) {
@@ -172,16 +171,15 @@ export const decodeMethod = ({
172171
signature,
173172
chainID,
174173
})
175-
176174
const decoded = yield* AbiDecoder.decodeMethod(data, abi)
177175

178176
if (decoded == null) {
179177
return yield* new AbiDecoder.DecodeError(`Failed to decode method: ${data}`)
180178
}
181179

182-
//MULTISEND: decode the params for the multisend contract which is also related to the safe smart account
180+
//MULTISEND: decode nested params for the multisend of the safe smart account
183181
if (
184-
decoded.signature === SAFE_MULTISEND_SIGNATURE &&
182+
signature === SAFE_MULTISEND_SIGNATURE &&
185183
decoded.params != null &&
186184
decoded.params.find((p) => p.name === 'transactions')
187185
) {

‎packages/transaction-decoder/src/decoding/constants.ts‎

Lines changed: 178 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,25 @@ import { Abi } from 'viem'
22

33
// Same address on all supported chains https://www.multicall3.com/deployments
44
export const MULTICALL3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11'
5-
export const SAFE_MULTISEND_SIGNATURE = 'multiSend(bytes)'
5+
export const SAFE_MULTISEND_SIGNATURE = '0x8d80ff0a'
6+
67
export const SAFE_MULTISEND_ABI: Abi = [
8+
{
9+
inputs: [
10+
{
11+
internalType: 'bytes',
12+
name: 'transactions',
13+
type: 'bytes',
14+
},
15+
],
16+
name: 'multiSend',
17+
outputs: [],
18+
stateMutability: 'payable',
19+
type: 'function',
20+
},
21+
]
22+
23+
export const SAFE_MULTISEND_NESTED_ABI: Abi = [
724
{
825
name: 'transactions',
926
type: 'function',
@@ -39,3 +56,163 @@ export const SAFE_MULTISEND_ABI: Abi = [
3956
},
4057
]
4158
export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
59+
60+
export const AA_ABIS: Record<string, Abi> = {
61+
'0xabc5345e': [
62+
{
63+
name: 'executeBySender',
64+
type: 'function',
65+
stateMutability: 'nonpayable',
66+
inputs: [
67+
{
68+
name: 'calls',
69+
type: 'tuple[]',
70+
components: [
71+
{ name: 'target', type: 'address' },
72+
{ name: 'value', type: 'uint256' },
73+
{ name: 'data', type: 'bytes' },
74+
],
75+
},
76+
],
77+
outputs: [],
78+
},
79+
],
80+
'0x34fcd5be': [
81+
{
82+
inputs: [
83+
{
84+
components: [
85+
{ name: 'target', type: 'address' },
86+
{ name: 'value', type: 'uint256' },
87+
{ name: 'data', type: 'bytes' },
88+
],
89+
name: 'calls',
90+
type: 'tuple[]',
91+
},
92+
],
93+
name: 'executeBatch',
94+
outputs: [],
95+
stateMutability: 'payable',
96+
type: 'function',
97+
},
98+
],
99+
'0x9e5d4c49': [
100+
{
101+
type: 'function',
102+
inputs: [
103+
{ name: 'to', internalType: 'address', type: 'address' },
104+
{ name: 'value', internalType: 'uint256', type: 'uint256' },
105+
{ name: 'data', internalType: 'bytes', type: 'bytes' },
106+
],
107+
name: 'executeCall',
108+
outputs: [
109+
{ name: 'success', internalType: 'bool', type: 'bool' },
110+
{ name: 'returnData', internalType: 'bytes', type: 'bytes' },
111+
],
112+
stateMutability: 'nonpayable',
113+
},
114+
],
115+
'0x912ccaa3': [
116+
{
117+
inputs: [
118+
{
119+
name: 'target',
120+
type: 'address[]',
121+
},
122+
{
123+
name: 'value',
124+
type: 'uint256[]',
125+
},
126+
{
127+
name: 'targetCallData',
128+
type: 'bytes[]',
129+
},
130+
],
131+
name: 'executeBatchCall',
132+
outputs: [],
133+
stateMutability: 'nonpayable',
134+
type: 'function',
135+
},
136+
],
137+
'0x18dfb3c7': [
138+
{
139+
name: 'execute',
140+
type: 'function',
141+
inputs: [
142+
{
143+
name: 'target',
144+
type: 'address[]',
145+
},
146+
{
147+
name: 'callData',
148+
type: 'bytes[]',
149+
},
150+
],
151+
outputs: [],
152+
stateMutability: 'nonpayable',
153+
},
154+
],
155+
'0xb61d27f6': [
156+
{
157+
name: 'execute',
158+
type: 'function',
159+
inputs: [
160+
{
161+
name: 'target',
162+
type: 'address',
163+
},
164+
{
165+
name: 'value',
166+
type: 'uint256',
167+
},
168+
{
169+
name: 'data',
170+
type: 'bytes',
171+
},
172+
],
173+
outputs: [],
174+
stateMutability: 'nonpayable',
175+
},
176+
],
177+
'0x51945447': [
178+
{
179+
type: 'function',
180+
inputs: [
181+
{ name: 'to', internalType: 'address', type: 'address' },
182+
{ name: 'value', internalType: 'uint256', type: 'uint256' },
183+
{ name: 'data', internalType: 'bytes', type: 'bytes' },
184+
{ name: 'operation', internalType: 'enum Operation', type: 'uint8' },
185+
],
186+
name: 'execute',
187+
outputs: [],
188+
stateMutability: 'payable',
189+
},
190+
],
191+
'0xf34308ef': [
192+
{
193+
name: 'execTransactionFromEntrypoint',
194+
type: 'function',
195+
stateMutability: 'payable',
196+
inputs: [
197+
{ name: 'to', type: 'address' },
198+
{ name: 'value', type: 'uint256' },
199+
{ name: 'data', type: 'bytes' },
200+
],
201+
outputs: [],
202+
},
203+
],
204+
'0x541d63c8': [
205+
{
206+
name: 'executeUserOpWithErrorString',
207+
type: 'function',
208+
stateMutability: 'nonpayable',
209+
inputs: [
210+
{ name: 'to', type: 'address' },
211+
{ name: 'value', type: 'uint256' },
212+
{ name: 'data', type: 'bytes' },
213+
{ name: 'operation', type: 'uint8' },
214+
],
215+
outputs: [],
216+
},
217+
],
218+
}

‎packages/transaction-decoder/test/snapshots/decoder/0xcc1f4e40e1186503bb19b5716c8527947ab4c7e972b79d3d64ad8a015cf10ff8.snapshot‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,57 @@
173173
"name": "callData",
174174
"type": "bytes",
175175
"value": "0x34fcd5be000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000eee8aed1957ca1545a0508afb51b53cca7e3c0d1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044095ea7b300000000000000000000000000000000005bbb0ef59571e58418f9a4357b68a00000000000000000000000000000000000000000000000002b7751a92f969f1b00000000000000000000000000000000000000000000000000000000",
176+
"valueDecoded": {
177+
"name": "executeBatch",
178+
"params": [
179+
{
180+
"components": [
181+
{
182+
"components": [
183+
{
184+
"name": "target",
185+
"type": "address",
186+
"value": "0xeEE8aED1957ca1545a0508AfB51b53cCA7e3c0d1",
187+
},
188+
{
189+
"name": "value",
190+
"type": "uint256",
191+
"value": "0",
192+
},
193+
{
194+
"name": "data",
195+
"type": "bytes",
196+
"value": "0x095ea7b300000000000000000000000000000000005bbb0ef59571e58418f9a4357b68a00000000000000000000000000000000000000000000000002b7751a92f969f1b",
197+
"valueDecoded": {
198+
"name": "approve",
199+
"params": [
200+
{
201+
"name": "_spender",
202+
"type": "address",
203+
"value": "0x00000000005BBB0EF59571E58418F9a4357b68A0",
204+
},
205+
{
206+
"name": "_value",
207+
"type": "uint256",
208+
"value": "3132061852949192475",
209+
},
210+
],
211+
"signature": "approve(address,uint256)",
212+
"type": "function",
213+
},
214+
},
215+
],
216+
"name": "calls",
217+
"type": "tuple",
218+
},
219+
],
220+
"name": "calls",
221+
"type": "tuple",
222+
},
223+
],
224+
"signature": "executeBatch((address,uint256,bytes)[])",
225+
"type": "function",
226+
},
176227
},
177228
{
178229
"name": "callGasLimit",

0 commit comments

Comments
 (0)