Add tests for AccountERC7702Mock (#44)

Amxx · web-flow · commit 602c301278a7 · 2024-12-18T16:11:23.000-06:00
diff --git a/test/account/Account.behavior.js b/test/account/Account.behavior.js
@@ -1,14 +1,12 @@
 const { ethers } = require('hardhat');
 const { expect } = require('chai');
-const { impersonate } = require('../../lib/@openzeppelin-contracts/test/helpers/account');
-const {
-  SIG_VALIDATION_SUCCESS,
-  SIG_VALIDATION_FAILURE,
-} = require('../../lib/@openzeppelin-contracts/test/helpers/erc4337');
 const { setBalance } = require('@nomicfoundation/hardhat-network-helpers');
+
+const { impersonate } = require('@openzeppelin/contracts/test/helpers/account');
+const { SIG_VALIDATION_SUCCESS, SIG_VALIDATION_FAILURE } = require('@openzeppelin/contracts/test/helpers/erc4337');
 const {
   shouldSupportInterfaces,
-} = require('../../lib/@openzeppelin-contracts/test/utils/introspection/SupportsInterface.behavior');
+} = require('@openzeppelin/contracts/test/utils/introspection/SupportsInterface.behavior');
 
 function shouldBehaveLikeAnAccountBase() {
   describe('entryPoint', function () {
diff --git a/test/account/AccountBase.test.js b/test/account/AccountBase.test.js
@@ -1,21 +1,29 @@
 const { ethers } = require('hardhat');
-const { shouldBehaveLikeAnAccountBase, shouldBehaveLikeAnAccountBaseExecutor } = require('./Account.behavior');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { NonNativeSigner } = require('../helpers/signers');
 
+const { shouldBehaveLikeAnAccountBase, shouldBehaveLikeAnAccountBaseExecutor } = require('./Account.behavior');
+
 async function fixture() {
+  // EOAs and environment
   const [beneficiary, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMockExtended');
+
+  // ERC-4337 signer
   const signer = new NonNativeSigner({ sign: () => ({ serialized: '0x01' }) });
-  const helper = new ERC4337Helper('$AccountBaseMock');
-  const smartAccount = await helper.newAccount(['AccountBase', '1']);
+
+  // ERC-4337 account
+  const helper = new ERC4337Helper();
+  const env = await helper.wait();
+  const mock = await helper.newAccount('$AccountBaseMock', ['AccountBase', '1']);
+
   const signUserOp = async userOp => {
     userOp.signature = await signer.signMessage(userOp.hash());
     return userOp;
   };
 
-  return { ...helper, mock: smartAccount, signer, target, beneficiary, other, signUserOp };
+  return { ...env, mock, signer, target, beneficiary, other, signUserOp };
 }
 
 describe('AccountBase', function () {
diff --git a/test/account/AccountECDSA.test.js b/test/account/AccountECDSA.test.js
@@ -1,54 +1,43 @@
 const { ethers } = require('hardhat');
+const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
+const { ERC4337Helper } = require('../helpers/erc4337');
+const { PackedUserOperation } = require('../helpers/eip712-types');
+
 const {
   shouldBehaveLikeAnAccountBase,
   shouldBehaveLikeAnAccountBaseExecutor,
   shouldBehaveLikeAccountHolder,
 } = require('./Account.behavior');
-const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
-const { ERC4337Helper } = require('../helpers/erc4337');
 const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739Signer.behavior');
-const { PackedUserOperation } = require('../helpers/eip712');
 
 async function fixture() {
+  // EOAs and environment
   const [beneficiary, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMockExtended');
+
+  // ERC-4337 signer
   const signer = ethers.Wallet.createRandom();
-  const helper = new ERC4337Helper('$AccountECDSAMock');
-  const smartAccount = await helper.newAccount(['AccountECDSA', '1', signer]);
+
+  // ERC-4337 account
+  const helper = new ERC4337Helper();
+  const env = await helper.wait();
+  const mock = await helper.newAccount('$AccountECDSAMock', ['AccountECDSA', '1', signer]);
+
+  // domain cannot be fetched using getDomain(mock) before the mock is deployed
   const domain = {
     name: 'AccountECDSA',
     version: '1',
-    chainId: helper.chainId,
-    verifyingContract: smartAccount.address,
+    chainId: env.chainId,
+    verifyingContract: mock.address,
   };
+
   const signUserOp = async userOp => {
-    const types = { PackedUserOperation };
-    const packed = userOp.packed;
-    const typedOp = {
-      sender: packed.sender,
-      nonce: packed.nonce,
-      initCode: packed.initCode,
-      callData: packed.callData,
-      accountGasLimits: packed.accountGasLimits,
-      preVerificationGas: packed.preVerificationGas,
-      gasFees: packed.gasFees,
-      paymasterAndData: packed.paymasterAndData,
-      entrypoint: userOp.context.entrypoint.target,
-    };
-    userOp.signature = await signer.signTypedData(domain, types, typedOp);
+    const typedOp = Object.assign(userOp.packed, { entrypoint: env.entrypoint.target });
+    userOp.signature = await signer.signTypedData(domain, { PackedUserOperation }, typedOp);
     return userOp;
   };
 
-  return {
-    ...helper,
-    domain,
-    mock: smartAccount,
-    signer,
-    target,
-    beneficiary,
-    other,
-    signUserOp,
-  };
+  return { ...env, mock, domain, signer, target, beneficiary, other, signUserOp };
 }
 
 describe('AccountECDSA', function () {
diff --git a/test/account/AccountERC7702.test.js b/test/account/AccountERC7702.test.js
@@ -0,0 +1,60 @@
+const { ethers } = require('hardhat');
+const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
+const { ERC4337Helper } = require('../helpers/erc4337');
+const { PackedUserOperation } = require('../helpers/eip712-types');
+
+const {
+  shouldBehaveLikeAnAccountBase,
+  shouldBehaveLikeAnAccountBaseExecutor,
+  shouldBehaveLikeAccountHolder,
+} = require('./Account.behavior');
+const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739Signer.behavior');
+
+async function fixture() {
+  // EOAs and environment
+  const [beneficiary, other] = await ethers.getSigners();
+  const target = await ethers.deployContract('CallReceiverMockExtended');
+
+  // ERC-4337 signer
+  const signer = ethers.Wallet.createRandom();
+
+  // ERC-4337 account
+  const helper = new ERC4337Helper();
+  const env = await helper.wait();
+  const mock = await helper.newAccount('$AccountERC7702Mock', ['AccountERC7702Mock', '1'], { erc7702signer: signer });
+
+  // domain cannot be fetched using getDomain(mock) before the mock is deployed
+  const domain = {
+    name: 'AccountERC7702Mock',
+    version: '1',
+    chainId: env.chainId,
+    verifyingContract: mock.address,
+  };
+
+  const signUserOp = async userOp => {
+    const typedOp = Object.assign(userOp.packed, { entrypoint: env.entrypoint.target });
+    userOp.signature = await signer.signTypedData(domain, { PackedUserOperation }, typedOp);
+    return userOp;
+  };
+
+  return { ...env, mock, domain, signer, target, beneficiary, other, signUserOp };
+}
+
+describe('AccountERC7702', function () {
+  beforeEach(async function () {
+    Object.assign(this, await loadFixture(fixture));
+  });
+
+  shouldBehaveLikeAnAccountBase();
+  shouldBehaveLikeAnAccountBaseExecutor({ deployable: false });
+  shouldBehaveLikeAccountHolder();
+
+  describe('ERC7739Signer', function () {
+    beforeEach(async function () {
+      this.mock = await this.mock.deploy();
+      this.signTypedData = this.signer.signTypedData.bind(this.signer);
+    });
+
+    shouldBehaveLikeERC7739Signer();
+  });
+});
diff --git a/test/account/AccountP256.test.js b/test/account/AccountP256.test.js
@@ -1,51 +1,49 @@
 const { ethers } = require('hardhat');
+const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
+const { ERC4337Helper } = require('../helpers/erc4337');
+const { NonNativeSigner, P256SigningKey } = require('../helpers/signers');
+const { PackedUserOperation } = require('../helpers/eip712-types');
+
 const {
   shouldBehaveLikeAnAccountBase,
   shouldBehaveLikeAnAccountBaseExecutor,
   shouldBehaveLikeAccountHolder,
 } = require('./Account.behavior');
-const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
-const { ERC4337Helper } = require('../helpers/erc4337');
-const { NonNativeSigner, P256SigningKey } = require('../helpers/signers');
 const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739Signer.behavior');
-const { PackedUserOperation } = require('../helpers/eip712');
 
 async function fixture() {
+  // EOAs and environment
   const [beneficiary, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMockExtended');
+
+  // ERC-4337 signer
   const signer = new NonNativeSigner(P256SigningKey.random());
-  const helper = new ERC4337Helper('$AccountP256Mock');
-  const smartAccount = await helper.newAccount([
+
+  // ERC-4337 account
+  const helper = new ERC4337Helper();
+  const env = await helper.wait();
+  const mock = await helper.newAccount('$AccountP256Mock', [
     'AccountP256',
     '1',
     signer.signingKey.publicKey.qx,
     signer.signingKey.publicKey.qy,
   ]);
+
+  // domain cannot be fetched using getDomain(mock) before the mock is deployed
   const domain = {
     name: 'AccountP256',
     version: '1',
-    chainId: helper.chainId,
-    verifyingContract: smartAccount.address,
+    chainId: env.chainId,
+    verifyingContract: mock.address,
   };
+
   const signUserOp = async userOp => {
-    const types = { PackedUserOperation };
-    const packed = userOp.packed;
-    const typedOp = {
-      sender: packed.sender,
-      nonce: packed.nonce,
-      initCode: packed.initCode,
-      callData: packed.callData,
-      accountGasLimits: packed.accountGasLimits,
-      preVerificationGas: packed.preVerificationGas,
-      gasFees: packed.gasFees,
-      paymasterAndData: packed.paymasterAndData,
-      entrypoint: userOp.context.entrypoint.target,
-    };
-    userOp.signature = await signer.signTypedData(domain, types, typedOp);
+    const typedOp = Object.assign(userOp.packed, { entrypoint: env.entrypoint.target });
+    userOp.signature = await signer.signTypedData(domain, { PackedUserOperation }, typedOp);
     return userOp;
   };
 
-  return { ...helper, domain, mock: smartAccount, signer, target, beneficiary, other, signUserOp };
+  return { ...env, mock, domain, signer, target, beneficiary, other, signUserOp };
 }
 
 describe('AccountP256', function () {
diff --git a/test/account/AccountRSA.test.js b/test/account/AccountRSA.test.js
@@ -1,51 +1,49 @@
 const { ethers } = require('hardhat');
+const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
+const { ERC4337Helper } = require('../helpers/erc4337');
+const { NonNativeSigner, RSASHA256SigningKey } = require('../helpers/signers');
+const { PackedUserOperation } = require('../helpers/eip712-types');
+
 const {
   shouldBehaveLikeAnAccountBase,
   shouldBehaveLikeAnAccountBaseExecutor,
   shouldBehaveLikeAccountHolder,
 } = require('./Account.behavior');
-const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
-const { ERC4337Helper } = require('../helpers/erc4337');
-const { NonNativeSigner, RSASHA256SigningKey } = require('../helpers/signers');
 const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739Signer.behavior');
-const { PackedUserOperation } = require('../helpers/eip712');
 
 async function fixture() {
+  // EOAs and environment
   const [beneficiary, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMockExtended');
+
+  // ERC-4337 signer
   const signer = new NonNativeSigner(RSASHA256SigningKey.random());
-  const helper = new ERC4337Helper('$AccountRSAMock');
-  const smartAccount = await helper.newAccount([
+
+  // ERC-4337 account
+  const helper = new ERC4337Helper();
+  const env = await helper.wait();
+  const mock = await helper.newAccount('$AccountRSAMock', [
     'AccountRSA',
     '1',
     signer.signingKey.publicKey.e,
     signer.signingKey.publicKey.n,
   ]);
+
+  // domain cannot be fetched using getDomain(mock) before the mock is deployed
   const domain = {
     name: 'AccountRSA',
     version: '1',
-    chainId: helper.chainId,
-    verifyingContract: smartAccount.address,
+    chainId: env.chainId,
+    verifyingContract: mock.address,
   };
+
   const signUserOp = async userOp => {
-    const types = { PackedUserOperation };
-    const packed = userOp.packed;
-    const typedOp = {
-      sender: packed.sender,
-      nonce: packed.nonce,
-      initCode: packed.initCode,
-      callData: packed.callData,
-      accountGasLimits: packed.accountGasLimits,
-      preVerificationGas: packed.preVerificationGas,
-      gasFees: packed.gasFees,
-      paymasterAndData: packed.paymasterAndData,
-      entrypoint: userOp.context.entrypoint.target,
-    };
-    userOp.signature = await signer.signTypedData(domain, types, typedOp);
+    const typedOp = Object.assign(userOp.packed, { entrypoint: env.entrypoint.target });
+    userOp.signature = await signer.signTypedData(domain, { PackedUserOperation }, typedOp);
     return userOp;
   };
 
-  return { ...helper, domain, mock: smartAccount, signer, target, beneficiary, other, signUserOp };
+  return { ...env, domain, mock, signer, target, beneficiary, other, signUserOp };
 }
 
 describe('AccountRSA', function () {
diff --git a/test/helpers/eip712-types.js b/test/helpers/eip712-types.js
@@ -0,0 +1,19 @@
+const { formatType } = require('@openzeppelin/contracts/test/helpers/eip712-types');
+const { mapValues } = require('@openzeppelin/contracts/test/helpers/iterate');
+
+module.exports = mapValues(
+  {
+    PackedUserOperation: {
+      sender: 'address',
+      nonce: 'uint256',
+      initCode: 'bytes',
+      callData: 'bytes',
+      accountGasLimits: 'bytes32',
+      preVerificationGas: 'uint256',
+      gasFees: 'bytes32',
+      paymasterAndData: 'bytes',
+      entrypoint: 'address',
+    },
+  },
+  formatType,
+);
diff --git a/test/helpers/eip712.js b/test/helpers/eip712.js
diff --git a/test/helpers/erc4337.js b/test/helpers/erc4337.js
