Update @OpenZeppelin/contracts dependency and migrate to hardhat-predeploy (#203)

Author: Amxx

hardhat.config.js

@@ -30,10 +30,10 @@ require('@nomicfoundation/hardhat-chai-matchers');
 require('@nomicfoundation/hardhat-ethers');
 require('hardhat-exposed');
 require('hardhat-gas-reporter');
+require('hardhat-predeploy');
 require('solidity-coverage');
 require('solidity-docgen');
 require('./hardhat/remappings');
-require('@openzeppelin/contracts/hardhat/common-contracts');
 
 module.exports = {
   solidity: {

lib/@openzeppelin-contracts

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers, predeploy } = require('hardhat');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 
 const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
@@ -26,7 +26,7 @@ async function fixture() {
   const helper = new ERC4337Helper();
 
   // ERC-4337 Entrypoint domain
-  const entrypointDomain = await getDomain(entrypoint.v08);
+  const entrypointDomain = await getDomain(predeploy.entrypoint.v08);
 
   // domain cannot be fetched using getDomain(mock) before the mock is deployed
   const domain = {

lib/@openzeppelin-contracts-upgradeable

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers, predeploy } = require('hardhat');
 const { expect } = require('chai');
 const { loadFixture, time } = require('@nomicfoundation/hardhat-network-helpers');
 
@@ -34,7 +34,7 @@ async function fixture() {
   // ERC-7579 account
   const mockAccount = await helper.newAccount('$AccountERC7579');
   const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount));
-  const mockAccountFromEntrypoint = await impersonate(entrypoint.v08.target).then(asEntrypoint =>
+  const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v08.target).then(asEntrypoint =>
     mockAccount.connect(asEntrypoint),
   );
 

package-lock.json

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers, predeploy } = require('hardhat');
 const { expect } = require('chai');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 
@@ -33,7 +33,7 @@ async function fixture() {
   const moduleType = MODULE_TYPE_EXECUTOR;
 
   await mockAccount.deploy();
-  await impersonate(entrypoint.v08.target).then(asEntrypoint =>
+  await impersonate(predeploy.entrypoint.v08.target).then(asEntrypoint =>
     mockAccount.connect(asEntrypoint).installModule(moduleType, mock.target, installData),
   );
 

test/account/AccountWebAuthn.test.js

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers, predeploy } = require('hardhat');
 const { expect } = require('chai');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 
@@ -41,7 +41,7 @@ async function fixture() {
   // ERC-7579 account
   const mockAccount = await helper.newAccount('$AccountERC7579');
   const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount));
-  const mockAccountFromEntrypoint = await impersonate(entrypoint.v08.target).then(asEntrypoint =>
+  const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v08.target).then(asEntrypoint =>
     mockAccount.connect(asEntrypoint),
   );
 

test/account/modules/ERC7579DelayedExecutor.test.js

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers, predeploy } = require('hardhat');
 const { expect } = require('chai');
 const { loadFixture, time } = require('@nomicfoundation/hardhat-network-helpers');
 
@@ -30,7 +30,7 @@ async function fixture() {
   // ERC-7579 account
   const mockAccount = await helper.newAccount('$AccountERC7579');
   const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount));
-  const mockAccountFromEntrypoint = await impersonate(entrypoint.v08.target).then(asEntrypoint =>
+  const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v08.target).then(asEntrypoint =>
     mockAccount.connect(asEntrypoint),
   );
 

test/account/modules/ERC7579Executor.test.js

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers, predeploy } = require('hardhat');
 const { expect } = require('chai');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { impersonate } = require('@openzeppelin/contracts/test/helpers/account');
@@ -40,7 +40,7 @@ async function fixture() {
   // ERC-7579 account
   const mockAccount = await helper.newAccount('$AccountERC7579');
   const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount));
-  const mockAccountFromEntrypoint = await impersonate(entrypoint.v08.target).then(asEntrypoint =>
+  const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v08.target).then(asEntrypoint =>
     mockAccount.connect(asEntrypoint),
   );