viem 2.24.2 → 2.24.3

package/chains/definitions/swellchainTestnet.ts

@@ -0,0 +1,28 @@
+import { chainConfig } from '../../op-stack/chainConfig.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const swellchainTestnet = /*#__PURE__*/ defineChain({
+  ...chainConfig,
+  id: 1924,
+  name: 'Swellchain Testnet',
+  nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://swell-testnet.alt.technology'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Swellchain Testnet Explorer',
+      url: 'https://swell-testnet-explorer.alt.technology',
+      apiUrl: 'https://swell-testnet-explorer.alt.technology/api',
+    },
+  },
+  contracts: {
+    ...chainConfig.contracts,
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 1,
+    },
+  },
+})

package/chains/definitions/westendAssetHub.ts

@@ -0,0 +1,21 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const westendAssetHub = /*#__PURE__*/ defineChain({
+  id: 420_420_421,
+  name: 'Westend Asset Hub',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'Westies',
+    symbol: 'WND',
+  },
+  rpcUrls: {
+    default: { http: ['https://westend-asset-hub-eth-rpc.polkadot.io'] },
+  },
+  blockExplorers: {
+    default: {
+      name: 'subscan',
+      url: 'https://westend-asset-hub-eth-explorer.parity.io',
+    },
+  },
+  testnet: true,
+})

package/chains/index.ts

@@ -504,6 +504,7 @@ export { swan } from './definitions/swan.js'
 export { swanProximaTestnet } from './definitions/swanProximaTestnet.js'
 export { swanSaturnTestnet } from './definitions/swanSaturnTestnet.js'
 export { swellchain } from './definitions/swellchain.js'
+export { swellchainTestnet } from './definitions/swellchainTestnet.js'
 export { swissdlt } from './definitions/swissdlt.js'
 export { syscoin } from './definitions/syscoin.js'
 export { syscoinTestnet } from './definitions/syscoinTestnet.js'
@@ -553,6 +554,7 @@ export { wanchainTestnet } from './definitions/wanchainTestnet.js'
 export { weaveVMAlphanet } from './definitions/weavevmAlphanet.js'
 export { wemix } from './definitions/wemix.js'
 export { wemixTestnet } from './definitions/wemixTestnet.js'
+export { westendAssetHub } from './definitions/westendAssetHub.js'
 export { whitechain } from './definitions/whitechain.js'
 export { whitechainTestnet } from './definitions/whitechainTestnet.js'
 export { wmcTestnet } from './definitions/wmcTestnet.js'

package/clients/transports/webSocket.ts

@@ -103,6 +103,7 @@ export function webSocket(
     const retryCount = config.retryCount ?? retryCount_
     const timeout = timeout_ ?? config.timeout ?? 10_000
     const url_ = url || chain?.rpcUrls.default.webSocket?.[0]
+    const wsRpcClientOpts = { keepAlive, reconnect }
     if (!url_) throw new UrlRequiredError()
     return createTransport(
       {
@@ -111,10 +112,7 @@ export function webSocket(
         name,
         async request({ method, params }) {
           const body = { method, params }
-          const rpcClient = await getWebSocketRpcClient(url_, {
-            keepAlive,
-            reconnect,
-          })
+          const rpcClient = await getWebSocketRpcClient(url_, wsRpcClientOpts)
           const { error, result } = await rpcClient.requestAsync({
             body,
             timeout,
@@ -137,10 +135,10 @@ export function webSocket(
           return getSocket(url_)
         },
         getRpcClient() {
-          return getWebSocketRpcClient(url_)
+          return getWebSocketRpcClient(url_, wsRpcClientOpts)
         },
         async subscribe({ params, onData, onError }: any) {
-          const rpcClient = await getWebSocketRpcClient(url_)
+          const rpcClient = await getWebSocketRpcClient(url_, wsRpcClientOpts)
           const { result: subscriptionId } = await new Promise<any>(
             (resolve, reject) =>
               rpcClient.request({

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.24.2'
+export const version = '2.24.3'

package/op-stack/actions/estimateL1Fee.ts

@@ -4,11 +4,6 @@ import {
   type ReadContractErrorType,
   readContract,
 } from '../../actions/public/readContract.js'
-import {
-  type PrepareTransactionRequestErrorType,
-  type PrepareTransactionRequestParameters,
-  prepareTransactionRequest,
-} from '../../actions/wallet/prepareTransactionRequest.js'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ErrorType } from '../../errors/utils.js'
@@ -21,15 +16,11 @@ import type {
 import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { getChainContractAddress } from '../../utils/chain/getChainContractAddress.js'
 import type { HexToNumberErrorType } from '../../utils/encoding/fromHex.js'
-import {
-  type AssertRequestErrorType,
-  type AssertRequestParameters,
-  assertRequest,
-} from '../../utils/transaction/assertRequest.js'
 import {
   type SerializeTransactionErrorType,
   serializeTransaction,
 } from '../../utils/transaction/serializeTransaction.js'
+import { parseGwei } from '../../utils/unit/parseGwei.js'
 import { gasPriceOracleAbi } from '../abis.js'
 import { contracts } from '../contracts.js'
 
@@ -48,8 +39,6 @@ export type EstimateL1FeeReturnType = bigint
 
 export type EstimateL1FeeErrorType =
   | RequestErrorType
-  | PrepareTransactionRequestErrorType
-  | AssertRequestErrorType
   | SerializeTransactionErrorType
   | HexToNumberErrorType
   | ReadContractErrorType
@@ -100,17 +89,18 @@ export async function estimateL1Fee<
     return contracts.gasPriceOracle.address
   })()
 
-  // Populate transaction with required fields to accurately estimate gas.
-  const request = await prepareTransactionRequest(
-    client,
-    args as PrepareTransactionRequestParameters,
-  )
-
-  assertRequest(request as AssertRequestParameters)
-
   const transaction = serializeTransaction({
-    ...request,
+    ...args,
+    chainId: chain?.id ?? 1,
     type: 'eip1559',
+
+    // Set upper-limit-ish stub values. Shouldn't affect the estimate too much as we are
+    // tweaking dust bytes here (as opposed to long `data` bytes).
+    // See: https://github.com/ethereum-optimism/optimism/blob/54d02df55523c9e1b4b38ed082c12a42087323a0/packages/contracts-bedrock/src/L2/GasPriceOracle.sol#L242-L248.
+    gas: args.data ? 300_000n : 21_000n,
+    maxFeePerGas: parseGwei('5'),
+    maxPriorityFeePerGas: parseGwei('1'),
+    nonce: 1,
   } as TransactionSerializable)
 
   return readContract(client, {

package/op-stack/actions/estimateL1Gas.ts

@@ -4,11 +4,6 @@ import {
   type ReadContractErrorType,
   readContract,
 } from '../../actions/public/readContract.js'
-import {
-  type PrepareTransactionRequestErrorType,
-  type PrepareTransactionRequestParameters,
-  prepareTransactionRequest,
-} from '../../actions/wallet/prepareTransactionRequest.js'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ErrorType } from '../../errors/utils.js'
@@ -21,15 +16,11 @@ import type {
 import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { getChainContractAddress } from '../../utils/chain/getChainContractAddress.js'
 import type { HexToNumberErrorType } from '../../utils/encoding/fromHex.js'
-import {
-  type AssertRequestErrorType,
-  type AssertRequestParameters,
-  assertRequest,
-} from '../../utils/transaction/assertRequest.js'
 import {
   type SerializeTransactionErrorType,
   serializeTransaction,
 } from '../../utils/transaction/serializeTransaction.js'
+import { parseGwei } from '../../utils/unit/parseGwei.js'
 import { gasPriceOracleAbi } from '../abis.js'
 import { contracts } from '../contracts.js'
 
@@ -48,8 +39,6 @@ export type EstimateL1GasReturnType = bigint
 
 export type EstimateL1GasErrorType =
   | RequestErrorType
-  | PrepareTransactionRequestErrorType
-  | AssertRequestErrorType
   | SerializeTransactionErrorType
   | HexToNumberErrorType
   | ReadContractErrorType
@@ -100,17 +89,18 @@ export async function estimateL1Gas<
     return contracts.gasPriceOracle.address
   })()
 
-  // Populate transaction with required fields to accurately estimate gas.
-  const request = await prepareTransactionRequest(
-    client,
-    args as PrepareTransactionRequestParameters,
-  )
-
-  assertRequest(request as AssertRequestParameters)
-
   const transaction = serializeTransaction({
-    ...request,
+    ...args,
+    chainId: chain?.id ?? 1,
     type: 'eip1559',
+
+    // Set upper-limit-ish stub values. Shouldn't affect the estimate too much as we are
+    // tweaking dust bytes here (as opposed to long `data` bytes).
+    // See: https://github.com/ethereum-optimism/optimism/blob/54d02df55523c9e1b4b38ed082c12a42087323a0/packages/contracts-bedrock/src/L2/GasPriceOracle.sol#L242-L248.
+    gas: args.data ? 300_000n : 21_000n,
+    maxFeePerGas: parseGwei('5'),
+    maxPriorityFeePerGas: parseGwei('1'),
+    nonce: 1,
   } as TransactionSerializable)
 
   return readContract(client, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.24.2",
+  "version": "2.24.3",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",