From ac57dde2d010ceafcd137afde885fe35d2a5f2a6 Mon Sep 17 00:00:00 2001
From: Anton Baliasnikov <antonbaliasnikov@gmail.com>
Date: Tue, 18 Jun 2024 03:12:04 +0100
Subject: [PATCH] Add ZKsync solidity compiler 1.4.1 and 1.5.0 (#6592)

## ZKsync solidity compiler

Adds two latest releases of **ZK**sync solidity compiler (`zksolc`)
`v1.4.1` and `v1.5.0`.

Related infra change:
https://github.com/compiler-explorer/infra/pull/1324
---
 .github/labeler.yml                                |  2 +-
 etc/config/solidity.amazon.properties              | 14 +++++++++-----
 etc/config/solidity.defaults.properties            |  4 ++--
 lib/compilers/_all.ts                              |  2 +-
 .../{solidity-eravm.ts => solidity-zksync.ts}      |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)
 rename lib/compilers/{solidity-eravm.ts => solidity-zksync.ts} (97%)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 4c59fea71..4cee262c2 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -323,7 +323,7 @@
   - changed-files:
       - any-glob-to-any-file:
           - 'lib/compilers/solidity.ts'
-          - 'lib/compilers/solidity-eravm.ts'
+          - 'lib/compilers/solidity-zksync.ts'
           - 'etc/config/solidity.*.properties'
 
 'lang-spice':
diff --git a/etc/config/solidity.amazon.properties b/etc/config/solidity.amazon.properties
index a9e602706..692496d7d 100644
--- a/etc/config/solidity.amazon.properties
+++ b/etc/config/solidity.amazon.properties
@@ -24,14 +24,18 @@ compiler.solc0821.exe=/opt/compiler-explorer/solc-0.8.21/solc
 compiler.solc0821.semver=0.8.21
 compiler.solc0821.name=solc 0.8.21
 
-group.zksolc.compilers=zksolc140
+group.zksolc.compilers=zksolc141:zksolc150
 group.zksolc.compilerType=solidity-eravm
 group.zksolc.supportsBinary=false
 group.zksolc.instructionSet=eravm
-compiler.zksolc140.exe=/opt/compiler-explorer/zksolc-1.4.0/zksolc
-compiler.zksolc140.semver=1.4.0
-compiler.zksolc140.name=zksolc 1.4.0
-compiler.zksolc140.options=--solc /opt/compiler-explorer/solc-0.8.21/solc
+compiler.zksolc141.exe=/opt/compiler-explorer/zksolc-1.4.1/zksolc
+compiler.zksolc141.semver=1.4.1
+compiler.zksolc141.name=zksolc 1.4.1
+compiler.zksolc141.options=--solc /opt/compiler-explorer/zksync-solc-0.8.25-1.0.1/solc
+compiler.zksolc150.exe=/opt/compiler-explorer/zksolc-1.5.0/zksolc
+compiler.zksolc150.semver=1.5.0
+compiler.zksolc150.name=zksolc 1.5.0
+compiler.zksolc150.options=--solc /opt/compiler-explorer/zksync-solc-0.8.26-1.0.1/solc
 
 #################################
 #################################
diff --git a/etc/config/solidity.defaults.properties b/etc/config/solidity.defaults.properties
index feeb1def8..1fe9ddec8 100644
--- a/etc/config/solidity.defaults.properties
+++ b/etc/config/solidity.defaults.properties
@@ -10,8 +10,8 @@ compiler.solc.instructionSet=evm
 compiler.solc.isSemVer=true
 
 compiler.zksolc.exe=/usr/bin/zksolc
-compiler.zksolc.semver=1.4.0
-compiler.zksolc.name=zksolc 1.4.0
+compiler.zksolc.semver=1.5.0
+compiler.zksolc.name=zksolc 1.5.0
 compiler.zksolc.compilerType=solidity-eravm
 compiler.zksolc.instructionSet=eravm
 compiler.zksolc.isSemVer=true
diff --git a/lib/compilers/_all.ts b/lib/compilers/_all.ts
index ec70e6afa..1628022da 100644
--- a/lib/compilers/_all.ts
+++ b/lib/compilers/_all.ts
@@ -115,7 +115,7 @@ export {RustCompiler} from './rust.js';
 export {ScalaCompiler} from './scala.js';
 export {SdccCompiler} from './sdcc.js';
 export {SolidityCompiler} from './solidity.js';
-export {SolidityEravmCompiler} from './solidity-eravm.js';
+export {SolidityZKsyncCompiler} from './solidity-zksync.js';
 export {SpiceCompiler} from './spice.js';
 export {SPIRVCompiler} from './spirv.js';
 export {SwiftCompiler} from './swift.js';
diff --git a/lib/compilers/solidity-eravm.ts b/lib/compilers/solidity-zksync.ts
similarity index 97%
rename from lib/compilers/solidity-eravm.ts
rename to lib/compilers/solidity-zksync.ts
index 94e3f2c05..1034aec20 100644
--- a/lib/compilers/solidity-eravm.ts
+++ b/lib/compilers/solidity-zksync.ts
@@ -28,7 +28,7 @@ import {BaseCompiler} from '../base-compiler.js';
 
 import {ZksolcParser} from './argument-parsers.js';
 
-export class SolidityEravmCompiler extends BaseCompiler {
+export class SolidityZKsyncCompiler extends BaseCompiler {
     static get key() {
         return 'solidity-eravm';
     }