From 283096c3ae60daa50934672a864197f033c1a53f Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Wed, 8 Nov 2023 10:00:38 +0000
Subject: [PATCH] chore: Restore contract verification tests (#419)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 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>
---
 .github/workflows/ci-core-reusable.yml      | 6 ++----
 core/tests/ts-integration/hardhat.config.ts | 5 ++---
 core/tests/ts-integration/package.json      | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
index bcd6f37c11d0..b5a97a694298 100644
--- a/.github/workflows/ci-core-reusable.yml
+++ b/.github/workflows/ci-core-reusable.yml
@@ -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
@@ -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
diff --git a/core/tests/ts-integration/hardhat.config.ts b/core/tests/ts-integration/hardhat.config.ts
index 61ad5a14edb3..3619a67732c6 100644
--- a/core/tests/ts-integration/hardhat.config.ts
+++ b/core/tests/ts-integration/hardhat.config.ts
@@ -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: {
diff --git a/core/tests/ts-integration/package.json b/core/tests/ts-integration/package.json
index fe4ff18fcd78..ef6e4880aa02 100644
--- a/core/tests/ts-integration/package.json
+++ b/core/tests/ts-integration/package.json
@@ -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",