From 8387d0df83b7eceff6f6af2845f34cac71f848f4 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 5 Jan 2017 14:08:55 +0100 Subject: test: add a test about gas costs of EXP --- test/libsolidity/GasMeter.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index 0671fb15..3f06cb85 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -248,6 +248,23 @@ BOOST_AUTO_TEST_CASE(multiple_external_functions) testRunTimeGas("g(uint256)", vector{encodeArgs(2)}); } +BOOST_AUTO_TEST_CASE(exponent_size) +{ + char const* sourceCode = R"( + contract A { + function g(uint x) returns (uint) { + return x ** 0x100; + } + function h(uint x) returns (uint) { + return x ** 0x10000; + } + } + )"; + testCreationTimeGas(sourceCode); + testRunTimeGas("f(uint256)", vector{encodeArgs(2)}); + testRunTimeGas("g(uint256)", vector{encodeArgs(2)}); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3 From 00b15d53b945494723df667fc37b32db9ae52673 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 5 Jan 2017 14:14:17 +0100 Subject: Add a failing test about the gas cost of BALANCE --- test/libsolidity/GasMeter.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index 3f06cb85..aa36e891 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -265,6 +265,19 @@ BOOST_AUTO_TEST_CASE(exponent_size) testRunTimeGas("g(uint256)", vector{encodeArgs(2)}); } +BOOST_AUTO_TEST_CASE(balance_gas) +{ + char const* sourceCode = R"( + contract A { + function lookup_balance(address a) returns (uint) { + return a.balance; + } + } + )"; + testCreationTimeGas(sourceCode); + testRunTimeGas("f(uint256)", vector{encodeArgs(2), encodeArgs(100)}); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3 From 259c551c617695928d721ebcfcd132902ff34d3f Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 5 Jan 2017 14:16:57 +0100 Subject: test: add a failing test case about the gas cost of SUICIDE opcode --- test/libsolidity/GasMeter.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index aa36e891..bc4c25bd 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -278,6 +278,19 @@ BOOST_AUTO_TEST_CASE(balance_gas) testRunTimeGas("f(uint256)", vector{encodeArgs(2), encodeArgs(100)}); } +BOOST_AUTO_TEST_CASE(selfdestruct_gas) +{ + char const* sourceCode = R"( + contract A { + function f() { + selfdestruct(0x30); + } + } + )"; + testCreationTimeGas(sourceCode); + testRunTimeGas("f()", vector{encodeArgs()}); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3 From 7da9ba68e9540314c6b51c119a14f3afde02a385 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 5 Jan 2017 14:20:22 +0100 Subject: test: add a test case about the gas cost of EXTCODESIZE --- test/libsolidity/GasMeter.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index bc4c25bd..220d27cf 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -291,6 +291,21 @@ BOOST_AUTO_TEST_CASE(selfdestruct_gas) testRunTimeGas("f()", vector{encodeArgs()}); } +BOOST_AUTO_TEST_CASE(extcodesize_gas) +{ + char const* sourceCode = R"( + contract A { + function f() returns (uint _s) { + assembly { + _s := extcodesize(0x30) + } + } + } + )"; + testCreationTimeGas(sourceCode); + testRunTimeGas("f()", vector{encodeArgs()}); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3 From f2775f82d02336ef8ec64ec391e8433448b2afd8 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Mon, 16 Jan 2017 14:43:44 +0100 Subject: libevmadm: EIP150.a changes on EXTCODE, EXTCODESIZE and BALANCE --- libevmasm/GasMeter.cpp | 2 ++ libevmasm/GasMeter.h | 2 ++ libevmasm/Instruction.cpp | 6 +++--- libevmasm/Instruction.h | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index a0adc35d..5cb25a22 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -232,6 +232,8 @@ unsigned GasMeter::runGas(Instruction _instruction) case Tier::High: return GasCosts::tier5Gas; case Tier::Ext: return GasCosts::tier6Gas; case Tier::Special: return GasCosts::tier7Gas; + case Tier::ExtCode: return GasCosts::extCodeGas; + case Tier::Balance: return GasCosts::balanceGas; default: break; } assertThrow(false, OptimizerException, "Invalid gas tier."); diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h index 8ade838a..7c6a04ce 100644 --- a/libevmasm/GasMeter.h +++ b/libevmasm/GasMeter.h @@ -44,6 +44,8 @@ namespace GasCosts static unsigned const tier5Gas = 10; static unsigned const tier6Gas = 20; static unsigned const tier7Gas = 0; + static unsigned const extCodeGas = 700; + static unsigned const balanceGas = 400; static unsigned const expGas = 10; static unsigned const expByteGas = 10; static unsigned const sha3Gas = 30; diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index de6630f3..87bdb643 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -191,7 +191,7 @@ static const std::map c_instructionInfo = { Instruction::SIGNEXTEND, { "SIGNEXTEND", 0, 2, 1, false, Tier::Low } }, { Instruction::SHA3, { "SHA3", 0, 2, 1, false, Tier::Special } }, { Instruction::ADDRESS, { "ADDRESS", 0, 0, 1, false, Tier::Base } }, - { Instruction::BALANCE, { "BALANCE", 0, 1, 1, false, Tier::Ext } }, + { Instruction::BALANCE, { "BALANCE", 0, 1, 1, false, Tier::Balance } }, { Instruction::ORIGIN, { "ORIGIN", 0, 0, 1, false, Tier::Base } }, { Instruction::CALLER, { "CALLER", 0, 0, 1, false, Tier::Base } }, { Instruction::CALLVALUE, { "CALLVALUE", 0, 0, 1, false, Tier::Base } }, @@ -201,8 +201,8 @@ static const std::map c_instructionInfo = { Instruction::CODESIZE, { "CODESIZE", 0, 0, 1, false, Tier::Base } }, { Instruction::CODECOPY, { "CODECOPY", 0, 3, 0, true, Tier::VeryLow } }, { Instruction::GASPRICE, { "GASPRICE", 0, 0, 1, false, Tier::Base } }, - { Instruction::EXTCODESIZE, { "EXTCODESIZE", 0, 1, 1, false, Tier::Ext } }, - { Instruction::EXTCODECOPY, { "EXTCODECOPY", 0, 4, 0, true, Tier::Ext } }, + { Instruction::EXTCODESIZE, { "EXTCODESIZE", 0, 1, 1, false, Tier::ExtCode } }, + { Instruction::EXTCODECOPY, { "EXTCODECOPY", 0, 4, 0, true, Tier::ExtCode } }, { Instruction::BLOCKHASH, { "BLOCKHASH", 0, 1, 1, false, Tier::Ext } }, { Instruction::COINBASE, { "COINBASE", 0, 0, 1, false, Tier::Base } }, { Instruction::TIMESTAMP, { "TIMESTAMP", 0, 0, 1, false, Tier::Base } }, diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h index d79ec969..192fe090 100644 --- a/libevmasm/Instruction.h +++ b/libevmasm/Instruction.h @@ -237,6 +237,8 @@ enum class Tier : unsigned Mid, // 8, Mid High, // 10, Slow Ext, // 20, Ext + ExtCode, // 700, Extcode + Balance, // 400, Balance Special, // multiparam or otherwise special Invalid // Invalid. }; -- cgit v1.2.3 From e54a3ead16322d6ff816187ad778166271cadb01 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Mon, 16 Jan 2017 14:49:14 +0100 Subject: libevmasm: EIP150.a changes on SLOAD, CALL, CALLCODE, DELEGATECALL and SUICIDE --- libevmasm/EVMSchedule.h | 2 +- libevmasm/GasMeter.cpp | 2 ++ libevmasm/GasMeter.h | 3 ++- libevmasm/Instruction.cpp | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libevmasm/EVMSchedule.h b/libevmasm/EVMSchedule.h index ce9003bd..65d307ae 100644 --- a/libevmasm/EVMSchedule.h +++ b/libevmasm/EVMSchedule.h @@ -34,7 +34,7 @@ struct EVMSchedule unsigned expByteGas = 10; unsigned sha3Gas = 30; unsigned sha3WordGas = 6; - unsigned sloadGas = 50; + unsigned sloadGas = 200; unsigned sstoreSetGas = 20000; unsigned sstoreResetGas = 5000; unsigned sstoreRefundGas = 15000; diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index 5cb25a22..e4fe7701 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -149,6 +149,8 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _ } break; } + case Instruction::SELFDESTRUCT: + gas = GasCosts::selfdestructGas; case Instruction::CREATE: if (_includeExternalCosts) // We assume that we do not know the target contract and thus, the consumption is infinite. diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h index 7c6a04ce..146f08a2 100644 --- a/libevmasm/GasMeter.h +++ b/libevmasm/GasMeter.h @@ -59,10 +59,11 @@ namespace GasCosts static unsigned const logDataGas = 8; static unsigned const logTopicGas = 375; static unsigned const createGas = 32000; - static unsigned const callGas = 40; + static unsigned const callGas = 700; static unsigned const callStipend = 2300; static unsigned const callValueTransferGas = 9000; static unsigned const callNewAccountGas = 25000; + static unsigned const selfdestructGas = 5000; static unsigned const selfdestructRefundGas = 24000; static unsigned const memoryGas = 3; static unsigned const quadCoeffDiv = 512; diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index 87bdb643..5e92c6e6 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -297,7 +297,7 @@ static const std::map c_instructionInfo = { Instruction::DELEGATECALL, { "DELEGATECALL", 0, 6, 1, true, Tier::Special } }, { Instruction::REVERT, { "REVERT", 0, 2, 0, true, Tier::Zero } }, { Instruction::INVALID, { "INVALID", 0, 0, 0, true, Tier::Zero } }, - { Instruction::SELFDESTRUCT, { "SELFDESTRUCT", 0, 1, 0, true, Tier::Zero } } + { Instruction::SELFDESTRUCT, { "SELFDESTRUCT", 0, 1, 0, true, Tier::Special } } }; void dev::solidity::eachInstruction( -- cgit v1.2.3 From 4e24639e396a6ed540b1382d915903c1334c1b66 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Mon, 16 Jan 2017 14:57:49 +0100 Subject: libevmasm: EIP150.c gas change --- libevmasm/GasMeter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index e4fe7701..a5f0da1b 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -151,6 +151,7 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _ } case Instruction::SELFDESTRUCT: gas = GasCosts::selfdestructGas; + gas += GasCosts::callNewAccountGas; // We very rarely know whether the address exists. case Instruction::CREATE: if (_includeExternalCosts) // We assume that we do not know the target contract and thus, the consumption is infinite. -- cgit v1.2.3 From 56e4b8269636e2906298ccface74cdebff4244ad Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Tue, 17 Jan 2017 14:36:07 +0100 Subject: libevmasm: reflect EIP 160 gas schedule change --- libevmasm/GasMeter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h index 146f08a2..6ee8ea74 100644 --- a/libevmasm/GasMeter.h +++ b/libevmasm/GasMeter.h @@ -47,7 +47,7 @@ namespace GasCosts static unsigned const extCodeGas = 700; static unsigned const balanceGas = 400; static unsigned const expGas = 10; - static unsigned const expByteGas = 10; + static unsigned const expByteGas = 50; static unsigned const sha3Gas = 30; static unsigned const sha3WordGas = 6; static unsigned const sloadGas = 50; -- cgit v1.2.3 From a1da03328ae41595c0c03bf050d0a4d950238290 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Tue, 17 Jan 2017 14:40:41 +0100 Subject: Changelog: add a point about fee schedule update --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 3603d315..71f9a83b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -14,6 +14,7 @@ Bugfixes: * Compiler interface: Fix a bug where source indexes could be inconsistent between Solidity compiled with different compilers (clang vs. gcc) or compiler settings. The bug was visible in AST and source mappings. + * Gas-estimator: reflect the most recent fee schedule. * Type system: Contract inheriting from base with unimplemented constructor should be abstract. ### 0.4.10 (2017-03-15) -- cgit v1.2.3 From f6f271df8a192fbc74b0c7afe37d8de89b682fc2 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Wed, 18 Jan 2017 16:56:10 +0100 Subject: test: change RPC settings to see if they have effects during testing --- test/RPCSession.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp index f8b364d1..3ea3b1fe 100644 --- a/test/RPCSession.cpp +++ b/test/RPCSession.cpp @@ -220,7 +220,10 @@ void RPCSession::test_setChainParams(vector const& _accounts) "accountStartNonce": "0x", "maximumExtraDataSize": "0x1000000", "blockReward": "0x", - "allowFutureBlocks": "1" + "allowFutureBlocks": "1", + "homsteadForkBlock": "0x00", + "EIP150ForkBlock": "0x00", + "EIP158ForkBlock": "0x00" }, "genesis": { "author": "0000000000000010000000000000000000000000", -- cgit v1.2.3 From 362813f0d6a0a8e548a626f2383121301b582a78 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 9 Feb 2017 18:11:23 +0100 Subject: libevmasm: add a break --- libevmasm/GasMeter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index a5f0da1b..f5fd00ea 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -152,6 +152,7 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _ case Instruction::SELFDESTRUCT: gas = GasCosts::selfdestructGas; gas += GasCosts::callNewAccountGas; // We very rarely know whether the address exists. + break; case Instruction::CREATE: if (_includeExternalCosts) // We assume that we do not know the target contract and thus, the consumption is infinite. -- cgit v1.2.3 From 1caf1f0b8d4b84881a1fb9a2684b5978825b3e08 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 8 Feb 2017 13:56:23 +0100 Subject: Test using eth from docker. --- .travis.yml | 4 ++++ scripts/tests.sh | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d947707c..1bf8ffe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,8 @@ matrix: dist: trusty sudo: required compiler: gcc + before_install: + - docker pull ethereum/client-cpp env: - ZIP_SUFFIX=ubuntu-trusty - SOLC_STOREBYTECODE=On @@ -68,6 +70,8 @@ matrix: dist: trusty sudo: required compiler: clang + before_install: + - docker pull ethereum/client-cpp env: - ZIP_SUFFIX=ubuntu-trusty-clang - SOLC_STOREBYTECODE=On diff --git a/scripts/tests.sh b/scripts/tests.sh index d47edd28..34d71bd2 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -43,7 +43,8 @@ test "${output//[[:blank:]]/}" = "3" if [[ "$OSTYPE" == "darwin"* ]]; then ETH_PATH="$REPO_ROOT/eth" else - ETH_PATH="eth" + mkdir -p /tmp/test + ETH_PATH="docker run --rm -v /tmp/test:/tmp/test -e HOME=/tmp/test/ --user $(id -u):$(id -g) ethereum/client-cpp" fi # This trailing ampersand directs the shell to run the command in the background, -- cgit v1.2.3 From ed32a57b860f11e902e0e7d7c7c5ba5b5bd685da Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 13 Feb 2017 17:37:33 +0000 Subject: Run tests in docker only on Travis --- scripts/tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/tests.sh b/scripts/tests.sh index 34d71bd2..09bdc963 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -42,6 +42,8 @@ test "${output//[[:blank:]]/}" = "3" # instead. This will go away soon. if [[ "$OSTYPE" == "darwin"* ]]; then ETH_PATH="$REPO_ROOT/eth" +else if [ -z $CI ]; then + ETH_PATH="eth" else mkdir -p /tmp/test ETH_PATH="docker run --rm -v /tmp/test:/tmp/test -e HOME=/tmp/test/ --user $(id -u):$(id -g) ethereum/client-cpp" -- cgit v1.2.3 From cc1d5e47f919989cdc0635a9816b62bc3b78e538 Mon Sep 17 00:00:00 2001 From: chriseth Date: Fri, 17 Feb 2017 16:08:03 +0100 Subject: Do not install eth from PPA for CI. --- scripts/install_deps.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 81cde14c..1d37d411 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -312,14 +312,6 @@ case $(uname -s) in cmake \ git \ libboost-all-dev - if [ "$CI" = true ]; then - # Install 'eth', for use in the Solidity Tests-over-IPC. - sudo add-apt-repository -y ppa:ethereum/ethereum - sudo add-apt-repository -y ppa:ethereum/ethereum-dev - sudo apt-get -y update - sudo apt-get -y install eth - fi - ;; #------------------------------------------------------------------------------ -- cgit v1.2.3 From dae5f7d35000db044527410a5995ac819d397ee6 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 20 Feb 2017 12:14:45 +0100 Subject: Fix test script. --- scripts/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests.sh b/scripts/tests.sh index 09bdc963..ff1229da 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -42,7 +42,7 @@ test "${output//[[:blank:]]/}" = "3" # instead. This will go away soon. if [[ "$OSTYPE" == "darwin"* ]]; then ETH_PATH="$REPO_ROOT/eth" -else if [ -z $CI ]; then +elif [ -z $CI ]; then ETH_PATH="eth" else mkdir -p /tmp/test -- cgit v1.2.3 From ed5b63f553681d66cbb18a2200f0e4f0acd10de3 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 20 Feb 2017 12:25:57 +0100 Subject: A bit more time for mining. --- test/RPCSession.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/RPCSession.h b/test/RPCSession.h index b37cc322..eae9aedd 100644 --- a/test/RPCSession.h +++ b/test/RPCSession.h @@ -133,7 +133,7 @@ private: IPCSocket m_ipcSocket; size_t m_rpcSequence = 1; - unsigned m_maxMiningTime = 15000; // 15 seconds + unsigned m_maxMiningTime = 30000; // 30 seconds unsigned m_sleepTime = 10; // 10 milliseconds unsigned m_successfulMineRuns = 0; -- cgit v1.2.3 From 5176784b18fda79e0634af4f817bedca80048eaf Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Fri, 24 Feb 2017 20:02:09 +0100 Subject: libevmasm: fix sloadGas in another file --- libevmasm/GasMeter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h index 6ee8ea74..3169ff2a 100644 --- a/libevmasm/GasMeter.h +++ b/libevmasm/GasMeter.h @@ -50,7 +50,7 @@ namespace GasCosts static unsigned const expByteGas = 50; static unsigned const sha3Gas = 30; static unsigned const sha3WordGas = 6; - static unsigned const sloadGas = 50; + static unsigned const sloadGas = 200; static unsigned const sstoreSetGas = 20000; static unsigned const sstoreResetGas = 5000; static unsigned const sstoreRefundGas = 15000; -- cgit v1.2.3 From cee54deb3b6504bebceec129a51cd1a93a68d56b Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Fri, 24 Feb 2017 20:09:38 +0100 Subject: test: fix invalid signatures --- test/libsolidity/GasMeter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index 220d27cf..35aa998d 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -261,8 +261,8 @@ BOOST_AUTO_TEST_CASE(exponent_size) } )"; testCreationTimeGas(sourceCode); - testRunTimeGas("f(uint256)", vector{encodeArgs(2)}); testRunTimeGas("g(uint256)", vector{encodeArgs(2)}); + testRunTimeGas("h(uint256)", vector{encodeArgs(2)}); } BOOST_AUTO_TEST_CASE(balance_gas) @@ -275,7 +275,7 @@ BOOST_AUTO_TEST_CASE(balance_gas) } )"; testCreationTimeGas(sourceCode); - testRunTimeGas("f(uint256)", vector{encodeArgs(2), encodeArgs(100)}); + testRunTimeGas("lookup_balance(address)", vector{encodeArgs(2), encodeArgs(100)}); } BOOST_AUTO_TEST_CASE(selfdestruct_gas) -- cgit v1.2.3 From 3c4c4abc2f39293ea4b8af52d00774323f9aac0f Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Sat, 25 Feb 2017 13:20:17 +0100 Subject: Remove a test about SELFDESTRUCT because the test harness obtains refund while the gas meter should not assume the refund. --- test/libsolidity/GasMeter.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index 35aa998d..f90cb105 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -278,19 +278,6 @@ BOOST_AUTO_TEST_CASE(balance_gas) testRunTimeGas("lookup_balance(address)", vector{encodeArgs(2), encodeArgs(100)}); } -BOOST_AUTO_TEST_CASE(selfdestruct_gas) -{ - char const* sourceCode = R"( - contract A { - function f() { - selfdestruct(0x30); - } - } - )"; - testCreationTimeGas(sourceCode); - testRunTimeGas("f()", vector{encodeArgs()}); -} - BOOST_AUTO_TEST_CASE(extcodesize_gas) { char const* sourceCode = R"( -- cgit v1.2.3 From ff00a14becb1be390da4ae61cf1908f3dd9a09fe Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 16 Mar 2017 01:53:10 +0000 Subject: Increase mining timeout to 2 minutes --- test/RPCSession.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/RPCSession.h b/test/RPCSession.h index eae9aedd..76bdbda5 100644 --- a/test/RPCSession.h +++ b/test/RPCSession.h @@ -133,7 +133,7 @@ private: IPCSocket m_ipcSocket; size_t m_rpcSequence = 1; - unsigned m_maxMiningTime = 30000; // 30 seconds + unsigned m_maxMiningTime = 1200000; // 120 seconds unsigned m_sleepTime = 10; // 10 milliseconds unsigned m_successfulMineRuns = 0; -- cgit v1.2.3 From e1689b6fbc61874497edc252171bfac089c34681 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 20 Mar 2017 12:37:48 +0100 Subject: Also increase socket read timeout. --- test/RPCSession.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/RPCSession.h b/test/RPCSession.h index 76bdbda5..45004d69 100644 --- a/test/RPCSession.h +++ b/test/RPCSession.h @@ -68,7 +68,7 @@ private: int m_socket; /// Socket read timeout in milliseconds. Needs to be large because the key generation routine /// might take long. - unsigned static constexpr m_readTimeOutMS = 15000; + unsigned static constexpr m_readTimeOutMS = 30000; char m_readBuf[512000]; }; #endif -- cgit v1.2.3 From 38211fdc255a7a8cc55a6af18a47c8dd04ddd8a9 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Tue, 11 Apr 2017 15:52:56 +0200 Subject: Just bigger numbers --- test/RPCSession.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/RPCSession.h b/test/RPCSession.h index 45004d69..f3c3339a 100644 --- a/test/RPCSession.h +++ b/test/RPCSession.h @@ -68,7 +68,7 @@ private: int m_socket; /// Socket read timeout in milliseconds. Needs to be large because the key generation routine /// might take long. - unsigned static constexpr m_readTimeOutMS = 30000; + unsigned static constexpr m_readTimeOutMS = 300000; char m_readBuf[512000]; }; #endif @@ -133,7 +133,7 @@ private: IPCSocket m_ipcSocket; size_t m_rpcSequence = 1; - unsigned m_maxMiningTime = 1200000; // 120 seconds + unsigned m_maxMiningTime = 6000000; // 600 seconds unsigned m_sleepTime = 10; // 10 milliseconds unsigned m_successfulMineRuns = 0; -- cgit v1.2.3 From cdc64e3cbb23fc6b5fc7792966b2491d308175a3 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 18 Apr 2017 18:52:01 +0200 Subject: Use fixed binary for eth. --- .travis.yml | 4 ---- scripts/tests.sh | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bf8ffe5..d947707c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,8 +60,6 @@ matrix: dist: trusty sudo: required compiler: gcc - before_install: - - docker pull ethereum/client-cpp env: - ZIP_SUFFIX=ubuntu-trusty - SOLC_STOREBYTECODE=On @@ -70,8 +68,6 @@ matrix: dist: trusty sudo: required compiler: clang - before_install: - - docker pull ethereum/client-cpp env: - ZIP_SUFFIX=ubuntu-trusty-clang - SOLC_STOREBYTECODE=On diff --git a/scripts/tests.sh b/scripts/tests.sh index ff1229da..6a16a40a 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -46,7 +46,10 @@ elif [ -z $CI ]; then ETH_PATH="eth" else mkdir -p /tmp/test - ETH_PATH="docker run --rm -v /tmp/test:/tmp/test -e HOME=/tmp/test/ --user $(id -u):$(id -g) ethereum/client-cpp" + wget -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/eth + test "$(shasum /tmp/test/eth)" = "52ca66b90aae9886576f3cabe5ef232a36f9b6a4 /tmp/test/eth" + chmod +x /tmp/test/eth + ETH_PATH="/tmp/test/eth" fi # This trailing ampersand directs the shell to run the command in the background, -- cgit v1.2.3 From 8758d9fb3c3bd355c476273921b24219d23c7bef Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 19 Apr 2017 09:05:43 +0200 Subject: Install eth (including dependencies). --- scripts/install_deps.sh | 8 ++++++++ scripts/tests.sh | 2 ++ 2 files changed, 10 insertions(+) diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 1d37d411..24cf49d5 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -312,6 +312,14 @@ case $(uname -s) in cmake \ git \ libboost-all-dev + if [ "$CI" = true ]; then + # Install 'eth', for use in the Solidity Tests-over-IPC. + # We will not use this 'eth', but its dependencies + sudo add-apt-repository -y ppa:ethereum/ethereum + sudo add-apt-repository -y ppa:ethereum/ethereum-dev + sudo apt-get -y update + sudo apt-get -y install eth + fi ;; #------------------------------------------------------------------------------ diff --git a/scripts/tests.sh b/scripts/tests.sh index 6a16a40a..4325535b 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -48,7 +48,9 @@ else mkdir -p /tmp/test wget -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/eth test "$(shasum /tmp/test/eth)" = "52ca66b90aae9886576f3cabe5ef232a36f9b6a4 /tmp/test/eth" + sync chmod +x /tmp/test/eth + sync # Otherwise we might get a "text file busy" error ETH_PATH="/tmp/test/eth" fi -- cgit v1.2.3 From 89bb8cbd6a12b4e42b7f00ea6aa64bf738d7a263 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 25 Apr 2017 16:47:02 +0200 Subject: Update shasum to new eth version. --- scripts/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests.sh b/scripts/tests.sh index 4325535b..6b76c154 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -47,7 +47,7 @@ elif [ -z $CI ]; then else mkdir -p /tmp/test wget -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/eth - test "$(shasum /tmp/test/eth)" = "52ca66b90aae9886576f3cabe5ef232a36f9b6a4 /tmp/test/eth" + test "$(shasum /tmp/test/eth)" = "c132e8989229e4840831a4fb1a1d058b732a11d5 /tmp/test/eth" sync chmod +x /tmp/test/eth sync # Otherwise we might get a "text file busy" error -- cgit v1.2.3 From ea6d925a5da79288bc2a3197c30f11c895a07a1a Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 26 Apr 2017 11:53:44 +0200 Subject: Option to disable/remove all tests that require IPC. --- test/TestHelper.cpp | 4 +++- test/TestHelper.h | 1 + test/boostTest.cpp | 31 +++++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp index 0c0857c9..094b59c6 100644 --- a/test/TestHelper.cpp +++ b/test/TestHelper.cpp @@ -43,8 +43,10 @@ Options::Options() optimize = true; else if (string(suite.argv[i]) == "--show-messages") showMessages = true; + else if (string(suite.argv[i]) == "--no-ipc") + disableIPC = true; - if (ipcPath.empty()) + if (!disableIPC && ipcPath.empty()) if (auto path = getenv("ETH_TEST_IPC")) ipcPath = path; } diff --git a/test/TestHelper.h b/test/TestHelper.h index 8f05eead..3e74b54c 100644 --- a/test/TestHelper.h +++ b/test/TestHelper.h @@ -108,6 +108,7 @@ struct Options: boost::noncopyable std::string ipcPath; bool showMessages = false; bool optimize = false; + bool disableIPC = false; static Options const& get(); diff --git a/test/boostTest.cpp b/test/boostTest.cpp index d1d35be3..6fc1c925 100644 --- a/test/boostTest.cpp +++ b/test/boostTest.cpp @@ -21,11 +21,9 @@ * Original code taken from boost sources. */ -#define BOOST_TEST_MODULE EthereumTests #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4535) // calling _set_se_translator requires /EHa @@ -36,3 +34,32 @@ #endif #pragma GCC diagnostic pop + +#include + +using namespace boost::unit_test; + +test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] ) +{ + master_test_suite_t& master = framework::master_test_suite(); + master.p_name.value = "SolidityTests"; + if (dev::test::Options::get().disableIPC) + { + for (auto suite: { + "SolidityAuctionRegistrar", + "SolidityFixedFeeRegistrar", + "SolidityWallet", + "LLLEndToEndTest", + "GasMeterTests", + "SolidityEndToEndTest", + "SolidityOptimizer" + }) + { + auto id = master.get(suite); + assert(id != INV_TEST_UNIT_ID); + master.remove(id); + } + } + + return 0; +} -- cgit v1.2.3 From b024fce150beefa265f56f86b2fe83e3ebf4641e Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 26 Apr 2017 11:53:57 +0200 Subject: Do not run IPC tests on windows. --- appveyor.yml | 6 +--- scripts/install_deps.bat | 1 - scripts/install_eth.cmake | 76 ----------------------------------------------- 3 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 scripts/install_eth.cmake diff --git a/appveyor.yml b/appveyor.yml index 8d9424f0..22ec30a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -69,12 +69,8 @@ build_script: test_script: - cd %APPVEYOR_BUILD_FOLDER% - - cd deps\install\x64\eth - - ps: $ethProc = Start-Process eth.exe --test - - ps: Start-Sleep -s 100 - cd %APPVEYOR_BUILD_FOLDER%\build\test\%CONFIGURATION% - - copy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvc*.dll" . - - soltest.exe --show-progress -- --ipcpath \\.\pipe\geth.ipc + - soltest.exe --show-progress -- --no-ipc artifacts: - path: solidity-windows.zip diff --git a/scripts/install_deps.bat b/scripts/install_deps.bat index bd68b07a..512a28df 100644 --- a/scripts/install_deps.bat +++ b/scripts/install_deps.bat @@ -59,4 +59,3 @@ REM Copyright (c) 2016 solidity contributors. REM --------------------------------------------------------------------------- cmake -P deps\install_deps.cmake -cmake -P scripts\install_eth.cmake diff --git a/scripts/install_eth.cmake b/scripts/install_eth.cmake deleted file mode 100644 index 25f449e0..00000000 --- a/scripts/install_eth.cmake +++ /dev/null @@ -1,76 +0,0 @@ -#------------------------------------------------------------------------------ -# Cmake script for installing pre-requisite package eth for solidity. -# -# The aim of this script is to simply download and unpack eth binaries to the deps folder. -# -# The documentation for solidity is hosted at: -# -# http://solidity.readthedocs.io/ -# -# ------------------------------------------------------------------------------ -# This file is part of solidity. -# -# solidity is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# solidity is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with solidity. If not, see -# -# (c) 2016 solidity contributors. -#------------------------------------------------------------------------------ - -function(download URL DST_FILE STATUS) - set(TMP_FILE "${DST_FILE}.part") - - get_filename_component(FILE_NAME ${DST_FILE} NAME) - if (NOT EXISTS ${DST_FILE}) - message("Downloading ${FILE_NAME}") - file(DOWNLOAD ${URL} ${TMP_FILE} SHOW_PROGRESS STATUS DOWNLOAD_STATUS) - list(GET DOWNLOAD_STATUS 0 STATUS_CODE) - if (STATUS_CODE EQUAL 0) - file(RENAME ${TMP_FILE} ${DST_FILE}) - else() - file(REMOVE ${TMP_FILE}) - list(GET DOWNLOAD_STATUS 1 ERROR_MSG) - - message("ERROR! Downloading '${FILE_NAME}' failed.") - message(STATUS "URL: ${URL}") - message(STATUS "Error: ${STATUS_CODE} ${ERROR_MSG}") - set(STATUS FALSE PARENT_SCOPE) - return() - endif() - else() - message("Using cached ${FILE_NAME}") - endif() - set(STATUS TRUE PARENT_SCOPE) -endfunction(download) - -function(download_and_unpack PACKAGE_URL DST_DIR) - get_filename_component(FILE_NAME ${PACKAGE_URL} NAME) - - set(DST_FILE "${CACHE_DIR}/${FILE_NAME}") - set(TMP_FILE "${DST_FILE}.part") - - file(MAKE_DIRECTORY ${CACHE_DIR}) - file(MAKE_DIRECTORY ${DST_DIR}) - - download(${PACKAGE_URL} ${DST_FILE} STATUS) - - if (STATUS) - message("Unpacking ${FILE_NAME} to ${DST_DIR}") - execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf ${DST_FILE} - WORKING_DIRECTORY ${DST_DIR}) - endif() -endfunction(download_and_unpack) - -get_filename_component(ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE) -set(CACHE_DIR "${ROOT_DIR}/deps/cache") -set(INSTALL_DIR "${ROOT_DIR}/deps/install/x64/eth") -download_and_unpack("https://github.com/bobsummerwill/cpp-ethereum/releases/download/develop-v1.3.0.401/cpp-ethereum-develop-windows.zip" ${INSTALL_DIR}) -- cgit v1.2.3 From efa9c7626718023083489aebee9a1662c5f24ab5 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 26 Apr 2017 12:48:19 +0200 Subject: Update Changelog.md --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 71f9a83b..7b64f950 100644 --- a/Changelog.md +++ b/Changelog.md @@ -14,7 +14,7 @@ Bugfixes: * Compiler interface: Fix a bug where source indexes could be inconsistent between Solidity compiled with different compilers (clang vs. gcc) or compiler settings. The bug was visible in AST and source mappings. - * Gas-estimator: reflect the most recent fee schedule. + * Gas Estimator: Reflect the most recent fee schedule. * Type system: Contract inheriting from base with unimplemented constructor should be abstract. ### 0.4.10 (2017-03-15) -- cgit v1.2.3