Merge branch '4.x' into 6393-web3validatorerror-error-value-at-0-must…

…-pass-bytes-validation

docs/docusaurus.config.js

@@ -121,7 +121,7 @@ const config = {
 						position: 'left',
 					},
 					{
-						to: '/libdocs/Accounts',
+						to: '/libdocs/ABI',
 						activeBasePath: '/libdocs/',
 						label: 'Documentation',
 						position: 'left',

packages/web3-eth-contract/CHANGELOG.md

@@ -358,3 +358,4 @@ Documentation:
 ### Fixed
 
 -	Fix and error that happen when trying to get past events by calling `contract.getPastEvents` or `contract.events.allEvents()`, if there is no matching events. (#6647)
+-	Fixed: The Contract is not using the context wallet passed if context was passed at constructor. (#6661)

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

@@ -483,6 +483,15 @@ export class Contract<Abi extends ContractAbi>
 			provider,
 			registeredSubscriptions: contractSubscriptions,
 		});
+
+		// Init protected properties
+		if ((contractContext as Web3Context)?.wallet) {
+			this._wallet = (contractContext as Web3Context).wallet;
+		}
+		if ((contractContext as Web3Context)?.accountProvider) {
+			this._accountProvider = (contractContext as Web3Context).accountProvider;
+		}
+
 		if (
 			!isNullish(options) &&
 			!isNullish(options.data) &&

packages/web3-eth/src/web3_eth.ts

@@ -1579,53 +1579,138 @@ export class Web3Eth extends Web3Context<Web3EthExecutionAPI, RegisteredSubscrip
 	}
 
 	/**
-	 * Lets you subscribe to specific events in the blockchain.
-	 *
-	 * @param name - The subscription you want to subscribe to.
-	 * @param args - Optional additional parameters, depending on the subscription type.
-	 * @returns A subscription object of type {@link RegisteredSubscription}. The object contains:
-	 *  - subscription.id: The subscription id, used to identify and unsubscribing the subscription.
-	 *  - subscription.subscribe(): Can be used to re-subscribe with the same parameters.
-	 *  - subscription.unsubscribe(): Unsubscribes the subscription and returns TRUE in the callback if successful.
-	 *  - subscription.args: The subscription arguments, used when re-subscribing.
-	 *
-	 *
-	 * You can use the subscription object to listen on:
-	 *
-	 * - on("data") - Fires on each incoming log with the log object as argument.
-	 * - on("changed") - Fires on each log which was removed from the blockchain. The log will have the additional property "removed: true".
-	 * - on("error") - Fires when an error in the subscription occurs.
-	 * - on("connected") - Fires once after the subscription successfully connected. Returns the subscription id.
-	 *
-	 * @example **Subscribe to Smart Contract events**
-	 * ```ts
-	 * // Subscribe to `logs`
-	 * const logSubscription = web3.eth.subscribe('logs', {
-	 *     address: '0x1234567890123456789012345678901234567890',
-	 *     topics: ['0x033456732123ffff2342342dd12342434324234234fd234fd23fd4f23d4234']
-	 * });
-	 * logSubscription.on('data', (data: any) => console.log(data));
-	 * logSubscription.on('error', (error: any) => console.log(error));
-	 *
-	 * ```
-	 *
-	 * @example **Subscribe to new block headers**
-	 * ```ts
-	 * // Subscribe to `newBlockHeaders`
-	 * const newBlocksSubscription = await web3.eth.subscribe('newBlockHeaders');
-	 *
-	 * newBlocksSubscription.on('data', async blockhead => {
-	 * 	console.log('New block header: ', blockhead);
-	 *
-	 * 	// You do not need the next line, if you like to keep notified for every new block
-	 * 	await newBlocksSubscription.unsubscribe();
-	 * 	console.log('Unsubscribed from new block headers.');
-	 * });
-	 * newBlocksSubscription.on('error', error =>
-	 * 	console.log('Error when subscribing to New block header: ', error),
-	 * );
-	 * ```
-	 */
+	* Lets you subscribe to specific events in the blockchain.
+	*
+	* @param name - The subscription you want to subscribe to.
+	* @param args - Optional additional parameters, depending on the subscription type.
+	* @returns A subscription object of type {@link RegisteredSubscription}. The object contains:
+	*  - subscription.id: The subscription id, used to identify and unsubscribing the subscription.
+	*  - subscription.subscribe(): Can be used to re-subscribe with the same parameters.
+	*  - subscription.unsubscribe(): Unsubscribes the subscription and returns TRUE in the callback if successful.
+	*  - subscription.args: The subscription arguments, used when re-subscribing.
+	*
+	*
+	* You can use the subscription object to listen on:
+	*
+	* - on("data") - Fires on each incoming log with the log object as argument.
+	* - on("changed") - Fires on each log which was removed from the blockchain. The log will have the additional property "removed: true".
+	* - on("error") - Fires when an error in the subscription occurs.
+	* - on("connected") - Fires once after the subscription successfully connected. Returns the subscription id.
+	*
+	* @example **Subscribe to Smart Contract events**
+	* ```ts
+	* // Subscribe to `logs`
+	* const logSubscription = web3.eth.subscribe('logs', {
+	*     address: '0x1234567890123456789012345678901234567890',
+	*     topics: ['0x033456732123ffff2342342dd12342434324234234fd234fd23fd4f23d4234']
+	* });
+	* logSubscription.on('data', (data: any) => console.log(data));
+	* logSubscription.on('error', (error: any) => console.log(error));
+	*
+	* ```
+	*
+	* @example **Subscribe to new block headers**
+	* ```ts
+	* // Subscribe to `newBlockHeaders`
+	* const newBlocksSubscription = await web3.eth.subscribe('newBlockHeaders');
+	*
+	* newBlocksSubscription.on('data', async blockhead => {
+	* 	console.log('New block header: ', blockhead);
+	*
+	* 	// You do not need the next line, if you like to keep notified for every new block
+	* 	await newBlocksSubscription.unsubscribe();
+	* 	console.log('Unsubscribed from new block headers.');
+	* });
+	* newBlocksSubscription.on('error', error =>
+	* 	console.log('Error when subscribing to New block header: ', error),
+	* );
+	* ```
+	* 
+	* 	### subscribe('pendingTransactions')
+	* 
+	* Subscribes to incoming pending transactions.
+	* You can subscribe to pending transactions by calling web3.eth.subscribe('pendingTransactions').
+	* 
+	* ```ts
+	* (await web3.eth.subscribe('pendingTransactions')).on('data', console.log);
+	* ```
+	*
+	* ### subscribe('newHeads') 
+	* ( same as subscribe('newBlockHeaders'))
+	* Subscribes to incoming block headers. This can be used as timer to check for changes on the blockchain.
+	*
+	* The structure of a returned block header is {@link BlockHeaderOutput}:
+	* 
+	* ```ts
+	* (await web3.eth.subscribe('newHeads')).on( // 'newBlockHeaders' would work as well
+	*  'data',
+	* console.log
+	* );
+	* >{
+	* parentHash: '0x9e746a1d906b299def98c75b06f714d62dacadd567c7515d76eeaa8c8074c738',
+	* sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
+	* miner: '0x0000000000000000000000000000000000000000',
+	* stateRoot: '0xe0f04b04861ecfa95e82a9310d6a7ef7aef8d7417f5209c182582bfb98a8e307',
+	* transactionsRoot: '0x31ab4ea571a9e10d3a19aaed07d190595b1dfa34e03960c04293fec565dea536',
+	* logsBloom: '0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+	* difficulty: 2n,
+	* number: 21n,
+	* gasLimit: 11738125n,
+	* gasUsed: 830006n,
+	* timestamp: 1678797237n,
+	* extraData: '0xd883010b02846765746888676f312e32302e31856c696e757800000000000000e0a6e93cf40e2e71a72e493272210c3f43738ccc7e7d7b14ffd51833797d896c09117e8dc4fbcbc969bd21b42e5af3e276a911524038c001b2109b63b8e0352601',
+	* nonce: 0n
+	* }
+	* ```
+	* 
+	* ### subscribe('syncing')
+	* Subscribe to syncing events. This will return `true` when the node is syncing and when it’s finished syncing will return `false`, for the `changed` event.
+	* 
+	* ```ts
+	* (await web3.eth.subscribe('syncing')).on('changed', console.log);
+	* > `true` // when syncing
+	*
+	* (await web3.eth.subscribe('syncing')).on('data', console.log);
+	* > {
+	*      startingBlock: 0,
+	*      currentBlock: 0,
+	*      highestBlock: 0,
+	*      pulledStates: 0,
+	*      knownStates: 0
+	*   }
+	* ```
+	*
+	* ### subscribe('logs', options)
+	* Subscribes to incoming logs, filtered by the given options. If a valid numerical fromBlock options property is set, web3.js will retrieve logs beginning from this point, backfilling the response as necessary.
+	*
+	* options: You can subscribe to logs matching a given filter object, which can take the following parameters:
+	* - `fromBlock`: (optional, default: 'latest') Integer block number, or `'latest'` for the last mined block or `'pending'`, `'earliest'` for not yet mined transactions.
+	* - `address`: (optional) Contract address or a list of addresses from which logs should originate.
+	* - `topics`: (optional) Array of 32 Bytes DATA topics. Topics are order-dependent. Each topic can also be an array of DATA with `or` options.
+	*
+	* ```ts
+	*  (await web3.eth.subscribe('logs', {
+    *    address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+    *   })).on('data', console.log);
+	* 
+	* > {
+	* removed: false,
+	* logIndex: 119n,
+	* transactionIndex: 58n,
+	* transactionHash: '0x61533efa77937360215069d5d6cb0be09a22af9721e6dc3df59d957833ed8870',
+	* blockHash: '0xe32bb97084479d32247f66f8b46d00af2fbc3c2db2bc6e5843fe2e4d1ca9b099',
+	* blockNumber: 18771966n,
+	* address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+	* data: '0x00000000000000000000000000000000000000000000000000000000d88b2e40',
+	* topics: [
+	* '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+	* '0x0000000000000000000000002fb2457f6ec1865dc0d4e7300c696b69c2a1b989',
+	* '0x00000000000000000000000027fd43babfbe83a81d14665b1a6fb8030a60c9b4'
+	* ]
+	* }
+	*``` 
+	*/
+
 	public async subscribe<
 		T extends keyof RegisteredSubscription,
 		ReturnType extends DataFormat = DataFormat,

packages/web3-utils/src/random.ts

@@ -15,6 +15,10 @@ 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/>.
 */
 
+/**
+ * @module Utils
+ */
+
 import { getRandomBytesSync } from 'ethereum-cryptography/random.js';
 import { bytesToHex } from './converters.js';
 

packages/web3-utils/src/string_manipulation.ts

@@ -15,6 +15,10 @@ 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/>.
 */
 
+/**
+ * @module Utils
+ */
+
 import { Numbers } from 'web3-types';
 import { NibbleWidthError } from 'web3-errors';
 import { isHexStrict, validator, utils as validatorUtils, bigintPower } from 'web3-validator';
@@ -134,7 +138,7 @@ export const toTwosComplement = (value: Numbers, nibbleWidth = 64): string => {
  *
  * @example
  * ```ts
- * console.log(web3.utils.fromTwosComplement(''0x0000000000000000000000000000000d', 32'));
+ * console.log(web3.utils.fromTwosComplement('0x0000000000000000000000000000000d', 32'));
  * > 13
  *
  * console.log(web3.utils.fromTwosComplement('0x00000000000000000020000000000000', 32));

packages/web3-utils/src/uuid.ts

@@ -15,6 +15,10 @@ 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/>.
 */
 
+/**
+ * @module Utils
+ */
+
 import { bytesToHex } from './converters.js';
 import { randomBytes } from './random.js';
 

packages/web3-utils/src/validation.ts

@@ -15,6 +15,10 @@ 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/>.
 */
 
+/**
+ * @module Utils
+ */
+
 import { InvalidBlockError } from 'web3-errors';
 import {
 	checkAddressCheckSum as checkAddressCheckSumValidator,

packages/web3/test/integration/contract.test.ts

@@ -0,0 +1,95 @@
+/*
+This file is part of web3.js.
+
+web3.js is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+web3.js is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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 * as Web3Eth from 'web3-eth';
+import { Web3, Contract } from '../../src/index';
+
+import {
+	ERC20TokenAbi,
+	// eslint-disable-next-line import/no-relative-packages
+} from '../shared_fixtures/contracts/ERC20Token';
+
+jest.mock('web3-eth');
+
+describe('Contract', () => {
+	describe('Contract use the the context wallet', () => {
+		it('should work when created as web.eth.Contract', async () => {
+			const web3 = new Web3('https://rpc2.sepolia.org');
+			const contract = new web3.eth.Contract(
+				ERC20TokenAbi,
+				'0x7af963cF6D228E564e2A0aA0DdBF06210B38615D',
+			);
+
+			// could be add wallet also as:
+			// const account = web3.eth.accounts.wallet.add('Private Key').get(0);
+			const account = web3.eth.accounts.create();
+
+			expect(contract.wallet).toBeDefined();
+
+			const sendTransactionSpy = jest
+				.spyOn(Web3Eth, 'sendTransaction')
+				.mockImplementation((_objInstance, tx) => {
+					expect(tx.from).toStrictEqual(account.address);
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+					return { on: jest.fn() } as any;
+				});
+
+			await contract.methods.transfer(account.address, 100).send({ from: account?.address });
+
+			expect(sendTransactionSpy).toHaveBeenLastCalledWith(
+				expect.any(Object),
+				expect.objectContaining({
+					from: account.address,
+				}),
+				expect.any(Object),
+				expect.any(Object),
+			);
+		});
+		it('should work when passed to constructor as Contract(..., web3Context)', async () => {
+			const web3 = new Web3('https://rpc2.sepolia.org');
+			const contract = new Contract(
+				ERC20TokenAbi,
+				'0x7af963cF6D228E564e2A0aA0DdBF06210B38615D',
+				web3,
+			);
+
+			// could be add wallet also as:
+			// const account = web3.eth.accounts.wallet.add('Private Key').get(0);
+			const account = web3.eth.accounts.create();
+
+			expect(contract.wallet).toBeDefined();
+
+			const sendTransactionSpy = jest
+				.spyOn(Web3Eth, 'sendTransaction')
+				.mockImplementation((_objInstance, tx) => {
+					expect(tx.from).toStrictEqual(account.address);
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+					return { on: jest.fn() } as any;
+				});
+
+			await contract.methods.transfer(account.address, 100).send({ from: account?.address });
+
+			expect(sendTransactionSpy).toHaveBeenLastCalledWith(
+				expect.any(Object),
+				expect.objectContaining({
+					from: account.address,
+				}),
+				expect.any(Object),
+				expect.any(Object),
+			);
+		});
+	});
+});

scripts/docshelper/functionsdoc.config.js

@@ -9,6 +9,10 @@ module.exports =  {
         //utils
         "./packages/web3-utils/src/converters.ts",
         "./packages/web3-utils/src/hash.ts",
+        "./packages/web3-utils/src/validation.ts",
+        "./packages/web3-utils/src/random.ts",
+        "./packages/web3-utils/src/string_manipulation.ts",
+        "./packages/web3-utils/src/uuid.ts",
         //ABI
          "./packages/web3-eth-abi/src/api/functions_api.ts",
          "./packages/web3-eth-abi/src/eip_712.ts",