feat: complete upgrade

tests/test_account.py

@@ -1,5 +1,7 @@
 import pytest
+from ape.api import AccountAPI
 from ape.exceptions import SignatureError
+from ape.types import AddressType
 from eth_utils import add_0x_prefix
 
 
@@ -158,3 +160,18 @@ def exec_transaction():
     assert receipt.events == expected_events
 
     assert old_owner not in safe.signers
+
+
+def test_account_type(safe):
+    actual = type(safe)
+    assert issubclass(actual, AccountAPI)
+
+
+def test_safe_account_convert(safe):
+    """
+    We had a bug where converting safe accounts to AddressType
+    would fail.
+    """
+    convert = safe.conversion_manager.convert
+    actual = convert(safe, AddressType)
+    assert actual == safe.address

tests/test_multisend.py

@@ -9,15 +9,15 @@ def test_asset(vault, token):
 
 def test_default_operation(safe, token, vault, multisend):
     amount = token.balanceOf(safe)
-    multisend.add(token.approve, vault, safe)
+    multisend.add(token.approve, vault, 123)
     multisend.add(vault.transfer, safe, amount)
     receipt = multisend(sender=safe)
     assert receipt.txn_hash
 
 
 def test_no_operation(safe, token, vault, multisend):
     amount = token.balanceOf(safe)
-    multisend.add(token.approve, vault, safe)
+    multisend.add(token.approve, vault, 123)
     multisend.add(vault.transfer, safe, amount)
     with pytest.raises(SafeLogicError, match="Safe transaction failed"):
         multisend(sender=safe, operation=0)