cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8047 from ethereum/version061

Browse Source 
Set version to 0.6.1
This commit is contained in:
chriseth 2019-12-18 11:28:24 +01:00 committed by GitHub
commit ce18e7bfcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ include(EthPolicy)
eth_policy() eth_policy()
# project name and version should be set after cmake_policy CMP0048 # project name and version should be set after cmake_policy CMP0048
set(PROJECT_VERSION "0.6.0") set(PROJECT_VERSION "0.6.1")
project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX) project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
include(TestBigEndian) include(TestBigEndian)

12
Changelog.md
View File

@ -1,3 +1,15 @@
### 0.6.1 (unreleased)
Language Features:
Compiler Features:
Bugfixes:
### 0.6.0 (2019-12-17) ### 0.6.0 (2019-12-17)
Breaking changes: Breaking changes:

14
test/libsolidity/GasCosts.cpp
View File

@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
auto evmVersion = dev::test::Options::get().evmVersion(); auto evmVersion = dev::test::Options::get().evmVersion();
if (evmVersion <= EVMVersion::byzantium()) if (evmVersion <= EVMVersion::byzantium())
CHECK_DEPLOY_GAS(134145, 130831, evmVersion); CHECK_DEPLOY_GAS(134209, 130895, evmVersion);
// This is only correct on >=Constantinople. // This is only correct on >=Constantinople.
else if (Options::get().useABIEncoderV2) else if (Options::get().useABIEncoderV2)
{ {
@ -107,22 +107,22 @@ BOOST_AUTO_TEST_CASE(string_storage)
{ {
// Costs with 0 are cases which cannot be triggered in tests. // Costs with 0 are cases which cannot be triggered in tests.
if (evmVersion < EVMVersion::istanbul()) if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(0, 123969, evmVersion); CHECK_DEPLOY_GAS(0, 124033, evmVersion);
else else
CHECK_DEPLOY_GAS(0, 110969, evmVersion); CHECK_DEPLOY_GAS(0, 110981, evmVersion);
} }
else else
{ {
if (evmVersion < EVMVersion::istanbul()) if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(147771, 131687, evmVersion); CHECK_DEPLOY_GAS(147835, 131687, evmVersion);
else else
CHECK_DEPLOY_GAS(131859, 117231, evmVersion); CHECK_DEPLOY_GAS(131871, 117231, evmVersion);
} }
} }
else if (evmVersion < EVMVersion::istanbul()) else if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(126929, 119659, evmVersion); CHECK_DEPLOY_GAS(126993, 119723, evmVersion);
else else
CHECK_DEPLOY_GAS(114345, 107335, evmVersion); CHECK_DEPLOY_GAS(114357, 107347, evmVersion);
if (evmVersion >= EVMVersion::byzantium()) if (evmVersion >= EVMVersion::byzantium())
{ {