Skip to content

Commit

Permalink
chore: Restore contract verification tests (#419)
Browse files Browse the repository at this point in the history
# What ❔

- restoring contract verification tests
- bumping hardhat and hardhat-vyper

## Why ❔

A bug in hardhat-vyper was fixed, hence we can compile vyper again.

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.

Co-authored-by: Igor Borodin <hatemosphere@protonmail.com>
  • Loading branch information
ly0va and hatemosphere committed Nov 8, 2023
1 parent f225b72 commit 283096c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/ci-core-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ jobs:
echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
echo $(pwd)/bin >> $GITHUB_PATH
echo IN_DOCKER=1 >> .env
# TODO (EVM-374): Change the following to `true` after https://github.com/NomicFoundation/hardhat/pull/4552 is merged and released.
echo RUN_CONTRACT_VERIFICATION_TEST=false >> .env
echo RUN_CONTRACT_VERIFICATION_TEST=true >> .env
echo ZKSYNC_DEBUG_LOGS=true >> .env
- name: Download zksolc/solc and zkvyper/vyper
Expand Down Expand Up @@ -205,8 +204,7 @@ jobs:
echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
echo $(pwd)/bin >> $GITHUB_PATH
echo IN_DOCKER=1 >> .env
# TODO (EVM-374): Change the following to `true` after https://github.com/NomicFoundation/hardhat/pull/4552 is merged and released.
echo RUN_CONTRACT_VERIFICATION_TEST=false >> .env
echo RUN_CONTRACT_VERIFICATION_TEST=true >> .env
echo ZKSYNC_DEBUG_LOGS=true >> .env
- name: Download zksolc/solc and zkvyper/vyper
Expand Down
5 changes: 2 additions & 3 deletions core/tests/ts-integration/hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import '@matterlabs/hardhat-zksync-solc';
// TODO (EVM-374): Uncomment after https://github.com/NomicFoundation/hardhat/pull/4552 is merged and released.
// import '@nomiclabs/hardhat-vyper';
// import '@matterlabs/hardhat-zksync-vyper';
import '@nomiclabs/hardhat-vyper';
import '@matterlabs/hardhat-zksync-vyper';

export default {
zksolc: {
Expand Down
4 changes: 2 additions & 2 deletions core/tests/ts-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"devDependencies": {
"@matterlabs/hardhat-zksync-deploy": "^0.6.1",
"@matterlabs/hardhat-zksync-solc": "0.4.2",
"@matterlabs/hardhat-zksync-vyper": "^0.2.0",
"@nomiclabs/hardhat-vyper": "^3.0.3",
"@matterlabs/hardhat-zksync-vyper": "^1.0.0",
"@nomiclabs/hardhat-vyper": "^3.0.5",
"@types/jest": "^29.0.3",
"@types/node": "^14.14.5",
"@types/node-fetch": "^2.5.7",
Expand Down

0 comments on commit 283096c

Please sign in to comment.