From b461095a9f4ce7f64e24bf15dd4a143a03c008aa Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Wed, 8 Jul 2020 23:03:29 +0200 Subject: [PATCH 1/4] overlay.nix: solc: default to 0.6.7 --- overlay.nix | 2 +- src/dapp/CHANGELOG.md | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/overlay.nix b/overlay.nix index c2fd0f1f8..b2c481692 100644 --- a/overlay.nix +++ b/overlay.nix @@ -105,7 +105,7 @@ in rec { fetchSolcVersions { owner = "NixOS"; attr = super.system; } // fetchSolcVersions { owner = "dapphub"; attr = "unreleased"; }; - solc = solc-versions.solc_0_5_15; + solc = solc-versions.solc_0_6_7; hevm = self.pkgs.haskell.lib.justStaticExecutables self.haskellPackages.hevm; diff --git a/src/dapp/CHANGELOG.md b/src/dapp/CHANGELOG.md index c0815a752..1b33fb5f4 100644 --- a/src/dapp/CHANGELOG.md +++ b/src/dapp/CHANGELOG.md @@ -4,10 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [0.28.0] - 2020-07-13 ### Added - Support for solc 0.6.7 +### Changed +- Default to solc 0.6.7 + ### Removed - Support for git submodules (setzer, dai-cli, chief, terra) - `dapp pkg` functionality - dapptools is now installed and upgraded as a Nix From 65a36c947fd43b31111ad72a1db056a3635fb342 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Wed, 8 Jul 2020 23:05:06 +0200 Subject: [PATCH 2/4] dapp: 0.28.0 --- src/dapp/default.nix | 2 +- src/dapp/libexec/dapp/dapp---version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dapp/default.nix b/src/dapp/default.nix index 57614906f..d008202e8 100644 --- a/src/dapp/default.nix +++ b/src/dapp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dapp-${version}"; - version = "0.27.0"; + version = "0.28.0"; src = ./.; nativeBuildInputs = [makeWrapper shellcheck coreutils nodejs]; diff --git a/src/dapp/libexec/dapp/dapp---version b/src/dapp/libexec/dapp/dapp---version index 524b1b724..729dcf97a 100755 --- a/src/dapp/libexec/dapp/dapp---version +++ b/src/dapp/libexec/dapp/dapp---version @@ -1,4 +1,4 @@ #!/usr/bin/env bash -echo dapp 0.27.0 +echo dapp 0.28.0 solc --version echo "hevm $(hevm version)" From d45b5a438e09b63270969129d1e6564284c7bfad Mon Sep 17 00:00:00 2001 From: Martin Lundfall Date: Mon, 13 Jul 2020 12:02:43 +0200 Subject: [PATCH 3/4] admit solc 0.6.x default --- src/hevm/src/EVM/Solidity.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hevm/src/EVM/Solidity.hs b/src/hevm/src/EVM/Solidity.hs index e46e81265..0dfbd8b3d 100644 --- a/src/hevm/src/EVM/Solidity.hs +++ b/src/hevm/src/EVM/Solidity.hs @@ -340,11 +340,11 @@ toCode = fst . BS16.decode . encodeUtf8 solidity' :: Text -> IO (Text, Text) solidity' src = withSystemTempFile "hevm.sol" $ \path handle -> do hClose handle - writeFile path ("pragma solidity ^0.5.2;\n" <> src) + writeFile path ("pragma solidity ^0.6.7;\n" <> src) x <- pack <$> readProcess "solc" - ["--combined-json=bin-runtime,bin,srcmap,srcmap-runtime,abi,ast", path] + ["--combined-json=bin-runtime,bin,srcmap,srcmap-runtime,abi,ast,storage-layout", path] "" return (x, pack path) From 8e00922a7d829f18514e2e80c9b04854e8a8f919 Mon Sep 17 00:00:00 2001 From: Martin Lundfall Date: Mon, 13 Jul 2020 12:35:28 +0200 Subject: [PATCH 4/4] bump solc version --- src/dapp-tests/src/constantinople.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dapp-tests/src/constantinople.sol b/src/dapp-tests/src/constantinople.sol index eed4afd56..8c336b5f4 100644 --- a/src/dapp-tests/src/constantinople.sol +++ b/src/dapp-tests/src/constantinople.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.6.7; import "ds-test/test.sol"; @@ -102,7 +102,7 @@ contract ConstantinopleTests is DSTest { let top := mload(0x40) mstore(top, sload(deadcode_slot)) let inithash := keccak256(top, 13) - mstore(sub(top, 11), address) + mstore(sub(top, 11), address()) mstore8(top, 0xff) mstore(add(top, 21), salt) mstore(add(top, 53), inithash)