diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml index bcd6f37c11d..b5a97a69429 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 61ad5a14edb..3619a67732c 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 fe4ff18fcd7..ef6e4880aa0 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",