viem 0.0.0-w-20230822145918 → 0.0.0-w-20230828183856

package/src/utils/transaction/parseTransaction.ts

@@ -66,10 +66,7 @@ export function parseTransaction<TSerialized extends TransactionSerialized>(
 function parseTransactionEIP1559(
   serializedTransaction: TransactionSerializedEIP1559,
 ): TransactionSerializableEIP1559 {
-  const transactionArray = fromRlp(
-    `0x${serializedTransaction.slice(4)}` as Hex,
-    'hex',
-  )
+  const transactionArray = toTransactionArray(serializedTransaction)
 
   const [
     chainId,
@@ -140,10 +137,7 @@ function parseTransactionEIP2930(
   serializedTransaction: TransactionSerializedEIP2930,
 ): Omit<TransactionRequestEIP2930, 'from'> &
   ({ chainId: number } | ({ chainId: number } & Signature)) {
-  const transactionArray = fromRlp(
-    `0x${serializedTransaction.slice(4)}` as Hex,
-    'hex',
-  )
+  const transactionArray = toTransactionArray(serializedTransaction)
 
   const [chainId, nonce, gasPrice, gas, to, value, data, accessList, v, r, s] =
     transactionArray
@@ -263,7 +257,11 @@ function parseTransactionLegacy(
   return transaction
 }
 
-function parseAccessList(accessList_: RecursiveArray<Hex>): AccessList {
+export function toTransactionArray(serializedTransaction: string) {
+  return fromRlp(`0x${serializedTransaction.slice(4)}` as Hex, 'hex')
+}
+
+export function parseAccessList(accessList_: RecursiveArray<Hex>): AccessList {
   const accessList: AccessList = []
   for (let i = 0; i < accessList_.length; i++) {
     const [address, storageKeys] = accessList_[i] as [Hex, Hex[]]

package/src/version.ts

@@ -1 +1 @@
-export const version = '1.6.2'
+export const version = '1.8.1'

package/dist/cjs/utils/transaction/prepareRequest.js

@@ -1,64 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareRequest = void 0;
-const parseAccount_js_1 = require("../../accounts/utils/parseAccount.js");
-const estimateGas_js_1 = require("../../actions/public/estimateGas.js");
-const getBlock_js_1 = require("../../actions/public/getBlock.js");
-const getGasPrice_js_1 = require("../../actions/public/getGasPrice.js");
-const getTransactionCount_js_1 = require("../../actions/public/getTransactionCount.js");
-const account_js_1 = require("../../errors/account.js");
-const base_js_1 = require("../../errors/base.js");
-const assertRequest_js_1 = require("./assertRequest.js");
-async function prepareRequest(client, args) {
-    const { account: account_, chain = client.chain, gas, gasPrice, maxFeePerGas, maxPriorityFeePerGas, nonce, } = args;
-    if (!account_)
-        throw new account_js_1.AccountNotFoundError();
-    const account = (0, parseAccount_js_1.parseAccount)(account_);
-    const block = await (0, getBlock_js_1.getBlock)(client, { blockTag: 'latest' });
-    const request = { ...args, from: account.address };
-    if (typeof nonce === 'undefined')
-        request.nonce = await (0, getTransactionCount_js_1.getTransactionCount)(client, {
-            address: account.address,
-            blockTag: 'pending',
-        });
-    if (typeof block.baseFeePerGas === 'bigint' &&
-        typeof gasPrice === 'undefined') {
-        let defaultPriorityFee = 1500000000n;
-        if (typeof chain?.fees?.defaultPriorityFee !== 'undefined') {
-            defaultPriorityFee =
-                typeof chain.fees.defaultPriorityFee === 'bigint'
-                    ? chain.fees.defaultPriorityFee
-                    : await chain.fees.defaultPriorityFee({
-                        block,
-                        request: request,
-                    });
-        }
-        if (typeof maxFeePerGas === 'undefined') {
-            request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultPriorityFee;
-            request.maxFeePerGas =
-                (block.baseFeePerGas * 120n) / 100n + request.maxPriorityFeePerGas;
-        }
-        else {
-            if (typeof maxPriorityFeePerGas === 'undefined' &&
-                maxFeePerGas < defaultPriorityFee)
-                throw new base_js_1.BaseError('`maxFeePerGas` cannot be less than the default `maxPriorityFeePerGas` (1.5 gwei).');
-            request.maxFeePerGas = maxFeePerGas;
-            request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultPriorityFee;
-        }
-    }
-    else if (typeof gasPrice === 'undefined') {
-        if (typeof maxFeePerGas !== 'undefined' ||
-            typeof maxPriorityFeePerGas !== 'undefined')
-            throw new base_js_1.BaseError('Chain does not support EIP-1559 fees.');
-        request.gasPrice = ((await (0, getGasPrice_js_1.getGasPrice)(client)) * 120n) / 100n;
-    }
-    if (typeof gas === 'undefined')
-        request.gas = await (0, estimateGas_js_1.estimateGas)(client, {
-            ...request,
-            account: { address: account.address, type: 'json-rpc' },
-        });
-    (0, assertRequest_js_1.assertRequest)(request);
-    return request;
-}
-exports.prepareRequest = prepareRequest;
-//# sourceMappingURL=prepareRequest.js.map

package/dist/cjs/utils/transaction/prepareRequest.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"prepareRequest.js","sourceRoot":"","sources":["../../../../src/utils/transaction/prepareRequest.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/transaction/prepareRequest.js

@@ -1,64 +0,0 @@
-import { parseAccount } from '../../accounts/utils/parseAccount.js';
-import { estimateGas, } from '../../actions/public/estimateGas.js';
-import { getBlock } from '../../actions/public/getBlock.js';
-import { getGasPrice } from '../../actions/public/getGasPrice.js';
-import { getTransactionCount } from '../../actions/public/getTransactionCount.js';
-import { AccountNotFoundError } from '../../errors/account.js';
-import { BaseError } from '../../errors/base.js';
-import { assertRequest } from './assertRequest.js';
-export async function prepareRequest(client, args) {
-    const { account: account_, chain = client.chain, gas, gasPrice, maxFeePerGas, maxPriorityFeePerGas, nonce, } = args;
-    if (!account_)
-        throw new AccountNotFoundError();
-    const account = parseAccount(account_);
-    const block = await getBlock(client, { blockTag: 'latest' });
-    const request = { ...args, from: account.address };
-    if (typeof nonce === 'undefined')
-        request.nonce = await getTransactionCount(client, {
-            address: account.address,
-            blockTag: 'pending',
-        });
-    if (typeof block.baseFeePerGas === 'bigint' &&
-        typeof gasPrice === 'undefined') {
-        let defaultPriorityFee = 1500000000n; // 1.5 gwei
-        if (typeof chain?.fees?.defaultPriorityFee !== 'undefined') {
-            defaultPriorityFee =
-                typeof chain.fees.defaultPriorityFee === 'bigint'
-                    ? chain.fees.defaultPriorityFee
-                    : await chain.fees.defaultPriorityFee({
-                        block,
-                        request: request,
-                    });
-        }
-        // EIP-1559 fees
-        if (typeof maxFeePerGas === 'undefined') {
-            // Set a buffer of 1.2x on top of the base fee to account for fluctuations.
-            request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultPriorityFee;
-            request.maxFeePerGas =
-                (block.baseFeePerGas * 120n) / 100n + request.maxPriorityFeePerGas;
-        }
-        else {
-            if (typeof maxPriorityFeePerGas === 'undefined' &&
-                maxFeePerGas < defaultPriorityFee)
-                throw new BaseError('`maxFeePerGas` cannot be less than the default `maxPriorityFeePerGas` (1.5 gwei).');
-            request.maxFeePerGas = maxFeePerGas;
-            request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultPriorityFee;
-        }
-    }
-    else if (typeof gasPrice === 'undefined') {
-        // Legacy fees
-        if (typeof maxFeePerGas !== 'undefined' ||
-            typeof maxPriorityFeePerGas !== 'undefined')
-            throw new BaseError('Chain does not support EIP-1559 fees.');
-        // Set a buffer of 1.2x on top of the base fee to account for fluctuations.
-        request.gasPrice = ((await getGasPrice(client)) * 120n) / 100n;
-    }
-    if (typeof gas === 'undefined')
-        request.gas = await estimateGas(client, {
-            ...request,
-            account: { address: account.address, type: 'json-rpc' },
-        });
-    assertRequest(request);
-    return request;
-}
-//# sourceMappingURL=prepareRequest.js.map

package/dist/esm/utils/transaction/prepareRequest.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"prepareRequest.js","sourceRoot":"","sources":["../../../../src/utils/transaction/prepareRequest.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAA;AACnE,OAAO,EAEL,WAAW,GACZ,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAA;AAIjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAKhD,OAAO,EAAgC,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAiChF,MAAM,CAAC,KAAK,UAAU,cAAc,CAMlC,MAA2C,EAC3C,IAAW;IAEX,MAAM,EACJ,OAAO,EAAE,QAAQ,EACjB,KAAK,GAAG,MAAM,CAAC,KAAK,EACpB,GAAG,EACH,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,KAAK,GACN,GAAG,IAAI,CAAA;IACR,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,oBAAoB,EAAE,CAAA;IAC/C,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAEtC,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;IAE5D,MAAM,OAAO,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,CAAA;IAElD,IAAI,OAAO,KAAK,KAAK,WAAW;QAC9B,OAAO,CAAC,KAAK,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE;YAChD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAA;IAEJ,IACE,OAAO,KAAK,CAAC,aAAa,KAAK,QAAQ;QACvC,OAAO,QAAQ,KAAK,WAAW,EAC/B;QACA,IAAI,kBAAkB,GAAG,WAAc,CAAA,CAAC,WAAW;QACnD,IAAI,OAAO,KAAK,EAAE,IAAI,EAAE,kBAAkB,KAAK,WAAW,EAAE;YAC1D,kBAAkB;gBAChB,OAAO,KAAK,CAAC,IAAI,CAAC,kBAAkB,KAAK,QAAQ;oBAC/C,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB;oBAC/B,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;wBAClC,KAAK;wBACL,OAAO,EAAE,OAAmC;qBAC7C,CAAC,CAAA;SACT;QAED,gBAAgB;QAChB,IAAI,OAAO,YAAY,KAAK,WAAW,EAAE;YACvC,2EAA2E;YAC3E,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,IAAI,kBAAkB,CAAA;YACzE,OAAO,CAAC,YAAY;gBAClB,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAA;SACrE;aAAM;YACL,IACE,OAAO,oBAAoB,KAAK,WAAW;gBAC3C,YAAY,GAAG,kBAAkB;gBAEjC,MAAM,IAAI,SAAS,CACjB,mFAAmF,CACpF,CAAA;YACH,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;YACnC,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,IAAI,kBAAkB,CAAA;SAC1E;KACF;SAAM,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;QAC1C,cAAc;QACd,IACE,OAAO,YAAY,KAAK,WAAW;YACnC,OAAO,oBAAoB,KAAK,WAAW;YAE3C,MAAM,IAAI,SAAS,CAAC,uCAAuC,CAAC,CAAA;QAE9D,2EAA2E;QAC3E,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAA;KAC/D;IAED,IAAI,OAAO,GAAG,KAAK,WAAW;QAC5B,OAAO,CAAC,GAAG,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE;YACtC,GAAG,OAAO;YACV,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;SAC/B,CAAC,CAAA;IAE7B,aAAa,CAAC,OAAkC,CAAC,CAAA;IAEjD,OAAO,OAKN,CAAA;AACH,CAAC"}

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

@@ -1,20 +0,0 @@
-import type { Address } from 'abitype';
-import type { Account } from '../../accounts/types.js';
-import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js';
-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, 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'];
-    maxFeePerGas?: SendTransactionParameters['maxFeePerGas'];
-    maxPriorityFeePerGas?: SendTransactionParameters['maxPriorityFeePerGas'];
-    nonce: SendTransactionParameters['nonce'];
-};
-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 +0,0 @@
-{"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/src/utils/transaction/prepareRequest.ts

@@ -1,143 +0,0 @@
-import type { Address } from 'abitype'
-
-import type { Account } from '../../accounts/types.js'
-import { parseAccount } from '../../accounts/utils/parseAccount.js'
-import {
-  type EstimateGasParameters,
-  estimateGas,
-} from '../../actions/public/estimateGas.js'
-import { getBlock } from '../../actions/public/getBlock.js'
-import { getGasPrice } from '../../actions/public/getGasPrice.js'
-import { getTransactionCount } from '../../actions/public/getTransactionCount.js'
-import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js'
-import type { Client } from '../../clients/createClient.js'
-import type { Transport } from '../../clients/transports/createTransport.js'
-import { AccountNotFoundError } from '../../errors/account.js'
-import { BaseError } from '../../errors/base.js'
-import type { GetAccountParameter } from '../../types/account.js'
-import type { Chain, GetChain } from '../../types/chain.js'
-import type { UnionOmit } from '../../types/utils.js'
-import type { FormattedTransactionRequest } from '../index.js'
-import { type AssertRequestParameters, assertRequest } from './assertRequest.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']
-  maxFeePerGas?: SendTransactionParameters['maxFeePerGas']
-  maxPriorityFeePerGas?: SendTransactionParameters['maxPriorityFeePerGas']
-  nonce: SendTransactionParameters['nonce']
-}
-
-export async 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>> {
-  const {
-    account: account_,
-    chain = client.chain,
-    gas,
-    gasPrice,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    nonce,
-  } = args
-  if (!account_) throw new AccountNotFoundError()
-  const account = parseAccount(account_)
-
-  const block = await getBlock(client, { blockTag: 'latest' })
-
-  const request = { ...args, from: account.address }
-
-  if (typeof nonce === 'undefined')
-    request.nonce = await getTransactionCount(client, {
-      address: account.address,
-      blockTag: 'pending',
-    })
-
-  if (
-    typeof block.baseFeePerGas === 'bigint' &&
-    typeof gasPrice === 'undefined'
-  ) {
-    let defaultPriorityFee = 1_500_000_000n // 1.5 gwei
-    if (typeof chain?.fees?.defaultPriorityFee !== 'undefined') {
-      defaultPriorityFee =
-        typeof chain.fees.defaultPriorityFee === 'bigint'
-          ? chain.fees.defaultPriorityFee
-          : await chain.fees.defaultPriorityFee({
-              block,
-              request: request as PrepareRequestParameters,
-            })
-    }
-
-    // EIP-1559 fees
-    if (typeof maxFeePerGas === 'undefined') {
-      // Set a buffer of 1.2x on top of the base fee to account for fluctuations.
-      request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultPriorityFee
-      request.maxFeePerGas =
-        (block.baseFeePerGas * 120n) / 100n + request.maxPriorityFeePerGas
-    } else {
-      if (
-        typeof maxPriorityFeePerGas === 'undefined' &&
-        maxFeePerGas < defaultPriorityFee
-      )
-        throw new BaseError(
-          '`maxFeePerGas` cannot be less than the default `maxPriorityFeePerGas` (1.5 gwei).',
-        )
-      request.maxFeePerGas = maxFeePerGas
-      request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultPriorityFee
-    }
-  } else if (typeof gasPrice === 'undefined') {
-    // Legacy fees
-    if (
-      typeof maxFeePerGas !== 'undefined' ||
-      typeof maxPriorityFeePerGas !== 'undefined'
-    )
-      throw new BaseError('Chain does not support EIP-1559 fees.')
-
-    // Set a buffer of 1.2x on top of the base fee to account for fluctuations.
-    request.gasPrice = ((await getGasPrice(client)) * 120n) / 100n
-  }
-
-  if (typeof gas === 'undefined')
-    request.gas = await estimateGas(client, {
-      ...request,
-      account: { address: account.address, type: 'json-rpc' },
-    } as EstimateGasParameters)
-
-  assertRequest(request as AssertRequestParameters)
-
-  return request as PrepareRequestReturnType<
-    TChain,
-    TAccount,
-    TChainOverride,
-    TArgs
-  >
-}