eraswap-sdk - npm Package Compare versions

Comparing version 2.0.5-commit.807ca3ec to 3.0.0-commit.807ca3ec

dist/custom-provider.d.ts

@@ -1,5 +0,9 @@
-import { ethers, BigNumber } from 'ethers';
+import { BigNumber } from 'ethers';
 import { Deferrable } from '@ethersproject/properties';
 import { TransactionRequest } from '@ethersproject/abstract-provider';
-export declare class CustomProviderBase extends ethers.providers.StaticJsonRpcProvider {
+import { FallbackProvider, StaticJsonRpcProvider } from '@ethersproject/providers';
+/**
+ * Custom Fall Back Provider, has overrided ENS methods with kyc dapp methods
+ */
+export declare class CustomFallbackProvider extends FallbackProvider {
     resolveName(name: string | Promise<string>): Promise<string>;
@@ -9,8 +13,21 @@ lookupAddress(address: string | Promise<string>): Promise<string>;
     resolveUsername(address: string | Promise<string>): Promise<string | never>;
+}
+/**
+ * Custom Json Rpc Provider, has overrided ENS methods with kyc dapp methods
+ * and call, estimateGas methods to trace revert reasons.
+ */
+export declare class CustomJsonRpcProvider extends StaticJsonRpcProvider {
+    resolveName(name: string | Promise<string>): Promise<string>;
+    lookupAddress(address: string | Promise<string>): Promise<string>;
+    resolveAddress(name: string | Promise<string>): Promise<string | never>;
+    resolveUsername(address: string | Promise<string>): Promise<string | never>;
     call(transaction: Deferrable<TransactionRequest>, blockTag?: string | number | undefined): Promise<string>;
     estimateGas(transaction: Deferrable<TransactionRequest>): Promise<BigNumber>;
 }
-export declare class CustomProvider extends CustomProviderBase {
+/**
+ * A pre-configured fallback provider
+ */
+export declare class CustomProvider extends CustomFallbackProvider {
     constructor(network: 'mainnet' | 'testnet');
 }
 //# sourceMappingURL=custom-provider.d.ts.map

dist/custom-provider.js

@@ -52,27 +52,103 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomProvider = exports.CustomProviderBase = void 0;
+exports.CustomProvider = exports.CustomJsonRpcProvider = exports.CustomFallbackProvider = void 0;
 var ethers_1 = require("ethers");
+var providers_1 = require("@ethersproject/providers");
 var logger_1 = require("@ethersproject/logger");
 var utils_1 = require("ethers/lib/utils");
+var addresses_1 = require("./addresses");
 var utils_2 = require("./utils");
-// class CustomLogger extends Logger {
-//   throwError(
-//     message: string,
-//     code?: ethers.errors | undefined,
-//     params?: any
-//   ): never {
-//     try {
-//       super.throwError(message, code, params);
-//     } catch (error) {
-//       throw parseEthersJsError(error);
-//     }
-//   }
-// }
 var logger = new logger_1.Logger(ethers_1.version);
-var CustomProviderBase = /** @class */ (function (_super) {
-    __extends(CustomProviderBase, _super);
-    function CustomProviderBase() {
+/**
+ * Overriding funtion to be used in CustomFallbackProvider and CustomJsonRpcProvider
+ *
+ * @param _this: Pass self here
+ * @param name: username
+ */
+function resolveAddress(_this, name) {
+    return __awaiter(this, void 0, void 0, function () {
+        var transaction, addr;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, name];
+                case 1:
+                    name = _a.sent();
+                    // If it is already an address, nothing to resolve
+                    try {
+                        return [2 /*return*/, Promise.resolve(_this.formatter.address(name))];
+                    }
+                    catch (error) {
+                        // If is is a hexstring, the address is bad (See #694)
+                        if (utils_1.isHexString(name)) {
+                            throw error;
+                        }
+                    }
+                    if (typeof name !== 'string') {
+                        logger.throwArgumentError('invalid ENS name', 'name', name);
+                    }
+                    if (!_this.network.ensAddress) {
+                        logger.throwError('ens address is not configured');
+                    }
+                    transaction = {
+                        to: _this.network.ensAddress,
+                        data: '0x6a14920a' + utils_1.formatBytes32String(name).substring(2),
+                    };
+                    return [4 /*yield*/, _this.call(transaction)];
+                case 2:
+                    addr = _a.sent();
+                    if (addr.length > 42) {
+                        addr = utils_1.hexZeroPad(utils_1.hexStripZeros(addr), 20);
+                    }
+                    if (addr === ethers_1.ethers.constants.AddressZero) {
+                        logger.throwError("The kycname " + name + " does not resolve to a non-zero address");
+                    }
+                    return [2 /*return*/, _this.formatter.address(addr)];
+            }
+        });
+    });
+}
+/**
+ * Overriding funtion to be used in CustomFallbackProvider and CustomJsonRpcProvider
+ *
+ * @param _this
+ * @param address
+ */
+function resolveUsername(_this, address) {
+    return __awaiter(this, void 0, void 0, function () {
+        var name, _a, addr;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, address];
+                case 1:
+                    address = _b.sent();
+                    address = _this.formatter.address(address);
+                    _a = utils_1.parseBytes32String;
+                    return [4 /*yield*/, _this.call({
+                            to: _this.network.ensAddress,
+                            data: '0x1f70693c' + utils_1.hexZeroPad(address, 32).substring(2),
+                        })];
+                case 2:
+                    name = _a.apply(void 0, [_b.sent()]);
+                    if (name === '') {
+                        logger.throwError("The address " + address + " does not resolve to a non-empty username");
+                    }
+                    return [4 /*yield*/, _this.resolveName(name)];
+                case 3:
+                    addr = _b.sent();
+                    if (addr != address) {
+                        logger.throwError("The address " + address + " mismatches with the resolved address of " + name + " as " + addr);
+                    }
+                    return [2 /*return*/, name];
+            }
+        });
+    });
+}
+/**
+ * Custom Fall Back Provider, has overrided ENS methods with kyc dapp methods
+ */
+var CustomFallbackProvider = /** @class */ (function (_super) {
+    __extends(CustomFallbackProvider, _super);
+    function CustomFallbackProvider() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    CustomProviderBase.prototype.resolveName = function (name) {
+    CustomFallbackProvider.prototype.resolveName = function (name) {
         return __awaiter(this, void 0, void 0, function () {
@@ -87,3 +163,3 @@ return __generator(this, function (_a) {
     };
-    CustomProviderBase.prototype.lookupAddress = function (address) {
+    CustomFallbackProvider.prototype.lookupAddress = function (address) {
         return __awaiter(this, void 0, void 0, function () {
@@ -98,40 +174,15 @@ return __generator(this, function (_a) {
     };
-    CustomProviderBase.prototype.resolveAddress = function (name) {
+    CustomFallbackProvider.prototype.resolveAddress = function (name) {
         return __awaiter(this, void 0, void 0, function () {
-            var transaction, addr;
             return __generator(this, function (_a) {
+                return [2 /*return*/, resolveAddress(this, name)];
+            });
+        });
+    };
+    CustomFallbackProvider.prototype.resolveUsername = function (address) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, name];
-                    case 1:
-                        name = _a.sent();
-                        // If it is already an address, nothing to resolve
-                        try {
-                            return [2 /*return*/, Promise.resolve(this.formatter.address(name))];
-                        }
-                        catch (error) {
-                            // If is is a hexstring, the address is bad (See #694)
-                            if (utils_1.isHexString(name)) {
-                                throw error;
-                            }
-                        }
-                        if (typeof name !== 'string') {
-                            logger.throwArgumentError('invalid ENS name', 'name', name);
-                        }
-                        if (!this.network.ensAddress) {
-                            logger.throwError('ens address is not configured');
-                        }
-                        transaction = {
-                            to: this.network.ensAddress,
-                            data: '0x6a14920a' + ethers_1.ethers.utils.formatBytes32String(name).substring(2),
-                        };
-                        return [4 /*yield*/, this.call(transaction)];
-                    case 2:
-                        addr = _a.sent();
-                        if (addr.length > 42) {
-                            addr = utils_1.hexZeroPad(utils_1.hexStripZeros(addr), 20);
-                        }
-                        if (addr === ethers_1.ethers.constants.AddressZero) {
-                            logger.throwError("The kycname " + name + " does not resolve to a non-zero address");
-                        }
-                        return [2 /*return*/, this.formatter.address(addr)];
+                    case 0: return [4 /*yield*/, resolveUsername(this, address)];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -141,28 +192,20 @@ });
     };
-    CustomProviderBase.prototype.resolveUsername = function (address) {
+    return CustomFallbackProvider;
+}(providers_1.FallbackProvider));
+exports.CustomFallbackProvider = CustomFallbackProvider;
+/**
+ * Custom Json Rpc Provider, has overrided ENS methods with kyc dapp methods
+ * and call, estimateGas methods to trace revert reasons.
+ */
+var CustomJsonRpcProvider = /** @class */ (function (_super) {
+    __extends(CustomJsonRpcProvider, _super);
+    function CustomJsonRpcProvider() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    CustomJsonRpcProvider.prototype.resolveName = function (name) {
         return __awaiter(this, void 0, void 0, function () {
-            var name, _a, addr;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, address];
-                    case 1:
-                        address = _b.sent();
-                        address = this.formatter.address(address);
-                        _a = utils_1.parseBytes32String;
-                        return [4 /*yield*/, this.call({
-                                to: this.network.ensAddress,
-                                data: '0x1f70693c' + ethers_1.ethers.utils.hexZeroPad(address, 32).substring(2),
-                            })];
-                    case 2:
-                        name = _a.apply(void 0, [_b.sent()]);
-                        if (name === '') {
-                            logger.throwError("The address " + address + " does not resolve to a non-empty username");
-                        }
-                        return [4 /*yield*/, this.resolveName(name)];
-                    case 3:
-                        addr = _b.sent();
-                        if (addr != address) {
-                            logger.throwError("The address " + address + " mismatches with the resolved address of " + name + " as " + addr);
-                        }
-                        return [2 /*return*/, name];
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.resolveAddress(name)];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -172,3 +215,30 @@ });
     };
-    CustomProviderBase.prototype.call = function (transaction, blockTag
+    CustomJsonRpcProvider.prototype.lookupAddress = function (address) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.resolveUsername(address)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    CustomJsonRpcProvider.prototype.resolveAddress = function (name) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, resolveAddress(this, name)];
+            });
+        });
+    };
+    CustomJsonRpcProvider.prototype.resolveUsername = function (address) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, resolveUsername(this, address)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    CustomJsonRpcProvider.prototype.call = function (transaction, blockTag
     // @ts-ignore Because including undefined makes the override  signature mismatch
@@ -208,3 +278,3 @@ ) {
     };
-    CustomProviderBase.prototype.estimateGas = function (transaction) {
+    CustomJsonRpcProvider.prototype.estimateGas = function (transaction) {
         return __awaiter(this, void 0, void 0, function () {
@@ -268,24 +338,36 @@ var resp, error_2, from, to, data, value, provider, result, _a, _b, _c, error_3, i;
     };
-    return CustomProviderBase;
-}(ethers_1.ethers.providers.StaticJsonRpcProvider));
-exports.CustomProviderBase = CustomProviderBase;
-var addresses_1 = require("./addresses");
+    return CustomJsonRpcProvider;
+}(providers_1.StaticJsonRpcProvider));
+exports.CustomJsonRpcProvider = CustomJsonRpcProvider;
+/**
+ * A pre-configured fallback provider
+ */
 var CustomProvider = /** @class */ (function (_super) {
     __extends(CustomProvider, _super);
     function CustomProvider(network) {
-        var _this = this;
+        var _this_1 = this;
         switch (network) {
             case 'mainnet':
-                _this = _super.call(this, 'https://mainnet.eraswap.network', {
-                    name: 'EraSwapNetwork',
-                    chainId: 5197,
-                    ensAddress: addresses_1.addresses['production'].ESN.kycdapp,
-                }) || this;
+                var providers = [
+                    new CustomJsonRpcProvider('https://rpc-mumbai.mainnet.eraswap.network', {
+                        name: 'EraSwapNetwork',
+                        chainId: 5197,
+                        ensAddress: addresses_1.addresses['production'].ESN.kycdapp,
+                    }),
+                    new CustomJsonRpcProvider('https://mainnet.eraswap.network', {
+                        name: 'EraSwapNetwork',
+                        chainId: 5197,
+                        ensAddress: addresses_1.addresses['production'].ESN.kycdapp,
+                    }),
+                ];
+                _this_1 = _super.call(this, providers) || this;
                 break;
             case 'testnet':
-                _this = _super.call(this, 'https://testnet.eraswap.network', {
-                    name: 'EraSwapNetwork',
-                    chainId: 5196,
-                    ensAddress: addresses_1.addresses['development'].ESN.kycdapp,
-                }) || this;
+                _this_1 = _super.call(this, [
+                    new CustomJsonRpcProvider('https://testnet.eraswap.network', {
+                        name: 'EraSwapNetwork',
+                        chainId: 5196,
+                        ensAddress: addresses_1.addresses['development'].ESN.kycdapp,
+                    }),
+                ]) || this;
                 break;
@@ -295,7 +377,7 @@ default:
         }
-        return _this;
+        return _this_1;
     }
     return CustomProvider;
-}(CustomProviderBase));
+}(CustomFallbackProvider));
 exports.CustomProvider = CustomProvider;
 //# sourceMappingURL=custom-provider.js.map

dist/index.d.ts

 import * as typechain from './typechain';
-import { CustomProvider, CustomProviderBase } from './custom-provider';
+import { CustomProvider, CustomFallbackProvider, CustomJsonRpcProvider } from './custom-providers';
 import * as utils from './utils';
@@ -14,5 +14,6 @@ import { addresses } from './addresses';
     CustomProvider: typeof CustomProvider;
-    CustomProviderBase: typeof CustomProviderBase;
+    CustomFallbackProvider: typeof CustomFallbackProvider;
+    CustomJsonRpcProvider: typeof CustomJsonRpcProvider;
 };
-export { typechain, utils, addresses, CustomProvider, CustomProviderBase };
+export { typechain, utils, addresses, CustomProvider, CustomFallbackProvider, CustomJsonRpcProvider, };
 //# sourceMappingURL=index.d.ts.map

dist/index.js

@@ -22,8 +22,9 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomProviderBase = exports.CustomProvider = exports.addresses = exports.utils = exports.typechain = exports.es = void 0;
+exports.CustomJsonRpcProvider = exports.CustomFallbackProvider = exports.CustomProvider = exports.addresses = exports.utils = exports.typechain = exports.es = void 0;
 var typechain = __importStar(require("./typechain"));
 exports.typechain = typechain;
-var custom_provider_1 = require("./custom-provider");
-Object.defineProperty(exports, "CustomProvider", { enumerable: true, get: function () { return custom_provider_1.CustomProvider; } });
-Object.defineProperty(exports, "CustomProviderBase", { enumerable: true, get: function () { return custom_provider_1.CustomProviderBase; } });
+var custom_providers_1 = require("./custom-providers");
+Object.defineProperty(exports, "CustomProvider", { enumerable: true, get: function () { return custom_providers_1.CustomProvider; } });
+Object.defineProperty(exports, "CustomFallbackProvider", { enumerable: true, get: function () { return custom_providers_1.CustomFallbackProvider; } });
+Object.defineProperty(exports, "CustomJsonRpcProvider", { enumerable: true, get: function () { return custom_providers_1.CustomJsonRpcProvider; } });
 var utils = __importStar(require("./utils"));
@@ -37,5 +38,6 @@ exports.utils = utils;
     addresses: addresses_1.addresses,
-    CustomProvider: custom_provider_1.CustomProvider,
-    CustomProviderBase: custom_provider_1.CustomProviderBase,
+    CustomProvider: custom_providers_1.CustomProvider,
+    CustomFallbackProvider: custom_providers_1.CustomFallbackProvider,
+    CustomJsonRpcProvider: custom_providers_1.CustomJsonRpcProvider,
 };
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "eraswap-sdk",
-  "version": "2.0.5-commit.807ca3ec",
+  "version": "3.0.0-commit.807ca3ec",
   "description": "Typechain outputs of esn-contracts and utils. Commit tag of KMPARDS/esn-contracts is included in the version.",
@@ -5,0 +5,0 @@ "main": "dist/",

src/index.ts

 import * as typechain from './typechain';
-import { CustomProvider, CustomProviderBase } from './custom-provider';
+import {
+  CustomProvider,
+  CustomFallbackProvider,
+  CustomJsonRpcProvider,
+} from './custom-providers';
 import * as utils from './utils';
@@ -11,5 +15,13 @@ import { addresses } from './addresses';
   CustomProvider,
-  CustomProviderBase,
+  CustomFallbackProvider,
+  CustomJsonRpcProvider,
 };
 
-export { typechain, utils, addresses, CustomProvider, CustomProviderBase };
+export {
+  typechain,
+  utils,
+  addresses,
+  CustomProvider,
+  CustomFallbackProvider,
+  CustomJsonRpcProvider,
+};

No alert changes

Improved metrics

Total package byte prevSize

10951607

increased by0.31%

Number of package files

805

increased by0.5%

Lines of code

254326

increased by0.23%

No dependency changes