Merge branch 'wagmi-dev:main' into brianatourhut/ismorphic_ws

wevm · Aug 24, 2023 · c9b0d40 · c9b0d40
2 parents 77f18d9 + da45ec2
commit c9b0d40
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/.changeset/dry-ducks-complain.md b/.changeset/dry-ducks-complain.md
@@ -0,0 +1,5 @@
+---
+"viem": patch
+---
+
+Deduped block retrieval in `estimateMaxPriorityFeePerGas`.
diff --git a/src/actions/public/estimateFeesPerGas.ts b/src/actions/public/estimateFeesPerGas.ts
@@ -131,6 +131,7 @@ export async function internal_estimateFeesPerGas<
       : await internal_estimateMaxPriorityFeePerGas(
           client as Client<Transport, Chain>,
           {
+            block,
             chain,
             request,
           },

diff --git a/src/actions/public/estimateMaxPriorityFeePerGas.test.ts b/src/actions/public/estimateMaxPriorityFeePerGas.test.ts
@@ -7,7 +7,10 @@ import { createPublicClient } from '../../clients/createPublicClient.js'
 import { http } from '../../clients/transports/http.js'
 import { MethodNotSupportedRpcError } from '../../errors/rpc.js'
 import { buildRequest } from '../../utils/buildRequest.js'
-import { estimateMaxPriorityFeePerGas } from './estimateMaxPriorityFeePerGas.js'
+import {
+  estimateMaxPriorityFeePerGas,
+  internal_estimateMaxPriorityFeePerGas,
+} from './estimateMaxPriorityFeePerGas.js'
 import * as getBlock from './getBlock.js'
 
 test('default', async () => {
@@ -151,3 +154,16 @@ describe('mainnet smoke', () => {
     expect(await estimateMaxPriorityFeePerGas(mainnetClient)).toBeDefined()
   })
 })
+
+describe('internal_estimateMaxPriorityFeePerGas', () => {
+  test('args: block', async () => {
+    const block = await getBlock.getBlock(publicClient)
+    const maxPriorityFeePerGas = await internal_estimateMaxPriorityFeePerGas(
+      publicClient,
+      {
+        block,
+      },
+    )
+    expect(maxPriorityFeePerGas).toBeDefined()
+  })
+})
diff --git a/src/actions/public/estimateMaxPriorityFeePerGas.ts b/src/actions/public/estimateMaxPriorityFeePerGas.ts
@@ -2,6 +2,7 @@ import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { Eip1559FeesNotSupportedError } from '../../errors/fee.js'
 import type { Account } from '../../types/account.js'
+import type { Block } from '../../types/block.js'
 import type { Chain, ChainFeesFnParameters } from '../../types/chain.js'
 import type { GetChain } from '../../types/chain.js'
 import { hexToBigInt } from '../../utils/encoding/fromHex.js'
@@ -53,16 +54,17 @@ export async function internal_estimateMaxPriorityFeePerGas<
 >(
   client: Client<Transport, chain>,
   args: EstimateMaxPriorityFeePerGasParameters<chain, chainOverride> & {
+    block?: Block
     request?: PrepareRequestParameters<
       chain,
       Account | undefined,
       chainOverride
     >
   },
 ): Promise<EstimateMaxPriorityFeePerGasReturnType> {
-  const { chain = client.chain, request } = args || {}
+  const { block: block_, chain = client.chain, request } = args || {}
   if (typeof chain?.fees?.defaultPriorityFee === 'function') {
-    const block = await getBlock(client)
+    const block = block_ || (await getBlock(client))
     return chain.fees.defaultPriorityFee({
       block,
       client,
@@ -81,7 +83,7 @@ export async function internal_estimateMaxPriorityFeePerGas<
     // fall back to calculating it manually via `gasPrice - baseFeePerGas`.
     // See: https://github.com/ethereum/pm/issues/328#:~:text=eth_maxPriorityFeePerGas%20after%20London%20will%20effectively%20return%20eth_gasPrice%20%2D%20baseFee
     const [block, gasPrice] = await Promise.all([
-      getBlock(client),
+      block_ ? Promise.resolve(block_) : getBlock(client),
       getGasPrice(client),
     ])