Merge pull request #14 from 1inch/chore/deps_update

chore(deps): use ethers@5 instead of old web3

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@1inch/multicall",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "description": "High-weight optimized call-processor",
     "repository": {
         "type": "git",
@@ -21,10 +21,10 @@
         "release": "standard-version"
     },
     "dependencies": {
-        "@ethersproject/bignumber": "^5.2.0",
-        "web3": "1.8.1"
+        "ethers": "5"
     },
     "devDependencies": {
+        "web3": "1.8.1",
         "@babel/core": "^7.18.6",
         "@babel/preset-env": "^7.13.15",
         "@babel/preset-typescript": "^7.13.0",
@@ -51,10 +51,7 @@
         "tslib": "^2.2.0",
         "typescript": "^4.2.4"
     },
-    "peerDependencies": {
-        "assert": "^2.0.0",
-        "stream": "^0.0.2"
-    },
+    "peerDependencies": {},
     "publishConfig": {
         "registry": "https://npm.pkg.github.com/1inch"
     },

src/connector/provider.connector.ts

@@ -22,4 +22,4 @@ export interface ProviderConnector {
     decodeABIParameter<T>(type: string | SolStructType, hex: string): T;
 
     decodeABIParameterList<T>(type: string[] | SolStructType[], hex: string): T;
-}
+}

src/connector/web3-provider.connector.ts

@@ -1,30 +1,27 @@
 import {ProviderConnector, SolStructType} from './provider.connector';
-import Web3 from 'web3';
 import {AbiItem} from '../model/abi.model';
-import {AbiItem as Web3AbiItem} from 'web3-utils';
-import Contract from 'web3-eth-contract'
+import {Interface, defaultAbiCoder, ParamType} from 'ethers/lib/utils';
 
-export class Web3ProviderConnector implements ProviderConnector {
+type Web3 = {
+    eth: {
+        call(callInfo: { data: string, to: string }, blockNumber: number | string): Promise<string>
+    }
+}
 
+export class Web3ProviderConnector implements ProviderConnector {
     constructor(protected readonly web3Provider: Web3) {
-        // eslint-disable-next-line
-        // @ts-ignore
-        Contract.setProvider(web3Provider.currentProvider)
     }
 
     contractEncodeABI(
         abi: AbiItem[],
-        address: string | null,
+        _address: string | null,
         methodName: string,
         methodParams: unknown[]
     ): string {
-        // eslint-disable-next-line
-        // @ts-ignore
-        const contract = new Contract(
-            abi as Web3AbiItem[],
-            address === null ? undefined : address
-        );
-        return contract.methods[methodName](...methodParams).encodeABI();
+
+        return new Interface(
+            abi,
+        ).encodeFunctionData(methodName, methodParams);
     }
 
     ethCall(
@@ -42,10 +39,17 @@ export class Web3ProviderConnector implements ProviderConnector {
     }
 
     decodeABIParameter<T>(type: string | SolStructType, hex: string): T {
-        return this.web3Provider.eth.abi.decodeParameter(type, hex) as T;
+        return this.decodeABIParameterList<[T]>([type], hex)[0];
     }
 
-    decodeABIParameterList<T>(type: string[] | SolStructType[], hex: string): T {
-        return this.web3Provider.eth.abi.decodeParameters(type, hex) as T;
+    decodeABIParameterList<T>(type: (string | SolStructType)[], hex: string): T {
+        const types = type.map((t) => {
+            return typeof t === 'string' ? t : ParamType.fromObject(t as {
+                readonly name?: string;
+                readonly type?: string;
+            })
+        })
+
+        return defaultAbiCoder.decode(types, hex) as unknown as T;
     }
 }

test/multicall.service.test.ts

@@ -1,7 +1,6 @@
 import {CHAIN_1_MULTICALL_ADDRESS, Web3ProviderConnector} from '../src';
 import Web3 from 'web3';
 import ERC20ABI from './ERC20.abi.json';
-import {BigNumber} from '@ethersproject/bignumber';
 import {ProviderConnector} from '../dist';
 import { GasLimitService } from '../src/gas-limit.service';
 import { MultiCallService } from '../src/multicall.service';
@@ -100,7 +99,7 @@ describe('MultiCallService', () => {
             );
 
             const balances = res.map((x) => {
-                return provider.decodeABIParameter<BigNumber>('uint256', x).toString()
+                return provider.decodeABIParameter('uint256', x).toString()
             });
 
             expect(balances).toEqual(expectedBalances);