Add zkevm specific details in the --version output

This patch also adds the SOLC_VERSION_ZKEVM cmake setting to configure the zkevm version.
matter-labs · Apr 6, 2023 · 0b0fd9e · 0b0fd9e
1 parent 014efa2
commit 0b0fd9e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 3 deletions.
diff --git a/cmake/EthBuildInfo.cmake b/cmake/EthBuildInfo.cmake
@@ -40,6 +40,7 @@ function(create_build_info NAME)
 		-DPROJECT_VERSION_MAJOR="${PROJECT_VERSION_MAJOR}"
 		-DPROJECT_VERSION_MINOR="${PROJECT_VERSION_MINOR}"
 		-DPROJECT_VERSION_PATCH="${PROJECT_VERSION_PATCH}"
+		-DSOLC_VERSION_ZKEVM="${SOLC_VERSION_ZKEVM}"
 		-P "${ETH_SCRIPTS_DIR}/buildinfo.cmake"
 		)
 	include_directories("${PROJECT_BINARY_DIR}/include")

diff --git a/cmake/scripts/buildinfo.cmake b/cmake/scripts/buildinfo.cmake
@@ -25,7 +25,6 @@ if (EXISTS ${ETH_SOURCE_DIR}/prerelease.txt)
 	file(READ ${ETH_SOURCE_DIR}/prerelease.txt SOL_VERSION_PRERELEASE)
 	string(STRIP "${SOL_VERSION_PRERELEASE}" SOL_VERSION_PRERELEASE)
 else()
-	string(TIMESTAMP SOL_VERSION_PRERELEASE "develop.%Y.%m.%d" UTC)
 	string(REPLACE .0 . SOL_VERSION_PRERELEASE "${SOL_VERSION_PRERELEASE}")
 endif()
 
@@ -64,6 +63,10 @@ set(SOL_VERSION_COMMIT "commit.${SOL_COMMIT_HASH}")
 set(SOl_VERSION_PLATFORM ETH_BUILD_PLATFORM)
 set(SOL_VERSION_BUILDINFO "commit.${SOL_COMMIT_HASH}.${ETH_BUILD_PLATFORM}")
 
+if (NOT SOLC_VERSION_ZKEVM)
+	set(SOLC_VERSION_ZKEVM "undefined")
+endif()
+
 set(TMPFILE "${ETH_DST_DIR}/BuildInfo.h.tmp")
 set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h")
 

diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in
@@ -13,3 +13,4 @@
 #define SOL_VERSION_BUILDINFO "@SOL_VERSION_BUILDINFO@"
 #define SOL_VERSION_COMMIT "@SOL_VERSION_COMMIT@"
 #define SOL_VERSION_PLATFORM "@SOL_VERSION_PLATFORM@"
+#define SOL_VERSION_ZKEVM "@SOLC_VERSION_ZKEVM@"
diff --git a/libsolidity/interface/Version.cpp b/libsolidity/interface/Version.cpp
@@ -28,6 +28,7 @@
 using namespace std;
 
 char const* solidity::frontend::VersionNumber = ETH_PROJECT_VERSION;
+char const* solidity::frontend::ZKEVMVersionString = SOL_VERSION_ZKEVM;
 
 string const solidity::frontend::VersionString =
 	string(solidity::frontend::VersionNumber) +

diff --git a/libsolidity/interface/Version.h b/libsolidity/interface/Version.h
@@ -39,6 +39,7 @@ extern std::string const VersionString;
 extern std::string const VersionStringStrict;
 extern bytes const VersionCompactBytes;
 extern bool const VersionIsRelease;
+extern char const* ZKEVMVersionString;
 
 }
 }
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
@@ -666,8 +666,9 @@ void CommandLineInterface::processInput()
 
 void CommandLineInterface::printVersion()
 {
-	sout() << "solc, the solidity compiler commandline interface" << endl;
+	sout() << "solc, the zkEVM Solidity compiler commandline interface" << endl;
 	sout() << "Version: " << solidity::frontend::VersionString << endl;
+	sout() << "zkEVM: " << solidity::frontend::ZKEVMVersionString << endl;
 }
 
 void CommandLineInterface::printLicense()

diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
@@ -139,7 +139,8 @@ BOOST_AUTO_TEST_CASE(version)
 	OptionsReaderAndMessages result = runCLI({"solc", "--version"}, "");
 
 	BOOST_TEST(result.success);
-	BOOST_TEST(boost::ends_with(result.stdoutContent, "Version: " + solidity::frontend::VersionString + "\n"));
+	BOOST_TEST(boost::ends_with(result.stdoutContent, "Version: " + solidity::frontend::VersionString + "\n"
+				+ "zkEVM: " + solidity::frontend::ZKEVMVersionString + "\n"));
 	BOOST_TEST(result.stderrContent == "");
 	BOOST_TEST(result.options.input.mode == InputMode::Version);
 }