Fix sdk.getContract and erc20, erc721, and erc1155 namespaces (#121)

* Fix sdk.getContract and erc20, erc721, and erc1155 namespaces

* Add publishing instructions

Author: adam-maj

README.md

@@ -110,6 +110,20 @@ Once you have run the initialization step, you can run the following to run all
 $ make test
 ```
 
+### Publishing the Package
+
+To make a build & publish the package, you need to have a `pypi` account with permission to edit the `thirdweb-sdk` pypi package. You can authenticate your pypi account with poetry with the following command:
+
+```bash
+poetry config pypi-token.pypi pypi-token-here
+```
+
+Then, you can build and release a prerelease version with the following command:
+
+```bash
+make publish
+```
+
 ### Code Style Setup
 
 Make sure you have `mypy`, `pylint`, and `black` installed (all included in the dev dependencies with `poetry install`.

pyproject.toml

@@ -6,7 +6,7 @@ packages = [
   {include = "thirdweb"},
 ]
 readme = "README.md"
-version = "3.0.1"
+version = "3.0.2a1"
 
 [tool.poetry.dependencies]
 python = ">=3.7.1"

thirdweb/common/feature_detection.py

@@ -56,7 +56,7 @@ def extract_minimal_proxy_implementation_address(bytecode: HexBytes) -> str:
 
 
 def resolve_contract_uri_from_address(address: str, provider: Web3) -> str:
-    bytecode = provider.eth.get_code(address)
+    bytecode = provider.eth.get_code(provider.toChecksumAddress(address))
     if bytecode.hex() == "0x":
         raise Exception(f"Contract at '{address}' does not exist")
 
@@ -68,6 +68,21 @@ def resolve_contract_uri_from_address(address: str, provider: Web3) -> str:
     except:
         pass
 
+    try:
+        proxy_storage = provider.eth.get_storage_at(
+            provider.toChecksumAddress(address), 
+            # hex: 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc
+            24440054405305269366569402256811496959409073762505157381672968839269610695612
+        )
+        implementation_address = "0x" + proxy_storage.hex().replace("0x", "").lstrip("0")
+        if implementation_address != "0x":
+            return resolve_contract_uri_from_address(
+                implementation_address,
+                provider,
+            )
+    except:
+        pass
+
     return extract_ipfs_hash_from_bytecode(bytecode)
 
 

thirdweb/contracts/custom.py

@@ -6,6 +6,8 @@
 from thirdweb.abi.i_token_erc1155 import ITokenERC1155
 from thirdweb.abi.i_token_erc20 import ITokenERC20
 from thirdweb.abi.i_token_erc721 import ITokenERC721
+from thirdweb.abi.token_erc1155 import TokenERC1155
+from thirdweb.abi.token_erc20 import TokenERC20
 from thirdweb.abi.token_erc721 import TokenERC721
 from thirdweb.common.error import NoSignerException
 from thirdweb.common.feature_detection import matches_interface
@@ -97,9 +99,9 @@ def __init__(
         self.sales = self._detect_primary_sales()
         self.platform_fee = self._detect_platform_fee()
 
-        self.token = self._detect_erc_20()
-        self.nft = self._detect_erc_721()
-        self.edition = self._detect_erc_1155()
+        self.erc20 = self._detect_erc_20()
+        self.erc721 = self._detect_erc_721()
+        self.erc1155 = self._detect_erc_1155()
 
     def call(self, fn: str, *args) -> Any:
         func = cast(ContractFunction, getattr(self.functions, fn, None))
@@ -190,26 +192,26 @@ def _detect_platform_fee(self):
         return None
 
     def _detect_erc_20(self):
-        interface_to_match = self._get_interface_functions(ITokenERC20.abi())
+        interface_to_match = self._get_interface_functions(TokenERC20.abi())
 
         if matches_interface(self.functions, interface_to_match):
-            contract_wrapper = self._get_contract_wrapper(ITokenERC20)
+            contract_wrapper = self._get_contract_wrapper(TokenERC20)
             return ERC20(contract_wrapper, self._storage)
         return None
 
     def _detect_erc_721(self):
-        interface_to_match = self._get_interface_functions(ITokenERC721.abi())
+        interface_to_match = self._get_interface_functions(TokenERC721.abi())
 
         if matches_interface(self.functions, interface_to_match):
-            contract_wrapper = self._get_contract_wrapper(ITokenERC721)
+            contract_wrapper = self._get_contract_wrapper(TokenERC721)
             return ERC721(contract_wrapper, self._storage)
         return None
 
     def _detect_erc_1155(self):
-        interface_to_match = self._get_interface_functions(ITokenERC1155.abi())
+        interface_to_match = self._get_interface_functions(TokenERC1155.abi())
 
         if matches_interface(self.functions, interface_to_match):
-            contract_wrapper = self._get_contract_wrapper(ITokenERC1155)
+            contract_wrapper = self._get_contract_wrapper(TokenERC1155)
             return ERC1155(contract_wrapper, self._storage)
         return None