cerc-io/solidity
10
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 #7462 from ethereum/version-060

Browse Source 
Build version 0.6.0
This commit is contained in:
Leonardo 2019-09-24 12:48:00 +02:00 committed by GitHub
commit 9c23f35bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 16 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.5.12") set(PROJECT_VERSION "0.6.0")
project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX) project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
include(TestBigEndian) include(TestBigEndian)

2
test/contracts/AuctionRegistrar.cpp
View File

@ -43,7 +43,7 @@ namespace
{ {
static char const* registrarCode = R"DELIMITER( static char const* registrarCode = R"DELIMITER(
pragma solidity >=0.4.0 <0.6.0; pragma solidity >=0.4.0 <0.7.0;
contract NameRegister { contract NameRegister {
function addr(string memory _name) public view returns (address o_owner); function addr(string memory _name) public view returns (address o_owner);

2
test/contracts/FixedFeeRegistrar.cpp
View File

@ -53,7 +53,7 @@ static char const* registrarCode = R"DELIMITER(
// @authors: // @authors:
// Gav Wood <g@ethdev.com> // Gav Wood <g@ethdev.com>
pragma solidity >=0.4.0 <0.6.0; pragma solidity >=0.4.0 <0.7.0;
contract Registrar { contract Registrar {
event Changed(string indexed name); event Changed(string indexed name);

2
test/contracts/Wallet.cpp
View File

@ -56,7 +56,7 @@ static char const* walletCode = R"DELIMITER(
// some number (specified in constructor) of the set of owners (specified in the constructor, modifiable) before the // some number (specified in constructor) of the set of owners (specified in the constructor, modifiable) before the
// interior is executed. // interior is executed.
pragma solidity >=0.4.0 <0.6.0; pragma solidity >=0.4.0 <0.7.0;
contract multiowned { contract multiowned {

6
test/libsolidity/GasCosts.cpp
View File

@ -96,17 +96,17 @@ BOOST_AUTO_TEST_CASE(string_storage)
compileAndRun(sourceCode); compileAndRun(sourceCode);
if (Options::get().evmVersion() <= EVMVersion::byzantium()) if (Options::get().evmVersion() <= EVMVersion::byzantium())
CHECK_DEPLOY_GAS(134209, 130895); CHECK_DEPLOY_GAS(134145, 130831);
// This is only correct on >=Constantinople. // This is only correct on >=Constantinople.
else if (Options::get().useABIEncoderV2) else if (Options::get().useABIEncoderV2)
{ {
if (Options::get().optimizeYul) if (Options::get().optimizeYul)
CHECK_DEPLOY_GAS(127785, 127785); CHECK_DEPLOY_GAS(127785, 127721);
else else
CHECK_DEPLOY_GAS(151587, 135371); CHECK_DEPLOY_GAS(151587, 135371);
} }
else else
CHECK_DEPLOY_GAS(126993, 119723); CHECK_DEPLOY_GAS(126929, 119659);
if (Options::get().evmVersion() >= EVMVersion::byzantium()) if (Options::get().evmVersion() >= EVMVersion::byzantium())
{ {

2
test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.5.7; pragma solidity >=0.5.7 <0.7.0;
contract InvalidTest { contract InvalidTest {

2
test/libsolidity/semanticTests/viaYul/erc20.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.5.0; pragma solidity >=0.4.0 <0.7.0;
contract ERC20 { contract ERC20 {
event Transfer(address indexed from, address indexed to, uint256 value); event Transfer(address indexed from, address indexed to, uint256 value);

9
test/solcjsTests.sh
View File

@ -39,8 +39,8 @@ VERSION="$2"
DIR=$(mktemp -d) DIR=$(mktemp -d)
( (
echo "Preparing solc-js (master)..." echo "Preparing solc-js (master_060)..."
git clone --depth 1 --branch master https://github.com/ethereum/solc-js "$DIR" git clone --depth 1 --branch master_060 https://github.com/ethereum/solc-js "$DIR"
cd "$DIR" cd "$DIR"
# disable "prepublish" script which downloads the latest version # disable "prepublish" script which downloads the latest version
# (we will replace it anyway and it is often incorrectly cached # (we will replace it anyway and it is often incorrectly cached
@ -53,11 +53,6 @@ DIR=$(mktemp -d)
rm -f soljson.js rm -f soljson.js
cp "$SOLJSON" soljson.js cp "$SOLJSON" soljson.js
# ensure to use always 0.5.0 sources
# FIXME: should be removed once the version bump in this repo is done
rm -rf test/DAO040
cp -R test/DAO test/DAO040
# Update version (needed for some tests) # Update version (needed for some tests)
echo "Updating package.json to version $VERSION" echo "Updating package.json to version $VERSION"
npm version --allow-same-version --no-git-tag-version $VERSION npm version --allow-same-version --no-git-tag-version $VERSION