fix(Contracts): only update contract cache with proper merge of ABI (#2568)

Author: fubuloubu

setup.py

@@ -121,7 +121,7 @@
         "web3[tester]>=6.20.1,<8",
         # ** Dependencies maintained by ApeWorX **
         "eip712>=0.2.10,<0.3",
-        "ethpm-types>=0.6.23,<0.7",
+        "ethpm-types>=0.6.25,<0.7",
         "eth_pydantic_types>=0.1.3,<0.2",
         "evmchains>=0.1.0,<0.2",
         "evm-trace>=0.2.3,<0.3",

src/ape/managers/_contractscache.py

@@ -955,5 +955,9 @@ def _merge_abis(base_contract: ContractType, extra_abis: list[ABI]) -> ContractT
 def _merge_contract_types(
     base_contract_type: ContractType, additive_contract_type: ContractType
 ) -> ContractType:
+    existing_methods = set(_get_relevant_additive_abis(base_contract_type))
     relevant_abis = _get_relevant_additive_abis(additive_contract_type)
-    return _merge_abis(base_contract_type, relevant_abis)
+    return _merge_abis(
+        base_contract_type,
+        [abi for abi in relevant_abis if abi not in existing_methods],
+    )

tests/functional/test_contracts_cache.py

@@ -5,6 +5,7 @@
 from ape.contracts import ContractInstance
 from ape.exceptions import ContractNotFoundError, ConversionError
 from ape.logging import LogLevel, logger
+from ape.managers._contractscache import _merge_contract_types
 from ape_ethereum.proxies import ProxyInfo, ProxyType, _make_minimal_proxy
 from tests.conftest import explorer_test, skip_if_plugin_installed
 
@@ -19,6 +20,15 @@ def contract_1(solidity_contract_container):
     return solidity_contract_container
 
 
+def test_merge_contract_types(contract_instance):
+    ct = contract_instance.contract_type
+    modified_ct = ct.model_copy(deep=True)
+    modified_ct.view_methods[0].name = "foo"
+    new_ct = _merge_contract_types(ct, modified_ct)
+    assert len(new_ct.abi) == len(ct.abi) + 1 == len(modified_ct.abi) + 1
+    assert len(new_ct.abi) == len(_merge_contract_types(new_ct, modified_ct).abi)
+
+
 def test_instance_at(chain, contract_instance):
     contract = chain.contracts.instance_at(str(contract_instance.address))
     assert contract.contract_type == contract_instance.contract_type