Add types for user input in send/call

docs/docs/guides/sign_and_send_tx/wallet_of_eth_node.md

@@ -78,7 +78,7 @@ try {
 	const contract = new web3.eth.Contract(ContractAbi);
 	const contractDeployed = await contract
 		.deploy({
-			input: ContractBytecode,
+			data: ContractBytecode,
 			arguments: ['Constructor param1', 'Constructor param2'],
 		})
 		.send({

packages/web3-eth-contract/src/contract.ts

@@ -502,7 +502,7 @@ export class Contract<Abi extends ContractAbi>
 	 *
 	 * ```ts
 	 * myContract.deploy({
-	 *   input: '0x12345...',
+	 *   input: '0x12345...', //data keyword can be used, too. But if input is used, data will be ignored.
 	 *   arguments: [123, 'My String']
 	 * })
 	 * .send({
@@ -603,10 +603,6 @@ export class Contract<Abi extends ContractAbi>
 			> => {
 				const modifiedOptions = { ...options };
 
-				// Remove to address
-				// modifiedOptions.to = '0x0000000000000000000000000000000000000000';
-				delete modifiedOptions.to;
-
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 				return this._contractMethodDeploySend(
 					abi as AbiFunctionFragment,
@@ -621,9 +617,6 @@ export class Contract<Abi extends ContractAbi>
 			) => {
 				const modifiedOptions = { ...options };
 
-				// Remove to address
-				delete modifiedOptions.to;
-
 				return this._contractMethodEstimateGas({
 					abi: abi as AbiFunctionFragment,
 					params: args as unknown[],

packages/web3-eth-contract/src/types.ts

@@ -304,7 +304,7 @@ export interface NonPayableMethodObject<Inputs = unknown[], Outputs = unknown[]>
 	 * @param block - If you pass this parameter it will not use the default block set with contract.defaultBlock. Pre-defined block numbers as `earliest`, `latest`, `pending`, `safe` or `finalized can also be used. Useful for requesting data from or replaying transactions in past blocks.
 	 * @returns The returned data of the createAccessList,  e.g. The generated access list for transaction.
 	 *
-	 *  ```ts
+	 * ```ts
 	 *  const result = await MyContract.methods.myFunction().createAccessList();
 	 *  console.log(result);
 	 *
@@ -319,7 +319,7 @@ export interface NonPayableMethodObject<Inputs = unknown[], Outputs = unknown[]>
 	 *   ],
 	 *   "gasUsed": "0x7671"
 	 * }
-	 *  ```
+	 * ```
 	 */
 	createAccessList(
 		tx?: NonPayableCallOptions,
@@ -376,7 +376,7 @@ export interface PayableMethodObject<Inputs = unknown[], Outputs = unknown[]> {
 	 * @returns - The return value(s) of the smart contract method. If it returns a single value, it’s returned as is. If it has multiple return values they are returned as an object with properties and indices.
 	 */
 	call<SpecialOutput = Outputs>(
-		tx?: PayableCallOptions,
+		tx?: Omit<PayableCallOptions, 'nonce'>,
 		block?: BlockNumberOrTag,
 	): Promise<SpecialOutput>;
 
@@ -470,7 +470,7 @@ export interface PayableMethodObject<Inputs = unknown[], Outputs = unknown[]> {
 	 * @returns - The gas amount estimated.
 	 */
 	estimateGas<ReturnFormat extends DataFormat = typeof DEFAULT_RETURN_FORMAT>(
-		options?: PayableCallOptions,
+		options?: Omit<PayableCallOptions, 'nonce'>,
 		returnFormat?: ReturnFormat,
 	): Promise<FormatType<Numbers, ReturnFormat>>;
 
@@ -493,7 +493,7 @@ export interface PayableMethodObject<Inputs = unknown[], Outputs = unknown[]> {
 	 * @param block - If you pass this parameter it will not use the default block set with contract.defaultBlock. Pre-defined block numbers as `earliest`, `latest`, `pending`, `safe` or `finalized can also be used. Useful for requesting data from or replaying transactions in past blocks.
 	 * @returns The returned data of the createAccessList,  e.g. The generated access list for transaction.
 	 *
-	 *  ```ts
+	 * ```ts
 	 *  const result = await MyContract.methods.myFunction().createAccessList();
 	 *  console.log(result);
 	 *
@@ -508,10 +508,10 @@ export interface PayableMethodObject<Inputs = unknown[], Outputs = unknown[]> {
 	 *   ],
 	 *   "gasUsed": "0x7671"
 	 * }
-	 *  ```
+	 *```
 	 */
 	createAccessList(
-		tx?: NonPayableCallOptions,
+		tx?: Omit<PayableCallOptions, 'nonce' | 'type'>,
 		block?: BlockNumberOrTag,
 	): Promise<AccessListResult>;
 }

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

@@ -22,6 +22,7 @@ import {
 	TransactionWithSenderAPI,
 	TransactionCall,
 	HexString,
+	Address,
 	NonPayableCallOptions,
 	PayableCallOptions,
 	ContractInitOptions,
@@ -38,7 +39,11 @@ export const getSendTxParams = ({
 }: {
 	abi: AbiFunctionFragment;
 	params: unknown[];
-	options?: PayableCallOptions | NonPayableCallOptions;
+	options?: (PayableCallOptions | NonPayableCallOptions) & {
+		input?: HexString;
+		data?: HexString;
+		to?: Address;
+	};
 	contractOptions: ContractOptions;
 }): TransactionCall => {
 	const deploymentCall = options?.input ?? options?.data ?? contractOptions.input;
@@ -80,7 +85,7 @@ export const getEthTxCallParams = ({
 }: {
 	abi: AbiFunctionFragment;
 	params: unknown[];
-	options?: PayableCallOptions | NonPayableCallOptions;
+	options?: (PayableCallOptions | NonPayableCallOptions) & { to?: Address };
 	contractOptions: ContractOptions;
 }): TransactionCall => {
 	if (!options?.to && !contractOptions.address) {
@@ -162,7 +167,7 @@ export const getCreateAccessListParams = ({
 }: {
 	abi: AbiFunctionFragment;
 	params: unknown[];
-	options?: PayableCallOptions | NonPayableCallOptions;
+	options?: (PayableCallOptions | NonPayableCallOptions) & { to?: Address };
 	contractOptions: ContractOptions;
 }): TransactionForAccessList => {
 	if (!options?.to && !contractOptions.address) {