Add hardhat

.github/workflows/build.yml

@@ -131,25 +131,25 @@ jobs:
                   token: ${{ secrets.CODECOV_TOKEN }}
               if: ${{ matrix.node == 18 }}
 
-    integration:
-        name: Integration (ganache) # (ganache with HTTP)
+    integration-hardhat:
+        name: Integration hardhat
         needs: build
         runs-on: ubuntu-latest
-        env:
-            INFURA_GOERLI_HTTP: ${{ secrets.INFURA_GOERLI_HTTP }}
-            INFURA_GOERLI_WS: ${{ secrets.INFURA_GOERLI_WS }}
+        strategy:
+          fail-fast: false
         steps:
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: 18
-            - uses: actions/cache/restore@v3
-              with:
+          - uses: actions/setup-node@v3
+            with:
+              node-version: 18
+          - uses: actions/cache/restore@v3
+            with:
                 path: ./
                 key: web3-18-${{github.event.pull_request.base.sha}}
-            - run: yarn test:e2e:ganache:http
-              shell: bash
+          - run: npx hardhat node &
+          - run: yarn test:e2e:hardhat:http
+            shell: bash
 
-    e2e:
+    e2e-geth:
         name: Integration # (geth with HTTP, IPC & WS)
         needs: build
         runs-on: ubuntu-latest
@@ -172,31 +172,31 @@ jobs:
                 shell: bash
 
     e2e-browsers:
-        name: End-to-End ganache:ws
+        name: End-to-End hardhat:ws
         needs: build
         runs-on: ubuntu-latest
         strategy:
-            fail-fast: false
-            matrix:
-                browser: ['electron', 'chrome', 'firefox']
+          fail-fast: false
+          matrix:
+            browser: ['electron', 'chrome', 'firefox']
         steps:
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: 18
-            - uses: browser-actions/setup-firefox@latest
-              if: matrix.browser == 'firefox'
-            - uses: actions/cache/restore@v3
-              with:
-                path: ./
-                key: web3-18-${{github.event.pull_request.base.sha}}
-            - run: npm install --no-package-lock --no-save --force cypress
-            - run: npx ts-node scripts/init.ts
-            - name: Cypress run
-              uses: cypress-io/github-action@v4
-              with:
-                  install: false
-                  command: yarn test:e2e:ganache:ws:${{ matrix.browser }}
-                  cache-key: node-v${{ matrix.node }}-on-${{ matrix.browser }}-hash-${{ hashFiles('yarn.lock') }}
+          - uses: actions/setup-node@v3
+            with:
+                node-version: 18
+          - uses: browser-actions/setup-firefox@latest
+            if: matrix.browser == 'firefox'
+          - uses: actions/cache/restore@v3
+            with:
+              path: ./
+              key: web3-18-${{github.event.pull_request.base.sha}}
+          - run: npx hardhat node &
+          - run: npm install --no-package-lock --no-save --force cypress
+          - name: Cypress run
+            uses: cypress-io/github-action@v4
+            with:
+                install: false
+                command: yarn test:e2e:hardhat:ws:${{ matrix.browser }}
+                cache-key: node-v18-on-${{ matrix.browser }}-hash-${{ hashFiles('yarn.lock') }}
 
     deploy-docs:
         name: Docs CloudFlare Deploy

hardhat.config.js

@@ -0,0 +1,13 @@
+/** @type import('hardhat/config').HardhatUserConfig */
+
+module.exports = {
+  solidity: "0.8.17",
+  networks: {
+    hardhat: {
+      chainId: 1337,
+      accounts: {
+
+      }
+    }
+  }
+};

package.json

@@ -44,15 +44,14 @@
 		"build:docs": "yarn generate:docs && cd docs && yarn install && yarn build",
 		"changelog": "ts-node -P scripts/changelog/tsconfig.json scripts/changelog/src/index.ts",
 		"clean": "lerna run clean --stream --parallel",
-		"ganache:start": "WEB3_SYSTEM_TEST_BACKEND=ganache && ./scripts/ganache.sh start",
-		"ganache:start:background": "WEB3_SYSTEM_TEST_BACKEND=ganache && ./scripts/ganache.sh start 1",
-		"ganache:stop": "./scripts/ganache.sh stop",
 		"geth:start": "WEB3_SYSTEM_TEST_BACKEND=geth && ./scripts/geth.sh start",
 		"geth:start:background": "WEB3_SYSTEM_TEST_BACKEND=geth && ./scripts/geth.sh start 1",
 		"geth:stop": "./scripts/geth.sh stop",
 		"geth-binary:start": "WEB3_SYSTEM_TEST_BACKEND=geth && ./scripts/geth_binary.sh start",
 		"geth-binary:start:background": "WEB3_SYSTEM_TEST_BACKEND=geth && ./scripts/geth_binary.sh start 1",
 		"geth-binary:stop": "WEB3_SYSTEM_TEST_BACKEND=geth && ./scripts/geth_binary.sh stop",
+		"hardhat:start": "WEB3_SYSTEM_TEST_BACKEND=hardhat && ./scripts/hardhat.sh start",
+		"hardhat:stop": "./scripts/hardhat.sh stop",
 		"geth-manual:start:background": "WEB3_SYSTEM_TEST_BACKEND=geth && ./scripts/geth_binary.sh manualStart 1",
 		"geth-manual:stop": "WEB3_SYSTEM_TEST_BACKEND=geth && ./scripts/geth_binary.sh stop",
 		"lint": "lerna run lint --stream --parallel",
@@ -65,14 +64,10 @@
 		"test:integration": "lerna run test:integration --stream",
 		"test:benchmark": "lerna run test:benchmark",
 		"test:integration:stress": "lerna run test:integration:stress --stream",
-		"test:e2e:ganache:http": "./scripts/test-runner.sh ganache http",
-		"test:e2e:ganache:ws": "./scripts/test-runner.sh ganache ws",
 		"test:e2e:geth:http": "./scripts/test-runner.sh geth http",
 		"test:e2e:geth:ws": "./scripts/test-runner.sh geth ws",
 		"test:e2e:geth:ipc": "./scripts/test-runner.sh geth ipc",
-		"test:e2e:ganache:ws:electron": "./scripts/test-runner.sh ganache ws electron",
-		"test:e2e:ganache:ws:chrome": "./scripts/test-runner.sh ganache ws chrome",
-		"test:e2e:ganache:ws:firefox": "./scripts/test-runner.sh ganache ws firefox",
+		"test:e2e:hardhat:http": "./scripts/test-runner.sh hardhat http",
 		"test:e2e:coverage": "./scripts/test-runner.sh coverage",
 		"test:e2e:mainnet:http": "./scripts/test-runner.sh mainnet http",
 		"test:e2e:mainnet:ws": "./scripts/test-runner.sh mainnet ws",
@@ -85,12 +80,15 @@
 		"generate:accounts": "node ./scripts/gen_accounts.js",
 		"pre-blackbox": "yarn config set registry http://localhost:4873 && git init && git config --global user.email \"ci@github.com\" && git config --global user.name \"CI\"",
 		"post-blackbox": "./scripts/verdaccio.sh stop",
-		"post-blackbox:ganache": "yarn ganache:stop && yarn post-blackbox",
 		"post-blackbox:geth": "yarn geth:stop && yarn post-blackbox",
-		"test:blackbox:ganache:http": "yarn pre-blackbox && yarn ganache:start:background && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:ganache:http --stream && yarn post-blackbox:ganache",
-		"test:blackbox:ganache:ws": "yarn pre-blackbox && yarn ganache:start:background && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:ganache:ws --stream && yarn post-blackbox:ganache",
 		"test:blackbox:geth:http": "yarn pre-blackbox && yarn geth:start:background && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:geth:http --stream && yarn post-blackbox:geth",
 		"test:blackbox:geth:ws": "yarn pre-blackbox && yarn geth:start:background && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:geth:ws --stream && yarn post-blackbox:geth",
+		"test:e2e:geth:ws:electron": "./scripts/test-runner.sh hardhat ws electron",
+		"test:e2e:geth:ws:chrome": "./scripts/test-runner.sh hardhat ws chrome",
+		"test:e2e:geth:ws:firefox": "./scripts/test-runner.sh hardhat ws firefox",
+		"test:e2e:hardhat:ws:electron": "./scripts/test-runner.sh hardhat http electron",
+		"test:e2e:hardhat:ws:chrome": "./scripts/test-runner.sh hardhat http chrome",
+		"test:e2e:hardhat:ws:firefox": "./scripts/test-runner.sh hardhat http firefox",
 		"test:blackbox:infura:http": "yarn pre-blackbox && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:infura:http --stream && yarn post-blackbox",
 		"test:blackbox:infura:ws": "yarn pre-blackbox && ./scripts/verdaccio.sh startBackgroundAndPublish && lerna run test:blackbox:infura:ws --stream && yarn post-blackbox",
 		"test:manual:long-connection-ws": "node packages/web3/test/stress/long_ws_tests/nodejs_test/long_connection_ws.js",
@@ -138,6 +136,7 @@
 		"typedoc-plugin-merge-modules": "^5.1.0",
 		"typescript": "^4.7.4",
 		"utf-8-validate": "^5.0.9",
+		"web3-hardhat-plugin": "^1.0.0",
 		"webpack": "^5.73.0",
 		"webpack-cli": "^4.10.0"
 	},

packages/web3-core/src/web3_request_manager.ts

@@ -425,10 +425,10 @@ export class Web3RequestManager<
 		} else if ((response as unknown) instanceof Error) {
 			error = response as unknown as JsonRpcError;
 		}
-
+		
 		// This message means that there was an error while executing the code of the smart contract
 		// However, more processing will happen at a higher level to decode the error data,
-		//	according to the Error ABI, if it was available as of EIP-838.
+		//	according to the Error ABI, if it was available as of EIP-838. 
 		if (error?.message.includes('revert')) throw new ContractExecutionError(error);
 
 		return false;

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

@@ -22,10 +22,11 @@ import {
 	createTempAccount,
 	describeIf,
 	getSystemTestBackend,
+	BACKEND
 } from '../fixtures/system_test_utils';
 
 describe('contract', () => {
-	describeIf(getSystemTestBackend() === 'geth')('createAccessList', () => {
+	describeIf(getSystemTestBackend() === BACKEND.GETH)('createAccessList', () => {
 		let contract: Contract<typeof GreeterAbi>;
 		let deployOptions: Record<string, unknown>;
 		let sendOptions: Record<string, unknown>;

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

@@ -29,6 +29,8 @@ import {
 	signTxAndSendEIP1559,
 	sendFewSampleTxs,
 	closeOpenConnection,
+	getSystemTestBackend,
+	BACKEND
 } from '../fixtures/system_test_utils';
 
 describe('contract', () => {
@@ -254,9 +256,17 @@ describe('contract', () => {
 		});
 
 		it('should fail with errors on "intrinsic gas too low" OOG', async () => {
-			await expect(
-				contract.deploy(deployOptions).send({ ...sendOptions, gas: '100' }),
-			).rejects.toThrow('Returned error: intrinsic gas too low');
+			if (getSystemTestBackend() !== BACKEND.HARDHAT){
+				// eslint-disable-next-line jest/no-conditional-expect
+				await expect(
+					contract.deploy(deployOptions).send({ ...sendOptions, gas: '100' }),
+				).rejects.toThrow('Returned error: intrinsic gas too low');
+			} else {
+				// eslint-disable-next-line jest/no-conditional-expect
+				await expect(
+					contract.deploy(deployOptions).send({ ...sendOptions, gas: '100' }),
+				).rejects.toThrow('Returned error: Transaction requires at least 109656 gas but got 100');
+			}
 		});
 
 		it('should fail with errors deploying a zero length bytecode', () => {
@@ -273,14 +283,25 @@ describe('contract', () => {
 		it('should fail with errors on revert', async () => {
 			const revert = new Contract(DeployRevertAbi);
 			revert.provider = getSystemTestProvider();
-			// eslint-disable-next-line jest/no-standalone-expect
+			if (getSystemTestBackend() !== BACKEND.HARDHAT){
+				// eslint-disable-next-line jest/no-conditional-expect
+				await expect(
+					revert
+						.deploy({
+							data: DeployRevertBytecode,
+						})
+						.send(sendOptions),
+				).rejects.toThrow("code couldn't be stored");
+			} else {
+			// eslint-disable-next-line jest/no-conditional-expect
 			await expect(
 				revert
 					.deploy({
 						data: DeployRevertBytecode,
 					})
 					.send(sendOptions),
-			).rejects.toThrow("code couldn't be stored");
+			).rejects.toThrow("Error happened while trying to execute a function inside a smart contract");
+				}	
 		});
 	});
 });

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

@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 import { ContractExecutionError } from 'web3-errors';
 import { Contract } from '../../src';
 import { BasicAbi, BasicBytecode } from '../shared_fixtures/build/Basic';
-import { getSystemTestProvider, createTempAccount } from '../fixtures/system_test_utils';
+import { getSystemTestProvider, createTempAccount, getSystemTestBackend, BACKEND} from '../fixtures/system_test_utils';
 
 describe('contract', () => {
 	let contract: Contract<typeof BasicAbi>;
@@ -135,9 +135,9 @@ describe('contract', () => {
 			it('should run send method of the contract if data is provided at initiation', async () => {
 				const tempContract = new Contract(BasicAbi, {
 					provider: getSystemTestProvider(),
-					input: BasicBytecode,
 					from: acc.address,
 					gas: '1000000',
+					data: BasicBytecode,
 				});
 				const deployedTempContract = await tempContract
 					.deploy({ arguments: [10, 'string init value'] })
@@ -148,23 +148,35 @@ describe('contract', () => {
 			});
 
 			it('should returns errors on reverts', async () => {
-				await expect(
-					contractDeployed.methods.reverts().send(sendOptions),
-				).rejects.toMatchObject({
-					name: 'TransactionRevertedWithoutReasonError',
-					receipt: {
-						cumulativeGasUsed: BigInt(21543),
-						from: acc.address,
-						gasUsed: BigInt(21543),
-						logs: [],
-						logsBloom:
-							'0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-						status: BigInt(0),
-						to: contractDeployed.options.address?.toLowerCase(),
-						transactionIndex: BigInt(0),
-						type: BigInt(2),
-					},
-				});
+				// TODO hardhat reverts but sends an undefined receipt, needs investigation
+				if (getSystemTestBackend() === BACKEND.HARDHAT) {
+					// eslint-disable-next-line jest/no-conditional-expect
+					await expect(
+						contractDeployed.methods.reverts().send(sendOptions),
+					).rejects.toMatchObject({
+						"name": "ContractExecutionError",
+						"receipt": undefined,
+					});
+				} else {
+					// eslint-disable-next-line jest/no-conditional-expect
+					await expect(
+						contractDeployed.methods.reverts().send(sendOptions),
+					).rejects.toMatchObject({
+						name: 'TransactionRevertedWithoutReasonError',
+						receipt: {
+							cumulativeGasUsed: BigInt(21543),
+							from: acc.address,
+							gasUsed: BigInt(21543),
+							logs: [],
+							logsBloom:
+								'0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+							status: BigInt(0),
+							to: contractDeployed.options.address?.toLowerCase(),
+							transactionIndex: BigInt(0),
+							type: BigInt(2),
+						},
+					});
+				}
 			});
 		});
 	});

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

@@ -23,6 +23,7 @@ import {
 	createTempAccount,
 	getSystemTestBackend,
 	describeIf,
+	BACKEND,
 } from '../fixtures/system_test_utils';
 
 describe('contract errors', () => {
@@ -50,7 +51,7 @@ describe('contract errors', () => {
 		contract.setProvider(getSystemTestProvider());
 	});
 
-	describeIf(getSystemTestBackend() === 'geth')('Test EIP-838 Error Codes', () => {
+	describeIf(getSystemTestBackend() === BACKEND.GETH)('Test EIP-838 Error Codes', () => {
 		it('Unauthorized', async () => {
 			let error: ContractExecutionError | undefined;
 			try {