return address type for contractoptions (#5874)

Signed-off-by: greg <gregfromstl@gmail.com> Co-authored-by: greg <gregfromstl@gmail.com>
thirdweb-dev · Jan 3, 2025 · 5cb8e3b · 5cb8e3b
1 parent 0c5b0bb
commit 5cb8e3b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/packages/thirdweb/src/contract/contract.ts b/packages/thirdweb/src/contract/contract.ts
@@ -1,24 +1,28 @@
 import type { Abi } from "abitype";
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
-import { isAddress } from "../utils/address.js";
+import { type Address, isAddress } from "../utils/address.js";
 
 /**
  * @contract
  */
-export type ContractOptions<abi extends Abi = []> = {
+export type ContractOptions<
+  abi extends Abi = [],
+  address extends string = string,
+> = {
   client: ThirdwebClient;
-  address: string;
+  address: address;
   chain: Chain;
   readonly abi?: abi;
 };
 
 /**
  * @contract
  */
-export type ThirdwebContract<abi extends Abi = []> = Readonly<
-  ContractOptions<abi>
->;
+export type ThirdwebContract<
+  abi extends Abi = [],
+  address extends string = string,
+> = Readonly<ContractOptions<abi, address>>;
 
 /**
  * Creates a Thirdweb contract by combining the Thirdweb client and contract options.
@@ -42,7 +46,7 @@ export type ThirdwebContract<abi extends Abi = []> = Readonly<
  */
 export function getContract<const abi extends Abi = []>(
   options: ContractOptions<abi>,
-): ThirdwebContract<abi> {
+): ThirdwebContract<abi, Address> {
   if (!options.client) {
     throw new Error(
       `getContract validation error - invalid client: ${options.client}`,
@@ -58,5 +62,5 @@ export function getContract<const abi extends Abi = []>(
       `getContract validation error - invalid chain: ${options.chain}`,
     );
   }
-  return options;
+  return options as ThirdwebContract<abi, Address>;
 }
diff --git a/packages/thirdweb/src/utils/address.ts b/packages/thirdweb/src/utils/address.ts
@@ -5,7 +5,7 @@ import { keccak256 } from "./hashing/keccak256.js";
 export type AddressInput = string;
 export type Address = `0x${string}`;
 
-const ADRESS_REGEX = /^0x[a-fA-F0-9]{40}$/;
+const ADDRESS_REGEX = /^0x[a-fA-F0-9]{40}$/;
 const IS_ADDRESS_CACHE = new LruMap<boolean>(4096);
 
 /**
@@ -26,16 +26,9 @@ export function isAddress(address: string): address is Address {
     // biome-ignore lint/style/noNonNullAssertion: the `has` above ensures that this will always be set
     return IS_ADDRESS_CACHE.get(address)!;
   }
-  const result = (() => {
-    if (!ADRESS_REGEX.test(address)) {
-      return false;
-    }
-    if (address.toLowerCase() === address) {
-      return true;
-    }
-
-    return checksumAddress(address) === address;
-  })();
+  const result =
+    ADDRESS_REGEX.test(address) &&
+    (address.toLowerCase() === address || checksumAddress(address) === address);
   IS_ADDRESS_CACHE.set(address, result);
   return result;
 }