Skip to content

Commit 81efdbb

Browse files
fix line endings
1 parent f34e2a6 commit 81efdbb

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

packages/thirdweb/src/contract/contract.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import type { Abi } from "abitype";
22
import type { Chain } from "../chains/types.js";
33
import type { ThirdwebClient } from "../client/client.js";
4-
import { isAddress } from "../utils/address.js";
4+
import { type Address, isAddress } from "../utils/address.js";
55

66
/**
77
* @contract
88
*/
99
export type ContractOptions<abi extends Abi = []> = {
1010
client: ThirdwebClient;
11-
address: string;
11+
address: Address;
1212
chain: Chain;
1313
readonly abi?: abi;
1414
};

packages/thirdweb/src/utils/address.ts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { keccak256 } from "./hashing/keccak256.js";
55
export type AddressInput = string;
66
export type Address = `0x${string}`;
77

8-
const ADRESS_REGEX = /^0x[a-fA-F0-9]{40}$/;
8+
const ADDRESS_REGEX = /^0x[a-fA-F0-9]{40}$/;
99
const IS_ADDRESS_CACHE = new LruMap<boolean>(4096);
1010

1111
/**
@@ -26,16 +26,9 @@ export function isAddress(address: string): address is Address {
2626
// biome-ignore lint/style/noNonNullAssertion: the `has` above ensures that this will always be set
2727
return IS_ADDRESS_CACHE.get(address)!;
2828
}
29-
const result = (() => {
30-
if (!ADRESS_REGEX.test(address)) {
31-
return false;
32-
}
33-
if (address.toLowerCase() === address) {
34-
return true;
35-
}
36-
37-
return checksumAddress(address) === address;
38-
})();
29+
const result =
30+
ADDRESS_REGEX.test(address) &&
31+
(address.toLowerCase() === address || checksumAddress(address) === address);
3932
IS_ADDRESS_CACHE.set(address, result);
4033
return result;
4134
}

0 commit comments

Comments
 (0)