Fix contract.call and storage (#131)

Author: adam-maj

pyproject.toml

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

thirdweb/contracts/custom.py

@@ -102,51 +102,7 @@ def __init__(
         self.erc1155 = self._detect_erc_1155()
 
     def call(self, fn: str, *args) -> Any:
-        func = cast(ContractFunction, getattr(self.functions, fn, None))
-        if func is None:
-            raise Exception(
-                f"Function {fn} not found on contract {self.get_address()}. "
-                + "Check your dashboard for the list of available functions."
-            )
-
-        # We need this to set params properly on func + throws good errors
-        func.args = args
-        func.kwargs = {}
-        func._set_function_info()
-
-        if len(func.abi["inputs"]) != len(args):
-            signature = (
-                "("
-                + ", ".join(
-                    [(i["name"] + ": " + i["type"]) for i in func.abi["inputs"]]
-                )
-                + ")"
-            )
-            raise Exception(
-                f"Function {fn} expects {len(func.arguments)} arguments, "
-                f"but {len(args)} were provided.\nExpected function signature: {signature}"
-            )
-
-        if func.abi["stateMutability"] == "view" or func.abi["stateMutability"] == "pure":
-            return func(*args).call()
-        else:
-            provider = self._contract_wrapper.get_provider()
-            signer = self._contract_wrapper.get_signer()
-
-            if signer is None:
-                raise NoSignerException
-
-            nonce = provider.eth.get_transaction_count(signer.address)  # type: ignore
-
-            tx = func(*args).buildTransaction(
-                TxParams(gas_price=provider.eth.gas_price).as_dict()
-            )
-            tx["nonce"] = nonce
-
-            signed_tx = signer.sign_transaction(tx)  # type: ignore
-            tx_hash = provider.eth.send_raw_transaction(signed_tx.rawTransaction)
-
-            return provider.eth.wait_for_transaction_receipt(tx_hash)
+        return self._contract_wrapper.call(fn, *args)
 
     """
     INTERNAL FUNCTIONS

thirdweb/contracts/edition.py

@@ -21,7 +21,7 @@
 
 from thirdweb.types.nft import EditionMetadata, EditionMetadataInput
 from thirdweb.types.sdk import SDKOptions
-from typing import Final, Optional, List
+from typing import Any, Final, Optional, List
 
 from thirdweb.types.settings.metadata import EditionContractMetadata
 from thirdweb.types.tx import TxResultWithId
@@ -210,3 +210,6 @@ def mint_batch_to(
         """
 
         return self._erc1155.mint_batch_to(to, metadatas_with_supply)
+
+    def call(self, fn: str, *args) -> Any:
+        return self._contract_wrapper.call(fn, *args)

thirdweb/contracts/edition_drop.py

@@ -1,4 +1,4 @@
-from typing import Final, List, Optional
+from typing import Any, Final, List, Optional
 
 from web3 import Web3
 from thirdweb.abi import DropERC1155
@@ -164,3 +164,6 @@ def claim(
         :return: tx receipt of the claim
         """
         return self._erc1155.claim(token_id, quantity)
+
+    def call(self, fn: str, *args) -> Any:
+        return self._contract_wrapper.call(fn, *args)

thirdweb/contracts/marketplace.py

@@ -342,6 +342,9 @@ def allow_listing_from_any_asset(self) -> TxReceipt:
 
         return self._contract_wrapper.multi_call(encoded)
 
+    def call(self, fn: str, *args) -> Any:
+        return self._contract_wrapper.call(fn, *args)
+
     """
     INTERNAL FUNCTIONS
     """
@@ -366,4 +369,4 @@ def _get_all_listings_no_filter(
             except:
                 pass
 
-        return [listing for listing in listings if listing is not None]
+        return [listing for listing in listings if listing is not None]

thirdweb/contracts/multiwrap.py

@@ -1,4 +1,4 @@
-from typing import Final, List, Optional, Union
+from typing import Any, Final, List, Optional, Union
 
 from web3 import Web3
 from web3.eth import TxReceipt
@@ -234,6 +234,9 @@ def unwrap(
             "unwrap", [wrapped_token_id, recipient_address]
         )
 
+    def call(self, fn: str, *args) -> Any:
+        return self._contract_wrapper.call(fn, *args)
+
     """
     INTERNAL FUNCTIONS
     """
@@ -333,4 +336,4 @@ def _to_token_struct_list(self, contents: TokensToWrap) -> List[ITokenBundleToke
                     }
                 )
 
-        return tokens
+        return tokens

thirdweb/contracts/nft_collection.py

@@ -8,7 +8,6 @@
 from thirdweb.core.classes.contract_royalty import ContractRoyalty
 from thirdweb.core.classes.contract_sales import ContractPrimarySale
 from thirdweb.core.classes.contract_wrapper import ContractWrapper
-from thirdweb.common.nft import upload_or_extract_uri, upload_or_extract_uris
 from thirdweb.core.classes.erc_721_standard import ERC721Standard
 from thirdweb.core.classes.erc_721_signature_minting import ERC721SignatureMinting
 from thirdweb.abi import TokenERC721
@@ -20,7 +19,7 @@
 from web3 import Web3
 
 from thirdweb.types.sdk import SDKOptions
-from typing import Final, Optional, List, Union
+from typing import Any, Final, Optional, List, Union
 
 from thirdweb.types.settings.metadata import NFTCollectionContractMetadata
 from thirdweb.types.tx import TxResultWithId
@@ -212,3 +211,6 @@ def mint_batch_to(
         """
 
         return self._erc721.mint_batch_to(to, metadatas)
+
+    def call(self, fn: str, *args) -> Any:
+        return self._contract_wrapper.call(fn, *args)

thirdweb/contracts/nft_drop.py

@@ -1,4 +1,4 @@
-from typing import Final, List, Optional
+from typing import Any, Final, List, Optional
 from thirdweb.abi import DropERC721
 from thirdweb.abi.drop_erc721 import IDropAllowlistProof
 from thirdweb.constants.role import Role
@@ -13,7 +13,6 @@
 from thirdweb.core.classes.erc_721_standard import ERC721Standard
 from thirdweb.core.classes.ipfs_storage import IpfsStorage
 from thirdweb.types.contract import ContractType
-from zero_ex.contract_wrappers.tx_params import TxParams
 from thirdweb.types.nft import (
     NFTMetadata,
     NFTMetadataInput,
@@ -250,3 +249,6 @@ def claim(
         :return: List of tx results with ids for claimed NFTs.
         """
         return self._erc721.claim(quantity)
+
+    def call(self, fn: str, *args) -> Any:
+        return self._contract_wrapper.call(fn, *args)

thirdweb/contracts/token.py

@@ -1,6 +1,6 @@
 """Interface for interacting with a token contract"""
 
-from typing import Final, List, Optional
+from typing import Any, Final, List, Optional
 from thirdweb.abi import TokenERC20
 from web3 import Web3
 from web3.eth import TxReceipt
@@ -178,3 +178,6 @@ def delegate_to(self, delegatee_address: str) -> TxReceipt:
         """
 
         return self._contract_wrapper.send_transaction("delegate", [delegatee_address])
+
+    def call(self, fn: str, *args) -> Any:
+        return self._contract_wrapper.call(fn, *args)

thirdweb/core/classes/contract_wrapper.py

@@ -3,7 +3,7 @@
 
 from web3 import Web3
 from web3.datastructures import AttributeDict
-from web3.contract import Contract
+from web3.contract import Contract, ContractFunction
 from thirdweb.common.error import NoSignerException
 from web3._utils.events import EventLogErrorFlags
 from thirdweb.common.sign import EIP712Domain, sign_typed_data_internal
@@ -95,6 +95,53 @@ def get_events(self, event: str, receipt: TxReceipt) -> Tuple[AttributeDict]:
             .processReceipt(receipt, errors=EventLogErrorFlags.Discard)
         )
 
+    def call(self, fn: str, *args) -> Any:
+        func = cast(ContractFunction, getattr(self.get_contract_interface().functions, fn, None))
+        if func is None:
+            raise Exception(
+                f"Function {fn} not found on contract {self._contract_abi.contract_address}. "
+                + "Check your dashboard for the list of available functions."
+            )
+
+        # We need this to set params properly on func + throws good errors
+        func.args = args
+        func.kwargs = {}
+        func._set_function_info()
+
+        if len(func.abi["inputs"]) != len(args):
+            signature = (
+                "("
+                + ", ".join(
+                    [(i["name"] + ": " + i["type"]) for i in func.abi["inputs"]]
+                )
+                + ")"
+            )
+            raise Exception(
+                f"Function {fn} expects {len(func.arguments)} arguments, "
+                f"but {len(args)} were provided.\nExpected function signature: {signature}"
+            )
+
+        if func.abi["stateMutability"] == "view" or func.abi["stateMutability"] == "pure":
+            return func(*args).call()
+        else:
+            provider = self.get_provider()
+            signer = self.get_signer()
+
+            if signer is None:
+                raise NoSignerException
+
+            nonce = provider.eth.get_transaction_count(signer.address)  # type: ignore
+
+            tx = func(*args).buildTransaction(
+                TxParams(gas_price=provider.eth.gas_price).as_dict()
+            )
+            tx["nonce"] = nonce
+
+            signed_tx = signer.sign_transaction(tx)  # type: ignore
+            tx_hash = provider.eth.send_raw_transaction(signed_tx.rawTransaction)
+
+            return provider.eth.wait_for_transaction_receipt(tx_hash)
+
     def send_transaction(self, fn: str, args: List[Any], overrides: TxParams = None) -> TxReceipt:
         """
         Send and execute a transaction and return the receipt.