Use account factory to generate the init code of wallet (eth-infinitism#250)

Author: kaiix

src/AASigner.ts

@@ -1,23 +1,21 @@
-import { BigNumber, Bytes, ethers, Event, Signer } from 'ethers'
-import { zeroAddress } from 'ethereumjs-util'
-import { BaseProvider, Provider, TransactionRequest } from '@ethersproject/providers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
+import { TransactionReceipt } from '@ethersproject/abstract-provider/src.ts/index'
+import { BytesLike, hexValue } from '@ethersproject/bytes'
 import { Deferrable, resolveProperties } from '@ethersproject/properties'
+import { BaseProvider, Provider, TransactionRequest } from '@ethersproject/providers'
+import { BigNumber, Bytes, ethers, Event, Signer } from 'ethers'
+import { clearInterval } from 'timers'
+import { getAccountAddress, getAccountInitCode } from '../test/testutils'
+import { fillAndSign, getUserOpHash } from '../test/UserOp'
+import { UserOperation } from '../test/UserOperation'
 import {
   EntryPoint,
   EntryPoint__factory,
-  ERC1967Proxy__factory,
   SimpleAccount,
+  SimpleAccountFactory,
+  SimpleAccountFactory__factory,
   SimpleAccount__factory
 } from '../typechain'
-import { BytesLike, hexValue } from '@ethersproject/bytes'
-import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { fillAndSign, getUserOpHash } from '../test/UserOp'
-import { UserOperation } from '../test/UserOperation'
-import { TransactionReceipt } from '@ethersproject/abstract-provider/src.ts/index'
-import { clearInterval } from 'timers'
-import { Create2Factory } from './Create2Factory'
-import { getCreate2Address, hexConcat, Interface, keccak256 } from 'ethers/lib/utils'
-import { HashZero } from '../test/testutils'
 
 export type SendUserOp = (userOp: UserOperation) => Promise<TransactionResponse | undefined>
 
@@ -202,6 +200,7 @@ export class AASigner extends Signer {
 
   private _isPhantom = true
   public entryPoint: EntryPoint
+  public accountFactory: SimpleAccountFactory
 
   private _chainId: Promise<number> | undefined
 
@@ -212,9 +211,10 @@ export class AASigner extends Signer {
    * @param sendUserOp function to actually send the UserOp to the entryPoint.
    * @param index - index of this account for this signer.
    */
-  constructor (readonly signer: Signer, readonly entryPointAddress: string, readonly sendUserOp: SendUserOp, readonly index = 0, readonly provider = signer.provider) {
+  constructor (readonly signer: Signer, readonly entryPointAddress: string, readonly sendUserOp: SendUserOp, readonly accountFactoryAddress: string, readonly index = 0, readonly provider = signer.provider) {
     super()
     this.entryPoint = EntryPoint__factory.connect(entryPointAddress, signer)
+    this.accountFactory = SimpleAccountFactory__factory.connect(accountFactoryAddress, signer)
   }
 
   // connect to a specific pre-deployed address
@@ -234,18 +234,6 @@ export class AASigner extends Signer {
     throw new Error('connect not implemented')
   }
 
-  async _deploymentAddress (): Promise<string> {
-    return getCreate2Address(Create2Factory.contractAddress, HashZero, keccak256(await this._deploymentTransaction()))
-  }
-
-  // TODO TODO: THERE IS UTILS.getAccountInitCode - why not use that?
-  async _deploymentTransaction (): Promise<BytesLike> {
-    const implementationAddress = zeroAddress() // TODO: pass implementation in here
-    const ownerAddress = await this.signer.getAddress()
-    const initializeCall = new Interface(SimpleAccount__factory.abi).encodeFunctionData('initialize', [ownerAddress])
-    return new ERC1967Proxy__factory(this.signer).getDeployTransaction(implementationAddress, initializeCall).data!
-  }
-
   async getAddress (): Promise<string> {
     await this.syncAccount()
     return this._account!.address
@@ -353,7 +341,7 @@ export class AASigner extends Signer {
 
   async syncAccount (): Promise<void> {
     if (this._account == null) {
-      const address = await this._deploymentAddress()
+      const address = await getAccountAddress(await this.signer.getAddress(), this.accountFactory)
       this._account = SimpleAccount__factory.connect(address, this.signer)
     }
 
@@ -380,12 +368,7 @@ export class AASigner extends Signer {
 
     let initCode: BytesLike | undefined
     if (this._isPhantom) {
-      const initCallData = new Create2Factory(this.provider!).getDeployTransactionCallData(hexValue(await this._deploymentTransaction()), HashZero)
-
-      initCode = hexConcat([
-        Create2Factory.contractAddress,
-        initCallData
-      ])
+      initCode = getAccountInitCode(await this.signer.getAddress(), this.accountFactory)
     }
     const execFromEntryPoint = await this._account!.populateTransaction.execute(tx.to!, tx.value ?? 0, tx.data!)
 

src/runop.ts

@@ -24,9 +24,10 @@ import { TransactionReceipt } from '@ethersproject/abstract-provider/src.ts/inde
       await hre.run('etherscan-verify')
     }
   }
-  const [entryPointAddress, testCounterAddress] = await Promise.all([
+  const [entryPointAddress, testCounterAddress, accountFactoryAddress] = await Promise.all([
     hre.deployments.get('EntryPoint').then(d => d.address),
-    hre.deployments.get('TestCounter').then(d => d.address)
+    hre.deployments.get('TestCounter').then(d => d.address),
+    hre.deployments.get('SimpleAccountFactory').then(d => d.address)
   ])
 
   console.log('entryPointAddress:', entryPointAddress, 'testCounterAddress:', testCounterAddress)
@@ -51,7 +52,7 @@ import { TransactionReceipt } from '@ethersproject/abstract-provider/src.ts/inde
   // index is unique for an account (so same owner can have multiple accounts, with different index
   const index = parseInt(process.env.AA_INDEX ?? '0')
   console.log('using account index (AA_INDEX)', index)
-  const aasigner = new AASigner(ethersSigner, entryPointAddress, sendUserOp, index)
+  const aasigner = new AASigner(ethersSigner, entryPointAddress, sendUserOp, accountFactoryAddress, index)
   // connect to pre-deployed account
   // await aasigner.connectAccountAddress(accountAddress)
   const myAddress = await aasigner.getAddress()