viem 1.9.5 → 1.10.0

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

@@ -1 +1 @@
-{"version":3,"file":"hashTypedData.d.ts","sourceRoot":"","sources":["../../../../src/utils/signature/hashTypedData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAgB,SAAS,EAAmB,MAAM,SAAS,CAAA;AAEvE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAYnE,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,mBAAmB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;AAEjD,MAAM,MAAM,uBAAuB,GAAG,GAAG,CAAA;AAEzC,wBAAgB,aAAa,CAC3B,KAAK,CAAC,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,EAC/D,YAAY,SAAS,MAAM,GAAG,MAAM,EACpC,EACA,MAAM,EAAE,OAAO,EACf,OAAO,EACP,WAAW,EACX,KAAK,EAAE,MAAM,GACd,EAAE,uBAAuB,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,uBAAuB,CAgD7E"}
+{"version":3,"file":"hashTypedData.d.ts","sourceRoot":"","sources":["../../../../src/utils/signature/hashTypedData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAgB,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAEvE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAOnE,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,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,mBAAmB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;AAEjD,MAAM,MAAM,uBAAuB,GAAG,GAAG,CAAA;AAEzC,wBAAgB,aAAa,CAC3B,KAAK,CAAC,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,EAC/D,YAAY,SAAS,MAAM,GAAG,MAAM,EACpC,EACA,MAAM,EAAE,OAAO,EACf,OAAO,EACP,WAAW,EACX,KAAK,EAAE,MAAM,GACd,EAAE,uBAAuB,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,uBAAuB,CAoC7E;AAED,wBAAgB,UAAU,CAAC,EACzB,MAAM,EACN,KAAK,GACN,EAAE;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAA;CAC7C,iBAMA"}

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

@@ -1,10 +1,10 @@
 import type { Address } from 'abitype';
-import type { ByteArray, Hex } from '../../types/misc.js';
+import type { ByteArray, Hex, SignableMessage } from '../../types/misc.js';
 export type VerifyMessageParameters = {
     /** The address that signed the original message. */
     address: Address;
     /** The message to be verified. */
-    message: string;
+    message: SignableMessage;
     /** The signature that was generated by signing the message with the address's private key. */
     signature: Hex | ByteArray;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"verifyMessage.d.ts","sourceRoot":"","sources":["../../../../src/utils/signature/verifyMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAMzD,MAAM,MAAM,uBAAuB,GAAG;IACpC,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAA;IAChB,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,8FAA8F;IAC9F,SAAS,EAAE,GAAG,GAAG,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAA;AAE7C;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAO,EACP,OAAO,EACP,SAAS,GACV,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAK5D"}
+{"version":3,"file":"verifyMessage.d.ts","sourceRoot":"","sources":["../../../../src/utils/signature/verifyMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAM1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAA;IAChB,kCAAkC;IAClC,OAAO,EAAE,eAAe,CAAA;IACxB,8FAA8F;IAC9F,SAAS,EAAE,GAAG,GAAG,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAA;AAE7C;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAO,EACP,OAAO,EACP,SAAS,GACV,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAK5D"}

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

@@ -1,6 +1,13 @@
-import type { TypedData } from 'abitype';
+import type { TypedData, TypedDataDomain, TypedDataParameter } from 'abitype';
+import type { Hex } from '../types/misc.js';
 import type { TypedDataDefinition } from '../types/typedData.js';
 export declare function validateTypedData<const TTypedData extends TypedData | {
     [key: string]: unknown;
 }, TPrimaryType extends string = string>({ domain, message, primaryType, types: types_, }: TypedDataDefinition<TTypedData, TPrimaryType>): void;
+export declare function getTypesForEIP712Domain({ domain, }: {
+    domain?: TypedDataDomain;
+}): TypedDataParameter[];
+export declare function domainSeparator({ domain }: {
+    domain: TypedDataDomain;
+}): Hex;
 //# sourceMappingURL=typedData.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"typedData.d.ts","sourceRoot":"","sources":["../../../src/utils/typedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAqC,MAAM,SAAS,CAAA;AAK3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAOhE,wBAAgB,iBAAiB,CAC/B,KAAK,CAAC,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,EAC/D,YAAY,SAAS,MAAM,GAAG,MAAM,EACpC,EACA,MAAM,EACN,OAAO,EACP,WAAW,EACX,KAAK,EAAE,MAAM,GACd,EAAE,mBAAmB,CAAC,UAAU,EAAE,YAAY,CAAC,QAoD/C"}
+{"version":3,"file":"typedData.d.ts","sourceRoot":"","sources":["../../../src/utils/typedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,kBAAkB,EAEnB,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAQhE,wBAAgB,iBAAiB,CAC/B,KAAK,CAAC,UAAU,SAAS,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,EAC/D,YAAY,SAAS,MAAM,GAAG,MAAM,EACpC,EACA,MAAM,EACN,OAAO,EACP,WAAW,EACX,KAAK,EAAE,MAAM,GACd,EAAE,mBAAmB,CAAC,UAAU,EAAE,YAAY,CAAC,QAoD/C;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,GACP,EAAE;IAAE,MAAM,CAAC,EAAE,eAAe,CAAA;CAAE,GAAG,kBAAkB,EAAE,CAcrD;AAED,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,GAAG,GAAG,CAO5E"}

package/package.json

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

package/src/actions/wallet/signTypedData.ts

@@ -11,7 +11,10 @@ import type { Hex } from '../../types/misc.js'
 import type { TypedDataDefinition } from '../../types/typedData.js'
 import { isHex } from '../../utils/data/isHex.js'
 import { stringify } from '../../utils/stringify.js'
-import { validateTypedData } from '../../utils/typedData.js'
+import {
+  getTypesForEIP712Domain,
+  validateTypedData,
+} from '../../utils/typedData.js'
 
 export type SignTypedDataParameters<
   TTypedData extends TypedData | { [key: string]: unknown } = TypedData,
@@ -142,19 +145,7 @@ export async function signTypedData<
   const account = parseAccount(account_)
 
   const types = {
-    EIP712Domain: [
-      typeof domain?.name === 'string' && { name: 'name', type: 'string' },
-      domain?.version && { name: 'version', type: 'string' },
-      typeof domain?.chainId === 'number' && {
-        name: 'chainId',
-        type: 'uint256',
-      },
-      domain?.verifyingContract && {
-        name: 'verifyingContract',
-        type: 'address',
-      },
-      domain?.salt && { name: 'salt', type: 'bytes32' },
-    ].filter(Boolean),
+    EIP712Domain: getTypesForEIP712Domain({ domain }),
     ...(types_ as TTypedData),
   }
 

package/src/chains/definitions/base.ts

@@ -1,5 +1,4 @@
 import { defineChain } from '../../utils/chain.js'
-import { feesOptimism } from '../optimism/fees.js'
 import { formattersOptimism } from '../optimism/formatters.js'
 
 export const base = /*#__PURE__*/ defineChain(
@@ -7,7 +6,7 @@ export const base = /*#__PURE__*/ defineChain(
     id: 8453,
     network: 'base',
     name: 'Base',
-    nativeCurrency: { name: 'Base', symbol: 'ETH', decimals: 18 },
+    nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
     rpcUrls: {
       default: {
         http: ['https://mainnet.base.org'],
@@ -38,7 +37,6 @@ export const base = /*#__PURE__*/ defineChain(
     },
   },
   {
-    fees: feesOptimism,
     formatters: formattersOptimism,
   },
 )

package/src/chains/definitions/baseGoerli.ts

@@ -1,5 +1,4 @@
 import { defineChain } from '../../utils/chain.js'
-import { feesOptimism } from '../optimism/fees.js'
 import { formattersOptimism } from '../optimism/formatters.js'
 
 export const baseGoerli = /*#__PURE__*/ defineChain(
@@ -7,7 +6,7 @@ export const baseGoerli = /*#__PURE__*/ defineChain(
     id: 84531,
     network: 'base-goerli',
     name: 'Base Goerli',
-    nativeCurrency: { name: 'Base Goerli', symbol: 'ETH', decimals: 18 },
+    nativeCurrency: { name: 'Goerli Ether', symbol: 'ETH', decimals: 18 },
     rpcUrls: {
       default: {
         http: ['https://goerli.base.org'],
@@ -36,7 +35,6 @@ export const baseGoerli = /*#__PURE__*/ defineChain(
     sourceId: 5, // goerli
   },
   {
-    fees: feesOptimism,
     formatters: formattersOptimism,
   },
 )

package/src/chains/definitions/meter.ts

@@ -0,0 +1,19 @@
+import { defineChain } from '../../utils/chain.js'
+
+export const meter = /*#__PURE__*/ defineChain({
+  id: 82,
+  name: 'Meter',
+  network: 'meter',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'MTR',
+    symbol: 'MTR',
+  },
+  rpcUrls: {
+    default: { http: ['https://rpc.meter.io'] },
+    public: { http: ['https://rpc.meter.io'] },
+  },
+  blockExplorers: {
+    default: { name: 'MeterScan', url: 'https://scan.meter.io' },
+  },
+})

package/src/chains/definitions/meterTestnet.ts

@@ -0,0 +1,22 @@
+import { defineChain } from '../../utils/chain.js'
+
+export const meterTestnet = /*#__PURE__*/ defineChain({
+  id: 83,
+  name: 'Meter Testnet',
+  network: 'meter-testnet',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'MTR',
+    symbol: 'MTR',
+  },
+  rpcUrls: {
+    default: { http: ['https://rpctest.meter.io'] },
+    public: { http: ['https://rpctest.meter.io'] },
+  },
+  blockExplorers: {
+    default: {
+      name: 'MeterTestnetScan',
+      url: 'https://scan-warringstakes.meter.io',
+    },
+  },
+})

package/src/chains/definitions/opBNB.ts

@@ -0,0 +1,26 @@
+import { defineChain } from '../../utils/chain.js'
+
+export const opBNB = /*#__PURE__*/ defineChain({
+  id: 204,
+  name: 'opBNB',
+  network: 'opBNB Mainnet',
+  nativeCurrency: {
+    name: 'BNB',
+    symbol: 'BNB',
+    decimals: 18,
+  },
+  rpcUrls: {
+    public: { http: ['https://opbnb-mainnet-rpc.bnbchain.org'] },
+    default: { http: ['https://opbnb-mainnet-rpc.bnbchain.org'] },
+  },
+  blockExplorers: {
+    default: { name: 'opbnbscan', url: 'https://mainnet.opbnbscan.com' },
+  },
+
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 512881,
+    },
+  },
+})

package/src/chains/definitions/opBNBTestnet.ts

@@ -0,0 +1,26 @@
+import { defineChain } from '../../utils/chain.js'
+
+export const opBNBTestnet = /*#__PURE__*/ defineChain({
+  id: 5611,
+  name: 'opBNB Testnet',
+  network: 'opBNB Testnet',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'tBNB',
+    symbol: 'tBNB',
+  },
+  rpcUrls: {
+    public: { http: ['https://opbnb-testnet-rpc.bnbchain.org'] },
+    default: { http: ['https://opbnb-testnet-rpc.bnbchain.org'] },
+  },
+  blockExplorers: {
+    default: { name: 'opbnbscan', url: 'https://opbnbscan.com' },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 3705108,
+    },
+  },
+  testnet: true,
+})

package/src/chains/definitions/optimism.ts

@@ -1,5 +1,4 @@
 import { defineChain } from '../../utils/chain.js'
-import { feesOptimism } from '../optimism/fees.js'
 import { formattersOptimism } from '../optimism/formatters.js'
 
 export const optimism = /*#__PURE__*/ defineChain(
@@ -42,7 +41,6 @@ export const optimism = /*#__PURE__*/ defineChain(
     },
   },
   {
-    fees: feesOptimism,
     formatters: formattersOptimism,
   },
 )

package/src/chains/definitions/optimismGoerli.ts

@@ -1,5 +1,4 @@
 import { defineChain } from '../../utils/chain.js'
-import { feesOptimism } from '../optimism/fees.js'
 import { formattersOptimism } from '../optimism/formatters.js'
 
 export const optimismGoerli = /*#__PURE__*/ defineChain(
@@ -43,7 +42,6 @@ export const optimismGoerli = /*#__PURE__*/ defineChain(
     testnet: true,
   },
   {
-    fees: feesOptimism,
     formatters: formattersOptimism,
   },
 )

package/src/chains/definitions/plinga.ts

@@ -0,0 +1,28 @@
+import { defineChain } from '../../utils/chain.js'
+
+export const plinga = /*#__PURE__*/ defineChain({
+  id: 242,
+  name: 'Plinga',
+  network: 'plinga',
+  nativeCurrency: { name: 'Plinga', symbol: 'PLINGA', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://rpcurl.mainnet.plgchain.com'],
+    },
+    public: {
+      http: ['https://rpcurl.mainnet.plgchain.com'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Plgscan',
+      url: 'https://www.plgscan.com',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0x0989576160f2e7092908BB9479631b901060b6e4',
+      blockCreated: 204489,
+    },
+  },
+})

package/src/chains/definitions/scrollSepolia.ts

@@ -21,5 +21,11 @@ export const scrollSepolia = /*#__PURE__*/ defineChain({
       url: 'https://sepolia-blockscout.scroll.io',
     },
   },
+  contracts: {
+    multicall3: {
+      address: '0xca11bde05977b3631167028862be2a173976ca11',
+      blockCreated: 9473,
+    },
+  },
   testnet: true,
 })

package/src/chains/definitions/zora.ts

@@ -1,5 +1,4 @@
 import { defineChain } from '../../utils/chain.js'
-import { feesOptimism } from '../optimism/fees.js'
 import { formattersOptimism } from '../optimism/formatters.js'
 
 export const zora = /*#__PURE__*/ defineChain(
@@ -33,7 +32,6 @@ export const zora = /*#__PURE__*/ defineChain(
     },
   },
   {
-    fees: feesOptimism,
     formatters: formattersOptimism,
   },
 )

package/src/chains/definitions/zoraTestnet.ts

@@ -1,5 +1,4 @@
 import { defineChain } from '../../utils/chain.js'
-import { feesOptimism } from '../optimism/fees.js'
 import { formattersOptimism } from '../optimism/formatters.js'
 
 export const zoraTestnet = /*#__PURE__*/ defineChain(
@@ -37,7 +36,6 @@ export const zoraTestnet = /*#__PURE__*/ defineChain(
     testnet: true,
   },
   {
-    fees: feesOptimism,
     formatters: formattersOptimism,
   },
 )

package/src/chains/index.ts

@@ -65,6 +65,8 @@ export { localhost } from './definitions/localhost.js'
 export { mainnet } from './definitions/mainnet.js'
 export { mantle } from './definitions/mantle.js'
 export { mantleTestnet } from './definitions/mantleTestnet.js'
+export { meter } from './definitions/meter.js'
+export { meterTestnet } from './definitions/meterTestnet.js'
 export { metis } from './definitions/metis.js'
 export { metisGoerli } from './definitions/metisGoerli.js'
 export { mev } from './definitions/mev.js'
@@ -80,6 +82,9 @@ export { oasys } from './definitions/oasys.js'
 export { okc } from './definitions/okc.js'
 export { optimism } from './definitions/optimism.js'
 export { optimismGoerli } from './definitions/optimismGoerli.js'
+export { opBNB } from './definitions/opBNB.js'
+export { opBNBTestnet } from './definitions/opBNBTestnet.js'
+export { plinga } from './definitions/plinga.js'
 export { polygon } from './definitions/polygon.js'
 export { polygonMumbai } from './definitions/polygonMumbai.js'
 export { polygonZkEvmTestnet } from './definitions/polygonZkEvmTestnet.js'

package/src/errors/node.ts

@@ -216,7 +216,7 @@ export class UnknownNodeError extends BaseError {
   override name = 'UnknownNodeError'
 
   constructor({ cause }: { cause?: BaseError }) {
-    super(`An error occurred while executing: ${cause?.message}`, {
+    super(`An error occurred while executing: ${cause?.shortMessage}`, {
       cause,
     })
   }

package/src/errors/version.ts

@@ -1 +1 @@
-export const version = '1.9.5'
+export const version = '1.10.0'

package/src/index.ts

@@ -878,4 +878,4 @@ export { size } from './utils/data/size.js'
 export { slice, sliceBytes, sliceHex } from './utils/data/slice.js'
 export { stringify } from './utils/stringify.js'
 export { trim } from './utils/data/trim.js'
-export { validateTypedData } from './utils/typedData.js'
+export { validateTypedData, domainSeparator } from './utils/typedData.js'

package/src/types/chain.ts

@@ -34,6 +34,8 @@ export type ChainConstants = {
   }
   /** Collection of contracts */
   contracts?: {
+    [key: string]: ChainContract | { [chainId: number]: ChainContract }
+  } & {
     ensRegistry?: ChainContract
     ensUniversalResolver?: ChainContract
     multicall3?: ChainContract

package/src/utils/buildRequest.ts

@@ -126,6 +126,10 @@ export function buildRequest<TRequest extends (args: any) => Promise<any>>(
             // 4902
             case SwitchChainError.code:
               throw new SwitchChainError(err)
+            // CAIP-25: User Rejected Error
+            // https://docs.walletconnect.com/2.0/specs/clients/sign/error-codes#rejected-caip-25
+            case 5000:
+              throw new UserRejectedRequestError(err)
             default:
               if (err_ instanceof BaseError) throw err_
               throw new UnknownRpcError(err as Error)

package/src/utils/errors/getCallError.ts

@@ -1,13 +1,10 @@
 import type { CallParameters } from '../../actions/public/call.js'
 import type { BaseError } from '../../errors/base.js'
 import { CallExecutionError } from '../../errors/contract.js'
+import { UnknownNodeError } from '../../errors/node.js'
 import type { Chain } from '../../types/chain.js'
 
-import {
-  type GetNodeErrorParameters,
-  containsNodeError,
-  getNodeError,
-} from './getNodeError.js'
+import { type GetNodeErrorParameters, getNodeError } from './getNodeError.js'
 
 export function getCallError(
   err: BaseError,
@@ -19,9 +16,8 @@ export function getCallError(
     docsPath?: string
   },
 ) {
-  let cause = err
-  if (containsNodeError(err))
-    cause = getNodeError(err, args as GetNodeErrorParameters)
+  let cause = getNodeError(err, args as GetNodeErrorParameters)
+  if (cause instanceof UnknownNodeError) cause = err
   return new CallExecutionError(cause, {
     docsPath,
     ...args,

package/src/utils/errors/getContractError.ts

@@ -8,6 +8,7 @@ import {
   ContractFunctionZeroDataError,
   RawContractError,
 } from '../../errors/contract.js'
+import { InternalRpcError } from '../../errors/rpc.js'
 
 const EXECUTION_REVERTED_ERROR_CODE = 3
 
@@ -41,7 +42,7 @@ export function getContractError(
   if (err instanceof AbiDecodingZeroDataError) {
     cause = new ContractFunctionZeroDataError({ functionName })
   } else if (
-    code === EXECUTION_REVERTED_ERROR_CODE &&
+    [EXECUTION_REVERTED_ERROR_CODE, InternalRpcError.code].includes(code) &&
     (data || message || shortMessage)
   ) {
     cause = new ContractFunctionRevertedError({

package/src/utils/errors/getEstimateGasError.ts

@@ -2,13 +2,10 @@ import type { Account } from '../../accounts/types.js'
 import type { EstimateGasParameters } from '../../actions/public/estimateGas.js'
 import type { BaseError } from '../../errors/base.js'
 import { EstimateGasExecutionError } from '../../errors/estimateGas.js'
+import { UnknownNodeError } from '../../errors/node.js'
 import type { Chain } from '../../types/chain.js'
 
-import {
-  type GetNodeErrorParameters,
-  containsNodeError,
-  getNodeError,
-} from './getNodeError.js'
+import { type GetNodeErrorParameters, getNodeError } from './getNodeError.js'
 
 export function getEstimateGasError(
   err: BaseError,
@@ -21,9 +18,8 @@ export function getEstimateGasError(
     docsPath?: string
   },
 ) {
-  let cause = err
-  if (containsNodeError(err))
-    cause = getNodeError(err, args as GetNodeErrorParameters)
+  let cause = getNodeError(err, args as GetNodeErrorParameters)
+  if (cause instanceof UnknownNodeError) cause = err
   return new EstimateGasExecutionError(cause, {
     docsPath,
     ...args,

package/src/utils/errors/getNodeError.ts

@@ -1,5 +1,5 @@
 import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js'
-import type { BaseError } from '../../errors/base.js'
+import { BaseError } from '../../errors/base.js'
 import {
   ExecutionRevertedError,
   FeeCapTooHighError,
@@ -31,8 +31,22 @@ export function containsNodeError(err: BaseError) {
 export type GetNodeErrorParameters = Partial<SendTransactionParameters<any>>
 
 export function getNodeError(err: BaseError, args: GetNodeErrorParameters) {
-  const message = err.details.toLowerCase()
-  if (FeeCapTooHighError.nodeMessage.test(message))
+  const message = (err.details || '').toLowerCase()
+
+  const executionRevertedError = err.walk(
+    (e) => (e as { code: number }).code === ExecutionRevertedError.code,
+  )
+  if (executionRevertedError instanceof BaseError) {
+    return new ExecutionRevertedError({
+      cause: err,
+      message: executionRevertedError.details,
+    })
+  } else if (ExecutionRevertedError.nodeMessage.test(message))
+    return new ExecutionRevertedError({
+      cause: err,
+      message: err.details,
+    })
+  else if (FeeCapTooHighError.nodeMessage.test(message))
     return new FeeCapTooHighError({
       cause: err,
       maxFeePerGas: args?.maxFeePerGas,
@@ -62,16 +76,7 @@ export function getNodeError(err: BaseError, args: GetNodeErrorParameters) {
       maxFeePerGas: args?.maxFeePerGas,
       maxPriorityFeePerGas: args?.maxPriorityFeePerGas,
     })
-  else if (
-    message.match(ExecutionRevertedError.nodeMessage) ||
-    ('code' in (err.cause as BaseError) &&
-      (err.cause as { code: number })?.code === ExecutionRevertedError.code)
-  )
-    return new ExecutionRevertedError({
-      cause: err,
-      message: (err.cause as BaseError).details || err.details,
-    })
   return new UnknownNodeError({
-    cause: (err.cause as BaseError).cause as BaseError,
+    cause: err,
   })
 }

package/src/utils/errors/getTransactionError.ts

@@ -1,14 +1,11 @@
 import type { Account } from '../../accounts/types.js'
 import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js'
 import type { BaseError } from '../../errors/base.js'
+import { UnknownNodeError } from '../../errors/node.js'
 import { TransactionExecutionError } from '../../errors/transaction.js'
 import type { Chain } from '../../types/chain.js'
 
-import {
-  type GetNodeErrorParameters,
-  containsNodeError,
-  getNodeError,
-} from './getNodeError.js'
+import { type GetNodeErrorParameters, getNodeError } from './getNodeError.js'
 
 export type GetTransactionErrorParameters = Omit<
   SendTransactionParameters,
@@ -23,9 +20,8 @@ export function getTransactionError(
   err: BaseError,
   { docsPath, ...args }: GetTransactionErrorParameters,
 ) {
-  let cause = err
-  if (containsNodeError(err))
-    cause = getNodeError(err, args as GetNodeErrorParameters)
+  let cause = getNodeError(err, args as GetNodeErrorParameters)
+  if (cause instanceof UnknownNodeError) cause = err
   return new TransactionExecutionError(cause, {
     docsPath,
     ...args,

package/src/utils/rpc.ts

@@ -1,4 +1,5 @@
-import type { MessageEvent, WebSocket } from 'isomorphic-ws'
+import WebSocket from 'isomorphic-ws'
+import type { MessageEvent } from 'isomorphic-ws'
 
 import {
   HttpRequestError,
@@ -40,7 +41,7 @@ type Subscription<TResult, TError> = {
   )
 }
 
-export type RpcRequest = { method: string; params?: any }
+export type RpcRequest = { method: string; params?: any; id?: number }
 
 export type RpcResponse<TResult = any, TError = any> = {
   jsonrpc: `${number}`
@@ -82,11 +83,11 @@ async function http<TBody extends RpcRequest | RpcRequest[]>(
             ? stringify(
                 body.map((body) => ({
                   jsonrpc: '2.0',
-                  id: id++,
+                  id: body.id ?? id++,
                   ...body,
                 })),
               )
-            : stringify({ jsonrpc: '2.0', id: id++, ...body }),
+            : stringify({ jsonrpc: '2.0', id: body.id ?? id++, ...body }),
           headers: {
             ...headers,
             'Content-Type': 'application/json',
@@ -144,10 +145,10 @@ export type Socket = WebSocket & {
   subscriptions: CallbackMap
 }
 
-const sockets = /*#__PURE__*/ new Map<string, Socket>()
+export const socketsCache = /*#__PURE__*/ new Map<string, Socket>()
 
 export async function getSocket(url: string) {
-  let socket = sockets.get(url)
+  let socket = socketsCache.get(url)
 
   // If the socket already exists, return it.
   if (socket) return socket
@@ -155,18 +156,6 @@ export async function getSocket(url: string) {
   const { schedule } = createBatchScheduler<undefined, [Socket]>({
     id: url,
     fn: async () => {
-      let WebSocket = await import('isomorphic-ws')
-      // Workaround for Vite.
-      // https://github.com/vitejs/vite/issues/9703
-      // TODO: Remove when issue is resolved.
-      if (
-        (WebSocket as unknown as { default?: typeof WebSocket }).default
-          ?.constructor
-      )
-        WebSocket = (WebSocket as unknown as { default: typeof WebSocket })
-          .default
-      else WebSocket = WebSocket.WebSocket
-
       const webSocket = new WebSocket(url)
 
       // Set up a cache for incoming "synchronous" requests.
@@ -185,7 +174,7 @@ export async function getSocket(url: string) {
         if (!isSubscription) cache.delete(id)
       }
       const onClose = () => {
-        sockets.delete(url)
+        socketsCache.delete(url)
         webSocket.removeEventListener('close', onClose)
         webSocket.removeEventListener('message', onMessage)
       }
@@ -208,7 +197,7 @@ export async function getSocket(url: string) {
         requests,
         subscriptions,
       })
-      sockets.set(url, socket)
+      socketsCache.set(url, socket)
 
       return [socket]
     },