From fd6c6655489e527b5a3e706c9a98da4a2f2b1258 Mon Sep 17 00:00:00 2001 From: Leonardo Alt Date: Mon, 14 Sep 2020 14:52:04 +0200 Subject: [PATCH 1/2] Update SMTChecker tests with z3 4.8.9 --- .../smtCheckerTests/functions/functions_external_2.sol | 1 + .../loops/for_loop_array_assignment_storage_memory.sol | 1 - .../loops/for_loop_array_assignment_storage_storage.sol | 1 - .../libsolidity/smtCheckerTests/types/struct/struct_mapping.sol | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol index bc4694192..975df538b 100644 --- a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol +++ b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol @@ -17,4 +17,5 @@ contract C } } // ---- +// Warning 1218: (297-321): Error trying to invoke SMT solver. // Warning 4661: (297-321): Assertion violation happens here. diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol index b30a23587..0ade36577 100644 --- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol +++ b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol @@ -20,4 +20,3 @@ contract LoopFor2 { } // ---- // Warning 6328: (363-382): Assertion violation happens here. -// Warning 4661: (316-336): Assertion violation happens here. diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_storage.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_storage.sol index 6a998de79..4d0f55d06 100644 --- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_storage.sol +++ b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_storage.sol @@ -21,4 +21,3 @@ contract LoopFor2 { // ---- // Warning 6328: (341-360): Assertion violation happens here. // Warning 6328: (364-383): Assertion violation happens here. -// Warning 4661: (317-337): Assertion violation happens here. diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_mapping.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_mapping.sol index 51bacc53d..090e0f6a1 100644 --- a/test/libsolidity/smtCheckerTests/types/struct/struct_mapping.sol +++ b/test/libsolidity/smtCheckerTests/types/struct/struct_mapping.sol @@ -15,4 +15,4 @@ contract C { } } // ---- -// Warning 4661: (143-169): Assertion violation happens here. +// Warning 6328: (143-169): Assertion violation happens here. From 4e448ad798a843618d76081d6cd1012c25efbfa1 Mon Sep 17 00:00:00 2001 From: Leonardo Alt Date: Mon, 14 Sep 2020 17:42:12 +0200 Subject: [PATCH 2/2] Change build hashes --- .circleci/config.yml | 18 +++++++++--------- .circleci/osx_install_dependencies.sh | 14 +++++++------- .travis.yml | 2 +- scripts/build_emscripten.sh | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6de764a39..0cf54d7e1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,23 +9,23 @@ version: 2.1 parameters: ubuntu-1804-docker-image: type: string - # solbuildpackpusher/solidity-buildpack-deps:ubuntu1804-2 - default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9ab317e583c395e50884ba82e9f99811c374344cea4c550725be8ec836e07acc" + # solbuildpackpusher/solidity-buildpack-deps:ubuntu1804-3 + default: "solbuildpackpusher/solidity-buildpack-deps@sha256:19f613d2ac47fedff654dacef984d8a64726c4d67ae8f2667a85ee7d97ac4c1c" ubuntu-2004-docker-image: type: string - # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-2 - default: "solbuildpackpusher/solidity-buildpack-deps@sha256:cbfa42d8ecbe94391ba8837e218869242666de7a0da6ccac065a856c85b6a6a0" + # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-3 + default: "solbuildpackpusher/solidity-buildpack-deps@sha256:aeedbe7390a7383815f0cf0f8a1b8bf84dc5e334a3b0043ebcdf8b1bdbe80a81" ubuntu-2004-clang-docker-image: type: string - # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-2 - default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a4d5271b5552139d9f2caefc50d42f401bf74132cf8f253e199e11c80ab42de" + # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-3 + default: "solbuildpackpusher/solidity-buildpack-deps@sha256:2593c15689dee5b5bdfff96a36c8c68a468cd3b147c41f75b820b8fabc257be9" ubuntu-1604-clang-ossfuzz-docker-image: type: string - # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-3 - default: "solbuildpackpusher/solidity-buildpack-deps@sha256:6fa6914bd81abcac4b162c738e6ff05d87cefe7655e3859c7a827e5a8ec20dc7" + # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-4 + default: "solbuildpackpusher/solidity-buildpack-deps@sha256:842126b164b3542f05bff2611459e21edc7e3e2c81ca9d1f43396c8cf066f7ca" emscripten-docker-image: type: string - default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d557d015918c3cf68b0d22839bab41013f0757b651a7fef21595f89721dbebcc" + default: "solbuildpackpusher/solidity-buildpack-deps@sha256:23dad3b34deae8107c8551804ef299f6a89c23ed506e8118fac151e2bdc9018c" defaults: diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh index 064680139..1cc16a9c9 100755 --- a/.circleci/osx_install_dependencies.sh +++ b/.circleci/osx_install_dependencies.sh @@ -43,13 +43,13 @@ then ./scripts/install_obsolete_jsoncpp_1_7_4.sh # z3 - wget https://github.com/Z3Prover/z3/releases/download/z3-4.8.8/z3-4.8.8-x64-osx-10.14.6.zip - unzip z3-4.8.8-x64-osx-10.14.6.zip - rm -f z3-4.8.8-x64-osx-10.14.6.zip - cp z3-4.8.8-x64-osx-10.14.6/bin/libz3.a /usr/local/lib - cp z3-4.8.8-x64-osx-10.14.6/bin/z3 /usr/local/bin - cp z3-4.8.8-x64-osx-10.14.6/include/* /usr/local/include - rm -rf z3-4.8.8-x64-osx-10.14.6 + wget https://github.com/Z3Prover/z3/releases/download/z3-4.8.9/z3-4.8.9-x64-osx-10.14.6.zip + unzip z3-4.8.9-x64-osx-10.14.6.zip + rm -f z3-4.8.9-x64-osx-10.14.6.zip + cp z3-4.8.9-x64-osx-10.14.6/bin/libz3.a /usr/local/lib + cp z3-4.8.9-x64-osx-10.14.6/bin/z3 /usr/local/bin + cp z3-4.8.9-x64-osx-10.14.6/include/* /usr/local/include + rm -rf z3-4.8.9-x64-osx-10.14.6 # evmone wget https://github.com/ethereum/evmone/releases/download/v0.4.0/evmone-0.4.0-darwin-x86_64.tar.gz diff --git a/.travis.yml b/.travis.yml index 3d00a974d..f9105e246 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,7 @@ matrix: before_install: - nvm install 10 - nvm use 10 - - docker pull solbuildpackpusher/solidity-buildpack-deps@sha256:d557d015918c3cf68b0d22839bab41013f0757b651a7fef21595f89721dbebcc + - docker pull solbuildpackpusher/solidity-buildpack-deps@sha256:23dad3b34deae8107c8551804ef299f6a89c23ed506e8118fac151e2bdc9018c env: - SOLC_EMSCRIPTEN=On - SOLC_INSTALL_DEPS_TRAVIS=Off diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh index f4b0fe647..cdb07bfb4 100755 --- a/scripts/build_emscripten.sh +++ b/scripts/build_emscripten.sh @@ -35,5 +35,5 @@ else fi docker run -v $(pwd):/root/project -w /root/project \ - solbuildpackpusher/solidity-buildpack-deps@sha256:d557d015918c3cf68b0d22839bab41013f0757b651a7fef21595f89721dbebcc \ + solbuildpackpusher/solidity-buildpack-deps@sha256:23dad3b34deae8107c8551804ef299f6a89c23ed506e8118fac151e2bdc9018c\ ./scripts/travis-emscripten/build_emscripten.sh $BUILD_DIR