Nikos/5939/eip1193 provider callback types

packages/web3-core/src/web3_subscriptions.ts

@@ -27,6 +27,7 @@ import {
 	Log,
 	JsonRpcNotification,
 	JsonRpcSubscriptionResult,
+	Web3ProviderEventCallback,
 } from 'web3-types';
 import { jsonRpc } from 'web3-utils';
 import { Web3EventEmitter, Web3EventMap } from './web3_event_emitter';
@@ -81,7 +82,10 @@ export abstract class Web3Subscription<
 			}
 		};
 
-		(this._requestManager.provider as Web3BaseProvider).on<Log>('message', messageListener);
+		(this._requestManager.provider as Web3BaseProvider).on<Log>(
+			'message',
+			messageListener as Web3ProviderEventCallback<Log>,
+		);
 
 		this._messageListener = messageListener;
 	}

packages/web3-eth-contract/test/integration/contract_deploy.test.ts

@@ -14,6 +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 { Web3Eth } from 'web3-eth';
 import { Contract } from '../../src';
 import { sleep } from '../shared_fixtures/utils';
 import { ERC721TokenAbi, ERC721TokenBytecode } from '../shared_fixtures/build/ERC721Token';
@@ -27,6 +28,7 @@ import {
 	signTxAndSendEIP2930,
 	signTxAndSendEIP1559,
 	sendFewSampleTxs,
+	closeOpenConnection,
 } from '../fixtures/system_test_utils';
 
 describe('contract', () => {
@@ -36,7 +38,10 @@ describe('contract', () => {
 		let sendOptions: Record<string, unknown>;
 		let acc: { address: string; privateKey: string };
 		let pkAccount: { address: string; privateKey: string };
+		let web3Eth: Web3Eth;
+
 		beforeAll(async () => {
+			web3Eth = new Web3Eth(getSystemTestProvider());
 			deployOptions = {
 				data: GreeterBytecode,
 				arguments: ['My Greeting'],
@@ -49,6 +54,10 @@ describe('contract', () => {
 			});
 			sendOptions = { from: acc.address, gas: '1000000' };
 		});
+
+		afterAll(async () => {
+			await closeOpenConnection(web3Eth);
+		});
 		describe('local account', () => {
 			it.each([signTxAndSendEIP1559, signTxAndSendEIP2930])(
 				'should deploy the contract %p',
@@ -68,6 +77,24 @@ describe('contract', () => {
 				},
 			);
 
+			it.each([signTxAndSendEIP1559, signTxAndSendEIP2930])(
+				'should deploy the contract with input%p',
+				async signTxAndSend => {
+					pkAccount = await createNewAccount({ refill: true });
+
+					const deployData = contract.deploy(deployOptions);
+
+					const res = await signTxAndSend(
+						contract.provider,
+						{
+							input: deployData.encodeABI(),
+						},
+						pkAccount.privateKey,
+					);
+					expect(Number(res.status)).toBe(1);
+				},
+			);
+
 			it('should return estimated gas of contract constructor %p', async () => {
 				const estimatedGas = await new Contract(GreeterAbi, undefined, {
 					provider: getSystemTestProvider(),

packages/web3-providers-ipc/test/integration/eip1193.test.ts

@@ -16,12 +16,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { hexToNumber } from 'web3-utils';
-import {
-	HexString,
-	ProviderConnectInfo,
-	ProviderRpcError,
-	Web3ProviderEventCallback,
-} from 'web3-types';
+import { HexString, ProviderRpcError, ProviderConnectInfo } from 'web3-types';
 import IpcProvider from '../../src/index';
 
 import {
@@ -49,20 +44,19 @@ describeIf(isIpc)('IpcProvider - eip1193', () => {
 
 	describe('check events', () => {
 		it('should send connect event', async () => {
-			const { chainId } = await new Promise(resolve => {
-				socketProvider.on('connect', ((_error: unknown, data) => {
-					resolve(data as unknown as ProviderConnectInfo);
-				}) as Web3ProviderEventCallback<ProviderConnectInfo>);
+			const providerConnectInfo = await new Promise<ProviderConnectInfo>(resolve => {
+				socketProvider.on('connect', (data: ProviderConnectInfo) => {
+					resolve(data);
+				});
 			});
-			expect(hexToNumber(chainId)).toBeGreaterThan(0);
+			expect(hexToNumber(providerConnectInfo.chainId)).toBeGreaterThan(0);
 		});
-
 		it('should send disconnect event', async () => {
 			await waitForSocketConnect(socketProvider);
 			const disconnectPromise = new Promise<ProviderRpcError>(resolve => {
-				socketProvider.on('disconnect', ((error: ProviderRpcError) => {
+				socketProvider.on('disconnect', (error: ProviderRpcError) => {
 					resolve(error);
-				}) as Web3ProviderEventCallback<ProviderRpcError>);
+				});
 			});
 			socketProvider.disconnect(1000, 'Some extra data');
 
@@ -76,16 +70,16 @@ describeIf(isIpc)('IpcProvider - eip1193', () => {
 			socketProvider._chainId = '0x1';
 			socketProvider.disconnect(1000);
 			await waitForSocketDisconnect(socketProvider);
-			const chainChangedPromise = new Promise<ProviderConnectInfo>(resolve => {
-				socketProvider.on('chainChanged', ((_error, data) => {
-					resolve(data as unknown as ProviderConnectInfo);
-				}) as Web3ProviderEventCallback<ProviderConnectInfo>);
+			const chainChangedPromise = new Promise<HexString>(resolve => {
+				socketProvider.on('chainChanged', (result: HexString) => {
+					resolve(result);
+				});
 			});
 			socketProvider.connect();
 			await waitForSocketConnect(socketProvider);
-			const changedData = await chainChangedPromise;
-			expect(changedData.chainId).not.toBe('0x1');
-			expect(hexToNumber(changedData.chainId)).toBeGreaterThan(0);
+			const chainId = await chainChangedPromise;
+			expect(chainId).not.toBe('0x1');
+			expect(hexToNumber(chainId)).toBeGreaterThan(0);
 		});
 		it('should send accountsChanged event', async () => {
 			await waitForSocketConnect(socketProvider);
@@ -94,16 +88,16 @@ describeIf(isIpc)('IpcProvider - eip1193', () => {
 			socketProvider._accounts = ['1', '2'];
 			socketProvider.disconnect(1000);
 			await waitForSocketDisconnect(socketProvider);
-			const chainChangedPromise = new Promise<{ accounts: HexString[] }>(resolve => {
-				socketProvider.on('accountsChanged', ((_error, data) => {
-					resolve(data as unknown as { accounts: HexString[] });
-				}) as Web3ProviderEventCallback<{ accounts: HexString[] }>);
+			const chainChangedPromise = new Promise<HexString[]>(resolve => {
+				socketProvider.on('accountsChanged', (accounts: HexString[]) => {
+					resolve(accounts);
+				});
 			});
 			socketProvider.connect();
 			await waitForSocketConnect(socketProvider);
-			const changedData = await chainChangedPromise;
+			const accounts = await chainChangedPromise;
 
-			expect(JSON.stringify(changedData.accounts)).not.toBe(JSON.stringify(['1', '2']));
+			expect(JSON.stringify(accounts)).not.toBe(JSON.stringify(['1', '2']));
 		});
 	});
 });

packages/web3-providers-ipc/test/integration/reconnection.test.ts

@@ -21,7 +21,7 @@ import {
 	describeIf,
 	getSystemTestProvider,
 	isIpc,
-	waitForOpenSocketConnection,
+	waitForSocketConnect,
 	waitForCloseSocketConnection,
 	waitForEvent,
 } from '../fixtures/system_test_utils';
@@ -49,15 +49,15 @@ describeIf(isIpc)('IpcSocketProvider - reconnection', () => {
 				delay: 5000,
 				maxAttempts: 5,
 			});
-			await waitForOpenSocketConnection(web3Provider);
+			await waitForSocketConnect(web3Provider);
 			web3Provider.disconnect(1000, 'test');
 			await waitForCloseSocketConnection(web3Provider);
 		});
 		it('set custom reconnectOptions', async () => {
 			const web3Provider = new IpcProvider(getSystemTestProvider(), {}, reconnectionOptions);
 			// @ts-expect-error-next-line
 			expect(web3Provider._reconnectOptions).toEqual(reconnectionOptions);
-			await waitForOpenSocketConnection(web3Provider);
+			await waitForSocketConnect(web3Provider);
 			web3Provider.disconnect(1000, 'test');
 			await waitForCloseSocketConnection(web3Provider);
 		});

packages/web3-providers-ws/test/integration/basic_auth.test.ts

@@ -22,7 +22,7 @@ import {
 	getSystemTestProvider,
 	describeIf,
 	isWs,
-	waitForOpenSocketConnection,
+	waitForSocketConnect,
 	waitForCloseSocketConnection,
 } from '../fixtures/system_test_utils';
 
@@ -81,14 +81,14 @@ describeIf(isWs)('Support of Basic Auth', () => {
 	afterEach(async () => {
 		// make sure we try to close the connection after it is established
 		if (webSocketProvider.getStatus() === 'connecting') {
-			await waitForOpenSocketConnection(webSocketProvider);
+			await waitForSocketConnect(webSocketProvider);
 		}
 		webSocketProvider.disconnect();
 		await waitForCloseSocketConnection(webSocketProvider);
 	});
 	// eslint-disable-next-line jest/expect-expect
 	test('should connect with basic auth', async () => {
-		await waitForOpenSocketConnection(webSocketProvider);
+		await waitForSocketConnect(webSocketProvider);
 		expect(webSocketProvider.getStatus()).toBe('connected');
 	});
 });

packages/web3-providers-ws/test/integration/eip1193.test.ts

@@ -16,12 +16,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { hexToNumber } from 'web3-utils';
-import {
-	HexString,
-	ProviderConnectInfo,
-	ProviderRpcError,
-	Web3ProviderEventCallback,
-} from 'web3-types';
+import { HexString, ProviderRpcError, ProviderConnectInfo } from 'web3-types';
 import WebSocketProvider from '../../src/index';
 
 import {
@@ -49,19 +44,19 @@ describeIf(isWs)('WebSocketProvider - eip1193', () => {
 
 	describe('check events', () => {
 		it('should send connect event', async () => {
-			const { chainId } = await new Promise(resolve => {
-				socketProvider.on('connect', ((_error: unknown, data) => {
-					resolve(data as unknown as ProviderConnectInfo);
-				}) as Web3ProviderEventCallback<ProviderConnectInfo>);
+			const providerConnectInfo = await new Promise<ProviderConnectInfo>(resolve => {
+				socketProvider.on('connect', (data: ProviderConnectInfo) => {
+					resolve(data);
+				});
 			});
-			expect(hexToNumber(chainId)).toBeGreaterThan(0);
+			expect(hexToNumber(providerConnectInfo.chainId)).toBeGreaterThan(0);
 		});
 		it('should send disconnect event', async () => {
 			await waitForSocketConnect(socketProvider);
 			const disconnectPromise = new Promise<ProviderRpcError>(resolve => {
-				socketProvider.on('disconnect', ((error: ProviderRpcError) => {
+				socketProvider.on('disconnect', (error: ProviderRpcError) => {
 					resolve(error);
-				}) as Web3ProviderEventCallback<ProviderRpcError>);
+				});
 			});
 			socketProvider.disconnect(1000, 'Some extra data');
 
@@ -75,16 +70,16 @@ describeIf(isWs)('WebSocketProvider - eip1193', () => {
 			socketProvider._chainId = '0x1';
 			socketProvider.disconnect(1000);
 			await waitForSocketDisconnect(socketProvider);
-			const chainChangedPromise = new Promise<ProviderConnectInfo>(resolve => {
-				socketProvider.on('chainChanged', ((_error, data) => {
-					resolve(data as unknown as ProviderConnectInfo);
-				}) as Web3ProviderEventCallback<ProviderConnectInfo>);
+			const chainChangedPromise = new Promise<HexString>(resolve => {
+				socketProvider.on('chainChanged', (result: HexString) => {
+					resolve(result);
+				});
 			});
 			socketProvider.connect();
 			await waitForSocketConnect(socketProvider);
-			const changedData = await chainChangedPromise;
-			expect(changedData.chainId).not.toBe('0x1');
-			expect(hexToNumber(changedData.chainId)).toBeGreaterThan(0);
+			const chainId = await chainChangedPromise;
+			expect(chainId).not.toBe('0x1');
+			expect(hexToNumber(chainId)).toBeGreaterThan(0);
 		});
 		it('should send accountsChanged event', async () => {
 			await waitForSocketConnect(socketProvider);
@@ -93,16 +88,16 @@ describeIf(isWs)('WebSocketProvider - eip1193', () => {
 			socketProvider._accounts = ['1', '2'];
 			socketProvider.disconnect(1000);
 			await waitForSocketDisconnect(socketProvider);
-			const chainChangedPromise = new Promise<{ accounts: HexString[] }>(resolve => {
-				socketProvider.on('accountsChanged', ((_error, data) => {
-					resolve(data as unknown as { accounts: HexString[] });
-				}) as Web3ProviderEventCallback<{ accounts: HexString[] }>);
+			const chainChangedPromise = new Promise<HexString[]>(resolve => {
+				socketProvider.on('accountsChanged', (accounts: HexString[]) => {
+					resolve(accounts);
+				});
 			});
 			socketProvider.connect();
 			await waitForSocketConnect(socketProvider);
-			const changedData = await chainChangedPromise;
+			const accounts = await chainChangedPromise;
 
-			expect(JSON.stringify(changedData.accounts)).not.toBe(JSON.stringify(['1', '2']));
+			expect(JSON.stringify(accounts)).not.toBe(JSON.stringify(['1', '2']));
 		});
 	});
 });