Skip to content

Commit 9fd82a4

Browse files
authored
chore: Remove Hardhat (#1312)
* chore: Remove Hardhat Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * update path Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * fix build Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * svm tests Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * remove hardhat test step Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * version Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * update publish step Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * add back the old scripts Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * use foundry artifacts Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * use abi Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * version Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * use ZERO_ADDRESS Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * update readmes Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> --------- Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
1 parent dc9c538 commit 9fd82a4

File tree

106 files changed

+685
-9604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+685
-9604
lines changed

.github/actions/cache-evm-artifacts/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
# The job that generates the artifacts is responsible for archiving them to the cache tarball. This avoids any
2424
# conflicts with other caching actions that might have cleaned some of cached contents.
2525
path: evm-artifacts.tar
26-
key: evm-artifacts-${{ runner.os }}-node-${{ steps.resolved-node.outputs.version }}-${{ hashFiles('yarn.lock', 'hardhat.config.ts', 'foundry.toml', 'contracts/**/*.sol') }}
26+
key: evm-artifacts-${{ runner.os }}-node-${{ steps.resolved-node.outputs.version }}-${{ hashFiles('yarn.lock', 'foundry.toml', 'contracts/**/*.sol') }}
2727
- name: Unpack restored EVM artifacts
2828
if: steps.evm-artifacts-cache.outputs.cache-hit == 'true'
2929
shell: bash

.github/actions/generate-evm-artifacts/action.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ runs:
1616
- name: Install packages
1717
shell: bash
1818
run: yarn install --frozen-lockfile
19-
- name: Build Hardhat
20-
shell: bash
21-
run: yarn build-hardhat
2219
- name: Install Foundry
2320
uses: foundry-rs/foundry-toolchain@v1
2421
- name: Install forge dependencies

.github/workflows/pr.yml

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ jobs:
4444
runs-on: ubuntu-latest
4545
env:
4646
ARTIFACTS_PATHS: |
47-
artifacts
48-
cache
49-
typechain
5047
out
5148
cache-foundry
5249
steps:
@@ -114,34 +111,6 @@ jobs:
114111
echo "Please run 'yarn generate-constants-json' and 'yarn extract-addresses' (or ensure the pre-commit hook runs) and commit the results."
115112
exit 1
116113
fi
117-
test-evm:
118-
name: Test EVM
119-
# Mixed leaf tests also require SVM types from assets that have been uploaded in the artifacts.
120-
needs:
121-
- upload-svm-artifacts
122-
- upload-evm-artifacts
123-
runs-on: ubuntu-latest
124-
steps:
125-
- name: Checkout repo
126-
uses: actions/checkout@v3
127-
- name: "Use Node ${{ env.NODE_VERSION }}"
128-
uses: actions/setup-node@v3
129-
with:
130-
node-version: "${{ env.NODE_VERSION }}"
131-
cache: yarn
132-
- name: Install packages
133-
run: yarn install --frozen-lockfile --ignore-optional
134-
- name: Download SVM artifacts
135-
uses: actions/download-artifact@v4
136-
with:
137-
name: svm-artifacts-${{ runner.os }}-node-${{ env.NODE_VERSION }}
138-
- name: Download EVM artifacts
139-
uses: actions/download-artifact@v4
140-
with:
141-
name: evm-artifacts-${{ runner.os }}-node-${{ env.NODE_VERSION }}
142-
- name: Test evm-hardhat
143-
shell: bash
144-
run: yarn test-evm-hardhat
145114
test-svm-verified:
146115
name: Test verified SVM build
147116
needs: upload-svm-artifacts
@@ -220,8 +189,8 @@ jobs:
220189
name: evm-artifacts-${{ runner.os }}-node-${{ env.NODE_VERSION }}
221190
- name: Build TypeScript
222191
run: yarn build-ts
223-
forge:
224-
name: Forge
192+
test-evm:
193+
name: EVM Tests
225194
needs: upload-evm-artifacts
226195
runs-on: ubuntu-latest
227196
steps:

.github/workflows/publish.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ permissions:
1818
env:
1919
NODE_VERSION: 22.18
2020
EVM_ARTIFACTS_PATHS: |
21-
artifacts
22-
cache
23-
typechain
2421
out
2522
cache-foundry
2623
SVM_ARTIFACTS_PATHS: |

README.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This [script](https://github.com/across-protocol/contracts/blob/555475cdee6109af
1919

2020
## Deployed Contract Versions
2121

22-
The latest contract deployments can be found in `/broadcast/deployed-addresses.json` (auto-generated by `yarn extract-addresses`). Legacy Hardhat deployment addresses are in `/deployments/legacy-addresses.json`.
22+
The latest contract deployments can be found in `/broadcast/deployed-addresses.json` (auto-generated by `yarn extract-addresses`).
2323

2424
## Requirements
2525

@@ -41,7 +41,7 @@ yarn build-verified # Will build all code. Compile solidity & rust (verified doc
4141
yarn test # Run all unit tests without gas analysis, using local toolchain SVM build
4242
yarn test-verified # Run all unit tests (without gas analysis) with verified SVM docker build
4343
yarn test:gas-analytics # Run only tests that count gas costs
44-
yarn test:report-gas # Run unit tests with hardhat-gas-reporter enabled
44+
yarn test:report-gas # Run unit tests with gas reporting enabled
4545
yarn test-evm # Only test EVM code
4646
yarn test-svm # Only test SVM code (local toolchain build)
4747
yarn test-svm-solana-verify # Only test SVM code (verified docker build)
@@ -61,13 +61,6 @@ yarn lint-fix
6161

6262
### EVM
6363

64-
#### Hardhat
65-
66-
```shell
67-
NODE_URL_1=https://mainnet.infura.com/xxx yarn hardhat deploy --tags HubPool --network mainnet
68-
ETHERSCAN_API_KEY=XXX yarn hardhat etherscan-verify --network mainnet --license AGPL-3.0 --force-license --solc-input
69-
```
70-
7164
#### Foundry
7265

7366
```shell

contracts/Lens_SpokePool.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import "./ZkSync_SpokePool.sol";
55

66
/**
77
* @notice Lens specific SpokePool. Wrapper around the ZkSync_SpokePool contract.
8-
* @dev Resources for compiling and deploying contracts with hardhat: https://era.zksync.io/docs/tools/hardhat/hardhat-zksync-solc.html
8+
* @dev Resources for compiling and deploying ZkSync contracts: https://docs.zksync.io/build/tooling/foundry/overview
99
* @custom:security-contact bugs@across.to
1010
*/
1111
contract Lens_SpokePool is ZkSync_SpokePool {

contracts/ZkSync_SpokePool.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ interface IL2ETH {
2222
}
2323

2424
/**
25-
* @notice ZkSync specific SpokePool, intended to be compiled with `@matterlabs/hardhat-zksync-solc`.
26-
* @dev Resources for compiling and deploying contracts with hardhat: https://era.zksync.io/docs/tools/hardhat/hardhat-zksync-solc.html
25+
* @notice ZkSync specific SpokePool.
26+
* @dev Resources for compiling and deploying ZkSync contracts: https://docs.zksync.io/build/tooling/foundry/overview
2727
* @custom:security-contact bugs@across.to
2828
*/
2929
contract ZkSync_SpokePool is SpokePool, CircleCCTPAdapter {

deploy/010_deploy_polygon_token_bridger_polygon.ts

Lines changed: 0 additions & 28 deletions
This file was deleted.

deploy/012_deploy_boba_adapter.ts

Lines changed: 0 additions & 23 deletions
This file was deleted.

deploy/013_deploy_boba_spokepool.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)