Merge pull request #1573 from bancorprotocol/web3Update

update web3 to v1.5.0

package.json

@@ -56,7 +56,7 @@
     "eos-transit-tokenpocket-provider": "^4.0.1",
     "eos-transit-whalevault-provider": "^4.0.1",
     "eosjs": "21.0.4",
-    "eth-multicall": "^1.3.13",
+    "eth-multicall": "^1.4.0",
     "fast-sort": "^3.0.2",
     "ipfs-http-client": "49.0.4",
     "json-bigint": "^1.0.0",
@@ -79,7 +79,7 @@
     "vuex-module-decorators": "^1.0.1",
     "vuex-router-sync": "^5.0.0",
     "waait": "^1.0.5",
-    "web3": "1.3.6"
+    "web3": "1.5.0"
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.14.0",

src/api/eth/contractTypes.ts

@@ -27,15 +27,22 @@ import { Proposal } from "@/store/modules/governance/ethGovernance";
 import Web3 from "web3";
 import { web3 } from "@/api/web3";
 import { StringRfq } from "@/api/observables/keeperDao";
+import { Contract } from "web3-eth-contract";
 
-const buildContract = (
+interface ContractTyped<T> extends Contract {
+  methods: T;
+}
+
+const buildContract = <T>(
   abi: AbiItem[],
   contractAddress?: string,
   injectedWeb3?: Web3
-) =>
-  contractAddress
+): ContractTyped<T> =>
+  (contractAddress
     ? new (injectedWeb3 || web3).eth.Contract(abi, contractAddress)
-    : new (injectedWeb3 || web3).eth.Contract(abi);
+    : new (injectedWeb3 || web3).eth.Contract(
+        abi
+      )) as unknown as ContractTyped<T>;
 
 interface TokenContractType {
   symbol: () => CallReturn<string>;