Chore/migrate to hardhat by kanej · Pull Request #133 · 1inch/aqua

kanej · 2026-06-08T16:43:11Z

Migrate aqua to Hardhat 3.

Building

The build settings have been ported from foundry.toml into a new hardhat.config.ts, and can be run with:

yarn build # or npx hardhat build

Hardhat 3 is able to resolve imports from node modules without further config. A single src/=src/ remapping has been kept to support absolute imports. We would recommend updating the tests to relative imports, and removing the remappings.txt file.

The hardhat-ignore-warnings plugin has been added to exclude warnings about test contract sizes.

Testing

The Solidity Test suite (50 tests) is passing

yarn test

Coverage

A coverage report (including an html report) can be generated with:

npx hardhat test --coverage

Gas Report

The gas snapshot file .gas-snapshot has been updated to Hardhat's format.

To update the snapshot:

yarn snapshot # or npx hardhat test solidity --snapshot

To check against the snapshot:

snapshot:check # npx hardhat test solidity --snapshot-check

Formatting

Formatting is now managed with prettier and prettier-plugin-solidity. The settings were chosen to minimize code level changes. The Solidity files have had the new formatting applied.

To format all files:

yarn format

To check the formatting:

yarn lint

Deployment

A sketch of a deployment setup using Hardhat Ignition has been added. The DEPLOY.md has been partially updated to reflect this.

The owner continues to be set based on the config. The owner for the development network (31337) has been set to the first built-in Hardhat account.

To run against an in-memory Hardhat network:

yarn hardhat run ./script/deployAquaRouter.ts

To run against a local development node:

yarn hardhat node 

# In another tab
yarn hardhat run ./script/deployAquaRouter.ts --network localhost

Review

Note

Reviewing this PR a commit at a time is the easiest approach

The latest `solidity-utils` uses package exports for the contracts, which is necessary with Hardhat 3 as it complies with npm resolution rules.

Pull in Hardhat 3 as a dev dependency. Add type `module` to the package.json so that the project is treated as ESM.

Hardhat 3 resolution honours npm transient dependency resolution, hence to ensure the same version of OpenZeppelin Contracts is used throughout contract compilation we add an explicit resolution.

Based on `foundry.toml` create an equivalent `hardhat.config.ts` file. The identical `[profile.default]` and `[profile.ci]` have been collapsed down into the single compilers setting. The `solx` profile has been left out as experimental rather than required for day to day development. Other Foundry-only settings that have been left out: 1. `[fmt]` - formatting will be replaced by prettier in a subsequent commit. 2. libs - npm dependencies will be used for dependency resolution in a subsequent commit.

Hardhat 3 Solidity import resolution can access npm modules directly, hence does not require remappings for forge/openzeppelin/solidity-utils. However, one remapping has been added `src/=src` to allow absolute imports. This is to avoid changing the imports in the Solidity files. It would be a small change to remove this remapping and update the Solidity imports with a small number of relative imports.

Update the package.json to change the test script to run Hardhat. There are no TS/JS tests so invoke Solidity test directly.

Hardhat supports recording a gas snapshot to `./.gas-snapshot`. It uses a slightly different format to Foundry, so the snapshot file has been updated. The `snapshot` script in the `package.json` has been updated to allow writing or updating the snapshot file by running: ```shell npm run snapshot ```

The core CI checks have been ported to using the Hardhat variants, so tests and the gas check. This required installing Node 24 to support running Hardhat. The snapshot check has been encoded as a script in the package.json for local running. The target branch was updated to `main`.

To replace `forge fmt` we add prettier with `prettier-plugin-solidity`. The configuration includes rules for ts, json and solidity. The Solidity file rules are aimed to reduce the number of formatting changes. Format and lint scripts have been added to the `package.json`, and swapped into the makefile.

Based on the config a run of `yarn run format` has updated the formatting.

Ignore solc warnings for code size when coming from tests and for transient storage from the 1inch/solidity-utils npm package.

This is a sketch of an Ignition based deployment for the AquaRouter, retaining the owner lookup from config via a wrapping script, but gaining the advantage of Ignition handling the deployment. Instead of passing in env variables, the `hardhat-keystore` plugin has been included.

kanej · 2026-06-08T16:44:02Z

  },
  "dependencies": {
    "forge-std": "github:foundry-rs/forge-std#v1.11.0",
-    "@1inch/solidity-utils": "6.9.7",


Solidity-utils 6.9.9 exposes its contracts via package.json exports, which Hardhat 3 needs.

kanej · 2026-06-08T16:44:36Z

    "@openzeppelin/contracts": "5.4.0"
  },
+  "devDependencies": {
+    "hardhat": "^3.7.0"


This is using a range, but that may not be appropriate for this repo.

kanej · 2026-06-08T16:45:22Z

+      default: { compilers: [aquaCompilerSettings] },
+      production: { compilers: [aquaCompilerSettings] },


The default profile is used for day to day development. production will be used by default during a deployment.

kanej · 2026-06-08T16:46:08Z

  push:
    branches:
-      - master
+      - main


I think this is the right update if I have read the repo default branch.

kanej · 2026-06-08T16:46:31Z

-
-      - name: Install deps
-        run: forge install
+          node-version: 24


I opted for Node 24.

kanej · 2026-06-08T16:47:42Z

  },
+  warnings: {
+    "test/**/*": {
+      "code-size": "off",


Turn off code size warnings from Test contracts.

kanej · 2026-06-08T16:48:10Z

+      "code-size": "off",
+    },
+    "npm/@1inch/**/*": {
+      "transient-storage": "off",


Ignore a transient storage warning from the @1inch/solidity-utils package.

kanej · 2026-06-08T16:49:05Z

-        "1": "0x0000000000000000000000000000000000000000"
-    }
+  "owner": {
+    "31337": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"


This is the first of the default Hardhat accounts, and so available on the dev node 31337.

kanej added 13 commits June 2, 2026 14:21

chore: bump version of solidity-utils to latest

7f7e8af

The latest `solidity-utils` uses package exports for the contracts, which is necessary with Hardhat 3 as it complies with npm resolution rules.

chore: add hardhat as a dev dependency

ce1d1cf

Pull in Hardhat 3 as a dev dependency. Add type `module` to the package.json so that the project is treated as ESM.

chore: use the same openzeppelin contracts in all resolutions

517a4ac

Hardhat 3 resolution honours npm transient dependency resolution, hence to ensure the same version of OpenZeppelin Contracts is used throughout contract compilation we add an explicit resolution.

chore: switch npm test script to use hardhat

79cb100

Update the package.json to change the test script to run Hardhat. There are no TS/JS tests so invoke Solidity test directly.

chore: apply prettier formatting

7031d92

Based on the config a run of `yarn run format` has updated the formatting.

chore: add hardhat-ignore-warnings

fbfe4e6

Ignore solc warnings for code size when coming from tests and for transient storage from the 1inch/solidity-utils npm package.

chore: update makefile commands

98b9ea4

kanej commented Jun 8, 2026

View reviewed changes

Comment thread .github/workflows/ci.yml

- name: Install deps

run: forge install

node-version: 24

kanej Jun 8, 2026

Copy link
Copy Markdown

Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I opted for Node 24.

kanej commented Jun 8, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chore/migrate to hardhat#133

Chore/migrate to hardhat#133
kanej wants to merge 13 commits into
1inch:mainfrom
NomicFoundation:chore/migrate-to-hardhat

kanej commented Jun 8, 2026

Uh oh!

kanej Jun 8, 2026

Uh oh!

kanej Jun 8, 2026

Uh oh!

kanej Jun 8, 2026

Uh oh!

kanej Jun 8, 2026

Uh oh!

kanej Jun 8, 2026

Uh oh!

kanej Jun 8, 2026

Uh oh!

kanej Jun 8, 2026

Uh oh!

kanej Jun 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		default: { compilers: [aquaCompilerSettings] },
		production: { compilers: [aquaCompilerSettings] },

Conversation

kanej commented Jun 8, 2026

Building

Testing

Coverage

Gas Report

Formatting

Deployment

Review

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant