Finalize test migration: remove legacy dependencies and test helpers (#…

…4797)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,7 @@ about: Report a bug in OpenZeppelin Contracts
 
 **💻 Environment**
 
-<!-- Tell us what version of OpenZeppelin Contracts you're using, and how you're using it: Truffle, Remix, etc. -->
+<!-- Tell us what version of OpenZeppelin Contracts you're using, and how you're using it: Hardhat, Remix, etc. -->
 
 **📝 Details**
 

.github/workflows/checks.yml

@@ -34,8 +34,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
-      - name: Compile contracts # TODO: Remove after migrating tests to ethers
-        run: npm run compile
       - name: Run tests and generate gas report
         run: npm run test
       - name: Check linearisation of the inheritance graph
@@ -64,8 +62,6 @@ jobs:
           cp -rnT contracts lib/openzeppelin-contracts/contracts
       - name: Transpile to upgradeable
         run: bash scripts/upgradeable/transpile.sh
-      - name: Compile contracts # TODO: Remove after migrating tests to ethers
-        run: npm run compile
       - name: Run tests
         run: npm run test
       - name: Check linearisation of the inheritance graph
@@ -94,8 +90,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
-      - name: Compile contracts # TODO: Remove after migrating tests to ethers
-        run: npm run compile
       - name: Run coverage
         run: npm run coverage
       - uses: codecov/codecov-action@v3

.gitignore

@@ -29,15 +29,9 @@ npm-debug.log
 # local env variables
 .env
 
-# truffle build directory
-build/
-
 # macOS
 .DS_Store
 
-# truffle
-.node-xmlhttprequest-*
-
 # IntelliJ IDE
 .idea
 

README.md

@@ -23,7 +23,7 @@
 
 ### Installation
 
-#### Hardhat, Truffle (npm)
+#### Hardhat (npm)
 
 ```
 $ npm install @openzeppelin/contracts

contracts/proxy/README.adoc

@@ -19,7 +19,7 @@ There are two alternative ways to add upgradeability to an ERC-1967 proxy. Their
 - {TransparentUpgradeableProxy}: A proxy with a built-in immutable admin and upgrade interface.
 - {UUPSUpgradeable}: An upgradeability mechanism to be included in the implementation contract.
 
-CAUTION: Using upgradeable proxies correctly and securely is a difficult task that requires deep knowledge of the proxy pattern, Solidity, and the EVM. Unless you want a lot of low level control, we recommend using the xref:upgrades-plugins::index.adoc[OpenZeppelin Upgrades Plugins] for Truffle and Hardhat.
+CAUTION: Using upgradeable proxies correctly and securely is a difficult task that requires deep knowledge of the proxy pattern, Solidity, and the EVM. Unless you want a lot of low level control, we recommend using the xref:upgrades-plugins::index.adoc[OpenZeppelin Upgrades Plugins] for Hardhat and Foundry.
 
 A different family of proxies are beacon proxies. This pattern, popularized by Dharma, allows multiple proxies to be upgraded to a different implementation in a single transaction.
 

docs/modules/ROOT/pages/index.adoc

@@ -13,7 +13,7 @@ IMPORTANT: OpenZeppelin Contracts uses semantic versioning to communicate backwa
 [[install]]
 === Installation
 
-==== Hardhat, Truffle (npm)
+==== Hardhat (npm)
 
 ```console
 $ npm install @openzeppelin/contracts

docs/modules/ROOT/pages/utilities.adoc

@@ -186,16 +186,15 @@ contract Box is Multicall {
 }
 ----
 
-This is how to call the `multicall` function using Truffle, allowing `foo` and `bar` to be called in a single transaction:
+This is how to call the `multicall` function using Ethers.js, allowing `foo` and `bar` to be called in a single transaction:
 [source,javascript]
 ----
 // scripts/foobar.js
 
-const Box = artifacts.require('Box');
-const instance = await Box.new();
+const instance = await ethers.deployContract("Box");
 
 await instance.multicall([
-    instance.contract.methods.foo().encodeABI(),
-    instance.contract.methods.bar().encodeABI()
+    instance.interface.encodeFunctionData("foo"),
+    instance.interface.encodeFunctionData("bar")
 ]);
 ----

docs/modules/ROOT/pages/wizard.adoc

@@ -4,7 +4,7 @@
 Not sure where to start? Use the interactive generator below to bootstrap your
 contract and learn about the components offered in OpenZeppelin Contracts.
 
-TIP: Place the resulting contract in your `contracts` directory in order to compile it with a tool like Hardhat or Truffle. Consider reading our guide on xref:learn::developing-smart-contracts.adoc[Developing Smart Contracts] for more guidance!
+TIP: Place the resulting contract in your `contracts` or `src` directory in order to compile it with a tool like Hardhat or Foundry. Consider reading our guide on xref:learn::developing-smart-contracts.adoc[Developing Smart Contracts] for more guidance!
 
 ++++
 <script async src="https://wizard.openzeppelin.com/build/embed.js"></script>

hardhat.config.js

@@ -55,7 +55,6 @@ const argv = require('yargs/yargs')()
     },
   }).argv;
 
-require('@nomiclabs/hardhat-truffle5'); // deprecated
 require('@nomicfoundation/hardhat-toolbox');
 require('@nomicfoundation/hardhat-ethers');
 require('hardhat-ignore-warnings');

hardhat/env-contract.js

@@ -15,27 +15,4 @@ extendEnvironment(hre => {
     const filteredSignersAsPromise = originalGetSigners().then(signers => signers.slice(1));
     hre.ethers.getSigners = () => filteredSignersAsPromise;
   }
-
-  // override hre.contract
-  const originalContract = hre.contract;
-  hre.contract = function (name, body) {
-    originalContract.call(this, name, accounts => {
-      let snapshot;
-
-      before(async function () {
-        // reset the state of the chain in between contract test suites
-        // TODO: this should be removed when migration to ethers is over
-        const { takeSnapshot } = require('@nomicfoundation/hardhat-network-helpers');
-        snapshot = await takeSnapshot();
-      });
-
-      after(async function () {
-        // reset the state of the chain in between contract test suites
-        // TODO: this should be removed when migration to ethers is over
-        await snapshot.restore();
-      });
-
-      body(accounts.slice(1));
-    });
-  };
 });