diff --git a/.github/workflows/build-core-template.yml b/.github/workflows/build-core-template.yml index fa714752fe0b..66b989ce7d37 100644 --- a/.github/workflows/build-core-template.yml +++ b/.github/workflows/build-core-template.yml @@ -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: diff --git a/.github/workflows/build-external-node-docker.yml b/.github/workflows/build-external-node-docker.yml index fe860c19b386..c772d0bbb4c0 100644 --- a/.github/workflows/build-external-node-docker.yml +++ b/.github/workflows/build-external-node-docker.yml @@ -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: diff --git a/.github/workflows/build-local-node-docker.yml b/.github/workflows/build-local-node-docker.yml index fb93df4209c2..66a87454c04c 100644 --- a/.github/workflows/build-local-node-docker.yml +++ b/.github/workflows/build-local-node-docker.yml @@ -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: diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml index 2af76c880558..e32e99b00d7c 100644 --- a/.github/workflows/ci-core-reusable.yml +++ b/.github/workflows/ci-core-reusable.yml @@ -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: @@ -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 @@ -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 diff --git a/core/tests/ts-integration/hardhat.config.ts b/core/tests/ts-integration/hardhat.config.ts index 4840e46e82b0..0626064aa0f5 100644 --- a/core/tests/ts-integration/hardhat.config.ts +++ b/core/tests/ts-integration/hardhat.config.ts @@ -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 diff --git a/core/tests/ts-integration/scripts/compile-yul.ts b/core/tests/ts-integration/scripts/compile-yul.ts index f92c259723c5..cefcfa902af0 100644 --- a/core/tests/ts-integration/scripts/compile-yul.ts +++ b/core/tests/ts-integration/scripts/compile-yul.ts @@ -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 { diff --git a/core/tests/ts-integration/tests/api/contract-verification.test.ts b/core/tests/ts-integration/tests/api/contract-verification.test.ts index 984361fb7b31..acd2a7673577 100644 --- a/core/tests/ts-integration/tests/api/contract-verification.test.ts +++ b/core/tests/ts-integration/tests/api/contract-verification.test.ts @@ -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'; diff --git a/docker/contract-verifier/Dockerfile b/docker/contract-verifier/Dockerfile index 21ce6946489b..5a13819b272f 100644 --- a/docker/contract-verifier/Dockerfile +++ b/docker/contract-verifier/Dockerfile @@ -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; \