From 219b16dc284b0c6a532c8c49e824d8234f94222b Mon Sep 17 00:00:00 2001
From: Richard Moore <github@ricmoo.com>
Date: Thu, 18 May 2023 17:05:33 -0400
Subject: [PATCH] Better errors when junk passed as Contract target (#3947,
 #4053).

---
 src.ts/contract/contract.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src.ts/contract/contract.ts b/src.ts/contract/contract.ts
index 8bbbb11b9..e930a9eef 100644
--- a/src.ts/contract/contract.ts
+++ b/src.ts/contract/contract.ts
@@ -1,5 +1,5 @@
 import { Interface, Typed } from "../abi/index.js";
-import { resolveAddress } from "../address/index.js";
+import { isAddressable, resolveAddress } from "../address/index.js";
 // import from provider.ts instead of index.ts to prevent circular dep
 // from EtherscanProvider
 import { copyRequest, Log, TransactionResponse } from "../providers/provider.js";
@@ -619,6 +619,9 @@ export class BaseContract implements Addressable, EventEmitterable<ContractEvent
     readonly fallback!: null | WrappedFallback;
 
     constructor(target: string | Addressable, abi: Interface | InterfaceAbi, runner?: null | ContractRunner, _deployTx?: null | TransactionResponse) {
+        assertArgument(typeof(target) === "string" || isAddressable(target),
+            "invalid value for Contract target", "target", target);
+
         if (runner == null) { runner = null; }
         const iface = Interface.from(abi);
         defineProperties<BaseContract>(this, { target, runner, interface: iface });