Merge pull request #26 from ChainSafe/25-update-dependencies-and-fix-tests-for-web3js-v401-rc2

Update dependencies and fix tests for web3.js v4.0.1-rc.2

Author: spacesailor24

.github/workflows/test.yml

@@ -13,8 +13,8 @@ jobs:
         strategy:
             matrix:
                 node:
-                    - 14
                     - 16
+                    - 18
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
@@ -43,8 +43,8 @@ jobs:
         strategy:
             matrix:
                 node:
-                    - 14
                     - 16
+                    - 18
         steps:
             - uses: actions/download-artifact@v3
               with:
@@ -60,10 +60,10 @@ jobs:
         steps:
             - uses: actions/download-artifact@v3
               with:
-                  name: chainlink-plugin-14.js.tar.gz
+                  name: chainlink-plugin-18.js.tar.gz
                   path: /tmp
             - run: corepack enable
-            - run: tar -xf /tmp/chainlink-plugin-14.js.tar.gz -C ./
+            - run: tar -xf /tmp/chainlink-plugin-18.js.tar.gz -C ./
             - run: yarn lint
     unit:
         name: Unit Tests
@@ -72,8 +72,8 @@ jobs:
         strategy:
             matrix:
                 node:
-                    - 14
                     - 16
+                    - 18
         steps:
             - uses: actions/download-artifact@v3
               with:
@@ -118,6 +118,7 @@ jobs:
             matrix:
                 node:
                     - 16
+                    - 18
         steps:
             - uses: actions/download-artifact@v3
               with:

README.md

@@ -1,7 +1,7 @@
 # Web3.js Chainlink Plugin
 
 ![ES Version](https://img.shields.io/badge/ES-2020-yellow)
-![Node Version](https://img.shields.io/badge/node-14.x-green)
+![Node Version](https://img.shields.io/badge/node-18.x-green)
 [![NPM Package][npm-image]][npm-url]
 
 This is a [web3.js](https://github.com/web3/web3.js) `4.x` plugin for interacting with Chainlink Ethereum contracts.
@@ -21,16 +21,19 @@ yarn add @chainsafe/web3.js-chainlink-plugin
 
 ### Installing Version `4.x` of `web3`
 
-When adding version `4.x` of the `web3` package to your project, make sure to use the `@alpha` tag to install the correct version like so:
+When adding the `web3` package to your project, make sure to use version `4.x`. You can append `@4.0.1-rc.2` tag to install RC2 of version 4:
 
--   `npm i -S web3@alpha`
--   `yarn add web3@alpha`
+-   `npm i -S web3@4.0.1-rc.2`
+-   `yarn add web3@4.0.1-rc.2`
 
-To verify you have the correct `web3` version installed, after adding the package to your project (the above commands), look at the versions listed in your project's `package.json` under the `dependencies` section, it should contain something similiar to:
+> **_NOTE_**  
+> If 4.x was already released, you are good to just use `web3` without appending anything to it.
+
+To verify you have the correct `web3` version installed, after adding the package to your project (the above commands), look at the versions listed in your project's `package.json` under the `dependencies` section, it should contain version 4.x similar to:
 
 ```json
 "dependencies": {
-	"web3": "4.0.1-rc.1"
+	"web3": "4.0.1-rc.2"
 }
 ```
 

package.json

@@ -68,18 +68,18 @@
 		"ts-loader": "^9.4.1",
 		"ts-node": "^10.9.1",
 		"typescript": "^4.7.4",
-		"web3": "4.0.1-rc.1",
-		"web3-core": "4.0.1-rc.1",
-		"web3-eth": "4.0.1-rc.1",
+		"web3": "4.0.1-rc.2",
+		"web3-core": "4.0.1-rc.2",
+		"web3-eth": "4.0.1-rc.2",
 		"webpack": "^5.75.0",
 		"webpack-cli": "^5.0.1"
 	},
 	"peerDependencies": {
-		"web3-core": ">= 4.0.1-rc.1 < 5",
-		"web3-eth": ">= 4.0.1-rc.1 < 5",
-		"web3-eth-abi": ">= 4.0.1-rc.1 < 5",
-		"web3-eth-contract": ">= 4.0.1-rc.1 < 5",
-		"web3-types": ">= 1.0.0-rc.1 < 5",
-		"web3-validator": ">= 1.0.0-rc.1 < 5"
+		"web3-core": ">= 4.0.1-rc.2 < 5",
+		"web3-eth": ">= 4.0.1-rc.2 < 5",
+		"web3-eth-abi": ">= 4.0.1-rc.2 < 5",
+		"web3-eth-contract": ">= 4.0.1-rc.2 < 5",
+		"web3-types": ">= 1.0.0-rc.2 < 5",
+		"web3-validator": ">= 1.0.0-rc.2 < 5"
 	}
 }

test/black_box/package.json

@@ -13,8 +13,8 @@
 	"devDependencies": {
 		"jest": "^28.1.3",
 		"ts-jest": "^28.0.7",
-		"web3": "^4.0.1-rc.1",
-		"web3-core": "^4.0.1-rc.1",
-		"web3-eth": "^4.0.1-rc.1"
+		"web3": "^4.0.1-rc.2",
+		"web3-core": "^4.0.1-rc.2",
+		"web3-eth": "^4.0.1-rc.2"
 	}
 }

test/black_box/test/chainlink_plugin.test.ts

@@ -1,14 +1,12 @@
-import { Web3 } from 'web3';
-import { Web3Context } from 'web3-core';
-import { Web3Eth } from 'web3-eth';
+import { core, Web3, Web3Eth } from 'web3';
 
 // https://github.com/ChainSafe/web3.js-plugin-chainlink/issues/15
 // @ts-ignore
 import { ChainlinkPlugin, MainnetPriceFeeds } from '@chainsafe/web3.js-chainlink-plugin';
 
 describe('ChainlinkPlugin Tests', () => {
 	it('should register ChainlinkPlugin plugin on Web3Context instance', () => {
-		const web3Context = new Web3Context('http://127.0.0.1:8545');
+		const web3Context = new core.Web3Context('http://127.0.0.1:8545');
 		web3Context.registerPlugin(new ChainlinkPlugin());
 		expect(web3Context.chainlink).toBeDefined();
 	});
@@ -63,7 +61,14 @@ describe('ChainlinkPlugin Tests', () => {
 			);
 			expect(requestManagerSendSpy).toHaveBeenCalledWith({
 				method: 'eth_call',
-				params: [{ input: '0xfeaf968c', to: MainnetPriceFeeds.LinkEth }, 'latest'],
+				params: [
+					{
+						data: '0xfeaf968c',
+						input: '0xfeaf968c',
+						to: MainnetPriceFeeds.LinkEth,
+					},
+					'latest',
+				],
 			});
 		});
 	});