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): Add zksolc v1.3.18 #654

Merged
merged 3 commits into from
Dec 11, 2023
Merged

feat(contract-verifier): Add zksolc v1.3.18 #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55c3d36
add zksolc v1.3.18
perekopskiy Dec 11, 2023
f9139c3
add, not replace
perekopskiy Dec 11, 2023
06fe1d1
Merge branch 'main' into add-zksolc-1.3.18
perekopskiy Dec 11, 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
2 changes: 1 addition & 1 deletion .github/workflows/build-core-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
description: 'JSON of required compilers and their versions'
type: string
required: false
default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7"] } , { "zkvyper": ["1.3.13"] }]'
default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7", "1.3.18"] } , { "zkvyper": ["1.3.13"] }]'

jobs:
build-images:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-external-node-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
description: 'JSON of required compilers and their versions'
type: string
required: false
default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7"] } , { "zkvyper": ["1.3.13"] }]'
default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7", "1.3.18"] } , { "zkvyper": ["1.3.13"] }]'

jobs:
build-images:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-local-node-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
description: 'JSON of required compilers and their versions'
type: string
required: false
default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7"] } , { "zkvyper": ["1.3.13"] }]'
default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7", "1.3.18"] } , { "zkvyper": ["1.3.13"] }]'

jobs:
build-images:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci-core-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
description: 'JSON of required compilers and their versions'
type: string
required: false
default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7"] } , { "zkvyper": ["1.3.13"] }]'
default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7", "1.3.18"] } , { "zkvyper": ["1.3.13"] }]'

jobs:
lint:
Expand Down Expand Up @@ -139,10 +139,10 @@ jobs:
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.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/zksolc-bin/v1.3.18
wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.18
mv zksolc-linux-amd64-musl-v1.3.18 $(pwd)/etc/zksolc-bin/v1.3.18/zksolc
chmod +x $(pwd)/etc/zksolc-bin/v1.3.18/zksolc

mkdir -p $(pwd)/etc/vyper-bin/0.3.10
wget -O vyper0.3.10 https://github.com/vyperlang/vyper/releases/download/v0.3.10/vyper.0.3.10%2Bcommit.91361694.linux
Expand Down Expand Up @@ -236,10 +236,10 @@ jobs:
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.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/zksolc-bin/v1.3.18
wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.18
mv zksolc-linux-amd64-musl-v1.3.18 $(pwd)/etc/zksolc-bin/v1.3.18/zksolc
chmod +x $(pwd)/etc/zksolc-bin/v1.3.18/zksolc

mkdir -p $(pwd)/etc/vyper-bin/0.3.10
wget -O vyper0.3.10 https://github.com/vyperlang/vyper/releases/download/v0.3.10/vyper.0.3.10%2Bcommit.91361694.linux
Expand Down
2 changes: 1 addition & 1 deletion 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.17',
version: '1.3.18',
compilerSource: 'binary',
settings: {
isSystem: true
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.17';
const COMPILER_VERSION = '1.3.18';
const IS_COMPILER_PRE_RELEASE = false;

async function compilerLocation(): Promise<string> {
Expand Down
2 changes: 1 addition & 1 deletion 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,7 +9,7 @@ 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.17';
const ZKSOLC_VERSION = 'v1.3.18';
const SOLC_VERSION = '0.8.23';

const ZKVYPER_VERSION = 'v1.3.13';
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 17); do \
for VERSION in $(seq -f "v1.3.%g" 0 18); do \
if echo " $skip_versions " | grep -q -w " $VERSION "; then \
continue; \
fi; \
Expand Down