Omit proxy key, update error message

boa_zksync/compile.py

@@ -40,7 +40,7 @@ def compile_zksync(
     if source_code is None:
         with open(filename) as file:
             source_code = file.read()
-    
+
     compile_output = get_compiler_output(output)
     bytecode = to_bytes(compile_output.pop("bytecode"))
     return ZksyncCompilerData(

boa_zksync/compiler_utils.py

@@ -81,11 +81,11 @@ def get_compiler_output(output):
     # we need this helper method to get the correct key containing compiler output
     # from the compiler. Assuming key names could change and also assuming that the
     # number of keys could change, this method breaks if any of that happens:
-    
-    excluded_keys = {"version", "zk_version"}
+
+    excluded_keys = {"version", "zk_version", "__VYPER_MINIMAL_PROXY_CONTRACT"}
     contract_keys = set(output.keys()) - excluded_keys
-    
+
     if len(contract_keys) != 1:
-        raise ValueError(f"Expected exactly one contract key, found {len(contract_keys)}")
-    
-    return output[next(iter(contract_keys))]
+        raise ValueError(f"Expected exactly one contract key, found {contract_keys}")
+
+    return output[next(iter(contract_keys))]

boa_zksync/deployer.py

@@ -92,6 +92,7 @@ def env(self) -> "ZksyncEnv":
         """
         env = Env.get_singleton()
         from boa_zksync.environment import ZksyncEnv
+
         assert isinstance(
             env, ZksyncEnv
         ), "ZksyncDeployer can only be used in zkSync environments"

tests/test_get_compiler_output.py

@@ -4,36 +4,34 @@
 
 
 def test_get_compiler_output():
-
-    output_dict = {
-        "blabla": 123,
-        "zk_version": 456,
-        "version": 789,
-    }
-
-    get_compiler_output(output_dict) == 123
 
-
-def test_get_compiler_output_revert_too_many_keys():
-
+    output_dict = {"blabla": 123, "zk_version": 456, "version": 789}
+
+    assert get_compiler_output(output_dict) == 123
+
+
+def test_get_compiler_output_too_many_keys():
+
     output_dict = {
         "blabla": 123,
         "zk_version": 456,
         "version": 789,
         "new_compiler_output_key": 101112,
     }
-
-    with pytest.raises(ValueError, match="Expected exactly one contract key, found 2"):
+
+    with pytest.raises(
+        ValueError,
+        match="Expected exactly one contract key, found {'blabla', 'new_compiler_output_key'}",
+    ):
         get_compiler_output(output_dict)
-
 
-def test_get_compiler_output_revert_unexpected_key():
-    
-    output_dict = {
-        "blabla": 123,
-        "zk_versions": 456,
-        "version": 789,
-    }
-
-    with pytest.raises(ValueError, match="Expected exactly one contract key, found 2"):
+
+def test_get_compiler_output_unexpected_key():
+
+    output_dict = {"blabla": 123, "zk_versions": 456, "version": 789}
+
+    with pytest.raises(
+        ValueError,
+        match="Expected exactly one contract key, found {'blabla', 'zk_versions'}",
+    ):
         get_compiler_output(output_dict)