vyper 0.4.0 draft

brownie/project/compiler/utils.py

@@ -8,6 +8,12 @@
 
 def expand_source_map(source_map_str: str) -> List:
     # Expands the compressed sourceMap supplied by solc into a list of lists
+
+    if isinstance(source_map_str, dict):
+        source_map_str = source_map_str["pc_pos_map_compressed"]
+    if not isinstance(source_map_str, str):
+        raise TypeError(source_map_str) from None
+
     source_map: List = [_expand_row(i) if i else None for i in source_map_str.split(";")]
     for i, value in enumerate(source_map[1:], 1):
         if value is None:

brownie/project/compiler/vyper.py

@@ -47,10 +47,10 @@ def set_vyper_version(version: Union[str, Version]) -> str:
         version = Version(version)
     if version != Version(vyper.__version__):
         try:
-            vvm.set_vyper_version(version, silent=True)
+            vvm.set_vyper_version(str(version), silent=True)
         except vvm.exceptions.VyperNotInstalled:
             install_vyper(version)
-            vvm.set_vyper_version(version, silent=True)
+            vvm.set_vyper_version(str(version), silent=True)
     _active_version = version
     return str(_active_version)
 
@@ -82,13 +82,13 @@ def get_abi(contract_source: str, name: str) -> Dict:
 
 def _get_vyper_version_list() -> Tuple[List, List]:
     global AVAILABLE_VYPER_VERSIONS
-    installed_versions = vvm.get_installed_vyper_versions()
+    installed_versions = [Version(str(v)) for v in vvm.get_installed_vyper_versions()]
     lib_version = Version(vyper.__version__)
     if lib_version not in installed_versions:
         installed_versions.append(lib_version)
     if AVAILABLE_VYPER_VERSIONS is None:
         try:
-            AVAILABLE_VYPER_VERSIONS = vvm.get_installable_vyper_versions()
+            AVAILABLE_VYPER_VERSIONS = [Version(str(v)) for v in vvm.get_installable_vyper_versions()]
         except ConnectionError:
             if not installed_versions:
                 raise ConnectionError("Vyper not installed and cannot connect to GitHub")
@@ -237,12 +237,12 @@ def compile_from_input_json(
         outputs.remove("devdoc")
     if version == Version(vyper.__version__):
         try:
-            return vyper_json.compile_json(input_json, root_path=allow_paths)
+            return vyper_json.compile_json(input_json)
         except VyperException as exc:
             raise exc.with_traceback(None)
     else:
         try:
-            return vvm.compile_standard(input_json, base_path=allow_paths, vyper_version=version)
+            return vvm.compile_standard(input_json, base_path=allow_paths, vyper_version=str(version))
         except vvm.exceptions.VyperError as exc:
             raise CompilerError(exc, "vyper")
 
@@ -292,7 +292,7 @@ def _generate_coverage_data(
 ) -> Tuple:
     if not opcodes_str:
         return {}, {}, {}
-
+        
     source_map = deque(expand_source_map(source_map_str))
     opcodes = deque(opcodes_str.split(" "))
 

requirements.in

@@ -24,6 +24,6 @@ rlp
 semantic-version<3
 tqdm<5
 vvm==0.1.0  # 0.2.0 switches from semantic-version to packaging.version and things break
-vyper>=0.3.8,<0.4
+vyper>=0.4.0,<0.5
 web3>=6,<7
 wrapt>=1.12.1,<2

requirements.txt

@@ -220,9 +220,9 @@ typing-extensions==4.9.0
     #   web3
 urllib3==2.2.1
     # via requests
-vvm==0.1.0
+vvm==0.2.1
     # via -r requirements.in
-vyper==0.3.10
+vyper==0.4.0
     # via -r requirements.in
 wcwidth==0.2.13
     # via prompt-toolkit