Eth account support

docs/Account.md

@@ -376,7 +376,10 @@ is_valid: felt
 This is the only external entrypoint to interact with the Account contract. It:
 
 1. Validates the transaction signature matches the message (including the nonce)
-2. Calls _unsafe_execute.
+2. Validates the transaction signature matches the message (including the nonce)
+3. Increments the nonce
+4. Calls the target contract with the intended function selector and calldata parameters
+5. Forwards the contract call response data as return value
 
 Parameters:
 
@@ -441,7 +444,7 @@ response: felt*
 
 ### `_unsafe_execute`
 
-Is the internal method that performs the following task inside the `execute` and `eth_execute` functions:
+It's an internal method that performs the following tasks:
 
 1. Increments the nonce.
 2. Takes the input and builds a `Call` for each iterated message. See [Multicall transactions](#multicall-transactions) for more information.
@@ -454,11 +457,11 @@ The following contract presets are ready to deploy and can be used as-is for qui
 
 ### Account
 
-The [`Account`](../src/openzeppelin/account/Account.cairo) preset offers an basic implementation of the library.
+The [`Account`](../src/openzeppelin/account/Account.cairo) preset uses StarkNet keys to validate transactions.
 
 ### Eth Account
 
-The [`EthAccount`](../src/openzeppelin/account/EthAccount.cairo) preset offers an account that supports ethereum addresses, meaning the key pair uses the 256k1 curve.
+The [`EthAccount`](../src/openzeppelin/account/EthAccount.cairo) preset supports Ethereum addresses, validating transactions with secp256k1 keys.
 
 ## Account differentiation with ERC165
 
@@ -474,7 +477,7 @@ To implement custom account contracts, a pair of `validate` and `execute` functi
 
 Account contract developers are encouraged to implement the [standard Account interface](https://github.com/OpenZeppelin/cairo-contracts/discussions/41) and incorporate the custom logic thereafter.
 
-To implement alternative `execute` functions, make sure to check their corresponding `validate` function before calling the `_unsafe_execute` building block. Do not expose `_unsafe_execute` directly.
+To implement alternative `execute` functions, make sure to check their corresponding `validate` function before calling the `_unsafe_execute` building block, as each of the current presets is doing. Do not expose `_unsafe_execute` directly.
 
 Some other validation schemes to look out for in the future:
 

tests/account/test_Account.py

@@ -1,9 +1,7 @@
 import pytest
 from starkware.starknet.testing.starknet import Starknet
-from starkware.starkware_utils.error_handling import StarkException
-from starkware.starknet.definitions.error_codes import StarknetErrorCode
 from signers import MockSigner
-from utils import assert_revert, get_contract_def, cached_contract, TRUE
+from utils import assert_revert, get_contract_class, cached_contract, TRUE
 
 
 signer = MockSigner(123456789987654321)

tests/account/test_AddressRegistry.py

@@ -1,8 +1,7 @@
 import pytest
 from starkware.starknet.testing.starknet import Starknet
 from signers import MockSigner
-from utils import contract_path
-
+from utils import get_contract_class, cached_contract
 
 
 signer = MockSigner(123456789987654321)

tests/account/test_EthAccount.py

@@ -2,7 +2,7 @@
 from starkware.starknet.testing.starknet import Starknet
 from starkware.starkware_utils.error_handling import StarkException
 from starkware.starknet.definitions.error_codes import StarknetErrorCode
-from utils import assert_revert, get_contract_def, cached_contract, TRUE, FALSE
+from utils import assert_revert, get_contract_class, cached_contract, TRUE, FALSE
 from signers import MockEthSigner
 
 private_key = b'\x01' * 32
@@ -14,36 +14,36 @@
 
 @pytest.fixture(scope='module')
 def contract_defs():
-    account_def = get_contract_def('openzeppelin/account/EthAccount.cairo')
-    init_def = get_contract_def("tests/mocks/Initializable.cairo")
-    attacker_def = get_contract_def("tests/mocks/account_reentrancy.cairo")
+    account_cls = get_contract_class('openzeppelin/account/EthAccount.cairo')
+    init_cls = get_contract_class("tests/mocks/Initializable.cairo")
+    attacker_cls = get_contract_class("tests/mocks/account_reentrancy.cairo")
 
-    return account_def, init_def, attacker_def
+    return account_cls, init_cls, attacker_cls
 
 
 @pytest.fixture(scope='module')
 async def account_init(contract_defs):
-    account_def, init_def, attacker_def = contract_defs
+    account_cls, init_cls, attacker_cls = contract_defs
     starknet = await Starknet.empty()
 
     account1 = await starknet.deploy(
-        contract_def=account_def,
+        contract_class=account_cls,
         constructor_calldata=[signer.eth_address]
     )
     account2 = await starknet.deploy(
-        contract_def=account_def,
+        contract_class=account_cls,
         constructor_calldata=[signer.eth_address]
     )
     initializable1 = await starknet.deploy(
-        contract_def=init_def,
+        contract_class=init_cls,
         constructor_calldata=[],
     )
     initializable2 = await starknet.deploy(
-        contract_def=init_def,
+        contract_class=init_cls,
         constructor_calldata=[],
     )
     attacker = await starknet.deploy(
-        contract_def=attacker_def,
+        contract_class=attacker_cls,
         constructor_calldata=[],
     )
 
@@ -52,14 +52,14 @@ async def account_init(contract_defs):
 
 @pytest.fixture
 def account_factory(contract_defs, account_init):
-    account_def, init_def, attacker_def = contract_defs
+    account_cls, init_cls, attacker_cls = contract_defs
     state, account1, account2, initializable1, initializable2, attacker = account_init
     _state = state.copy()
-    account1 = cached_contract(_state, account_def, account1)
-    account2 = cached_contract(_state, account_def, account2)
-    initializable1 = cached_contract(_state, init_def, initializable1)
-    initializable2 = cached_contract(_state, init_def, initializable2)
-    attacker = cached_contract(_state, attacker_def, attacker)
+    account1 = cached_contract(_state, account_cls, account1)
+    account2 = cached_contract(_state, account_cls, account2)
+    initializable1 = cached_contract(_state, init_cls, initializable1)
+    initializable2 = cached_contract(_state, init_cls, initializable2)
+    attacker = cached_contract(_state, attacker_cls, attacker)
 
     return account1, account2, initializable1, initializable2, attacker
 
@@ -91,12 +91,10 @@ async def test_execute(account_factory):
     assert execution_info.result == (TRUE,)
 
     # should revert if signature is not correct
-    try:
-        await signer.send_transactions(account, [(account.contract_address, 'is_valid_signature', [hash-1, len(signature), *signature])])
-        assert False
-    except StarkException as err:
-        _, error = err.args
-        assert error['code'] == StarknetErrorCode.TRANSACTION_FAILED
+    await assert_revert(
+        signer.send_transactions(account, [(account.contract_address, 'is_valid_signature', [hash-1, len(signature), *signature])]),
+        reverted_with="Invalid signature"
+    )
 
 
 @pytest.mark.asyncio

tests/security/test_pausable.py

@@ -3,7 +3,7 @@
 from signers import MockSigner
 from utils import (
     TRUE, FALSE, assert_revert, assert_event_emitted, 
-    get_contract_def, cached_contract
+    get_contract_class, cached_contract
 )
 
 

tests/signers.py

@@ -89,7 +89,7 @@ async def send_transactions(self, account, calls, nonce=None, max_fee=0):
         sig_r = to_uint(signature.r)
         sig_s = to_uint(signature.s)
 
-        # the hash and signature are returned for other tests to use them
+        # the hash and signature are returned for other tests to use
         return await account.__execute__(call_array, calldata, nonce).invoke(
             signature=[signature.v, *sig_r, *sig_s]
         ), message_hash, [signature.v, *sig_r, *sig_s]

tests/token/erc20/test_ERC20.py

@@ -3,7 +3,7 @@
 from signers import MockSigner
 from utils import (
     to_uint, add_uint, sub_uint, str_to_felt, MAX_UINT256, 
-    ZERO_ADDRESS, INVALID_UINT256, TRUE, get_contract_def, cached_contract, 
+    ZERO_ADDRESS, INVALID_UINT256, TRUE, get_contract_class, cached_contract, 
     assert_revert, assert_event_emitted, contract_path
 )
 

tests/token/erc20/test_ERC20_Burnable_mock.py

@@ -3,7 +3,7 @@
 from signers import MockSigner
 from utils import (
     to_uint, add_uint, sub_uint, str_to_felt, ZERO_ADDRESS, INVALID_UINT256,
-    get_contract_def, cached_contract, assert_revert, assert_event_emitted, 
+    get_contract_class, cached_contract, assert_revert, assert_event_emitted
 )
 
 

tests/token/erc20/test_ERC20_Mintable.py

@@ -3,7 +3,7 @@
 from signers import MockSigner
 from utils import (
     to_uint, add_uint, sub_uint, str_to_felt, 
-    MAX_UINT256, ZERO_ADDRESS, INVALID_UINT256, get_contract_def, 
+    MAX_UINT256, ZERO_ADDRESS, INVALID_UINT256, get_contract_class, 
     cached_contract, assert_revert, assert_event_emitted
 )
 

tests/token/erc20/test_ERC20_Pausable.py

@@ -3,7 +3,7 @@
 from signers import MockSigner
 from utils import (
     TRUE, FALSE, to_uint, str_to_felt, assert_revert, 
-    get_contract_def, cached_contract
+    get_contract_class, cached_contract
 )
 
 

tests/token/erc20/test_ERC20_Upgradeable.py

@@ -3,7 +3,7 @@
 from signers import MockSigner
 from utils import (
     to_uint, sub_uint, str_to_felt, assert_revert,
-    get_contract_def, cached_contract
+    get_contract_class, cached_contract
 )
 
 

tests/token/erc721/test_ERC721_Mintable_Burnable.py

@@ -3,7 +3,7 @@
 from signers import MockSigner
 from utils import (
     str_to_felt, ZERO_ADDRESS, TRUE, FALSE, assert_revert, INVALID_UINT256,
-    assert_event_emitted, get_contract_def, cached_contract, to_uint, sub_uint, add_uint
+    assert_event_emitted, get_contract_class, cached_contract, to_uint, sub_uint, add_uint
 )
 
 

tests/token/erc721/test_ERC721_Mintable_Pausable.py

@@ -2,7 +2,7 @@
 from starkware.starknet.testing.starknet import Starknet
 from signers import MockSigner
 from utils import (
-    str_to_felt, TRUE, FALSE, get_contract_def, cached_contract, 
+    str_to_felt, TRUE, FALSE, get_contract_class, cached_contract, 
     assert_revert, to_uint
 )
 

tests/token/erc721/test_ERC721_SafeMintable_mock.py

@@ -3,7 +3,7 @@
 from signers import MockSigner
 from utils import (
     str_to_felt, ZERO_ADDRESS, INVALID_UINT256, assert_revert,
-    assert_event_emitted, get_contract_def, cached_contract, to_uint
+    assert_event_emitted, get_contract_class, cached_contract, to_uint
 )
 
 

tests/token/erc721_enumerable/test_ERC721_Enumerable_Mintable_Burnable.py

@@ -2,7 +2,7 @@
 from starkware.starknet.testing.starknet import Starknet
 from signers import MockSigner
 from utils import (
-    str_to_felt, MAX_UINT256, get_contract_def, cached_contract,
+    str_to_felt, MAX_UINT256, get_contract_class, cached_contract,
     TRUE, assert_revert, to_uint, sub_uint, add_uint
 )
 

tests/upgrades/test_Proxy.py

@@ -2,7 +2,11 @@
 from starkware.starknet.testing.starknet import Starknet
 from signers import MockSigner
 from utils import (
-    assert_revert, get_contract_def, cached_contract
+    assert_revert,
+    get_contract_class,
+    cached_contract,
+    assert_event_emitted,
+    assert_revert_entry_point
 )
 
 # random value

tests/upgrades/test_upgrades.py

@@ -2,7 +2,11 @@
 from starkware.starknet.testing.starknet import Starknet
 from signers import MockSigner
 from utils import (
-    assert_revert, assert_event_emitted, get_contract_def, cached_contract
+    assert_revert,
+    assert_revert_entry_point,
+    assert_event_emitted,
+    get_contract_class,
+    cached_contract
 )