viem 0.0.0-w-20230725184008 → 0.0.0-w-20230810155401

package/dist/types/utils/hash/hashFunction.d.ts

@@ -1,4 +1,4 @@
 import type { AbiEvent, AbiFunction } from 'abitype';
 export declare function hashFunction(def: string): `0x${string}`;
-export declare function hashAbiItem(def: AbiFunction | AbiEvent): `0x${string}`;
+export declare function hashAbiItem(abiItem: AbiFunction | AbiEvent): `0x${string}`;
 //# sourceMappingURL=hashFunction.d.ts.map

package/dist/types/utils/hash/hashFunction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hashFunction.d.ts","sourceRoot":"","sources":["../../../../src/utils/hash/hashFunction.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAMpD,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,iBAIvC;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,WAAW,GAAG,QAAQ,iBAEtD"}
+{"version":3,"file":"hashFunction.d.ts","sourceRoot":"","sources":["../../../../src/utils/hash/hashFunction.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAMpD,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,iBAIvC;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,QAAQ,iBAE1D"}

package/dist/types/utils/promise/withCache.d.ts

@@ -25,12 +25,12 @@ export declare function getCache<TData>(cacheKey: string): {
 export type WithCacheParameters = {
     /** The key to cache the data against. */
     cacheKey: string;
-    /** The maximum age (in ms) of the cached value. Default: Infinity (no expiry) */
-    maxAge?: number;
+    /** The time that cached data will remain in memory. Default: Infinity (no expiry) */
+    cacheTime?: number;
 };
 /**
  * @description Returns the result of a given promise, and caches the result for
  * subsequent invocations against a provided cache key.
  */
-export declare function withCache<TData>(fn: () => Promise<TData>, { cacheKey, maxAge }: WithCacheParameters): Promise<TData>;
+export declare function withCache<TData>(fn: () => Promise<TData>, { cacheKey, cacheTime }: WithCacheParameters): Promise<TData>;
 //# sourceMappingURL=withCache.d.ts.map

package/dist/types/utils/promise/withCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withCache.d.ts","sourceRoot":"","sources":["../../../../src/utils/promise/withCache.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,eAA0B,CAAA;AACnD,eAAO,MAAM,aAAa,eAA0B,CAAA;AAEpD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM;;;;;;;;;;qBAQP,IAAI;kBAAQ,KAAK;;;qBAAjB,IAAI;kBAAQ,KAAK;;qBAAjB,IAAI;kBAAQ,KAAK;;;EAazD;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAA;IAChB,iFAAiF;IACjF,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,KAAK,EACnC,EAAE,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,EACxB,EAAE,QAAQ,EAAE,MAAiB,EAAE,EAAE,mBAAmB,kBAmCrD"}
+{"version":3,"file":"withCache.d.ts","sourceRoot":"","sources":["../../../../src/utils/promise/withCache.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,eAA0B,CAAA;AACnD,eAAO,MAAM,aAAa,eAA0B,CAAA;AAEpD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM;;;;;;;;;;qBAQP,IAAI;kBAAQ,KAAK;;;qBAAjB,IAAI;kBAAQ,KAAK;;qBAAjB,IAAI;kBAAQ,KAAK;;;EAazD;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAA;IAChB,qFAAqF;IACrF,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,KAAK,EACnC,EAAE,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,EACxB,EAAE,QAAQ,EAAE,SAAoB,EAAE,EAAE,mBAAmB,kBAmCxD"}

package/dist/types/utils/signature/hexToSignature.d.ts

@@ -0,0 +1,13 @@
+import type { Hex, Signature } from '../../types/misc.js';
+/**
+ * @description Parses a hex formatted signature into a structured signature.
+ *
+ * @param signatureHex Signature in hex format.
+ * @returns The structured signature.
+ *
+ * @example
+ * hexToSignature('0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db81c')
+ * // { r: '0x...', s: '0x...', v: 28n }
+ */
+export declare function hexToSignature(signatureHex: Hex): Signature;
+//# sourceMappingURL=hexToSignature.d.ts.map

package/dist/types/utils/signature/hexToSignature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hexToSignature.d.ts","sourceRoot":"","sources":["../../../../src/utils/signature/hexToSignature.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAGzD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,GAAG,GAAG,SAAS,CAI3D"}

package/dist/types/utils/signature/signatureToHex.d.ts

@@ -0,0 +1,17 @@
+import type { Hex, Signature } from '../../types/misc.js';
+/**
+ * @description Converts a signature into hex format.
+ *
+ * @param signature The signature to convert.
+ * @returns The signature in hex format.
+ *
+ * @example
+ * signatureToHex({
+ *   r: '0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf',
+ *   s: '0x4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db8',
+ *   v: 28n
+ * })
+ * // "0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db81c"
+ */
+export declare function signatureToHex({ r, s, v }: Signature): Hex;
+//# sourceMappingURL=signatureToHex.d.ts.map

package/dist/types/utils/signature/signatureToHex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signatureToHex.d.ts","sourceRoot":"","sources":["../../../../src/utils/signature/signatureToHex.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAIzD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,GAAG,GAAG,CAK1D"}

package/dist/types/utils/transaction/prepareRequest.d.ts

@@ -4,15 +4,11 @@ import type { SendTransactionParameters } from '../../actions/wallet/sendTransac
 import type { Client } from '../../clients/createClient.js';
 import type { Transport } from '../../clients/transports/createTransport.js';
 import type { GetAccountParameter } from '../../types/account.js';
-import type { Chain } from '../../types/chain.js';
-export type PrepareRequestParameters<TAccount extends Account | undefined = undefined> = GetAccountParameter<TAccount> & {
-    gas?: SendTransactionParameters['gas'];
-    gasPrice?: SendTransactionParameters['gasPrice'];
-    maxFeePerGas?: SendTransactionParameters['maxFeePerGas'];
-    maxPriorityFeePerGas?: SendTransactionParameters['maxPriorityFeePerGas'];
-    nonce?: SendTransactionParameters['nonce'];
-};
-export type PrepareRequestReturnType<TAccount extends Account | undefined = undefined, TParameters extends PrepareRequestParameters<TAccount> = PrepareRequestParameters<TAccount>> = TParameters & {
+import type { Chain, GetChain } from '../../types/chain.js';
+import type { UnionOmit } from '../../types/utils.js';
+import type { FormattedTransactionRequest } from '../index.js';
+export type PrepareRequestParameters<TChain extends Chain | undefined = Chain | undefined, TAccount extends Account | undefined = Account | undefined, TChainOverride extends Chain | undefined = Chain | undefined> = UnionOmit<FormattedTransactionRequest<TChainOverride extends Chain ? TChainOverride : TChain>, 'from'> & GetAccountParameter<TAccount> & GetChain<TChain, TChainOverride>;
+export type PrepareRequestReturnType<TChain extends Chain | undefined = Chain | undefined, TAccount extends Account | undefined = Account | undefined, TChainOverride extends Chain | undefined = Chain | undefined, TArgs extends PrepareRequestParameters<TChain, TAccount, TChainOverride> = PrepareRequestParameters<TChain, TAccount, TChainOverride>> = TArgs & {
     from: Address;
     gas: SendTransactionParameters['gas'];
     gasPrice?: SendTransactionParameters['gasPrice'];
@@ -20,6 +16,5 @@ export type PrepareRequestReturnType<TAccount extends Account | undefined = unde
     maxPriorityFeePerGas?: SendTransactionParameters['maxPriorityFeePerGas'];
     nonce: SendTransactionParameters['nonce'];
 };
-export declare const defaultTip = 1500000000n;
-export declare function prepareRequest<TChain extends Chain | undefined, TAccount extends Account | undefined, TParameters extends PrepareRequestParameters<TAccount>>(client: Client<Transport, TChain, TAccount>, args: TParameters): Promise<PrepareRequestReturnType<TAccount, TParameters>>;
+export declare function prepareRequest<TChain extends Chain | undefined, TAccount extends Account | undefined, TChainOverride extends Chain | undefined, TArgs extends PrepareRequestParameters<TChain, TAccount, TChainOverride>>(client: Client<Transport, TChain, TAccount>, args: TArgs): Promise<PrepareRequestReturnType<TChain, TAccount, TChainOverride, TArgs>>;
 //# sourceMappingURL=prepareRequest.d.ts.map

package/dist/types/utils/transaction/prepareRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepareRequest.d.ts","sourceRoot":"","sources":["../../../../src/utils/transaction/prepareRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAStD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAA;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAG5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAIjD,MAAM,MAAM,wBAAwB,CAClC,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,IAC9C,mBAAmB,CAAC,QAAQ,CAAC,GAAG;IAClC,GAAG,CAAC,EAAE,yBAAyB,CAAC,KAAK,CAAC,CAAA;IACtC,QAAQ,CAAC,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAA;IAChD,YAAY,CAAC,EAAE,yBAAyB,CAAC,cAAc,CAAC,CAAA;IACxD,oBAAoB,CAAC,EAAE,yBAAyB,CAAC,sBAAsB,CAAC,CAAA;IACxE,KAAK,CAAC,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAA;CAC3C,CAAA;AAED,MAAM,MAAM,wBAAwB,CAClC,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAChD,WAAW,SAAS,wBAAwB,CAAC,QAAQ,CAAC,GAAG,wBAAwB,CAAC,QAAQ,CAAC,IACzF,WAAW,GAAG;IAChB,IAAI,EAAE,OAAO,CAAA;IACb,GAAG,EAAE,yBAAyB,CAAC,KAAK,CAAC,CAAA;IACrC,QAAQ,CAAC,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAA;IAChD,YAAY,CAAC,EAAE,yBAAyB,CAAC,cAAc,CAAC,CAAA;IACxD,oBAAoB,CAAC,EAAE,yBAAyB,CAAC,sBAAsB,CAAC,CAAA;IACxE,KAAK,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAA;CAC1C,CAAA;AAED,eAAO,MAAM,UAAU,cAAiB,CAAA;AAExC,wBAAsB,cAAc,CAClC,MAAM,SAAS,KAAK,GAAG,SAAS,EAChC,QAAQ,SAAS,OAAO,GAAG,SAAS,EACpC,WAAW,SAAS,wBAAwB,CAAC,QAAQ,CAAC,EAEtD,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAC3C,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,wBAAwB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAiE1D"}
+{"version":3,"file":"prepareRequest.d.ts","sourceRoot":"","sources":["../../../../src/utils/transaction/prepareRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAStD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAA;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAG5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AAG9D,MAAM,MAAM,wBAAwB,CAClC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,EAC1D,cAAc,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IAC1D,SAAS,CACX,2BAA2B,CACzB,cAAc,SAAS,KAAK,GAAG,cAAc,GAAG,MAAM,CACvD,EACD,MAAM,CACP,GACC,mBAAmB,CAAC,QAAQ,CAAC,GAC7B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;AAElC,MAAM,MAAM,wBAAwB,CAClC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,EAC1D,cAAc,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EAC5D,KAAK,SAAS,wBAAwB,CACpC,MAAM,EACN,QAAQ,EACR,cAAc,CACf,GAAG,wBAAwB,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,CAAC,IAC5D,KAAK,GAAG;IACV,IAAI,EAAE,OAAO,CAAA;IACb,GAAG,EAAE,yBAAyB,CAAC,KAAK,CAAC,CAAA;IACrC,QAAQ,CAAC,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAA;IAChD,YAAY,CAAC,EAAE,yBAAyB,CAAC,cAAc,CAAC,CAAA;IACxD,oBAAoB,CAAC,EAAE,yBAAyB,CAAC,sBAAsB,CAAC,CAAA;IACxE,KAAK,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAsB,cAAc,CAClC,MAAM,SAAS,KAAK,GAAG,SAAS,EAChC,QAAQ,SAAS,OAAO,GAAG,SAAS,EACpC,cAAc,SAAS,KAAK,GAAG,SAAS,EACxC,KAAK,SAAS,wBAAwB,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,CAAC,EAExE,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAC3C,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,wBAAwB,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAiF5E"}

package/dist/types/utils/unit/parseUnits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseUnits.d.ts","sourceRoot":"","sources":["../../../../src/utils/unit/parseUnits.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAoCzD"}
+{"version":3,"file":"parseUnits.d.ts","sourceRoot":"","sources":["../../../../src/utils/unit/parseUnits.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAqCzD"}

package/package.json

@@ -3,10 +3,11 @@
   "description": "TypeScript Interface for Ethereum",
   "dependencies": {
     "@adraffy/ens-normalize": "1.9.0",
-    "@noble/curves": "1.0.0",
+    "@noble/curves": "1.1.0",
     "@noble/hashes": "1.3.0",
     "@scure/bip32": "1.3.0",
     "@scure/bip39": "1.2.0",
+    "@types/ws": "^8.5.4",
     "@wagmi/chains": "1.6.0",
     "abitype": "0.9.3",
     "isomorphic-ws": "5.0.0",
@@ -20,7 +21,7 @@
       "optional": true
     }
   },
-  "version": "0.0.0-w-20230725184008",
+  "version": "0.0.0-w-20230810155401",
   "files": [
     "dist",
     "!dist/**/*.tsbuildinfo",
@@ -33,6 +34,7 @@
     "accounts",
     "actions",
     "chains",
+    "chains/utils",
     "contract",
     "ens",
     "public",
@@ -67,6 +69,11 @@
       "import": "./dist/esm/chains/index.js",
       "default": "./dist/cjs/chains/index.js"
     },
+    "./chains/utils": {
+      "types": "./dist/types/chains/utils.d.ts",
+      "import": "./dist/esm/chains/utils.js",
+      "default": "./dist/cjs/chains/utils.js"
+    },
     "./contract": {
       "types": "./dist/types/contract.d.ts",
       "import": "./dist/esm/contract.js",

package/src/accounts/index.ts

@@ -17,12 +17,17 @@ export type {
   PrivateKeyAccount,
 } from './types.js'
 export { type SignParameters, type SignReturnType, sign } from './utils/sign.js'
-export { signatureToHex } from './utils/signatureToHex.js'
+export { signatureToHex } from '../utils/signature/signatureToHex.js'
 export {
   type SignMessageParameters,
   type SignMessageReturnType,
   signMessage,
 } from './utils/signMessage.js'
+export {
+  type SignTransactionParameters,
+  type SignTransactionReturnType,
+  signTransaction,
+} from './utils/signTransaction.js'
 export {
   type SignTypedDataParameters,
   type SignTypedDataReturnType,
@@ -30,6 +35,7 @@ export {
 } from './utils/signTypedData.js'
 export { parseAccount } from './utils/parseAccount.js'
 export { publicKeyToAddress } from './utils/publicKeyToAddress.js'
+export { privateKeyToAddress } from './utils/privateKeyToAddress.js'
 export { czech } from './wordlists/czech.js'
 export { english } from './wordlists/english.js'
 export { french } from './wordlists/french.js'

package/src/accounts/utils/privateKeyToAddress.ts

@@ -0,0 +1,20 @@
+import { secp256k1 } from '@noble/curves/secp256k1'
+import type { Address } from 'abitype'
+
+import type { Hex } from '../../types/misc.js'
+import { bytesToHex } from '../../utils/encoding/toHex.js'
+import { publicKeyToAddress } from './publicKeyToAddress.js'
+
+/**
+ * @description Converts an ECDSA private key to an address.
+ *
+ * @param privateKey The private key to convert.
+ *
+ * @returns The address.
+ */
+export function privateKeyToAddress(privateKey: Hex): Address {
+  const publicKey = bytesToHex(
+    secp256k1.getPublicKey(privateKey.slice(2), false),
+  )
+  return publicKeyToAddress(publicKey)
+}

package/src/accounts/utils/signMessage.ts

@@ -1,8 +1,8 @@
 import type { Hex, SignableMessage } from '../../types/misc.js'
 import { hashMessage } from '../../utils/signature/hashMessage.js'
+import { signatureToHex } from '../../utils/signature/signatureToHex.js'
 
 import { sign } from './sign.js'
-import { signatureToHex } from './signatureToHex.js'
 
 export type SignMessageParameters = {
   /** The message to sign. */

package/src/accounts/utils/signTransaction.ts

@@ -12,7 +12,7 @@ import {
 
 import { sign } from './sign.js'
 
-export type SignTransactionArgs<
+export type SignTransactionParameters<
   TTransactionSerializable extends TransactionSerializable = TransactionSerializable,
 > = {
   privateKey: Hex
@@ -31,7 +31,7 @@ export async function signTransaction<
   privateKey,
   transaction,
   serializer = serializeTransaction,
-}: SignTransactionArgs<TTransactionSerializable>): Promise<
+}: SignTransactionParameters<TTransactionSerializable>): Promise<
   SignTransactionReturnType<TTransactionSerializable>
 > {
   const signature = await sign({

package/src/accounts/utils/signTypedData.ts

@@ -3,9 +3,9 @@ import type { TypedData } from 'abitype'
 import type { Hex } from '../../types/misc.js'
 import type { TypedDataDefinition } from '../../types/typedData.js'
 import { hashTypedData } from '../../utils/signature/hashTypedData.js'
+import { signatureToHex } from '../../utils/signature/signatureToHex.js'
 
 import { sign } from './sign.js'
-import { signatureToHex } from './signatureToHex.js'
 
 export type SignTypedDataParameters<
   typedData extends TypedData | Record<string, unknown> = TypedData,

package/src/actions/ens/getEnsAddress.ts

@@ -3,7 +3,7 @@ import type { Address } from 'abitype'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import {
-  singleAddressResolverAbi,
+  addressResolverAbi,
   universalResolverResolveAbi,
 } from '../../constants/abis.js'
 import type { Chain } from '../../types/chain.js'
@@ -23,6 +23,8 @@ import {
 
 export type GetEnsAddressParameters = Prettify<
   Pick<ReadContractParameters, 'blockNumber' | 'blockTag'> & {
+    /** ENSIP-9 compliant coinType used to resolve addresses for other chains */
+    coinType?: number
     /** Name to get the address for. */
     name: string
     /** Address of ENS Universal Resolver Contract. */
@@ -65,6 +67,7 @@ export async function getEnsAddress<TChain extends Chain | undefined,>(
   {
     blockNumber,
     blockTag,
+    coinType,
     name,
     universalResolverAddress: universalResolverAddress_,
   }: GetEnsAddressParameters,
@@ -84,31 +87,37 @@ export async function getEnsAddress<TChain extends Chain | undefined,>(
   }
 
   try {
+    const functionData = encodeFunctionData({
+      abi: addressResolverAbi,
+      functionName: 'addr',
+      ...(coinType != null
+        ? { args: [namehash(name), BigInt(coinType)] }
+        : { args: [namehash(name)] }),
+    })
+
     const res = await readContract(client, {
       address: universalResolverAddress,
       abi: universalResolverResolveAbi,
       functionName: 'resolve',
-      args: [
-        toHex(packetToBytes(name)),
-        encodeFunctionData({
-          abi: singleAddressResolverAbi,
-          functionName: 'addr',
-          args: [namehash(name)],
-        }),
-      ],
+      args: [toHex(packetToBytes(name)), functionData],
       blockNumber,
       blockTag,
     })
 
     if (res[0] === '0x') return null
 
-    const address = decodeFunctionResult({
-      abi: singleAddressResolverAbi,
-      functionName: 'addr',
-      data: res[0],
-    })
+    const address = trim(
+      decodeFunctionResult({
+        abi: addressResolverAbi,
+        args: coinType != null ? [namehash(name), BigInt(coinType)] : undefined,
+        functionName: 'addr',
+        data: res[0],
+      }),
+    )
 
-    return trim(address) === '0x00' ? null : address
+    if (address === '0x') return null
+    if (trim(address) === '0x00') return null
+    return address
   } catch (err) {
     if (isNullUniversalResolverError(err, 'resolve')) return null
     throw err

package/src/actions/index.ts

@@ -160,8 +160,12 @@ export {
   watchBlockNumber,
 } from './public/watchBlockNumber.js'
 export {
-  type OnLogsFn,
-  type OnLogsParameter,
+  type WatchEventOnLogsFn,
+  /** @deprecated - use `WatchEventOnLogsFn` instead. */
+  type WatchEventOnLogsFn as OnLogsFn,
+  type WatchEventOnLogsParameter,
+  /** @deprecated - use `WatchEventOnLogsParameter` instead. */
+  type WatchEventOnLogsParameter as OnLogsParameter,
   type WatchEventParameters,
   type WatchEventReturnType,
   watchEvent,

package/src/actions/public/createContractEventFilter.ts

@@ -9,6 +9,7 @@ import type {
   MaybeExtractEventArgsFromAbi,
 } from '../../types/contract.js'
 import type { Filter } from '../../types/filter.js'
+import type { Hex } from '../../types/misc.js'
 import {
   type EncodeEventTopicsParameters,
   encodeEventTopics,
@@ -23,17 +24,19 @@ export type CreateContractEventFilterParameters<
     | MaybeExtractEventArgsFromAbi<TAbi, TEventName>
     | undefined = undefined,
   TStrict extends boolean | undefined = undefined,
+  TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
+  TToBlock extends BlockNumber | BlockTag | undefined = undefined,
 > = {
   address?: Address | Address[]
   abi: Narrow<TAbi>
   eventName?: InferEventName<TAbi, TEventName>
-  fromBlock?: BlockNumber | BlockTag
+  fromBlock?: TFromBlock | BlockNumber | BlockTag
   /**
    * Whether or not the logs must match the indexed/non-indexed arguments in the event ABI item.
    * @default false
    */
   strict?: TStrict
-  toBlock?: BlockNumber | BlockTag
+  toBlock?: TToBlock | BlockNumber | BlockTag
 } & (undefined extends TEventName
   ? {
       args?: never
@@ -56,7 +59,9 @@ export type CreateContractEventFilterReturnType<
     | MaybeExtractEventArgsFromAbi<TAbi, TEventName>
     | undefined = undefined,
   TStrict extends boolean | undefined = undefined,
-> = Filter<'event', TAbi, TEventName, TArgs, TStrict>
+  TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
+  TToBlock extends BlockNumber | BlockTag | undefined = undefined,
+> = Filter<'event', TAbi, TEventName, TArgs, TStrict, TFromBlock, TToBlock>
 
 /**
  * Creates a Filter to retrieve event logs that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges.html) or [`getFilterLogs`](https://viem.sh/docs/actions/public/getFilterLogs.html).
@@ -86,6 +91,8 @@ export async function createContractEventFilter<
   TEventName extends string | undefined,
   TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
   TStrict extends boolean | undefined = undefined,
+  TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
+  TToBlock extends BlockNumber | BlockTag | undefined = undefined,
 >(
   client: Client<Transport, TChain>,
   {
@@ -96,9 +103,23 @@ export async function createContractEventFilter<
     fromBlock,
     strict,
     toBlock,
-  }: CreateContractEventFilterParameters<TAbi, TEventName, TArgs, TStrict>,
+  }: CreateContractEventFilterParameters<
+    TAbi,
+    TEventName,
+    TArgs,
+    TStrict,
+    TFromBlock,
+    TToBlock
+  >,
 ): Promise<
-  CreateContractEventFilterReturnType<TAbi, TEventName, TArgs, TStrict>
+  CreateContractEventFilterReturnType<
+    TAbi,
+    TEventName,
+    TArgs,
+    TStrict,
+    TFromBlock,
+    TToBlock
+  >
 > {
   const getRequest = createFilterRequestScope(client, {
     method: 'eth_newFilter',
@@ -111,7 +132,7 @@ export async function createContractEventFilter<
         eventName,
       } as unknown as EncodeEventTopicsParameters)
     : undefined
-  const id = await client.request({
+  const id: Hex = await client.request({
     method: 'eth_newFilter',
     params: [
       {
@@ -136,6 +157,8 @@ export async function createContractEventFilter<
     TAbi,
     TEventName,
     TArgs,
-    TStrict
+    TStrict,
+    TFromBlock,
+    TToBlock
   >
 }

package/src/actions/public/createEventFilter.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiEvent, Address, Narrow } from 'abitype'
+import type { AbiEvent, Address, Narrow } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
@@ -9,7 +9,7 @@ import type {
   MaybeExtractEventArgsFromAbi,
 } from '../../types/contract.js'
 import type { Filter } from '../../types/filter.js'
-import type { LogTopic } from '../../types/misc.js'
+import type { Hex, LogTopic } from '../../types/misc.js'
 import type { Prettify } from '../../types/utils.js'
 import {
   type EncodeEventTopicsParameters,
@@ -20,18 +20,23 @@ import { createFilterRequestScope } from '../../utils/filters/createFilterReques
 
 export type CreateEventFilterParameters<
   TAbiEvent extends AbiEvent | undefined = undefined,
+  TAbiEvents extends
+    | readonly AbiEvent[]
+    | readonly unknown[]
+    | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined,
   TStrict extends boolean | undefined = undefined,
-  _Abi extends Abi | readonly unknown[] = [TAbiEvent],
+  TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
+  TToBlock extends BlockNumber | BlockTag | undefined = undefined,
   _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
   _Args extends
-    | MaybeExtractEventArgsFromAbi<_Abi, _EventName>
+    | MaybeExtractEventArgsFromAbi<TAbiEvents, _EventName>
     | undefined = undefined,
 > = {
   address?: Address | Address[]
-  fromBlock?: BlockNumber | BlockTag
-  toBlock?: BlockNumber | BlockTag
+  fromBlock?: TFromBlock | BlockNumber | BlockTag
+  toBlock?: TToBlock | BlockNumber | BlockTag
 } & (MaybeExtractEventArgsFromAbi<
-  _Abi,
+  TAbiEvents,
   _EventName
 > extends infer TEventFilterArgs
   ?
@@ -40,6 +45,7 @@ export type CreateEventFilterParameters<
             | TEventFilterArgs
             | (_Args extends TEventFilterArgs ? _Args : never)
           event: Narrow<TAbiEvent>
+          events?: never
           /**
            * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
            * @default false
@@ -49,6 +55,7 @@ export type CreateEventFilterParameters<
       | {
           args?: never
           event?: Narrow<TAbiEvent>
+          events?: never
           /**
            * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
            * @default false
@@ -58,23 +65,42 @@ export type CreateEventFilterParameters<
       | {
           args?: never
           event?: never
+          events: Narrow<TAbiEvents>
+          /**
+           * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
+           * @default false
+           */
+          strict?: TStrict
+        }
+      | {
+          args?: never
+          event?: never
+          events?: never
           strict?: never
         }
   : {
       args?: never
       event?: never
+      events?: never
       strict?: never
     })
 
 export type CreateEventFilterReturnType<
   TAbiEvent extends AbiEvent | undefined = undefined,
+  TAbiEvents extends
+    | readonly AbiEvent[]
+    | readonly unknown[]
+    | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined,
   TStrict extends boolean | undefined = undefined,
-  _Abi extends Abi | readonly unknown[] = [TAbiEvent],
+  TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
+  TToBlock extends BlockNumber | BlockTag | undefined = undefined,
   _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
   _Args extends
-    | MaybeExtractEventArgsFromAbi<_Abi, _EventName>
+    | MaybeExtractEventArgsFromAbi<TAbiEvents, _EventName>
     | undefined = undefined,
-> = Prettify<Filter<'event', _Abi, _EventName, _Args, TStrict>>
+> = Prettify<
+  Filter<'event', TAbiEvents, _EventName, _Args, TStrict, TFromBlock, TToBlock>
+>
 
 /**
  * Creates a [`Filter`](https://viem.sh/docs/glossary/types.html#filter) to listen for new events that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges.html).
@@ -101,12 +127,17 @@ export type CreateEventFilterReturnType<
  */
 export async function createEventFilter<
   TChain extends Chain | undefined,
-  TAbiEvent extends AbiEvent | undefined,
+  TAbiEvent extends AbiEvent | undefined = undefined,
+  TAbiEvents extends
+    | readonly AbiEvent[]
+    | readonly unknown[]
+    | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined,
   TStrict extends boolean | undefined = undefined,
-  _Abi extends Abi | readonly unknown[] = [TAbiEvent],
+  TFromBlock extends BlockNumber<bigint> | BlockTag | undefined = undefined,
+  TToBlock extends BlockNumber<bigint> | BlockTag | undefined = undefined,
   _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
   _Args extends
-    | MaybeExtractEventArgsFromAbi<_Abi, _EventName>
+    | MaybeExtractEventArgsFromAbi<TAbiEvents, _EventName>
     | undefined = undefined,
 >(
   client: Client<Transport, TChain>,
@@ -114,32 +145,51 @@ export async function createEventFilter<
     address,
     args,
     event,
+    events: events_,
     fromBlock,
     strict,
     toBlock,
   }: CreateEventFilterParameters<
     TAbiEvent,
+    TAbiEvents,
     TStrict,
-    _Abi,
+    TFromBlock,
+    TToBlock,
     _EventName,
     _Args
   > = {} as any,
 ): Promise<
-  CreateEventFilterReturnType<TAbiEvent, TStrict, _Abi, _EventName, _Args>
+  CreateEventFilterReturnType<
+    TAbiEvent,
+    TAbiEvents,
+    TStrict,
+    TFromBlock,
+    TToBlock,
+    _EventName,
+    _Args
+  >
 > {
+  const events = events_ ?? (event ? [event] : undefined)
+
   const getRequest = createFilterRequestScope(client, {
     method: 'eth_newFilter',
   })
 
   let topics: LogTopic[] = []
-  if (event)
-    topics = encodeEventTopics({
-      abi: [event],
-      eventName: (event as AbiEvent).name,
-      args,
-    } as EncodeEventTopicsParameters)
+  if (events) {
+    topics = [
+      (events as AbiEvent[]).flatMap((event) =>
+        encodeEventTopics({
+          abi: [event],
+          eventName: (event as AbiEvent).name,
+          args,
+        } as EncodeEventTopicsParameters),
+      ),
+    ]
+    if (event) topics = topics[0] as LogTopic[]
+  }
 
-  const id = await client.request({
+  const id: Hex = await client.request({
     method: 'eth_newFilter',
     params: [
       {
@@ -153,17 +203,21 @@ export async function createEventFilter<
   })
 
   return {
-    abi: event ? [event] : undefined,
+    abi: events,
     args,
     eventName: event ? (event as AbiEvent).name : undefined,
+    fromBlock,
     id,
     request: getRequest(id),
     strict,
+    toBlock,
     type: 'event',
   } as unknown as CreateEventFilterReturnType<
     TAbiEvent,
+    TAbiEvents,
     TStrict,
-    _Abi,
+    TFromBlock,
+    TToBlock,
     _EventName,
     _Args
   >