From 02f489ca0fedee25dacafaea1bb384367e3732fd Mon Sep 17 00:00:00 2001 From: Anton Baliasnikov Date: Wed, 29 May 2024 10:09:37 +0100 Subject: [PATCH] chore: rebranding to ZKsync from ZKEVM --- CONTRIBUTING.md | 2 +- Changelog.md | 2 +- README.md | 10 +++++----- cmake/EthBuildInfo.cmake | 2 +- cmake/scripts/buildinfo.cmake | 4 ++-- cmake/templates/BuildInfo.h.in | 2 +- libevmasm/LinkerObject.cpp | 2 +- libsolidity/interface/Version.cpp | 2 +- libsolidity/interface/Version.h | 2 +- solc/CommandLineInterface.cpp | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 152aec38d3..95cda68b05 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ license. We aim to make it as easy as possible to contribute to the mission. This is still WIP, and we're happy for contributions and suggestions here too. Some resources to help: -1. [zkSync Era docs!](https://era.zksync.io/docs/) +1. [ZKsync Era docs!](https://era.zksync.io/docs/) 2. Company links can be found in the [repo's readme](README.md) ## Code of Conduct diff --git a/Changelog.md b/Changelog.md index d1ddf0a229..3279ab8bf8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,6 @@ ### solc v0.6.1-legacy for zkVM - revision 1.0.0 - Legacy edition -This release has changes in the lowering of EVM assembly in order to get the zkSync's translator (targeting LLVM IR) to work correctly. +This release has changes in the lowering of EVM assembly in order to get the ZKsync's translator (targeting LLVM IR) to work correctly. Added: * A new metadata output field called "extraMetadata" in standard-json that stores information of recursive functions diff --git a/README.md b/README.md index bfb637ed21..a1123f4053 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# zkSync Era: Solidity Compiler +# ZKsync Era: Solidity Compiler [![Logo](eraLogo.svg)](https://zksync.io/) -zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security +ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or decentralization. As it's EVM-compatible (with Solidity/Vyper), 99% of Ethereum projects can redeploy without -needing to refactor or re-audit any code. zkSync Era also uses an LLVM-based compiler that will eventually enable +needing to refactor or re-audit any code. ZKsync Era also uses an LLVM-based compiler that will eventually enable developers to write smart contracts in popular languages such as C++ and Rust. This repository contains the Solidity compiler and language tuned for EraVM. @@ -20,12 +20,12 @@ Some third-party code has its [own licensing terms](cmake/templates/license.h.in - [Website](https://zksync.io/) - [GitHub](https://github.com/matter-labs) - [Twitter](https://twitter.com/zksync) -- [Twitter for Devs](https://twitter.com/zkSyncDevs) +- [Twitter for Devs](https://twitter.com/ZKsyncDevs) - [Discord](https://join.zksync.dev/) ## Disclaimer -zkSync Era has been through extensive testing and audits, and although it is live, it is still in alpha state and +ZKsync Era has been through extensive testing and audits, and although it is live, it is still in alpha state and will undergo further audits and bug bounty programs. We would love to hear our community's thoughts and suggestions about it! It's important to note that forking it now could potentially lead to missing important diff --git a/cmake/EthBuildInfo.cmake b/cmake/EthBuildInfo.cmake index 96e3e92daf..12ef523241 100644 --- a/cmake/EthBuildInfo.cmake +++ b/cmake/EthBuildInfo.cmake @@ -40,7 +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}" + -DSOL_VERSION_ZKSYNC="${SOL_VERSION_ZKSYNC}" -P "${ETH_SCRIPTS_DIR}/buildinfo.cmake" ) include_directories("${PROJECT_BINARY_DIR}/include") diff --git a/cmake/scripts/buildinfo.cmake b/cmake/scripts/buildinfo.cmake index ceabaa17ed..48d2e17bd7 100644 --- a/cmake/scripts/buildinfo.cmake +++ b/cmake/scripts/buildinfo.cmake @@ -63,8 +63,8 @@ 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") +if (NOT SOL_VERSION_ZKSYNC) + set(SOL_VERSION_ZKSYNC "undefined") endif() set(TMPFILE "${ETH_DST_DIR}/BuildInfo.h.tmp") diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in index 33e8e9e377..48bec71380 100644 --- a/cmake/templates/BuildInfo.h.in +++ b/cmake/templates/BuildInfo.h.in @@ -13,4 +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@" +#define SOL_VERSION_ZKSYNC "@SOL_VERSION_ZKSYNC@" diff --git a/libevmasm/LinkerObject.cpp b/libevmasm/LinkerObject.cpp index eb6426b44b..8b5311a047 100644 --- a/libevmasm/LinkerObject.cpp +++ b/libevmasm/LinkerObject.cpp @@ -47,7 +47,7 @@ void LinkerObject::link(map const& _libraryAddresses) string LinkerObject::toHex() const { - return "The EVM bytecode is unavailable in the zkEVM edition of solc"; + return "The EVM bytecode is unavailable in the ZKsync edition of solc"; string hex = dev::toHex(bytecode); for (auto const& ref: linkReferences) { diff --git a/libsolidity/interface/Version.cpp b/libsolidity/interface/Version.cpp index cb02e86bb7..ca1b1445b4 100644 --- a/libsolidity/interface/Version.cpp +++ b/libsolidity/interface/Version.cpp @@ -33,7 +33,7 @@ using namespace dev::solidity; using namespace std; char const* dev::solidity::VersionNumber = ETH_PROJECT_VERSION; -char const* dev::solidity::ZKEVMVersionString = SOL_VERSION_ZKEVM; +char const* dev::solidity::ZKsyncVersionString = SOL_VERSION_ZKSYNC; string const dev::solidity::VersionString = string(dev::solidity::VersionNumber) + diff --git a/libsolidity/interface/Version.h b/libsolidity/interface/Version.h index dad43ef12a..2449e20f53 100644 --- a/libsolidity/interface/Version.h +++ b/libsolidity/interface/Version.h @@ -35,7 +35,7 @@ extern std::string const VersionString; extern std::string const VersionStringStrict; extern bytes const VersionCompactBytes; extern bool const VersionIsRelease; -extern char const* ZKEVMVersionString; +extern char const* ZKsyncVersionString; } } diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index cbd4c2cce0..905f79f209 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -254,12 +254,12 @@ static set const g_metadataHashArgs static void version() { sout() << - "solc, the zkEVM Solidity compiler commandline interface" << + "solc, the ZKsync Solidity compiler commandline interface" << endl << "Version: " << dev::solidity::VersionString << endl << - "zkEVM: " << dev::solidity::ZKEVMVersionString << endl; + "ZKsync: " << dev::solidity::ZKsyncVersionString << endl; exit(0); }