viem 1.2.9 → 1.2.11

package/dist/types/types/typedData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typedData.d.ts","sourceRoot":"","sources":["../../../src/types/typedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,SAAS,EACT,eAAe,EACf,yBAAyB,EAC1B,MAAM,SAAS,CAAA;AAEhB,MAAM,MAAM,mBAAmB,CAC7B,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACrE,YAAY,SAAS,MAAM,GAAG,MAAM,IAClC;IACF,WAAW,EAAE,uBAAuB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;CAC/D,GAAG,mBAAmB,CAAC,UAAU,EAAE,YAAY,CAAC,GAC/C,iBAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,GAC3C,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;AAE9C,MAAM,MAAM,kBAAkB,CAC5B,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACrE,YAAY,SAAS,MAAM,GAAG,MAAM,EACpC,OAAO,GAAG,UAAU,SAAS,SAAS,GAClC,yBAAyB,CAAC,UAAU,CAAC,GACrC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,OAAO,GAAG,OAAO,SAAS;IAAE,YAAY,EAAE,MAAM,MAAM,CAAA;CAAE,GACpD,MAAM,GACN,eAAe,IACjB,YAAY,SAAS,cAAc,GACnC;IACE,MAAM,EAAE,OAAO,CAAA;CAChB,GACD;IACE,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAEL,MAAM,MAAM,mBAAmB,CAC7B,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACrE,YAAY,SAAS,MAAM,GAAG,MAAM,EACpC,OAAO,GAAG,UAAU,SAAS,SAAS,GAClC,yBAAyB,CAAC,UAAU,CAAC,GACrC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,QAAQ,GAAG,OAAO,CAAC,YAAY,SAAS,MAAM,OAAO,GACjD,YAAY,GACZ,MAAM,OAAO,CAAC,IAChB,YAAY,SAAS,cAAc,GACnC,EAAE,GACF;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,SAAS,QAAQ,GACvC;IACE;;;;OAIG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;CACpC,GACD;IACE,mBAAmB;IACnB,OAAO,EAAE,QAAQ,CAAA;CAClB,CAAA;AAEL,MAAM,MAAM,uBAAuB,CACjC,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACrE,YAAY,SAAS,MAAM,GAAG,MAAM,IAClC,UAAU,SAAS,SAAS,GAC5B,MAAM,UAAU,SAAS,MAAM,gBAAgB,GAEzC,gBAAgB,GAChB,CAAC,YAAY,SAAS,gBAAgB,GAAG,YAAY,GAAG,KAAK,CAAC,GAC9D,CAAC,SAAS,SAAS,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC,GAC/C,cAAc,GAClB,KAAK,GACP,YAAY,CAAA;AAEhB,MAAM,MAAM,iBAAiB,CAC3B,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACrE,YAAY,SAAS,MAAM,GAAG,MAAM,IAClC,YAAY,SAAS,cAAc,GACnC;IACE,KAAK,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;CAC3B,GACD;IACE,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;CAC1B,CAAA"}
+{"version":3,"file":"typedData.d.ts","sourceRoot":"","sources":["../../../src/types/typedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,SAAS,EACT,eAAe,EACf,yBAAyB,EAC1B,MAAM,SAAS,CAAA;AAEhB,MAAM,MAAM,mBAAmB,CAC7B,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACrE,YAAY,SAAS,MAAM,GAAG,MAAM,IAClC;IACF,WAAW,EAAE,uBAAuB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;CAC/D,GAAG,mBAAmB,CAAC,UAAU,EAAE,YAAY,CAAC,GAC/C,iBAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,GAC3C,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;AAE9C,MAAM,MAAM,kBAAkB,CAC5B,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACvE,YAAY,SAAS,MAAM,GAAG,MAAM,EACpC,OAAO,GAAG,UAAU,SAAS,SAAS,GAClC,yBAAyB,CAAC,UAAU,CAAC,GACrC;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC5B,OAAO,GAAG,OAAO,SAAS;IAAE,YAAY,EAAE,MAAM,MAAM,CAAA;CAAE,GACpD,MAAM,GACN,eAAe,IACjB,YAAY,SAAS,cAAc,GACnC;IACE,MAAM,EAAE,OAAO,CAAA;CAChB,GACD;IACE,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAEL,MAAM,MAAM,mBAAmB,CAC7B,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACvE,YAAY,SAAS,MAAM,GAAG,MAAM,EACpC,OAAO,GAAG,UAAU,SAAS,SAAS,GAClC,yBAAyB,CAAC,UAAU,CAAC,GACrC;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC5B,QAAQ,GAAG,OAAO,CAAC,YAAY,SAAS,MAAM,OAAO,GACjD,YAAY,GACZ,MAAM,OAAO,CAAC,IAChB,YAAY,SAAS,cAAc,GACnC,EAAE,GACF;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,SAAS,QAAQ,GACzC;IACE;;;;OAIG;IACH,OAAO,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;CACtC,GACD;IACE,mBAAmB;IACnB,OAAO,EAAE,QAAQ,CAAA;CAClB,CAAA;AAEL,MAAM,MAAM,uBAAuB,CACjC,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACrE,YAAY,SAAS,MAAM,GAAG,MAAM,IAClC,UAAU,SAAS,SAAS,GAC5B,MAAM,UAAU,SAAS,MAAM,gBAAgB,GAEzC,gBAAgB,GAChB,CAAC,YAAY,SAAS,gBAAgB,GAAG,YAAY,GAAG,KAAK,CAAC,GAC9D,CAAC,SAAS,SAAS,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC,GAC/C,cAAc,GAClB,KAAK,GACP,YAAY,CAAA;AAEhB,MAAM,MAAM,iBAAiB,CAC3B,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,EACrE,YAAY,SAAS,MAAM,GAAG,MAAM,IAClC,YAAY,SAAS,cAAc,GACnC;IACE,KAAK,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;CAC3B,GACD;IACE,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;CAC1B,CAAA"}

package/dist/types/utils/ens/avatar/utils.d.ts

@@ -29,7 +29,7 @@ type ParsedNft = {
     contractAddress: Address;
     tokenID: string;
 };
-export declare function parseNftUri(uri: string): ParsedNft;
+export declare function parseNftUri(uri_: string): ParsedNft;
 export declare function getNftTokenUri<TChain extends Chain | undefined>(client: Client<Transport, TChain>, { nft }: {
     nft: ParsedNft;
 }): Promise<string>;

package/dist/types/utils/ens/avatar/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/utils/ens/avatar/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAGtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAA;AAO/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,KAAK,OAAO,GAAG;IACb,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AASD,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,oBA4B3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,cAAc,EAAE,MAAM,UAI5E;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,GAAG,EACH,WAAW,GACZ,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;CAC3C,GAAG,OAAO,CAuDV;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,OAUrC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,WAAW,EACX,GAAG,GACJ,EAAE;IACD,WAAW,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IAC1C,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,MAAM,CAAC,CAWlB;AAED,wBAAsB,cAAc,CAAC,EACnC,WAAW,EACX,GAAG,GACJ,EAAE;IACD,WAAW,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IAC1C,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,MAAM,CAAC,CASlB;AAED,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,OAAO,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CA+BlD;AAED,wBAAsB,cAAc,CAAC,MAAM,SAAS,KAAK,GAAG,SAAS,EACnE,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EACjC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,SAAS,CAAA;CAAE,mBAmC5B"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/utils/ens/avatar/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAGtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAA;AAO/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,KAAK,OAAO,GAAG;IACb,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AASD,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,oBA6B3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,cAAc,EAAE,MAAM,UAI5E;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,GAAG,EACH,WAAW,GACZ,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;CAC3C,GAAG,OAAO,CAuDV;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,OAUrC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,WAAW,EACX,GAAG,GACJ,EAAE;IACD,WAAW,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IAC1C,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,MAAM,CAAC,CAWlB;AAED,wBAAsB,cAAc,CAAC,EACnC,WAAW,EACX,GAAG,GACJ,EAAE;IACD,WAAW,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IAC1C,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,MAAM,CAAC,CASlB;AAED,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,OAAO,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAgCnD;AAED,wBAAsB,cAAc,CAAC,MAAM,SAAS,KAAK,GAAG,SAAS,EACnE,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EACjC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,SAAS,CAAA;CAAE,mBAmC5B"}

package/dist/types/utils/formatters/extract.d.ts

@@ -4,5 +4,5 @@ import type { Formatter } from '../../types/formatter.js';
  */
 export declare function extract(value: Record<string, unknown>, { format }: {
     format?: Formatter['format'];
-}): {};
+}): Record<string, unknown>;
 //# sourceMappingURL=extract.d.ts.map

package/dist/types/utils/formatters/extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../../../src/utils/formatters/extract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEzD;;GAEG;AACH,wBAAgB,OAAO,CACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;CAAE,MAU7C"}
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../../../src/utils/formatters/extract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEzD;;GAEG;AACH,wBAAgB,OAAO,CACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;CAAE,2BAW7C"}

package/package.json

@@ -20,7 +20,7 @@
       "optional": true
     }
   },
-  "version": "1.2.9",
+  "version": "1.2.11",
   "files": [
     "dist",
     "!dist/**/*.tsbuildinfo",

package/src/accounts/utils/signTransaction.ts

@@ -17,7 +17,9 @@ export type SignTransactionArgs<
 > = {
   privateKey: Hex
   transaction: TTransactionSerializable
-  serializer?: SerializeTransactionFn<TTransactionSerializable>
+  serializer?: SerializeTransactionFn<
+    TransactionSerializable & TTransactionSerializable
+  >
 }
 export type SignTransactionReturnType<
   TTransactionSerializable extends TransactionSerializable = TransactionSerializable,
@@ -36,5 +38,8 @@ export async function signTransaction<
     hash: keccak256(serializer(transaction)),
     privateKey,
   })
-  return serializer(transaction, signature)
+  return serializer(
+    transaction,
+    signature,
+  ) as SignTransactionReturnType<TTransactionSerializable>
 }

package/src/chains/formatters/celo.ts

@@ -14,7 +14,7 @@ import {
 import { defineTransactionReceipt } from '../../utils/formatters/transactionReceipt.js'
 import { defineTransactionRequest } from '../../utils/formatters/transactionRequest.js'
 
-export type CeloOverrides = {
+export type CeloFormatOverrides = {
   RpcBlock: {
     randomness: {
       committed: Hex
@@ -49,10 +49,11 @@ export type CeloOverrides = {
     gatewayFeeRecipient: Address | null
   }
 }
-export const celoFormatters = {
+
+export const formattersCelo = {
   block: /*#__PURE__*/ defineBlock({
     exclude: ['difficulty', 'gasLimit', 'mixHash', 'nonce', 'uncles'],
-    format(args: CeloOverrides['RpcBlock']) {
+    format(args: CeloFormatOverrides['RpcBlock']) {
       const transactions = args.transactions?.map((transaction) => {
         if (typeof transaction === 'string') return transaction
         return {
@@ -63,7 +64,7 @@ export const celoFormatters = {
             : null,
           gatewayFeeRecipient: transaction.gatewayFeeRecipient,
         }
-      }) as Hash[] | (Transaction & CeloOverrides['Transaction'])[]
+      }) as Hash[] | (Transaction & CeloFormatOverrides['Transaction'])[]
       return {
         randomness: args.randomness,
         transactions,
@@ -71,7 +72,7 @@ export const celoFormatters = {
     },
   }),
   transaction: /*#__PURE__*/ defineTransaction({
-    format(args: CeloOverrides['RpcTransaction']) {
+    format(args: CeloFormatOverrides['RpcTransaction']) {
       return {
         feeCurrency: args.feeCurrency,
         gatewayFee: args.gatewayFee ? hexToBigInt(args.gatewayFee) : null,
@@ -80,7 +81,7 @@ export const celoFormatters = {
     },
   }),
   transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
-    format(args: CeloOverrides['RpcTransactionReceipt']) {
+    format(args: CeloFormatOverrides['RpcTransactionReceipt']) {
       return {
         feeCurrency: args.feeCurrency,
         gatewayFee: args.gatewayFee ? hexToBigInt(args.gatewayFee) : null,
@@ -89,7 +90,7 @@ export const celoFormatters = {
     },
   }),
   transactionRequest: /*#__PURE__*/ defineTransactionRequest({
-    format(args: CeloOverrides['TransactionRequest']) {
+    format(args: CeloFormatOverrides['TransactionRequest']) {
       return {
         feeCurrency: args.feeCurrency,
         gatewayFee:

package/src/chains/formatters/optimism.ts

@@ -23,6 +23,12 @@ type RpcTransaction = RpcTransaction_ & {
   sourceHash?: undefined
 }
 
+type Transaction = Transaction_ & {
+  isSystemTx?: undefined
+  mint?: undefined
+  sourceHash?: undefined
+}
+
 export type RpcDepositTransaction = TransactionBase<Quantity, Index> &
   FeeValuesEIP1559<Quantity> & {
     isSystemTx?: boolean
@@ -31,12 +37,6 @@ export type RpcDepositTransaction = TransactionBase<Quantity, Index> &
     type: '0x7e'
   }
 
-type Transaction = Transaction_ & {
-  isSystemTx?: undefined
-  mint?: undefined
-  sourceHash?: undefined
-}
-
 export type DepositTransaction = TransactionBase &
   FeeValuesEIP1559 & {
     isSystemTx?: boolean
@@ -45,22 +45,22 @@ export type DepositTransaction = TransactionBase &
     type: 'deposit'
   }
 
-type OptimismOverrides = {
+export type OptimismFormatOverrides = {
   RpcBlock: {
-    transactions: Hash[] | OptimismOverrides['RpcTransaction'][]
+    transactions: Hash[] | OptimismFormatOverrides['RpcTransaction'][]
   }
   RpcTransaction: RpcTransaction | RpcDepositTransaction
   Transaction: Transaction | DepositTransaction
 }
 
-export const optimismFormatters = {
+export const formattersOptimism = {
   block: /*#__PURE__*/ defineBlock({
-    format(args: OptimismOverrides['RpcBlock']) {
+    format(args: OptimismFormatOverrides['RpcBlock']) {
       const transactions = args.transactions?.map((transaction) => {
         if (typeof transaction === 'string') return transaction
         const formatted = formatTransaction(
           transaction as RpcTransaction,
-        ) as OptimismOverrides['Transaction']
+        ) as OptimismFormatOverrides['Transaction']
         if (formatted.typeHex === '0x7e') {
           formatted.isSystemTx = transaction.isSystemTx
           formatted.mint = transaction.mint
@@ -70,15 +70,15 @@ export const optimismFormatters = {
           formatted.type = 'deposit'
         }
         return formatted
-      }) as Hash[] | OptimismOverrides['Transaction'][]
+      }) as Hash[] | OptimismFormatOverrides['Transaction'][]
       return {
         transactions,
       }
     },
   }),
   transaction: /*#__PURE__*/ defineTransaction({
-    format(args: OptimismOverrides['RpcTransaction']) {
-      const transaction = {} as OptimismOverrides['Transaction']
+    format(args: OptimismFormatOverrides['RpcTransaction']) {
+      const transaction = {} as OptimismFormatOverrides['Transaction']
       if (args.type === '0x7e') {
         transaction.isSystemTx = args.isSystemTx
         transaction.mint = args.mint ? hexToBigInt(args.mint) : undefined

package/src/chains/index.ts

@@ -1,9 +1,9 @@
 import * as chains from '@wagmi/chains'
 
 import { defineChain } from '../utils/chain.js'
-import { celoFormatters } from './formatters/celo.js'
-import { optimismFormatters } from './formatters/optimism.js'
-import { celoSerializers } from './serializers/celo.js'
+import { formattersCelo } from './formatters/celo.js'
+import { formattersOptimism } from './formatters/optimism.js'
+import { serializersCelo } from './serializers/celo.js'
 
 export const arbitrum = /*#__PURE__*/ defineChain(chains.arbitrum)
 export const arbitrumGoerli = /*#__PURE__*/ defineChain(chains.arbitrumGoerli)
@@ -19,16 +19,16 @@ export const bsc = /*#__PURE__*/ defineChain(chains.bsc)
 export const bscTestnet = /*#__PURE__*/ defineChain(chains.bscTestnet)
 export const canto = /*#__PURE__*/ defineChain(chains.canto)
 export const celo = /*#__PURE__*/ defineChain(chains.celo, {
-  formatters: celoFormatters,
-  serializers: celoSerializers,
+  formatters: formattersCelo,
+  serializers: serializersCelo,
 })
 export const celoAlfajores = /*#__PURE__*/ defineChain(chains.celoAlfajores, {
-  formatters: celoFormatters,
-  serializers: celoSerializers,
+  formatters: formattersCelo,
+  serializers: serializersCelo,
 })
 export const celoCannoli = /*#__PURE__*/ defineChain(chains.celoCannoli, {
-  formatters: celoFormatters,
-  serializers: celoSerializers,
+  formatters: formattersCelo,
+  serializers: serializersCelo,
 })
 export const cronos = /*#__PURE__*/ defineChain(chains.cronos)
 export const crossbell = /*#__PURE__*/ defineChain(chains.crossbell)
@@ -69,10 +69,10 @@ export const moonriver = /*#__PURE__*/ defineChain(chains.moonriver)
 export const nexi = /*#__PURE__*/ defineChain(chains.nexi)
 export const okc = /*#__PURE__*/ defineChain(chains.okc)
 export const optimism = /*#__PURE__*/ defineChain(chains.optimism, {
-  formatters: optimismFormatters,
+  formatters: formattersOptimism,
 })
 export const optimismGoerli = /*#__PURE__*/ defineChain(chains.optimismGoerli, {
-  formatters: optimismFormatters,
+  formatters: formattersOptimism,
 })
 export const polygon = /*#__PURE__*/ defineChain(chains.polygon)
 export const polygonMumbai = /*#__PURE__*/ defineChain(chains.polygonMumbai)

package/src/chains/serializers/celo.ts

@@ -6,6 +6,7 @@ import { InvalidChainIdError } from '../../errors/chain.js'
 import { FeeCapTooHighError, TipAboveFeeCapError } from '../../errors/node.js'
 import type { FeeValuesEIP1559 } from '../../types/fee.js'
 import type { Signature } from '../../types/misc.js'
+import type { Serializers } from '../../types/serializer.js'
 import type {
   AccessList,
   TransactionSerializable,
@@ -19,30 +20,26 @@ import { toRlp } from '../../utils/encoding/toRlp.js'
 import { serializeAccessList } from '../../utils/transaction/serializeAccessList.js'
 import {
   type SerializeTransactionFn,
-  serializeTransaction as serializeTransaction_,
+  serializeTransaction,
 } from '../../utils/transaction/serializeTransaction.js'
 
-export const serializeTransaction: SerializeTransactionFn<
+export const serializeTransactionCelo: SerializeTransactionFn<
   TransactionSerializableCelo
 > = (tx, signature) => {
-  // Handle Celo's CIP-42 Transactions
-  if (couldBeCIP42(tx))
+  // Handle CIP-42 transactions
+  if (isCIP42(tx))
     return serializeTransactionCIP42(
       tx as TransactionSerializableCIP42,
       signature,
     )
 
   // Handle other transaction types
-  return serializeTransaction_(tx as TransactionSerializable, signature)
+  return serializeTransaction(tx as TransactionSerializable, signature)
 }
 
-export type CeloSerializers = {
-  transaction: typeof serializeTransaction
-}
-
-export const celoSerializers: CeloSerializers = {
-  transaction: serializeTransaction,
-}
+export const serializersCelo = {
+  transaction: serializeTransactionCelo,
+} as const satisfies Serializers
 
 //////////////////////////////////////////////////////////////////////////////
 // Types
@@ -126,14 +123,13 @@ function serializeTransactionCIP42(
 // Utilities
 
 // process as CIP42 if any of these fields are present. realistically gatewayfee is not used but is part of spec
-function couldBeCIP42(tx: TransactionSerializableCelo) {
-  const maybeCIP42 = tx as TransactionSerializableCIP42
+function isCIP42(transaction: TransactionSerializableCelo) {
   if (
-    'maxFeePerGas' in maybeCIP42 &&
-    'maxPriorityFeePerGas' in maybeCIP42 &&
-    ('feeCurrency' in maybeCIP42 ||
-      'gatewayFee' in maybeCIP42 ||
-      'gatewayFeeRecipient' in maybeCIP42)
+    'maxFeePerGas' in transaction &&
+    'maxPriorityFeePerGas' in transaction &&
+    ('feeCurrency' in transaction ||
+      'gatewayFee' in transaction ||
+      'gatewayFeeRecipient' in transaction)
   )
     return true
   return false

package/src/clients/createClient.ts

@@ -1,7 +1,6 @@
-import type { Address, Narrow } from 'abitype'
+import type { Address } from 'abitype'
 
 import type { Account, JsonRpcAccount } from '../accounts/types.js'
-import type { ParseAccount } from '../types/account.js'
 import type { Chain } from '../types/chain.js'
 import type {
   EIP1193RequestFn,
@@ -13,60 +12,82 @@ import { parseAccount } from '../utils/accounts.js'
 import { uid } from '../utils/uid.js'
 import type { Transport } from './transports/createTransport.js'
 
-export type MulticallBatchOptions = {
-  /** The maximum size (in bytes) for each calldata chunk. @default 1_024 */
-  batchSize?: number
-  /** The maximum number of milliseconds to wait before sending a batch. @default 0 */
-  wait?: number
-}
-
 export type ClientConfig<
-  TTransport extends Transport = Transport,
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccountOrAddress extends Account | Address | undefined =
+  transport extends Transport = Transport,
+  chain extends Chain | undefined = Chain | undefined,
+  accountOrAddress extends Account | Address | undefined =
     | Account
     | Address
     | undefined,
 > = {
   /** The Account to use for the Client. This will be used for Actions that require an account as an argument. */
-  account?: TAccountOrAddress
+  account?: accountOrAddress extends Account | Address
+    ? accountOrAddress | Account | Address // `accountOrAddress` defined, add for inference
+    : Account | Address | undefined // `accountOrAddress` undefined, show possible types for autocomplete
   /** Flags for batch settings. */
-  batch?: {
-    /** Toggle to enable `eth_call` multicall aggregation. */
-    multicall?: boolean | MulticallBatchOptions
-  }
+  batch?:
+    | {
+        /** Toggle to enable `eth_call` multicall aggregation. */
+        multicall?: boolean | Prettify<MulticallBatchOptions> | undefined
+      }
+    | undefined
   /** Chain for the client. */
-  chain?: TChain
+  chain?: chain extends Chain
+    ? chain // `chain` defined, add for inference
+    : Chain | undefined // `chain` undefined, show possible types for autocomplete
   /** A key for the client. */
-  key?: string
+  key?: string | undefined
   /** A name for the client. */
-  name?: string
+  name?: string | undefined
   /**
    * Frequency (in ms) for polling enabled actions & events.
    * @default 4_000
    */
-  pollingInterval?: number
+  pollingInterval?: number | undefined
   /** The RPC transport */
-  transport: TTransport
+  transport: transport
   /** The type of client. */
-  type?: string
+  type?: string | undefined
 }
 
+// TODO: Move `transport` to slot index 2 since `chain` and `account` used more frequently.
+// Otherwise, we end up with a lot of `Client<Transport, chain, account>` in actions.
+export type Client<
+  transport extends Transport = Transport,
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
+  extended extends Extended | undefined = Extended | undefined,
+> = Prettify<
+  Prettify<Client_Base<transport, chain, account, rpcSchema>> & {
+    extend: <const client extends Extended>(
+      fn: (
+        client: Client<transport, chain, account, rpcSchema, extended>,
+      ) => client,
+    ) => Prettify<
+      Client<
+        transport,
+        chain,
+        account,
+        rpcSchema,
+        Prettify<client> & (extended extends Extended ? extended : unknown)
+      >
+    >
+  } & (extended extends Extended ? extended : unknown)
+>
+
 type Client_Base<
-  TTransport extends Transport = Transport,
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TRpcSchema extends RpcSchema | undefined = undefined,
+  transport extends Transport = Transport,
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 > = {
   /** The Account of the Client. */
-  account: TAccount
+  account: account
   /** Flags for batch settings. */
-  batch?: {
-    /** Toggle to enable `eth_call` multicall aggregation. */
-    multicall?: boolean | MulticallBatchOptions
-  }
+  batch?: ClientConfig['batch']
   /** Chain for the client. */
-  chain: TChain
+  chain: chain
   /** A key for the client. */
   key: string
   /** A name for the client. */
@@ -74,86 +95,89 @@ type Client_Base<
   /** Frequency (in ms) for polling enabled actions & events. Defaults to 4_000 milliseconds. */
   pollingInterval: number
   /** Request function wrapped with friendly error handling */
-  request: TRpcSchema extends undefined
-    ? EIP1193RequestFn<EIP1474Methods>
-    : EIP1193RequestFn<TRpcSchema>
+  request: EIP1193RequestFn<
+    rpcSchema extends undefined ? EIP1474Methods : rpcSchema
+  >
   /** The RPC transport */
-  transport: ReturnType<TTransport>['config'] & ReturnType<TTransport>['value']
+  transport: ReturnType<transport>['config'] & ReturnType<transport>['value']
   /** The type of client. */
   type: string
   /** A unique ID for the client. */
   uid: string
 }
 
-type Extended = { [K in keyof Client_Base]?: undefined } & {
-  [key: string]: unknown
-}
+type Extended = Prettify<
+  // disallow redefining base properties
+  { [K in keyof Client_Base]?: undefined } & {
+    [key: string]: unknown
+  }
+>
 
-export type Client<
-  TTransport extends Transport = Transport,
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TRpcSchema extends RpcSchema | undefined = undefined,
-  TExtended extends Extended | undefined = Extended | undefined,
-> = Client_Base<TTransport, TChain, TAccount, TRpcSchema> & {
-  extend: <TNextExtended extends Extended = Extended>(
-    fn: (
-      client: Client<TTransport, TChain, TAccount, TRpcSchema, TExtended>,
-    ) => Narrow<TNextExtended>,
-  ) => Client<
-    TTransport,
-    TChain,
-    TAccount,
-    TRpcSchema,
-    (TExtended extends Extended ? TExtended : {}) & TNextExtended
-  >
-} & (TExtended extends Extended ? TExtended : {})
+export type MulticallBatchOptions = {
+  /** The maximum size (in bytes) for each calldata chunk. @default 1_024 */
+  batchSize?: number | undefined
+  /** The maximum number of milliseconds to wait before sending a batch. @default 0 */
+  wait?: number | undefined
+}
 
 /**
- * @description Creates a base client with the given transport.
+ * Creates a base client with the given transport.
  */
 export function createClient<
-  TTransport extends Transport,
-  TChain extends Chain | undefined = undefined,
-  TAccountOrAddress extends Account | Address | undefined = undefined,
->({
-  account,
-  batch,
-  chain,
-  key = 'base',
-  name = 'Base Client',
-  pollingInterval = 4_000,
+  transport extends Transport,
+  chain extends Chain | undefined = undefined,
+  accountOrAddress extends Account | Address | undefined = undefined,
+>(
+  parameters: ClientConfig<transport, chain, accountOrAddress>,
+): Client<
   transport,
-  type = 'base',
-}: ClientConfig<TTransport, TChain, TAccountOrAddress>): Client<
-  TTransport,
-  TChain,
-  TAccountOrAddress extends Address
-    ? Prettify<JsonRpcAccount<TAccountOrAddress>>
-    : TAccountOrAddress
-> {
-  const { config, request, value } = transport({ chain, pollingInterval })
+  chain,
+  accountOrAddress extends Address
+    ? Prettify<JsonRpcAccount<accountOrAddress>>
+    : accountOrAddress
+>
+
+export function createClient(parameters: ClientConfig): Client {
+  const {
+    batch,
+    key = 'base',
+    name = 'Base Client',
+    pollingInterval = 4_000,
+    type = 'base',
+  } = parameters
+
+  const chain = parameters.chain
+  const account = parameters.account
+    ? parseAccount(parameters.account)
+    : undefined
+  const { config, request, value } = parameters.transport({
+    chain,
+    pollingInterval,
+  })
+  const transport = { ...config, ...value }
+
   const client = {
-    account: (account
-      ? parseAccount(account)
-      : undefined) as ParseAccount<TAccountOrAddress>,
+    account,
     batch,
-    chain: chain as TChain,
+    chain,
     key,
     name,
     pollingInterval,
     request,
-    transport: { ...config, ...value },
+    transport,
     type,
     uid: uid(),
   }
-  function extend(client_: typeof client) {
-    return (fn: (_: typeof client) => unknown) => {
-      const extended = fn(client_) as Extended
+
+  function extend(base: typeof client) {
+    type ExtendFn = (base: typeof client) => unknown
+    return (extendFn: ExtendFn) => {
+      const extended = extendFn(base) as Extended
       for (const key in client) delete extended[key]
-      const nextClient = { ...client_, ...extended }
-      return Object.assign(nextClient, { extend: extend(nextClient) })
+      const combined = { ...base, ...extended }
+      return Object.assign(combined, { extend: extend(combined) })
     }
   }
+
   return Object.assign(client, { extend: extend(client) as any })
 }