Skip to content

Commit

Permalink
chore: rebranding to ZKsync from ZKEVM
Browse files Browse the repository at this point in the history
  • Loading branch information
antonbaliasnikov committed May 29, 2024
1 parent 14c99de commit 02f489c
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/EthBuildInfo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions cmake/scripts/buildinfo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion cmake/templates/BuildInfo.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@"
2 changes: 1 addition & 1 deletion libevmasm/LinkerObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void LinkerObject::link(map<string, h160> 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)
{
Expand Down
2 changes: 1 addition & 1 deletion libsolidity/interface/Version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) +
Expand Down
2 changes: 1 addition & 1 deletion libsolidity/interface/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}
}
4 changes: 2 additions & 2 deletions solc/CommandLineInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,12 @@ static set<string> 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);
}

Expand Down

0 comments on commit 02f489c

Please sign in to comment.