From 6d56b8a8b0653c134721f309bfe7ca39ad319be2 Mon Sep 17 00:00:00 2001
From: antazoey <jules@apeworx.io>
Date: Tue, 11 Jun 2024 16:12:45 -0500
Subject: [PATCH] feat: allow deploying contract types from account (#2126)

---
 src/ape/api/accounts.py           |  8 +++++++-
 tests/functional/test_accounts.py |  6 ++++++
 tests/functional/test_project.py  | 11 +++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/ape/api/accounts.py b/src/ape/api/accounts.py
index 8d99e24bb8..abe8b8a846 100644
--- a/src/ape/api/accounts.py
+++ b/src/ape/api/accounts.py
@@ -9,6 +9,7 @@
 from eth_account import Account
 from eth_account.messages import encode_defunct
 from eth_pydantic_types import HexBytes
+from ethpm_types import ContractType
 
 from ape.api.address import BaseAddress
 from ape.api.transactions import ReceiptAPI, TransactionAPI
@@ -249,10 +250,15 @@ def deploy(
         """
         from ape.contracts import ContractContainer
 
+        if isinstance(contract, ContractType):
+            # Hack to allow deploying ContractTypes w/o being
+            # wrapped in a container first.
+            contract = ContractContainer(contract)
+
         # NOTE: It is important to type check here to prevent cases where user
         #    may accidentally pass in a ContractInstance, which has a very
         #    different implementation for __call__ than ContractContainer.
-        if not isinstance(contract, ContractContainer):
+        elif not isinstance(contract, ContractContainer):
             raise TypeError(
                 "contract argument must be a ContractContainer type, "
                 "such as 'project.MyContract' where 'MyContract' is the name of "
diff --git a/tests/functional/test_accounts.py b/tests/functional/test_accounts.py
index 042587ed63..69afbe6dba 100644
--- a/tests/functional/test_accounts.py
+++ b/tests/functional/test_accounts.py
@@ -331,6 +331,12 @@ def test_deploy_no_deployment_bytecode(owner, bytecode):
         owner.deploy(contract)
 
 
+def test_deploy_contract_type(owner, vyper_contract_type, chain, clean_contracts_cache):
+    contract = owner.deploy(vyper_contract_type, 0)
+    assert contract.address
+    assert contract.txn_hash
+
+
 def test_send_transaction_with_bad_nonce(sender, receiver):
     # Bump the nonce so we can set one that is too low.
     sender.transfer(receiver, "1 gwei", type=0)
diff --git a/tests/functional/test_project.py b/tests/functional/test_project.py
index 301973d266..fb7f5351e3 100644
--- a/tests/functional/test_project.py
+++ b/tests/functional/test_project.py
@@ -529,6 +529,17 @@ def test_project_api_foundry_and_ape_config_found(foundry_toml):
         assert not isinstance(actual, FoundryProject)
 
 
+def test_get_contract(project_with_contracts):
+    actual = project_with_contracts.get_contract("Other")
+    assert isinstance(actual, ContractContainer)
+    assert actual.contract_type.name == "Other"
+
+
+def test_get_contract_not_exists(project):
+    actual = project.get_contract("this is not a contract")
+    assert actual is None
+
+
 class TestProject:
     """
     All tests related to ``ape.Project``.