Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(contract-verifier): Support verification for zksolc v1.3.17 #606

Merged
merged 4 commits into from
Dec 5, 2023
Merged

feat(contract-verifier): Support verification for zksolc v1.3.17 #606

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d576d9
Support contract verification for zksolc v1.3.17
perekopskiy Dec 5, 2023
510eda5
Fix
perekopskiy Dec 5, 2023
31a63d8
Fix
perekopskiy Dec 5, 2023
cc523fa
Use vyper 0.3.10
perekopskiy Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/ci-core-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ jobs:
run: |
sudo apt update && sudo apt install wget -y

mkdir -p $(pwd)/etc/solc-bin/0.8.21
wget https://github.com/ethereum/solc-bin/raw/gh-pages/linux-amd64/solc-linux-amd64-v0.8.21%2Bcommit.d9974bed
mv solc-linux-amd64-v0.8.21+commit.d9974bed $(pwd)/etc/solc-bin/0.8.21/solc
chmod +x $(pwd)/etc/solc-bin/0.8.21/solc
mkdir -p $(pwd)/etc/solc-bin/0.8.23
wget https://github.com/ethereum/solc-bin/raw/gh-pages/linux-amd64/solc-linux-amd64-v0.8.23%2Bcommit.f704f362
mv solc-linux-amd64-v0.8.23+commit.f704f362 $(pwd)/etc/solc-bin/0.8.23/solc
chmod +x $(pwd)/etc/solc-bin/0.8.23/solc

mkdir -p $(pwd)/etc/zksolc-bin/v1.3.16
wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.16
mv zksolc-linux-amd64-musl-v1.3.16 $(pwd)/etc/zksolc-bin/v1.3.16/zksolc
chmod +x $(pwd)/etc/zksolc-bin/v1.3.16/zksolc
mkdir -p $(pwd)/etc/zksolc-bin/v1.3.17
wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.17
mv zksolc-linux-amd64-musl-v1.3.17 $(pwd)/etc/zksolc-bin/v1.3.17/zksolc
chmod +x $(pwd)/etc/zksolc-bin/v1.3.17/zksolc

mkdir -p $(pwd)/etc/vyper-bin/0.3.3
wget -O vyper0.3.3 https://github.com/vyperlang/vyper/releases/download/v0.3.3/vyper.0.3.3%2Bcommit.48e326f0.linux
Expand Down Expand Up @@ -211,15 +211,15 @@ jobs:
run: |
sudo apt update && sudo apt install wget -y

mkdir -p $(pwd)/etc/solc-bin/0.8.21
wget https://github.com/ethereum/solc-bin/raw/gh-pages/linux-amd64/solc-linux-amd64-v0.8.21%2Bcommit.d9974bed
mv solc-linux-amd64-v0.8.21+commit.d9974bed $(pwd)/etc/solc-bin/0.8.21/solc
chmod +x $(pwd)/etc/solc-bin/0.8.21/solc
mkdir -p $(pwd)/etc/solc-bin/0.8.23
wget https://github.com/ethereum/solc-bin/raw/gh-pages/linux-amd64/solc-linux-amd64-v0.8.23%2Bcommit.f704f362
mv solc-linux-amd64-v0.8.23+commit.f704f362 $(pwd)/etc/solc-bin/0.8.23/solc
chmod +x $(pwd)/etc/solc-bin/0.8.23/solc

mkdir -p $(pwd)/etc/zksolc-bin/v1.3.16
wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.16
mv zksolc-linux-amd64-musl-v1.3.16 $(pwd)/etc/zksolc-bin/v1.3.16/zksolc
chmod +x $(pwd)/etc/zksolc-bin/v1.3.16/zksolc
mkdir -p $(pwd)/etc/zksolc-bin/v1.3.17
wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.17
mv zksolc-linux-amd64-musl-v1.3.17 $(pwd)/etc/zksolc-bin/v1.3.17/zksolc
chmod +x $(pwd)/etc/zksolc-bin/v1.3.17/zksolc

mkdir -p $(pwd)/etc/vyper-bin/0.3.3
wget -O vyper0.3.3 https://github.com/vyperlang/vyper/releases/download/v0.3.3/vyper.0.3.3%2Bcommit.48e326f0.linux
Expand Down
4 changes: 2 additions & 2 deletions core/tests/ts-integration/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import '@matterlabs/hardhat-zksync-vyper';

export default {
zksolc: {
version: '1.3.16',
version: '1.3.17',
compilerSource: 'binary',
settings: {
isSystem: true
Expand All @@ -20,7 +20,7 @@ export default {
}
},
solidity: {
version: '0.8.21'
version: '0.8.23'
},
vyper: {
version: '0.3.3'
Expand Down
2 changes: 1 addition & 1 deletion core/tests/ts-integration/scripts/compile-yul.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getZksolcUrl, saltFromUrl } from '@matterlabs/hardhat-zksync-solc';
import { getCompilersDir } from 'hardhat/internal/util/global-dir';
import path from 'path';

const COMPILER_VERSION = '1.3.16';
const COMPILER_VERSION = '1.3.17';
const IS_COMPILER_PRE_RELEASE = false;

async function compilerLocation(): Promise<string> {
Expand Down
4 changes: 2 additions & 2 deletions core/tests/ts-integration/tests/api/contract-verification.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { sleep } from 'zksync-web3/build/src/utils';
// Regular expression to match ISO dates.
const DATE_REGEX = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?/;

const ZKSOLC_VERSION = 'v1.3.16';
const SOLC_VERSION = '0.8.21';
const ZKSOLC_VERSION = 'v1.3.17';
const SOLC_VERSION = '0.8.23';

const ZKVYPER_VERSION = 'v1.3.13';
const VYPER_VERSION = '0.3.3';
Expand Down
2 changes: 1 addition & 1 deletion docker/contract-verifier/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y curl libpq5 ca-certificates wget python

# install zksolc 1.3.x
RUN skip_versions="v1.3.12 v1.3.15" && \
for VERSION in $(seq -f "v1.3.%g" 0 16); do \
for VERSION in $(seq -f "v1.3.%g" 0 17); do \
if echo " $skip_versions " | grep -q -w " $VERSION "; then \
continue; \
fi; \
Expand Down