transaction integration tests

packages/web3-core/src/web3_context.ts

@@ -368,13 +368,14 @@ export class Web3Context<
 }
 
 // To avoid cycle dependency declare this type in this file
-export type TransactionBuilder<API extends Web3APISpec = unknown> = <
- ReturnType = Transaction,
->(options: {
- transaction: Transaction;
- web3Context: Web3Context<API>;
- privateKey?: HexString | Uint8Array;
-}) => Promise<ReturnType>;
+export type TransactionBuilder<API extends Web3APISpec = unknown> = <ReturnType = Transaction>(
+ options: {
+ transaction: Transaction;
+ web3Context: Web3Context<API>;
+ privateKey?: HexString | Uint8Array;
+ },
+ fillGasPrice: boolean,
+) => Promise<ReturnType>;
 
 /**
  * Extend this class when creating a plugin that either doesn't require {@link EthExecutionAPI},

packages/web3-eth/CHANGELOG.md

@@ -126,6 +126,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed `ignoreGasPricing` bug with wallet in context (#6071)
+
 ### Changed
 
 - `formatTransaction` no longer throws a `TransactionDataAndInputError` if it's passed a transaction object with both `data` and `input` properties set (as long as they are the same value) (#6064)

packages/web3-eth/src/utils/prepare_transaction_for_signing.ts

@@ -124,12 +124,16 @@ export const prepareTransactionForSigning = async (
  transaction: Transaction,
  web3Context: Web3Context<EthExecutionAPI>,
  privateKey?: HexString | Uint8Array,
+ fillGasPrice = false,
 ) => {
- const populatedTransaction = (await transactionBuilder({
- transaction,
- web3Context,
- privateKey,
- })) as unknown as PopulatedUnsignedTransaction;
+ const populatedTransaction = (await transactionBuilder(
+ {
+ transaction,
+ web3Context,
+ privateKey,
+ },
+ fillGasPrice,
+ )) as unknown as PopulatedUnsignedTransaction;
 
  const formattedTransaction = formatTransaction(
  populatedTransaction,

packages/web3-eth/src/utils/transaction_builder.ts

@@ -49,10 +49,10 @@ import { NUMBER_DATA_FORMAT } from '../constants';
 // eslint-disable-next-line import/no-cycle
 import { getChainId, getTransactionCount } from '../rpc_method_wrappers';
 import { detectTransactionType } from './detect_transaction_type';
-// eslint-disable-next-line import/no-cycle
-import { getTransactionGasPricing } from './get_transaction_gas_pricing';
 import { transactionSchema } from '../schemas';
 import { InternalTransaction } from '../types';
+// eslint-disable-next-line import/no-cycle
+import { getTransactionGasPricing } from './get_transaction_gas_pricing';
 
 export const getTransactionFromOrToAttr = (
  attr: 'from' | 'to',
@@ -124,11 +124,14 @@ export const getTransactionType = (
 
 // Keep in mind that the order the properties of populateTransaction get populated matters
 // as some of the properties are dependent on others
-export async function defaultTransactionBuilder<ReturnType = Transaction>(options: {
- transaction: Transaction;
- web3Context: Web3Context<EthExecutionAPI & Web3NetAPI>;
- privateKey?: HexString | Uint8Array;
-}): Promise<ReturnType> {
+export async function defaultTransactionBuilder<ReturnType = Transaction>(
+ options: {
+ transaction: Transaction;
+ web3Context: Web3Context<EthExecutionAPI & Web3NetAPI>;
+ privateKey?: HexString | Uint8Array;
+ },
+ fillGasPrice = false,
+): Promise<ReturnType> {
  // let populatedTransaction = { ...options.transaction } as unknown as InternalTransaction;
  let populatedTransaction = format(
  transactionSchema,
@@ -228,25 +231,32 @@ export async function defaultTransactionBuilder<ReturnType = Transaction>(option
  populatedTransaction.accessList = [];
  }
 
- populatedTransaction = {
- ...populatedTransaction,
- ...(await getTransactionGasPricing(
- populatedTransaction,
- options.web3Context,
- ETH_DATA_FORMAT,
- )),
- };
+ if (fillGasPrice)
+ populatedTransaction = {
+ ...populatedTransaction,
+ ...(await getTransactionGasPricing(
+ populatedTransaction,
+ options.web3Context,
+ ETH_DATA_FORMAT,
+ )),
+ };
 
  return populatedTransaction as ReturnType;
 }
 
-export const transactionBuilder = async <ReturnType = Transaction>(options: {
- transaction: Transaction;
- web3Context: Web3Context<EthExecutionAPI>;
- privateKey?: HexString | Uint8Array;
+export const transactionBuilder = async <ReturnType = Transaction>(
+ options: {
+ transaction: Transaction;
+ web3Context: Web3Context<EthExecutionAPI>;
+ privateKey?: HexString | Uint8Array;
+ },
+ fillGasPrice = false,
  // eslint-disable-next-line @typescript-eslint/require-await
-}) =>
- (options.web3Context.transactionBuilder ?? defaultTransactionBuilder)({
- ...options,
- transaction: options.transaction,
- }) as unknown as ReturnType;
+) =>
+ (options.web3Context.transactionBuilder ?? defaultTransactionBuilder)(
+ {
+ ...options,
+ transaction: options.transaction,
+ },
+ fillGasPrice,
+ ) as unknown as ReturnType;