Refactor predeployed contract wrapper classes

starknet_devnet/account.py

@@ -11,9 +11,10 @@
 
 from starknet_devnet.account_util import set_balance
 from starknet_devnet.contract_class_wrapper import ContractClassWrapper
+from starknet_devnet.predeployed_contract_wrapper import PredeployedContractWrapper
 
 
-class Account:
+class Account(PredeployedContractWrapper):
     """Account contract wrapper."""
 
     # pylint: disable=too-many-arguments

starknet_devnet/fee_token.py

@@ -13,11 +13,12 @@
 from starknet_devnet.account_util import get_execute_args
 from starknet_devnet.chargeable_account import ChargeableAccount
 from starknet_devnet.constants import SUPPORTED_TX_VERSION
+from starknet_devnet.predeployed_contract_wrapper import PredeployedContractWrapper
 from starknet_devnet.sequencer_api_utils import InternalInvokeFunction
 from starknet_devnet.util import Uint256, str_to_felt
 
 
-class FeeToken:
+class FeeToken(PredeployedContractWrapper):
     """Wrapper of token for charging fees."""
 
     CONTRACT_CLASS: ContractClass = None  # loaded lazily

starknet_devnet/predeployed_contract_wrapper.py

@@ -0,0 +1,9 @@
+"""Parent for predeployed contract wrapper classes"""
+
+
+class PredeployedContractWrapper:
+    """Parent class for all predeployed contract wrapper classes"""
+
+    async def deploy(self):
+        """Deploy the contract wrapper to devnet"""
+        raise NotImplementedError()

starknet_devnet/udc.py

@@ -5,8 +5,10 @@
 from starkware.starknet.services.api.contract_class import ContractClass
 from starkware.starknet.testing.starknet import Starknet
 
+from starknet_devnet.predeployed_contract_wrapper import PredeployedContractWrapper
 
-class UDC:
+
+class UDC(PredeployedContractWrapper):
     """Universal deployer contract wrapper class"""
 
     CONTRACT_CLASS: ContractClass = None  # loaded lazily