From 82469a3fc3b4a3b9cfea834213922c4bbc19c9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mi=C5=9Bkowicz?= Date: Wed, 6 Sep 2023 12:28:51 +0200 Subject: [PATCH] revert #1167 --- starknet_py/net/gateway_client.py | 18 ++---------------- starknet_py/net/schemas/gateway.py | 9 +++------ .../tests/e2e/integration_tests/client_test.py | 4 ---- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/starknet_py/net/gateway_client.py b/starknet_py/net/gateway_client.py index ba8dbbb59..ba36eae1f 100644 --- a/starknet_py/net/gateway_client.py +++ b/starknet_py/net/gateway_client.py @@ -147,8 +147,7 @@ async def get_state_update( self, block_hash: Optional[Union[Hash, Tag]] = None, block_number: Optional[Union[int, Tag]] = None, - # TODO (#1166): revert to `bool = False` - include_block: Optional[bool] = None, + include_block: bool = False, ) -> Union[BlockStateUpdate, StateUpdateWithBlock]: """ Get the information about the result of executing the requested block. @@ -158,26 +157,13 @@ async def get_state_update( :param include_block: Flag deciding whether to include the queried block. Defaults to false. :return: BlockStateUpdate object representing changes in the requested block. """ - # TODO (#1166): remove that - if include_block is not None and self._net in [ - "https://alpha-mainnet.starknet.io", - "mainnet", - ]: - raise ValueError( - "Argument 'include_block' does not work on mainnet yet and will be working after v0.12.2 release." - ) - block_identifier = get_block_identifier( block_hash=block_hash, block_number=block_number ) - params = { **block_identifier, + "includeBlock": str(include_block).lower(), } - # TODO (#1166): bring back into params - if include_block is not None: - params["includeBlock"] = str(include_block).lower() - res = await self._feeder_gateway_client.call( method_name="get_state_update", params=params ) diff --git a/starknet_py/net/schemas/gateway.py b/starknet_py/net/schemas/gateway.py index 37e34d58b..e4eecf30e 100644 --- a/starknet_py/net/schemas/gateway.py +++ b/starknet_py/net/schemas/gateway.py @@ -261,8 +261,7 @@ class StarknetBlockSchema(Schema): parent_block_hash = Felt(data_key="parent_block_hash", required=True) block_number = fields.Integer(data_key="block_number") status = BlockStatusField(data_key="status", required=True) - # TODO (#1166): change nonprefixedhex to felt in line below - root = NonPrefixedHex(data_key="state_root") + root = Felt(data_key="state_root") transactions = fields.List( fields.Nested(TypesOfTransactionsSchema(unknown=EXCLUDE)), data_key="transactions", @@ -424,10 +423,8 @@ def make_dataclass(self, data, **kwargs) -> GatewayStateDiff: class BlockStateUpdateSchema(Schema): block_hash = Felt(data_key="block_hash", required=True) - # TODO (#1166): change nonprefixedhex to felt in line below - new_root = NonPrefixedHex(data_key="new_root", required=True) - # TODO (#1166): change nonprefixedhex to felt in line below - old_root = NonPrefixedHex(data_key="old_root", required=True) + new_root = Felt(data_key="new_root", required=True) + old_root = Felt(data_key="old_root", required=True) state_diff = fields.Nested(StateDiffSchema(), data_key="state_diff", required=True) @post_load diff --git a/starknet_py/tests/e2e/integration_tests/client_test.py b/starknet_py/tests/e2e/integration_tests/client_test.py index cfe52f7e4..b5e4dde33 100644 --- a/starknet_py/tests/e2e/integration_tests/client_test.py +++ b/starknet_py/tests/e2e/integration_tests/client_test.py @@ -469,8 +469,4 @@ async def test_get_state_update_different_starknet_versions(): _ = await mainnet.get_state_update(block_number=100000) - with pytest.raises(ValueError): - _ = await mainnet.get_state_update(block_number=100000, include_block=False) - _ = await mainnet.get_state_update(block_number=100000, include_block=True) - _ = await testnet.get_state_update(block_number=100000, include_block=True)