From 81f415dbfc2117b02ef38b8c41c088c6140258ef Mon Sep 17 00:00:00 2001
From: Nick Gheorghita <nickgheorghita@gmail.com>
Date: Tue, 12 Feb 2019 17:07:46 -0700
Subject: [PATCH] Update vyper registry assets

---
 setup.py                                     | 2 +-
 tests/core/pm-module/conftest.py             | 2 +-
 tests/core/pm-module/test_ens_integration.py | 2 +-
 web3/pm.py                                   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 72fe386759..bcadeb7c5e 100644
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@
         "eth-account>=0.2.1,<0.4.0",
         "eth-hash[pycryptodome]>=0.2.0,<1.0.0",
         "eth-utils>=1.3.0,<2.0.0",
-        "ethpm>=0.1.4a10,<1.0.0",
+        "ethpm>=0.1.4a12,<1.0.0",
         "hexbytes>=0.1.0,<1.0.0",
         "lru-dict>=1.1.6,<2.0.0",
         "requests>=2.16.0,<3.0.0",
diff --git a/tests/core/pm-module/conftest.py b/tests/core/pm-module/conftest.py
index 0ac2ed46e4..49ca700225 100644
--- a/tests/core/pm-module/conftest.py
+++ b/tests/core/pm-module/conftest.py
@@ -165,7 +165,7 @@ def sol_registry(w3):
 
 def vy_registry(w3):
     registry_path = ASSETS_DIR / "vyper_registry"
-    manifest = json.loads((registry_path / "1.0.0.json").read_text().rstrip('\n'))
+    manifest = json.loads((registry_path / "0.1.0.json").read_text().rstrip('\n'))
     registry_package = Package(manifest, w3)
     registry_deployer = Deployer(registry_package)
     deployed_registry_package = registry_deployer.deploy("registry")
diff --git a/tests/core/pm-module/test_ens_integration.py b/tests/core/pm-module/test_ens_integration.py
index 6ec0a60d21..d5d674d71e 100644
--- a/tests/core/pm-module/test_ens_integration.py
+++ b/tests/core/pm-module/test_ens_integration.py
@@ -136,7 +136,7 @@ def test_web3_ens(ens):
     w3.ens.setup_address('tester.eth', registry.address)
     actual_addr = ens.address('tester.eth')
     w3.pm.set_registry('tester.eth')
-    assert w3.pm.registry.address == to_canonical_address(actual_addr)
+    assert w3.pm.registry.address == actual_addr
     w3.pm.release_package('owned', '1.0.0', 'ipfs://QmbeVyFLSuEUxiXKwSsEjef6icpdTdA4kGG9BcrJXKNKUW')
     pkg_name, version, manifest_uri = w3.pm.get_release_data('owned', '1.0.0')
     assert pkg_name == 'owned'
diff --git a/web3/pm.py b/web3/pm.py
index 899574b065..e0b79fe962 100644
--- a/web3/pm.py
+++ b/web3/pm.py
@@ -223,7 +223,7 @@ def __init__(self, address: Address, w3: Web3) -> None:
         # todo: validate runtime bytecode
         abi = get_vyper_registry_manifest()["contract_types"]["registry"]["abi"]
         self.registry = w3.eth.contract(address=address, abi=abi)
-        self.address = address
+        self.address = to_checksum_address(address)
         self.w3 = w3
 
     @classmethod
@@ -620,7 +620,7 @@ def _validate_set_ens(self) -> None:
 
 
 def get_vyper_registry_manifest() -> Dict[str, Any]:
-    return json.loads((ASSETS_DIR / "vyper_registry" / "1.0.0.json").read_text())
+    return json.loads((ASSETS_DIR / "vyper_registry" / "0.1.0.json").read_text())
 
 
 def get_solidity_registry_manifest() -> Dict[str, Any]: