dumpCalls

eth-infinitism · Feb 19, 2025 · c85351a · c85351a
1 parent f616408
commit c85351a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/packages/utils/contracts/Imports.sol b/packages/utils/contracts/Imports.sol
@@ -5,5 +5,7 @@ import "@account-abstraction/contracts/core/EntryPointSimulations.sol";
 import "@account-abstraction/contracts/interfaces/IStakeManager.sol";
 import "@account-abstraction/contracts/accounts/SimpleAccountFactory.sol";
 import "@account-abstraction/rip7560/contracts/predeploys/Rip7560StakeManager.sol";
+import "@account-abstraction/rip7560/contracts/interfaces/IRip7560Account.sol";
+import "@account-abstraction/rip7560/contracts/interfaces/IRip7560Paymaster.sol";
 
 import {NonceManager as NonceManagerRIP7712} from "@account-abstraction/rip7560/contracts/predeploys/NonceManager.sol";
diff --git a/packages/validation-manager/src/ERC7562Parser.ts b/packages/validation-manager/src/ERC7562Parser.ts
@@ -19,7 +19,7 @@ import { bannedOpCodes, opcodesOnlyInStakedEntities } from './ERC7562BannedOpcod
 import { ValidationResult } from './IValidationManager'
 import { ERC7562Call } from './ERC7562Call'
 import { getOpcodeName } from './enum/EVMOpcodes'
-import { _tryDetectKnownMethod } from './decodeHelper'
+import { _tryDetectKnownMethod, dumpCallTree } from './decodeHelper'
 
 export interface ERC7562ValidationResults {
   storageMap: StorageMap
@@ -81,6 +81,7 @@ export class ERC7562Parser {
       throw new Error('Unexpected traceCall result: no calls from entrypoint.')
     }
     this.stakeValidationResult = validationResult
+    dumpCallTree(erc7562Call, { ...userOp })
     this._innerStepRecursive(userOp, erc7562Call, 0, erc7562Call.to)
     return {
       contractAddresses: this.contractAddresses,

diff --git a/packages/validation-manager/src/decodeHelper.ts b/packages/validation-manager/src/decodeHelper.ts
@@ -2,6 +2,7 @@ import { ERC7562Call } from './ERC7562Call'
 import Debug from 'debug'
 import { IEntryPoint__factory, IPaymaster__factory, SenderCreator__factory } from '@account-abstraction/utils'
 import { FunctionFragment, Interface } from 'ethers/lib/utils'
+import { IRip7560Account__factory, IRip7560Paymaster__factory } from '@account-abstraction/utils/dist/src/types'
 
 const debug = Debug('aa.dump')
 
@@ -234,6 +235,8 @@ const RIP7560EntryPointABI = [
 
 const abis = [
   ...RIP7560EntryPointABI,
+  ...IRip7560Account__factory.abi,
+  ...IRip7560Paymaster__factory.abi,
   ...SenderCreator__factory.abi,
   ...IEntryPoint__factory.abi,
   ...IPaymaster__factory.abi