fix passing in ethers provider or web3 provider

joshstevens19 · Jul 1, 2021 · a382d68 · a382d68
1 parent 1b65d64
commit a382d68
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -292,6 +292,7 @@ export enum ErrorCodes {
   canNotFindProviderUrl = 16,
   wrongEthersProviderContext = 17,
   chainIdNotSupported = 18,
+  chainIdCanNotBeFound = 19,
 }
 ```
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-uniswap-sdk",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Simple easy to understand SDK for uniswap which looks over best v2 and v3 to find you the best swap quote",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/common/errors/error-codes.ts b/src/common/errors/error-codes.ts
@@ -17,4 +17,5 @@ export enum ErrorCodes {
   canNotFindProviderUrl = 16,
   wrongEthersProviderContext = 17,
   chainIdNotSupported = 18,
+  chainIdCanNotBeFound = 19,
 }
diff --git a/src/ethers-provider.spec.ts b/src/ethers-provider.spec.ts
@@ -51,7 +51,7 @@ describe('EthersProvider', () => {
         });
       }).toThrowError(
         new UniswapError(
-          'Can not find chain name for 10293',
+          'Can not find chain name for 10293. This lib only supports mainnet(1), ropsten(4), kovan(42), rinkeby(4), görli(5) and ropsten(3)',
           ErrorCodes.canNotFindChainId
         )
       );

diff --git a/src/ethers-provider.ts b/src/ethers-provider.ts
@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import { Contract, ContractInterface, providers } from 'ethers';
 import { ErrorCodes } from './common/errors/error-codes';
 import { UniswapError } from './common/errors/uniswap-error';
@@ -13,7 +14,11 @@ export interface EthereumProvider {
 }
 
 export class EthersProvider {
-  private _ethersProvider: providers.BaseProvider;
+  private _ethersProvider:
+    | providers.StaticJsonRpcProvider
+    | providers.JsonRpcProvider
+    | providers.InfuraProvider
+    | providers.Web3Provider;
   constructor(private _providerContext: ChainIdAndProvider | EthereumProvider) {
     const chainId = (<ChainIdAndProvider>this._providerContext).chainId;
     if (chainId) {
@@ -51,7 +56,11 @@ export class EthersProvider {
         );
       }
 
-      this._ethersProvider = new providers.Web3Provider(ethereumProvider);
+      if (ethereumProvider._isProvider) {
+        this._ethersProvider = ethereumProvider;
+      } else {
+        this._ethersProvider = new providers.Web3Provider(ethereumProvider);
+      }
     }
   }
 
@@ -73,7 +82,30 @@ export class EthersProvider {
    * Get the network
    */
   public network(): providers.Network {
-    return this._ethersProvider.network;
+    if (this._ethersProvider.network) {
+      return this._ethersProvider.network;
+    }
+
+    // @ts-ignore
+    if (this._ethersProvider.provider) {
+      // @ts-ignore
+      const chainId = this._ethersProvider.provider.chainId;
+      if (chainId) {
+        const chainIdNumber = new BigNumber(chainId).toNumber();
+        const chainName = ChainNames.get(chainIdNumber);
+        if (chainName) {
+          return {
+            chainId: chainIdNumber,
+            name: chainName,
+          };
+        }
+      }
+    }
+
+    throw new UniswapError(
+      'chainId can not be found on the provider',
+      ErrorCodes.chainIdCanNotBeFound
+    );
   }
 
   /**