Merge pull request #370 from iamdefinitelyahuman/v1.6.7

V1.6.7

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://github.com/iamdefinitelyahuman/brownie)
 
+## [1.6.7](https://github.com/iamdefinitelyahuman/brownie/tree/v1.6.7) - 2020-03-09
+
+### Fixed
+- INVALID instructions with no related ast node (assembly)
+- Missing f-strings in compiler output
+
 ## [1.6.6](https://github.com/iamdefinitelyahuman/brownie/tree/v1.6.6) - 2020-03-03
 
 ### Changed

brownie/_cli/__main__.py

@@ -10,7 +10,7 @@
 from brownie.utils import color, notify
 from brownie.utils.docopt import docopt, levenshtein_norm
 
-__version__ = "1.6.6"
+__version__ = "1.6.7"
 
 __doc__ = """Usage:  brownie <command> [<args>...] [options <args>]
 

brownie/project/compiler/solidity.py

@@ -52,9 +52,9 @@ def compile_from_input_json(
         input_json["settings"]["evmVersion"] = EVM_EQUIVALENTS[input_json["settings"]["evmVersion"]]
 
     if not silent:
-        print("Compiling contracts...\n  Solc version: {str(solcx.get_solc_version())}")
+        print(f"Compiling contracts...\n  Solc version: {str(solcx.get_solc_version())}")
 
-        opt = "Enabled  Runs: {optimizer['runs']}" if optimizer["enabled"] else "Disabled"
+        opt = f"Enabled  Runs: {optimizer['runs']}" if optimizer["enabled"] else "Disabled"
         print(f"  Optimizer: {opt}")
 
         if input_json["settings"]["evmVersion"]:
@@ -478,15 +478,19 @@ def _find_revert_offset(
     # statement within a function
     if fn_node[-1].nodeType == "ExpressionStatement":
         expr = fn_node[-1].expression
-        if expr.nodeType == "FunctionCall" and expr.expression.name == "revert":
+
+        if expr.nodeType == "FunctionCall" and expr.get("expression.name") == "revert":
             pc_list[-1].update(
                 path=source_node.absolutePath, fn=fn_name, offset=expr.expression.offset
             )
 
 
 def _set_invalid_error_string(source_node: NodeBase, pc_map: Dict) -> None:
     # set custom error string for INVALID opcodes
-    node = source_node.children(include_children=False, offset_limits=pc_map["offset"])[0]
+    try:
+        node = source_node.children(include_children=False, offset_limits=pc_map["offset"])[0]
+    except IndexError:
+        return
     if node.nodeType == "IndexAccess":
         pc_map["dev"] = "Index out of range"
     elif node.nodeType == "BinaryOperation":

docs/conf.py

@@ -37,7 +37,7 @@ def setup(sphinx):
 # The short X.Y version
 version = ""
 # The full version, including alpha/beta/rc tags
-release = "v1.6.6"
+release = "v1.6.7"
 
 
 # -- General configuration ---------------------------------------------------

requirements.txt

@@ -8,7 +8,7 @@ hypothesis==5.5.4
 psutil>=5.7.0,<6.0.0
 py>=1.5.0
 pyreadline==2.1;platform_system=='Windows'
-py-solc-ast>=1.1.0,<2.0.0
+py-solc-ast>=1.2.1,<2.0.0
 py-solc-x>=0.8.0,<1.0.0
 pytest==5.3.5
 pytest-xdist==1.31.0

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.6
+current_version = 1.6.7
 
 [bumpversion:file:setup.py]
 

setup.py

@@ -11,7 +11,7 @@
 setup(
     name="eth-brownie",
     packages=find_packages(),
-    version="1.6.6",  # don't change this manually, use bumpversion instead
+    version="1.6.7",  # don't change this manually, use bumpversion instead
     license="MIT",
     description="A Python framework for Ethereum smart contract deployment, testing and interaction.",  # noqa: E501
     long_description=long_description,