Transaction input and data refactors

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

@@ -17,8 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 import { Transaction, DataFormat, DEFAULT_RETURN_FORMAT, FormatType } from 'web3-types';
 import { isNullish, ValidationSchemaInput } from 'web3-validator';
-import { TransactionDataAndInputError } from 'web3-errors';
-import { mergeDeep, bytesToHex, format } from 'web3-utils';
+import { mergeDeep, format } from 'web3-utils';
 import { transactionSchema } from '../schemas.js';
 
 export function formatTransaction<
@@ -40,21 +39,6 @@ export function formatTransaction<
 
 	formattedTransaction = format(options.transactionSchema, formattedTransaction, returnFormat);
 
-	if (!isNullish(formattedTransaction.data)) {
-		if (
-			!isNullish(formattedTransaction.input) &&
-			formattedTransaction.data !== formattedTransaction.input
-		)
-			throw new TransactionDataAndInputError({
-				data: bytesToHex(formattedTransaction.data),
-				input: bytesToHex(formattedTransaction.input),
-			});
-
-		formattedTransaction.input = formattedTransaction.data;
-	} else if (!isNullish(formattedTransaction.input)) {
-		formattedTransaction.data = formattedTransaction.input;
-	}
-
 	if (!isNullish(formattedTransaction.gasLimit)) {
 		formattedTransaction.gas = formattedTransaction.gasLimit;
 		delete formattedTransaction.gasLimit;

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

@@ -42,7 +42,7 @@ const getEthereumjsTxDataFromTransaction = (
 	gasLimit: transaction.gasLimit ?? transaction.gas,
 	to: transaction.to,
 	value: transaction.value,
-	data: transaction.input,
+	data: transaction.data ?? transaction.input,
 	type: transaction.type,
 	chainId: transaction.chainId,
 	accessList: (

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

@@ -171,16 +171,11 @@ export async function defaultTransactionBuilder<ReturnType = Transaction>(option
 
 		if (!populatedTransaction.data.startsWith('0x'))
 			populatedTransaction.data = `0x${populatedTransaction.data}`;
-
-		populatedTransaction.input = populatedTransaction.data;
 	} else if (!isNullish(populatedTransaction.input)) {
 		if (!populatedTransaction.input.startsWith('0x'))
 			populatedTransaction.input = `0x${populatedTransaction.input}`;
-
-		populatedTransaction.data = populatedTransaction.input;
 	} else {
 		populatedTransaction.input = '0x';
-		populatedTransaction.data = '0x';
 	}
 
 	if (isNullish(populatedTransaction.common)) {

packages/web3-eth/test/integration/web3_eth/sign_transaction.test.ts

@@ -20,6 +20,7 @@ import { Web3Eth } from '../../../src';
 import {
 	closeOpenConnection,
 	createTempAccount,
+	getSystemTestBackend,
 	getSystemTestProvider,
 } from '../../fixtures/system_test_utils';
 
@@ -47,17 +48,21 @@ describe('Web3Eth.signTransaction', () => {
 			gasPrice: '0x3b9aca01',
 		};
 		const response = await web3Eth.signTransaction(transaction);
-		expect(response).toMatchObject({
+		const expectedResponse: { tx: Transaction } = {
 			tx: {
 				type: BigInt(0),
 				nonce: BigInt(nonce),
 				gasPrice: BigInt(1000000001),
 				gas: BigInt(21000),
 				value: BigInt(1),
 				to: transaction.to,
-				input: '0x',
 			},
-		});
+		};
+		if (getSystemTestBackend() === 'geth') expectedResponse.tx.input = '0x';
+		else if (getSystemTestBackend() === 'ganache') expectedResponse.tx.data = '0x';
+
+		expect(response).toMatchObject(expectedResponse);
+
 		// Pulling out of toMatchObject to be compatiable with Cypress
 		expect(response.raw).toMatch(/0[xX][0-9a-fA-F]+/);
 		expect(typeof (response.tx as TransactionLegacySignedAPI).v).toBe('bigint');
@@ -77,16 +82,21 @@ describe('Web3Eth.signTransaction', () => {
 			gasPrice: '0x3b9aca01',
 		};
 		const response = await web3Eth.signTransaction(transaction);
-		// eslint-disable-next-line jest/no-standalone-expect
-		expect(response).toMatchObject({
+		const expectedResponse: { tx: Transaction } = {
 			tx: {
 				type: BigInt(0),
 				nonce: BigInt(nonce),
 				gasPrice: BigInt(1000000001),
 				gas: BigInt(475320),
-				input: greeterContractDeploymentData,
 			},
-		});
+		};
+		if (getSystemTestBackend() === 'geth')
+			expectedResponse.tx.input = greeterContractDeploymentData;
+		else if (getSystemTestBackend() === 'ganache')
+			expectedResponse.tx.data = greeterContractDeploymentData;
+
+		// eslint-disable-next-line jest/no-standalone-expect
+		expect(response).toMatchObject(expectedResponse);
 		// Pulling out of toMatchObject to be compatiable with Cypress
 		expect(response.raw).toMatch(/0[xX][0-9a-fA-F]+/);
 		expect(typeof (response.tx as TransactionLegacySignedAPI).v).toBe('bigint');

packages/web3-eth/test/unit/default_transaction_builder.test.ts

@@ -246,9 +246,8 @@ describe('defaultTransactionBuilder', () => {
 	});
 
 	describe('should populate input/data', () => {
-		it('should populate with 0x', async () => {
+		it('should populate input with 0x', async () => {
 			const input = { ...transaction };
-			delete input.input;
 			delete input.maxPriorityFeePerGas;
 			delete input.maxFeePerGas;
 			delete input.data;
@@ -259,22 +258,37 @@ describe('defaultTransactionBuilder', () => {
 				fillGasPrice: true,
 			});
 			expect(result.input).toBe('0x');
-			expect(result.data).toBe('0x');
+			expect(result.data).toBeUndefined();
 		});
 
-		it('should prefix with 0x', async () => {
+		it('should prefix input with 0x', async () => {
 			const input = { ...transaction };
 			input.input = '123';
 			delete input.maxPriorityFeePerGas;
 			delete input.maxFeePerGas;
-			input.data = '123';
+			delete input.data;
 
 			const result = await defaultTransactionBuilder({
 				transaction: input,
 				web3Context,
 				fillGasPrice: true,
 			});
 			expect(result.input).toBe('0x123');
+			expect(result.data).toBeUndefined();
+		});
+
+		it('should prefix data with 0x', async () => {
+			const input = { ...transaction };
+			delete input.maxPriorityFeePerGas;
+			delete input.maxFeePerGas;
+			input.data = '123';
+
+			const result = await defaultTransactionBuilder({
+				transaction: input,
+				web3Context,
+				fillGasPrice: true,
+			});
+			expect(result.input).toBeUndefined();
 			expect(result.data).toBe('0x123');
 		});
 

packages/web3-eth/test/unit/format_transaction.test.ts

@@ -14,8 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Transaction } from 'web3-types';
-import { TransactionDataAndInputError } from 'web3-errors';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER } from 'web3-types';
 
 import { formatTransaction } from '../../src/utils/format_transaction';
 import {
@@ -94,18 +93,4 @@ describe('formatTransaction', () => {
 			}
 		}
 	});
-
-	it('Should throw a TransactionDataAndInputError error', () => {
-		const transaction: Transaction = {
-			data: '0x00',
-			input: '0x01',
-		};
-
-		expect(() => formatTransaction(transaction)).toThrow(
-			new TransactionDataAndInputError({
-				data: transaction.data as string,
-				input: transaction.input as string,
-			}),
-		);
-	});
 });

packages/web3-types/src/eth_types.ts

@@ -409,7 +409,8 @@ export interface PopulatedUnsignedBaseTransaction {
 	gas?: Numbers;
 	gasPrice: Numbers;
 	type: Numbers;
-	input: Bytes;
+	input?: Bytes;
+	data?: Bytes;
 	nonce: Numbers;
 	networkId: Numbers;
 	chain: ValidChains;