Fork of ethers so it is compatible with XDC and doesn't interfere with existing code (#3)

* Drop patch packages

* Update build files

* Update vendor packages for building

* ethers-xdc is building

* It compiles

* try again

* Still trying

* fix

* clean up

Author: james-hummingbot

.prettierignore

@@ -2,4 +2,5 @@ certs
 *.md
 *.yml
 coverage
-dist
+dist
+vendor

package.json

@@ -64,6 +64,7 @@
     "dayjs": "^1.10.6",
     "decimal.js-light": "^2.5.1",
     "ethers": "^5.6.2",
+    "ethers-xdc": "file:./vendor/ethers-xdc",
     "express": "^4.17.1",
     "express-winston": "^4.1.0",
     "fs-extra": "^10.0.0",
@@ -73,14 +74,8 @@
     "mathjs": "^10.5.0",
     "minimist": "^1.2.6",
     "morgan": "^1.10.0",
-<<<<<<< HEAD
-    "patch-package": "^6.4.7",
-    "postinstall-postinstall": "^2.1.0",
-=======
     "near-api-js": "1.0.0",
->>>>>>> e41c04384 (Drop patch packages)
     "quickswap-sdk": "^3.0.8",
-    "near-api-js": "1.0.0",
     "swagger-ui-express": "^4.1.6",
     "tslib": "^2.3.1",
     "uuid": "^8.3.2",

src/chains/xdc/xdc.ts

@@ -1,14 +1,19 @@
 import abi from '../ethereum/ethereum.abi.json';
 import { logger } from '../../services/logger';
 import { Contract, Transaction, Wallet } from 'ethers';
+import { providers } from 'ethers-xdc';
+
 import { EthereumBase } from '../ethereum/ethereum-base';
 import { getEthereumConfig as getXdcConfig } from '../ethereum/ethereum.config';
 import { Provider } from '@ethersproject/abstract-provider';
 import { XdcswapConfig } from '../../connectors/xdcswap/xdcswap.config';
 import { Ethereumish } from '../../services/common-interfaces';
 import { ConfigManagerV2 } from '../../services/config-manager-v2';
 import { walletPath } from '../../services/base';
-import { convertEthAddressToXdcAddress, convertXdxAddressToEthAddress } from '../../services/wallet/wallet.controllers';
+import {
+  convertEthAddressToXdcAddress,
+  convertXdxAddressToEthAddress,
+} from '../../services/wallet/wallet.controllers';
 import fse from 'fs-extra';
 import { ConfigManagerCertPassphrase } from '../../services/config-manager-cert-passphrase';
 
@@ -17,6 +22,7 @@ export class Xdc extends EthereumBase implements Ethereumish {
   private _gasPrice: number;
   private _nativeTokenSymbol: string;
   private _chain: string;
+  private _xdcProvider: providers.Provider;
 
   private constructor(network: string) {
     const config = getXdcConfig('xdc', network);
@@ -34,6 +40,9 @@ export class Xdc extends EthereumBase implements Ethereumish {
     this._chain = config.network.name;
     this._nativeTokenSymbol = config.nativeCurrencySymbol;
     this._gasPrice = config.manualGasPrice;
+    this._xdcProvider = new providers.StaticJsonRpcProvider(
+      config.network.nodeURL
+    );
   }
 
   public static getInstance(network: string): Xdc {
@@ -101,6 +110,35 @@ export class Xdc extends EthereumBase implements Ethereumish {
     return await this.decrypt(encryptedPrivateKey, passphrase);
   }
 
+  async getTransaction(txHash: string): Promise<providers.TransactionResponse> {
+    console.log('this._xdcProvider.getTransaction');
+    return this._xdcProvider.getTransaction(txHash);
+  }
+
+  // returns an ethereum TransactionReceipt for a txHash if the transaction has been mined.
+  async getTransactionReceipt(
+    txHash: string
+  ): Promise<providers.TransactionReceipt | null> {
+    if (this.cache.keys().includes(txHash)) {
+      // If it's in the cache, return the value in cache, whether it's null or not
+      return this.cache.get(txHash) as providers.TransactionReceipt;
+    } else {
+      // If it's not in the cache,
+      const fetchedTxReceipt = await this._xdcProvider.getTransactionReceipt(
+        txHash
+      );
+
+      this.cache.set(txHash, fetchedTxReceipt); // Cache the fetched receipt, whether it's null or not
+
+      if (!fetchedTxReceipt) {
+        this._xdcProvider.once(txHash, this.cacheTransactionReceipt.bind(this));
+      }
+
+      return fetchedTxReceipt;
+    }
+  }
+  
+
   async close() {
     await super.close();
     if (this._chain in Xdc._instances) {

src/network/network.routes.ts

@@ -89,6 +89,7 @@ export namespace NetworkRoutes {
           req.body.chain,
           req.body.network
         );
+        console.log(chain.chainName);
 
         res.status(200).json(await ethereumControllers.poll(chain, req.body));
       }

vendor/.gitignore

@@ -0,0 +1,8 @@
+node_modules/
+**/node_modules
+**/lib._esm
+obsolete/
+.DS_Store
+.tmp/
+**/src.ts/*.js
+**/tsconfig.tsbuildinfo

vendor/@ethersproject-xdc/abi/.npmignore

@@ -0,0 +1,4 @@
+.DS_Store
+tsconfig.json
+lib._esm
+tsconfig.tsbuildinfo

vendor/@ethersproject-xdc/abi/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Richard Moore
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

vendor/@ethersproject-xdc/abi/README.md

@@ -0,0 +1,52 @@
+Ethereum ABI Coder
+==================
+
+This sub-module is part of the [ethers project](https://github.com/ethers-io/ethers.js).
+
+It is responsible for encoding and decoding the Application Binary Interface (ABI)
+used by most smart contracts to interoperate between other smart contracts and clients.
+
+For more information, see the [documentation](https://docs.ethers.io/v5/api/utils/abi/).
+
+Importing
+---------
+
+Most users will prefer to use the [umbrella package](https://www.npmjs.com/package/ethers),
+but for those with more specific needs, individual components can be imported.
+
+```javascript
+const {
+
+    ConstructorFragment,
+    EventFragment,
+    Fragment,
+    FunctionFragment,
+    ParamType,
+    FormatTypes,
+
+    AbiCoder,
+    defaultAbiCoder,
+
+    Interface,
+    Indexed,
+
+    /////////////////////////
+    // Types
+
+    CoerceFunc,
+    JsonFragment,
+    JsonFragmentType,
+
+    Result,
+    checkResultErrors,
+
+    LogDescription,
+    TransactionDescription
+
+} = require("@ethersproject-xdc/abi");
+```
+
+License
+-------
+
+MIT License

vendor/@ethersproject-xdc/abi/lib.esm/_version.d.ts

@@ -0,0 +1,2 @@
+export declare const version = "abi/5.7.0";
+//# sourceMappingURL=_version.d.ts.map