Fix

Author: rohan-agarwal-coinbase

cdp/evm_call_types.py

@@ -5,15 +5,15 @@
 from web3.types import HexStr, Wei
 
 
-class EVMCallDict(BaseModel):
+class EncodedCall(BaseModel):
     """Represents an encoded call to a smart contract."""
 
     to: HexAddress = Field(..., description="Target contract address")
     value: Wei | None = Field(None, description="Amount of native currency to send")
     data: HexStr | None = Field(None, description="Encoded call data")
 
 
-class EVMAbiCallDict(BaseModel):
+class FunctionCall(BaseModel):
     """Represents a call to a smart contract that needs to be encoded using the ABI."""
 
     to: HexAddress = Field(..., description="Target contract address")
@@ -23,4 +23,4 @@ class EVMAbiCallDict(BaseModel):
     args: list[Any] = Field(..., description="Arguments to pass to the function")
 
 
-EVMCall = EVMCallDict | EVMAbiCallDict
+ContractCall = EncodedCall | FunctionCall

cdp/smart_wallet.py

@@ -4,7 +4,7 @@
 from cdp.cdp import Cdp
 from cdp.client.models.call import Call
 from cdp.client.models.create_smart_wallet_request import CreateSmartWalletRequest
-from cdp.evm_call_types import EVMAbiCallDict, EVMCall
+from cdp.evm_call_types import ContractCall, FunctionCall
 from cdp.network import Network
 from cdp.user_operation import UserOperation
 
@@ -79,7 +79,7 @@ def use_network(
         )
 
     def send_user_operation(
-        self, calls: list[EVMCall], chain_id: int, paymaster_url: str | None = None
+        self, calls: list[ContractCall], chain_id: int, paymaster_url: str | None = None
     ) -> UserOperation:
         """Send a user operation.
 
@@ -102,7 +102,7 @@ def send_user_operation(
 
         encoded_calls = []
         for call in calls:
-            if isinstance(call, EVMAbiCallDict):
+            if isinstance(call, FunctionCall):
                 contract = Web3().eth.contract(address=call.to, abi=call.abi)
                 data = contract.encode_abi(call.function_name, args=call.args)
                 value = "0" if call.value is None else str(call.value)
@@ -188,7 +188,7 @@ def paymaster_url(self) -> str | None:
 
     def send_user_operation(
         self,
-        calls: list[EVMCall],
+        calls: list[ContractCall],
     ) -> UserOperation:
         """Send a user operation on the configured network.
 

tests/test_evm_call_types.py

@@ -1,17 +1,17 @@
 import pytest
 from web3.types import Wei
 
-from cdp.evm_call_types import EVMAbiCallDict, EVMCall, EVMCallDict
+from cdp.evm_call_types import ContractCall, EncodedCall, FunctionCall
 
 
 def test_evm_call_dict_valid():
     """Test that the EVMCallDict is valid."""
-    call = EVMCallDict(to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e")
+    call = EncodedCall(to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e")
     assert isinstance(call.to, str)
     assert call.value is None
     assert call.data is None
 
-    call = EVMCallDict(
+    call = EncodedCall(
         to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e",
         value=Wei(1000000000000000000),
         data="0x095ea7b30000000000000000000000742d35cc6634c0532925a3b844bc454e4438f44e",
@@ -23,7 +23,7 @@ def test_evm_call_dict_valid():
 
 def test_evm_abi_call_dict_valid():
     """Test that the EVMAbiCallDict is valid."""
-    call = EVMAbiCallDict(
+    call = FunctionCall(
         to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e",
         abi=[
             {
@@ -43,7 +43,7 @@ def test_evm_abi_call_dict_valid():
     assert call.function_name == "totalSupply"
     assert call.args == []
 
-    call = EVMAbiCallDict(
+    call = FunctionCall(
         to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e",
         value=Wei(1000000000000000000),
         abi=[
@@ -71,20 +71,18 @@ def test_evm_abi_call_dict_valid():
 def test_evm_abi_call_dict_invalid():
     """Test that the EVMAbiCallDict is invalid."""
     with pytest.raises(ValueError):
-        EVMAbiCallDict(
-            to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e", function_name="test", args=[]
-        )
+        FunctionCall(to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e", function_name="test", args=[])
 
 
 def test_evm_call_union():
     """Test that the EVMCall union is valid."""
-    call_dict = EVMCallDict(to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e")
-    abi_call_dict = EVMAbiCallDict(
+    call_dict = EncodedCall(to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e")
+    abi_call_dict = FunctionCall(
         to="0x742d35Cc6634C0532925a3b844Bc454e4438f44e", abi=[], function_name="test", args=[]
     )
 
-    call: EVMCall = call_dict
-    assert isinstance(call, EVMCallDict)
+    call: ContractCall = call_dict
+    assert isinstance(call, EncodedCall)
 
     call = abi_call_dict
-    assert isinstance(call, EVMAbiCallDict)
+    assert isinstance(call, FunctionCall)

tests/test_smart_wallet.py

@@ -5,7 +5,7 @@
 
 from cdp.client.models.call import Call
 from cdp.client.models.create_smart_wallet_request import CreateSmartWalletRequest
-from cdp.evm_call_types import EVMAbiCallDict, EVMCallDict
+from cdp.evm_call_types import EncodedCall, FunctionCall
 from cdp.smart_wallet import SmartWallet, to_smart_wallet
 from cdp.user_operation import UserOperation
 
@@ -73,7 +73,7 @@ def test_smart_wallet_send_user_operation_with_encoded_call(
     mock_create_user_operation = Mock(return_value=mock_user_operation)
     mock_api_clients.smart_wallets.create_user_operation = mock_create_user_operation
 
-    calls = [EVMCallDict(to=account.address, value=1000000000000000000, data="0x")]
+    calls = [EncodedCall(to=account.address, value=1000000000000000000, data="0x")]
 
     user_operation = smart_wallet.send_user_operation(
         calls=calls, chain_id=84532, paymaster_url="https://paymaster.com"
@@ -111,7 +111,7 @@ def test_send_user_operation_with_abi_call(
     mock_create_user_operation = Mock(return_value=mock_user_operation)
     mock_api_clients.smart_wallets.create_user_operation = mock_create_user_operation
 
-    abi_call = EVMAbiCallDict(
+    abi_call = FunctionCall(
         to=account.address,
         abi=[{"inputs": [], "name": "transfer", "type": "function"}],
         function_name="transfer",
@@ -140,9 +140,9 @@ def test_smart_wallet_multiple_calls(
     smart_wallet = smart_wallet_factory(smart_wallet_address, account)
 
     calls = [
-        EVMCallDict(to=account.address, value=1000000000000000000, data="0x"),
-        EVMCallDict(to=account.address, value=0, data="0x123"),
-        EVMCallDict(to=account.address, value=None, data=None),
+        EncodedCall(to=account.address, value=1000000000000000000, data="0x"),
+        EncodedCall(to=account.address, value=0, data="0x123"),
+        EncodedCall(to=account.address, value=None, data=None),
     ]
 
     model_calls = [Call(to=c.to, value=str(c.value or 0), data=c.data or "0x") for c in calls]
@@ -207,7 +207,7 @@ def test_network_scoped_wallet_send_operation(
     mock_create_user_operation = Mock(return_value=mock_user_operation)
     mock_api_clients.smart_wallets.create_user_operation = mock_create_user_operation
 
-    calls = [EVMCallDict(to=account.address, value=1000000000000000000, data="0x")]
+    calls = [EncodedCall(to=account.address, value=1000000000000000000, data="0x")]
     user_operation = network_wallet.send_user_operation(calls=calls)
 
     assert user_operation.smart_wallet_address == smart_wallet_address