Enable deploying contracts without providing abi

.github/workflows/checks.yml

@@ -120,29 +120,8 @@ jobs:
         if: steps.cache-contracts_v1.outputs.cache-hit != 'true'
         run: |
           poetry run poe compile_contracts v1
-
-      # ====================== CONTRACTS v0 ====================== #
 
-      - name: Cache contracts v0
-        id: cache-contracts
-        uses: actions/cache@v3
-        with:
-          path: starknet_py/tests/e2e/mock/contracts_compiled
-          key: ${{ runner.os }}-contracts-${{ hashFiles('starknet_py/tests/e2e/mock/contracts', 'poetry.lock') }}-${{ env.CAIRO_LANG_VERSION }}
-
-      - name: Install deprecated cairo compiler
-        if: steps.cache-contracts.outputs.cache-hit != 'true'
-        run: |
-          pip install --upgrade setuptools
-          pip install sympy==1.11.1
-          pip install cairo-lang==${{ env.CAIRO_LANG_VERSION }}
-
-      - name: Compile contracts v0
-        if: steps.cache-contracts.outputs.cache-hit != 'true'
-        run: |
-          poetry run poe compile_contracts v0
-
-      - name: Upload contracts v0
+      - name: Upload contracts artifacts
         uses: actions/upload-artifact@v3
         with:
           name: contract-artifacts

docs/guide/deploying_contracts.rst

@@ -4,8 +4,8 @@ Deploying contracts
 Declaring contracts
 -------------------
 
-A declare transaction can be issued in version 1, 2 or 3. Contracts written in Cairo 0 should be declared using version 1, while those written in Cairo 1 or higher should be declared with versions 2 or 3.
-To sign a declare transaction, you should utilize the :meth:`~starknet_py.net.account.account.Account.sign_declare_v1`, :meth:`~starknet_py.net.account.account.Account.sign_declare_v2` or :meth:`~starknet_py.net.account.account.Account.sign_declare_v3` method, respectively.
+A declare transaction can be issued in version 2 or 3. Contracts written in Cairo 0 cannot be declared while those written in Cairo 1 or higher should be declared with versions 2 or 3.
+To sign a declare transaction, you should utilize the :meth:`~starknet_py.net.account.account.Account.sign_declare_v2` or :meth:`~starknet_py.net.account.account.Account.sign_declare_v3` method, respectively.
 
 Here's an example how to use it.
 
@@ -14,17 +14,6 @@ Here's an example how to use it.
     :dedent: 4
 
 
-Simple declare and deploy
--------------------------
-
-The simplest way of declaring and deploying contracts on the Starknet is to use the :ref:`Contract` class.
-Under the hood, this flow first sends ``Declare`` transaction and then sends ``Invoke``
-through Universal Deployment Contract (UDC) to deploy a contract.
-
-.. codesnippet:: ../../starknet_py/tests/e2e/docs/guide/test_simple_declare_and_deploy.py
-    :language: python
-    :dedent: 4
-
 Simple deploy
 -------------
 

starknet_py/abi/v0/parser_test.py

@@ -5,7 +5,7 @@
 import starknet_py.tests.e2e.fixtures.abi_structures as fixtures
 from starknet_py.abi.v0 import AbiParser, AbiParsingError
 from starknet_py.cairo.type_parser import UnknownCairoTypeError
-from starknet_py.tests.e2e.fixtures.constants import CONTRACTS_COMPILED_V0_DIR
+from starknet_py.tests.e2e.fixtures.constants import CAIRO_0_ABI_DIR
 from starknet_py.tests.e2e.fixtures.misc import read_contract
 
 
@@ -192,10 +192,9 @@ def test_missing_type_used(missing_name, input_dict):
 def test_deserialize_balance_struct_event_abi():
     # Contains all types of ABI apart from structures
     abi = json.loads(
-        read_contract(
-            "balance_struct_event_abi.json", directory=CONTRACTS_COMPILED_V0_DIR
-        )
+        read_contract("balance_struct_event_abi.json", directory=CAIRO_0_ABI_DIR)
     )
+
     deserialized = AbiParser(abi).parse()
 
     assert deserialized == fixtures.balance_struct_abi

starknet_py/abi/v0/schemas_test.py

@@ -3,16 +3,13 @@
 from marshmallow import EXCLUDE
 
 from starknet_py.abi.v0.schemas import ContractAbiEntrySchema
-from starknet_py.tests.e2e.fixtures.constants import CONTRACTS_COMPILED_V0_DIR
+from starknet_py.tests.e2e.fixtures.constants import CAIRO_0_ABI_DIR
 from starknet_py.tests.e2e.fixtures.misc import read_contract
 
 
 def test_deserialize_abi():
-    abi = json.loads(
-        read_contract(
-            "balance_struct_event_abi.json", directory=CONTRACTS_COMPILED_V0_DIR
-        )
-    )
+    abi = json.loads(read_contract("complex_abi_abi.json", directory=CAIRO_0_ABI_DIR))
+
     deserialized = [
         ContractAbiEntrySchema().load(entry, unknown=EXCLUDE) for entry in abi
     ]

starknet_py/abi/v1/schemas_test.py

@@ -11,11 +11,11 @@
     "contract_name",
     [
         "Account",
-        "ERC20",
+        "Hello",
         "HelloStarknet",
         "MinimalContract",
         "TestContract",
-        "TokenBridge",
+        "TestEnum",
     ],
 )
 def test_deserialize_abi(contract_name):

starknet_py/contract.py

@@ -808,37 +808,6 @@ async def from_address(
             cairo_version=cairo_version,
         )
 
-    @staticmethod
-    async def declare_v1(
-        account: BaseAccount,
-        compiled_contract: str,
-        *,
-        nonce: Optional[int] = None,
-        max_fee: Optional[int] = None,
-        auto_estimate: bool = False,
-    ) -> DeclareResult:
-        """
-        Declares a contract.
-
-        :param account: BaseAccount used to sign and send declare transaction.
-        :param compiled_contract: String containing compiled contract.
-        :param nonce: Nonce of the transaction.
-        :param max_fee: Max amount of Wei to be paid when executing transaction.
-        :param auto_estimate: Use automatic fee estimation (not recommended, as it may lead to high costs).
-        :return: DeclareResult instance.
-        """
-
-        declare_tx = await account.sign_declare_v1(
-            compiled_contract=compiled_contract,
-            nonce=nonce,
-            max_fee=max_fee,
-            auto_estimate=auto_estimate,
-        )
-
-        return await _declare_contract(
-            declare_tx, account, compiled_contract, cairo_version=0
-        )
-
     @staticmethod
     async def declare_v2(
         account: BaseAccount,
@@ -992,7 +961,7 @@ async def deploy_contract_v1(
     async def deploy_contract_v3(
         account: BaseAccount,
         class_hash: Hash,
-        abi: List,
+        abi: Optional[List] = None,
         constructor_args: Optional[Union[List, Dict]] = None,
         *,
         deployer_address: AddressRepresentation = DEFAULT_DEPLOYER_ADDRESS,
@@ -1043,9 +1012,15 @@ async def deploy_contract_v3(
             auto_estimate=auto_estimate,
         )
 
-        deployed_contract = Contract(
-            provider=account, address=address, abi=abi, cairo_version=cairo_version
-        )
+        if abi:
+            deployed_contract = Contract(
+                provider=account, address=address, abi=abi, cairo_version=cairo_version
+            )
+        else:
+            deployed_contract = await Contract.from_address(
+                address=address, provider=account
+            )
+
         deploy_result = DeployResult(
             hash=res.transaction_hash,
             _client=account.client,

starknet_py/hash/sierra_class_hash_test.py

@@ -9,7 +9,7 @@
     "contract_name, expected_class_hash",
     # fmt: off
     [
-        ("Account", 0x450f568a8cb6ea1bcce446355e8a1c2e5852a6b8dc3536f495cdceb62e8a7e2),
+        ("Account", 0x183078afce57a1d33b948ea6cd9ab0769dd08ca93a6afe4c23637b08aa893c1),
         ("ERC20", 0x746248ba570006607113ae3f4dbb4130e81233fb818d15329c6a4aaccf94812),
         ("HelloStarknet", 0x224518978adb773cfd4862a894e9d333192fbd24bc83841dc7d4167c09b89c5),
         ("MinimalContract", 0x6fb1efd745d57b60023c6dc3209227e5e54d44fa16e0ae75cc03e1a7f3da08a),

starknet_py/net/account/account.py

@@ -1,5 +1,4 @@
 import dataclasses
-import json
 from collections import OrderedDict
 from typing import Any, Dict, Iterable, List, Optional, Tuple, Union
 
@@ -309,7 +308,7 @@ async def get_balance(
         low, high = await self._client.call_contract(
             Call(
                 to_addr=parse_address(token_address),
-                selector=get_selector_from_name("balanceOf"),
+                selector=get_selector_from_name("balance_of"),
                 calldata=[self.address],
             ),
             block_hash=block_hash,
@@ -361,30 +360,6 @@ async def sign_invoke_v3(
         signature = self.signer.sign_transaction(invoke_tx)
         return _add_signature_to_transaction(invoke_tx, signature)
 
-    async def sign_declare_v1(
-        self,
-        compiled_contract: str,
-        *,
-        nonce: Optional[int] = None,
-        max_fee: Optional[int] = None,
-        auto_estimate: bool = False,
-    ) -> DeclareV1:
-        if _is_sierra_contract(json.loads(compiled_contract)):
-            raise ValueError(
-                "Signing sierra contracts requires using `sign_declare_v2` method."
-            )
-
-        declare_tx = await self._make_declare_v1_transaction(
-            compiled_contract, nonce=nonce
-        )
-
-        max_fee = await self._get_max_fee(
-            transaction=declare_tx, max_fee=max_fee, auto_estimate=auto_estimate
-        )
-        declare_tx = _add_max_fee_to_transaction(declare_tx, max_fee)
-        signature = self.signer.sign_transaction(declare_tx)
-        return _add_signature_to_transaction(declare_tx, signature)
-
     async def sign_declare_v2(
         self,
         compiled_contract: str,

starknet_py/net/account/base_account.py

@@ -13,7 +13,6 @@
 from starknet_py.net.models import AddressRepresentation
 from starknet_py.net.models.transaction import (
     AccountTransaction,
-    DeclareV1,
     DeclareV2,
     DeclareV3,
     DeployAccountV1,
@@ -158,25 +157,6 @@ async def sign_invoke_v3(
         :return: Invoke created from the calls.
         """
 
-    @abstractmethod
-    async def sign_declare_v1(
-        self,
-        compiled_contract: str,
-        *,
-        nonce: Optional[int] = None,
-        max_fee: Optional[int] = None,
-        auto_estimate: bool = False,
-    ) -> DeclareV1:
-        """
-        Create and sign declare transaction version 1.
-
-        :param compiled_contract: string containing a compiled Starknet contract. Supports old contracts.
-        :param nonce: Nonce of the transaction.
-        :param max_fee: Max amount of Wei to be paid when executing transaction.
-        :param auto_estimate: Use automatic fee estimation, not recommend as it may lead to high costs.
-        :return: Signed Declare transaction.
-        """
-
     @abstractmethod
     async def sign_declare_v2(
         self,

starknet_py/net/udc_deployer/deployer.py

@@ -75,12 +75,19 @@ def create_contract_deployment(
         :param calldata: Constructor args of the contract to be deployed.
         :return: NamedTuple with call and address of the contract to be deployed.
         """
-        if not abi and calldata:
-            raise ValueError("Argument calldata was provided without an ABI.")
+        raw_calldata = None
 
-        raw_calldata = translate_constructor_args(
-            abi=abi or [], constructor_args=calldata, cairo_version=cairo_version
-        )
+        if calldata and not abi:
+            if not _is_list_of_ints_or_strings(calldata):
+                raise ValueError(
+                    "Argument calldata was provided without an ABI. It cannot be serialized."
+                )
+            raw_calldata = [int_from_hex(x) for x in calldata]
+
+        if calldata and abi:
+            raw_calldata = translate_constructor_args(
+                abi=abi or [], constructor_args=calldata, cairo_version=cairo_version
+            )
 
         return self.create_contract_deployment_raw(
             class_hash=class_hash, salt=salt, raw_calldata=raw_calldata
@@ -176,3 +183,15 @@ def _get_random_salt() -> int:
 _deployer_serializer = serializer_for_function(
     _deployer_abi.functions["deployContract"]
 )
+
+
+def _is_list_of_ints_or_strings(data: Union[List, dict]) -> bool:
+    """
+    Checks if the given data is a list containing only strings or integers.
+
+    Returns:
+    bool: True if the data is a list of strings or integers, False otherwise.
+    """
+    if isinstance(data, list):
+        return all(isinstance(x, (int, str)) for x in data)
+    return False

starknet_py/serialization/serialization_test.py

@@ -14,7 +14,7 @@
     serializer_for_function,
 )
 from starknet_py.serialization.tuple_dataclass import TupleDataclass
-from starknet_py.tests.e2e.fixtures.constants import CONTRACTS_COMPILED_V0_DIR
+from starknet_py.tests.e2e.fixtures.constants import CAIRO_0_ABI_DIR
 from starknet_py.tests.e2e.fixtures.misc import (
     ContractVersion,
     load_contract,
@@ -105,14 +105,26 @@ class Education(NamedTuple):
     *dog_serialized,
 ]
 
-abi = json.loads(
-    read_contract("complex_abi_abi.json", directory=CONTRACTS_COMPILED_V0_DIR)
-)
+abi = json.loads(read_contract("complex_abi_abi.json", directory=CAIRO_0_ABI_DIR))
 parsed_abi = AbiParserV0(abi).parse()
 
-abi_v1 = json.loads(
-    load_contract(contract_name="ERC20", version=ContractVersion.V1)["sierra"]
-)["abi"]
+abi_v1 = [
+    {
+        "type": "event",
+        "name": "Approval",
+        "inputs": [
+            {
+                "name": "owner",
+                "type": "core::starknet::contract_address::ContractAddress",
+            },
+            {
+                "name": "spender",
+                "type": "core::starknet::contract_address::ContractAddress",
+            },
+            {"name": "value", "type": "core::integer::u256"},
+        ],
+    }
+]
 parsed_abi_v1 = AbiParserV1(abi_v1).parse()
 
 abi_v2 = json.loads(