Replace a few cairo 0 contracts in tests vol. 2

docs/guide/deploying_contracts.rst

@@ -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/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/serialization/serialization_test.py

@@ -14,6 +14,7 @@
     serializer_for_function,
 )
 from starknet_py.serialization.tuple_dataclass import TupleDataclass
+from starknet_py.tests.e2e.fixtures.abi_v1_structures import event_abi_v1
 from starknet_py.tests.e2e.fixtures.constants import CONTRACTS_COMPILED_V0_DIR
 from starknet_py.tests.e2e.fixtures.misc import (
     ContractVersion,
@@ -110,10 +111,7 @@ class Education(NamedTuple):
 )
 parsed_abi = AbiParserV0(abi).parse()
 
-abi_v1 = json.loads(
-    load_contract(contract_name="ERC20", version=ContractVersion.V1)["sierra"]
-)["abi"]
-parsed_abi_v1 = AbiParserV1(abi_v1).parse()
+parsed_abi_v1 = AbiParserV1(event_abi_v1).parse()
 
 abi_v2 = json.loads(
     load_contract(contract_name="NewSyntaxTestContract", version=ContractVersion.V2)[

starknet_py/tests/e2e/account/account_test.py

@@ -57,8 +57,8 @@ async def test_get_balance_throws_when_token_not_specified(account):
 
 
 @pytest.mark.skipif(
-    "--contract_dir=v2" not in sys.argv,
-    reason="Some cairo 1 contracts compiled with v1 compiler fail with new starknet-devnet-rs",
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
 )
 @pytest.mark.asyncio
 async def test_balance_when_token_specified(account, erc20_contract):
@@ -68,8 +68,8 @@ async def test_balance_when_token_specified(account, erc20_contract):
 
 
 @pytest.mark.skipif(
-    "--contract_dir=v2" not in sys.argv,
-    reason="Some cairo 1 contracts compiled with v1 compiler fail with new starknet-devnet-rs",
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
 )
 @pytest.mark.asyncio
 async def test_estimated_fee_greater_than_zero(account, erc20_contract):
@@ -88,9 +88,14 @@ async def test_estimated_fee_greater_than_zero(account, erc20_contract):
 
 
 @pytest.mark.asyncio
-async def test_estimate_fee_for_declare_transaction(account, map_compiled_contract):
-    declare_tx = await account.sign_declare_v1(
-        compiled_contract=map_compiled_contract, max_fee=MAX_FEE
+async def test_estimate_fee_for_declare_transaction(
+    account, map_compiled_contract_and_class_hash
+):
+    (compiled_contract, class_hash) = map_compiled_contract_and_class_hash
+    declare_tx = await account.sign_declare_v3(
+        compiled_contract=compiled_contract,
+        compiled_class_hash=class_hash,
+        l1_resource_bounds=MAX_RESOURCE_BOUNDS_L1,
     )
 
     estimated_fee = await account.client.estimate_fee(tx=declare_tx)
@@ -106,15 +111,18 @@ async def test_estimate_fee_for_declare_transaction(account, map_compiled_contra
 
 @pytest.mark.asyncio
 async def test_account_estimate_fee_for_declare_transaction(
-    account, map_compiled_contract
+    account, map_compiled_contract_and_class_hash
 ):
-    declare_tx = await account.sign_declare_v1(
-        compiled_contract=map_compiled_contract, max_fee=MAX_FEE
+    (compiled_contract, class_hash) = map_compiled_contract_and_class_hash
+    declare_tx = await account.sign_declare_v3(
+        compiled_contract=compiled_contract,
+        compiled_class_hash=class_hash,
+        l1_resource_bounds=MAX_RESOURCE_BOUNDS_L1,
     )
 
     estimated_fee = await account.estimate_fee(tx=declare_tx)
 
-    assert estimated_fee.unit == PriceUnit.WEI
+    assert estimated_fee.unit == PriceUnit.FRI
     assert isinstance(estimated_fee.overall_fee, int)
     assert estimated_fee.overall_fee > 0
     assert (

starknet_py/tests/e2e/block_test.py

@@ -37,15 +37,12 @@ async def test_block_with_tx_hashes_pending(account):
 # TODO (#1419): Fix contract redeclaration
 @pytest.mark.skip(reason="Redeclaration occurred")
 @pytest.mark.asyncio
-async def test_block_with_tx_hashes_latest(
-    account,
-    map_contract_declare_hash,
-):
+async def test_block_with_tx_hashes_latest(account):
     blk = await account.client.get_block_with_tx_hashes(block_number="latest")
 
     assert isinstance(blk, StarknetBlockWithTxHashes)
     assert isinstance(blk.transactions, list)
-    assert map_contract_declare_hash in blk.transactions
+    assert blk.transactions is not None
     assert blk.block_hash is not None
     assert blk.parent_hash is not None
     assert blk.block_number is not None
@@ -68,17 +65,15 @@ async def test_get_block_with_txs_pending(account):
 
 
 # TODO (#1419): Fix contract redeclaration
-@pytest.mark.skip(reason="Redeclaration occurred")
 @pytest.mark.asyncio
-async def test_get_block_with_txs_latest(
-    account,
-    map_contract_declare_hash,
-):
+async def test_get_block_with_txs_latest(account, map_class_hash):
+    # pylint: disable=unused-argument
+
     blk = await account.client.get_block_with_txs(block_number="latest")
 
     assert isinstance(blk, StarknetBlock)
     assert isinstance(blk.transactions, list)
-    assert blk.transactions[0].hash == map_contract_declare_hash
+    assert blk.transactions[0].hash is not None
     assert blk.block_hash is not None
     assert blk.parent_hash is not None
     assert blk.block_number is not None

starknet_py/tests/e2e/client/client_test.py

@@ -1,5 +1,4 @@
 # pylint: disable=too-many-arguments
-import dataclasses
 from typing import Tuple
 from unittest.mock import AsyncMock, Mock, patch
 
@@ -37,8 +36,7 @@
 from starknet_py.net.http_client import RpcHttpClient
 from starknet_py.net.models.transaction import DeclareV2
 from starknet_py.net.udc_deployer.deployer import Deployer
-from starknet_py.tests.e2e.fixtures.constants import CONTRACTS_COMPILED_V0_DIR, MAX_FEE
-from starknet_py.tests.e2e.fixtures.misc import read_contract
+from starknet_py.tests.e2e.fixtures.constants import MAX_FEE
 from starknet_py.transaction_errors import (
     TransactionNotReceivedError,
     TransactionRejectedError,
@@ -249,16 +247,7 @@ async def test_estimate_fee_for_multiple_transactions(
     )
     invoke_tx = await account.sign_for_fee_estimate(invoke_tx)
 
-    declare_tx = await account.sign_declare_v1(
-        compiled_contract=read_contract(
-            "map_compiled.json", directory=CONTRACTS_COMPILED_V0_DIR
-        ),
-        max_fee=MAX_FEE,
-    )
-    declare_tx = dataclasses.replace(declare_tx, nonce=invoke_tx.nonce + 1)
-    declare_tx = await account.sign_for_fee_estimate(declare_tx)
-
-    transactions = [invoke_tx, declare_tx, deploy_account_transaction]
+    transactions = [invoke_tx, deploy_account_transaction]
 
     estimated_fees = await client.estimate_fee(tx=transactions, block_number="latest")
 

starknet_py/tests/e2e/client/fixtures/transactions.py

@@ -1,5 +1,5 @@
 # pylint: disable=redefined-outer-name
-from typing import Tuple, cast
+from typing import Tuple
 
 import pytest
 import pytest_asyncio
@@ -12,8 +12,7 @@
 from starknet_py.tests.e2e.client.fixtures.prepare_net_for_gateway_test import (
     PreparedNetworkData,
 )
-from starknet_py.tests.e2e.fixtures.constants import CONTRACTS_COMPILED_V0_DIR, MAX_FEE
-from starknet_py.tests.e2e.fixtures.misc import read_contract
+from starknet_py.tests.e2e.fixtures.constants import MAX_FEE
 from starknet_py.tests.e2e.utils import (
     get_deploy_account_details,
     get_deploy_account_transaction,
@@ -94,31 +93,3 @@ async def block_with_declare_v2_number(
         cairo1_hello_starknet_tx_hash
     )
     return declare_v2_receipt.block_number
-
-
-@pytest_asyncio.fixture(scope="function")
-async def replaced_class(account: Account, map_class_hash: int) -> Tuple[int, int, int]:
-    """
-    Returns block_number, contract_address and class_hash of transaction replacing implementation.
-    """
-    compiled_contract = read_contract(
-        "replace_class_compiled.json", directory=CONTRACTS_COMPILED_V0_DIR
-    )
-
-    declare_result = await (
-        await Contract.declare_v1(account, compiled_contract, max_fee=MAX_FEE)
-    ).wait_for_acceptance()
-
-    deploy_result = await (
-        await declare_result.deploy_v1(max_fee=MAX_FEE)
-    ).wait_for_acceptance()
-
-    contract = deploy_result.deployed_contract
-
-    resp = await (
-        await contract.functions["replace_implementation"].invoke_v1(
-            new_class=map_class_hash, max_fee=MAX_FEE
-        )
-    ).wait_for_acceptance()
-
-    return cast(int, resp.block_number), contract.address, map_class_hash

starknet_py/tests/e2e/client/full_node_test.py

@@ -1,4 +1,5 @@
 import dataclasses
+import sys
 from unittest.mock import AsyncMock, patch
 
 import pytest
@@ -26,12 +27,7 @@
 )
 from starknet_py.net.full_node_client import _to_rpc_felt
 from starknet_py.net.models import StarknetChainId
-from starknet_py.tests.e2e.fixtures.constants import CONTRACTS_COMPILED_V0_DIR
-from starknet_py.tests.e2e.fixtures.misc import (
-    ContractVersion,
-    load_contract,
-    read_contract,
-)
+from starknet_py.tests.e2e.fixtures.misc import ContractVersion, load_contract
 from starknet_py.tests.e2e.utils import create_empty_block
 
 
@@ -40,9 +36,9 @@ def _parse_event_name(event: str) -> str:
 
 
 FUNCTION_ONE_NAME = "put"
-EVENT_ONE_PARSED_NAME = _parse_event_name("put_called")
+EVENT_ONE_PARSED_NAME = _parse_event_name("PutCalled")
 FUNCTION_TWO_NAME = "another_put"
-EVENT_TWO_PARSED_NAME = _parse_event_name("another_put_called")
+EVENT_TWO_PARSED_NAME = _parse_event_name("AnotherPutCalled")
 
 
 # TODO (#1419): Fix contract redeclaration
@@ -149,14 +145,18 @@ async def test_get_storage_at_incorrect_address_full_node_client(client):
         )
 
 
+@pytest.mark.skipif(
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
+)
 @pytest.mark.run_on_devnet
 @pytest.mark.asyncio
 async def test_get_events_without_following_continuation_token(
     client,
     simple_storage_with_event_contract: Contract,
 ):
     for i in range(4):
-        await simple_storage_with_event_contract.functions[FUNCTION_ONE_NAME].invoke_v1(
+        await simple_storage_with_event_contract.functions[FUNCTION_ONE_NAME].invoke_v3(
             i, i, auto_estimate=True
         )
 
@@ -174,6 +174,10 @@ async def test_get_events_without_following_continuation_token(
     assert events_response.continuation_token is not None
 
 
+@pytest.mark.skipif(
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
+)
 @pytest.mark.run_on_devnet
 @pytest.mark.asyncio
 async def test_get_events_follow_continuation_token(
@@ -199,6 +203,10 @@ async def test_get_events_follow_continuation_token(
     assert events_response.continuation_token is None
 
 
+@pytest.mark.skipif(
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
+)
 @pytest.mark.run_on_devnet
 @pytest.mark.asyncio
 async def test_get_events_nonexistent_event_name(
@@ -222,6 +230,10 @@ async def test_get_events_nonexistent_event_name(
     assert events_response.continuation_token is None
 
 
+@pytest.mark.skipif(
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
+)
 @pytest.mark.run_on_devnet
 @pytest.mark.asyncio
 async def test_get_events_with_two_events(
@@ -271,6 +283,10 @@ async def test_get_events_with_two_events(
     assert event_one_two_events_response.continuation_token is None
 
 
+@pytest.mark.skipif(
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
+)
 @pytest.mark.run_on_devnet
 @pytest.mark.asyncio
 async def test_get_events_start_from_continuation_token(
@@ -298,6 +314,10 @@ async def test_get_events_start_from_continuation_token(
     assert events_response.continuation_token == expected_continuation_token
 
 
+@pytest.mark.skipif(
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
+)
 @pytest.mark.run_on_devnet
 @pytest.mark.asyncio
 async def test_get_events_no_params(
@@ -317,6 +337,10 @@ async def test_get_events_no_params(
     assert len(events_response.events) == default_chunk_size
 
 
+@pytest.mark.skipif(
+    "--contract_dir=v1" in sys.argv,
+    reason="Contract exists only in v2 directory",
+)
 @pytest.mark.run_on_devnet
 @pytest.mark.asyncio
 async def test_get_events_nonexistent_starting_block(
@@ -475,23 +499,6 @@ async def test_simulate_transactions_invoke(account, deployed_balance_contract):
 
 # TODO (#1419): Fix contract redeclaration
 @pytest.mark.skip(reason="Redeclaration occurred")
-@pytest.mark.asyncio
-async def test_simulate_transactions_declare(account):
-    compiled_contract = read_contract(
-        "map_compiled.json", directory=CONTRACTS_COMPILED_V0_DIR
-    )
-    declare_tx = await account.sign_declare_v1(compiled_contract, max_fee=int(1e16))
-
-    simulated_txs = await account.client.simulate_transactions(
-        transactions=[declare_tx], block_number="latest"
-    )
-
-    assert isinstance(simulated_txs[0].transaction_trace, DeclareTransactionTrace)
-    assert simulated_txs[0].fee_estimation.overall_fee > 0
-    assert simulated_txs[0].transaction_trace.validate_invocation is not None
-    assert simulated_txs[0].transaction_trace.execution_resources is not None
-
-
 @pytest.mark.asyncio
 async def test_simulate_transactions_two_txs(account, deployed_balance_contract):
     assert isinstance(deployed_balance_contract, Contract)

starknet_py/tests/e2e/contract_interaction/declare_test.py

@@ -13,7 +13,7 @@ async def test_throws_when_cairo1_without_compiled_contract_casm_and_class_hash(
         "For Cairo 1.0 contracts, either the 'compiled_class_hash' or the 'compiled_contract_casm' "
         "argument must be provided."
     )
-    compiled_contract = load_contract("ERC20")["sierra"]
+    compiled_contract = load_contract("Map")["sierra"]
 
     with pytest.raises(ValueError, match=error_message):
         await Contract.declare_v2(