@axelar-network/axelarjs-sdk 0.3.4 → 0.3.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (72) hide show
  1. package/dist/TransferAssetBridge/index.d.ts +2 -1
  2. package/dist/TransferAssetBridge/index.d.ts.map +1 -1
  3. package/dist/TransferAssetBridge/index.js +45 -16
  4. package/dist/TransferAssetBridge/index.js.map +1 -1
  5. package/dist/TransferAssetBridge/status/index.d.ts +1 -1
  6. package/dist/TransferAssetBridge/status/index.d.ts.map +1 -1
  7. package/dist/TransferAssetBridge/status/index.js +3 -2
  8. package/dist/TransferAssetBridge/status/index.js.map +1 -1
  9. package/dist/{constants/assetsPerEnvironment.d.ts → assets/index.d.ts} +5 -2
  10. package/dist/assets/index.d.ts.map +1 -0
  11. package/dist/assets/index.js +33 -0
  12. package/dist/assets/index.js.map +1 -0
  13. package/dist/chains/Axelar/WaitingService.d.ts +3 -2
  14. package/dist/chains/Axelar/WaitingService.d.ts.map +1 -1
  15. package/dist/chains/Axelar/WaitingService.js +9 -13
  16. package/dist/chains/Axelar/WaitingService.js.map +1 -1
  17. package/dist/chains/Bitcoin/WaitingService.d.ts +3 -2
  18. package/dist/chains/Bitcoin/WaitingService.d.ts.map +1 -1
  19. package/dist/chains/Bitcoin/WaitingService.js +4 -3
  20. package/dist/chains/Bitcoin/WaitingService.js.map +1 -1
  21. package/dist/chains/Ethereum/WaitingService.d.ts +7 -3
  22. package/dist/chains/Ethereum/WaitingService.d.ts.map +1 -1
  23. package/dist/chains/Ethereum/WaitingService.js +24 -13
  24. package/dist/chains/Ethereum/WaitingService.js.map +1 -1
  25. package/dist/chains/Ethereum/index.d.ts.map +1 -1
  26. package/dist/chains/Ethereum/index.js +3 -15
  27. package/dist/chains/Ethereum/index.js.map +1 -1
  28. package/dist/chains/Terra/index.d.ts +0 -2
  29. package/dist/chains/Terra/index.d.ts.map +1 -1
  30. package/dist/chains/Terra/index.js +1 -2
  31. package/dist/chains/Terra/index.js.map +1 -1
  32. package/dist/chains/index.js +2 -2
  33. package/dist/chains/index.js.map +1 -1
  34. package/dist/chains/models/BaseWaitingService.d.ts +5 -2
  35. package/dist/chains/models/BaseWaitingService.d.ts.map +1 -1
  36. package/dist/chains/models/BaseWaitingService.js +32 -1
  37. package/dist/chains/models/BaseWaitingService.js.map +1 -1
  38. package/dist/constants/index.d.ts +9 -7
  39. package/dist/constants/index.d.ts.map +1 -1
  40. package/dist/constants/index.js +12 -13
  41. package/dist/constants/index.js.map +1 -1
  42. package/dist/interface/IAssetTransferObject.d.ts +2 -6
  43. package/dist/interface/IAssetTransferObject.d.ts.map +1 -1
  44. package/dist/interface/IAssetTransferObject.js +2 -8
  45. package/dist/interface/IAssetTransferObject.js.map +1 -1
  46. package/dist/interface/index.d.ts +11 -1
  47. package/dist/interface/index.d.ts.map +1 -1
  48. package/dist/interface/index.js.map +1 -1
  49. package/dist/utils/EthersJs/EthersJsWaitingService.d.ts +3 -2
  50. package/dist/utils/EthersJs/EthersJsWaitingService.d.ts.map +1 -1
  51. package/dist/utils/EthersJs/EthersJsWaitingService.js +6 -5
  52. package/dist/utils/EthersJs/EthersJsWaitingService.js.map +1 -1
  53. package/dist/utils/EthersJs/ethersjsProvider.d.ts +2 -2
  54. package/dist/utils/EthersJs/ethersjsProvider.d.ts.map +1 -1
  55. package/dist/utils/EthersJs/ethersjsProvider.js +13 -29
  56. package/dist/utils/EthersJs/ethersjsProvider.js.map +1 -1
  57. package/dist/utils/findModuleForChainName.d.ts +2 -0
  58. package/dist/utils/findModuleForChainName.d.ts.map +1 -0
  59. package/dist/utils/findModuleForChainName.js +13 -0
  60. package/dist/utils/findModuleForChainName.js.map +1 -0
  61. package/dist/utils/index.d.ts +1 -0
  62. package/dist/utils/index.d.ts.map +1 -1
  63. package/dist/utils/index.js +1 -0
  64. package/dist/utils/index.js.map +1 -1
  65. package/package.json +1 -1
  66. package/dist/chains/Terra/WaitingService.d.ts +0 -8
  67. package/dist/chains/Terra/WaitingService.d.ts.map +0 -1
  68. package/dist/chains/Terra/WaitingService.js +0 -81
  69. package/dist/chains/Terra/WaitingService.js.map +0 -1
  70. package/dist/constants/assetsPerEnvironment.d.ts.map +0 -1
  71. package/dist/constants/assetsPerEnvironment.js +0 -32
  72. package/dist/constants/assetsPerEnvironment.js.map +0 -1
@@ -7,6 +7,7 @@ export declare class TransferAssetBridge {
7
7
  constructor(environment: string);
8
8
  transferAssets(message: IAssetTransferObject, sourceCbs: ICallbackStatus, destCbs: ICallbackStatus, showAlerts?: boolean): Promise<IAssetInfoWithTrace>;
9
9
  private getDepositAddress;
10
- private listenForTransactionStatus;
10
+ private confirmDeposit;
11
+ private detectTransferOnDestinationChain;
11
12
  }
12
13
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/TransferAssetBridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,mBAAmB,EAAE,oBAAoB,EAAC,MAAM,mCAAmC,CAAC;AAChH,OAAO,EAGN,eAAe,EAIf,MAA2E,cAAc,CAAC;AAO3F,qBAAa,mBAAmB;IAE/B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,mBAAmB,CAAiB;IAC5C,OAAO,CAAC,WAAW,CAAS;gBAEhB,WAAW,EAAE,MAAM;IASlB,cAAc,CAAC,OAAO,EAAE,oBAAoB,EAC7B,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,eAAe,EACxB,UAAU,GAAE,OAAc,GACnD,OAAO,CAAC,mBAAmB,CAAC;YAsCjB,iBAAiB;YAWjB,0BAA0B;CAuBxC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/TransferAssetBridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,mBAAmB,EAAE,oBAAoB,EAAC,MAAM,mCAAmC,CAAC;AAChH,OAAO,EAIN,eAAe,EAGf,MAA2E,cAAc,CAAC;AAO3F,qBAAa,mBAAmB;IAE/B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,mBAAmB,CAAiB;IAC5C,OAAO,CAAC,WAAW,CAAS;gBAEhB,WAAW,EAAE,MAAM;IASlB,cAAc,CAAC,OAAO,EAAE,oBAAoB,EAC7B,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,eAAe,EACxB,UAAU,GAAE,OAAc,GACnD,OAAO,CAAC,mBAAmB,CAAC;YA0CjB,iBAAiB;YAWjB,cAAc;YAsBd,gCAAgC;CAqB9C"}
@@ -67,25 +67,26 @@ var TransferAssetBridge = /** @class */ (function () {
67
67
  this.clientSocketConnect = new SocketServices_1.SocketServices(resourceUrl);
68
68
  }
69
69
  TransferAssetBridge.prototype.transferAssets = function (message, sourceCbs, destCbs, showAlerts) {
70
- var _a, _b;
71
70
  if (showAlerts === void 0) { showAlerts = true; }
72
71
  return __awaiter(this, void 0, void 0, function () {
73
- var depositAddressWithTraceId, traceId, sourceAssetInfoForWaitService, destinationAssetInfoForWaitService;
72
+ var selectedDestinationAsset, sourceChainInfo, destinationChainInfo, depositAddressWithTraceId, traceId, srcAssetForDepositConfirmation, destAssetForTransferEvent;
74
73
  var _this = this;
75
- return __generator(this, function (_c) {
76
- switch (_c.label) {
74
+ return __generator(this, function (_a) {
75
+ switch (_a.label) {
77
76
  case 0:
78
- if (!(0, utils_1.validateDestinationAddress)((_a = message === null || message === void 0 ? void 0 : message.destinationChainInfo) === null || _a === void 0 ? void 0 : _a.chainSymbol, message === null || message === void 0 ? void 0 : message.selectedDestinationAsset))
79
- throw new Error("invalid destination address in ".concat((_b = message === null || message === void 0 ? void 0 : message.selectedDestinationAsset) === null || _b === void 0 ? void 0 : _b.assetSymbol));
77
+ selectedDestinationAsset = message.selectedDestinationAsset, sourceChainInfo = message.sourceChainInfo, destinationChainInfo = message.destinationChainInfo;
78
+ if (!(0, utils_1.validateDestinationAddress)(destinationChainInfo === null || destinationChainInfo === void 0 ? void 0 : destinationChainInfo.chainSymbol, selectedDestinationAsset))
79
+ throw new Error("invalid destination address in ".concat(selectedDestinationAsset === null || selectedDestinationAsset === void 0 ? void 0 : selectedDestinationAsset.assetSymbol));
80
80
  return [4 /*yield*/, this.getDepositAddress(message, showAlerts)];
81
81
  case 1:
82
- depositAddressWithTraceId = _c.sent();
82
+ depositAddressWithTraceId = _a.sent();
83
83
  traceId = depositAddressWithTraceId.traceId;
84
- sourceAssetInfoForWaitService = __assign(__assign({}, (message.sourceChainInfo.chainSymbol === "ETH" ? message.selectedDestinationAsset : depositAddressWithTraceId.assetInfo)), { traceId: depositAddressWithTraceId.traceId, sourceOrDestChain: "source" });
85
- destinationAssetInfoForWaitService = __assign(__assign({}, message.selectedDestinationAsset), { traceId: traceId, sourceOrDestChain: "destination" });
86
- this.listenForTransactionStatus(sourceAssetInfoForWaitService, message.sourceChainInfo, sourceCbs.successCb, sourceCbs.failCb, "source").then(function () {
87
- _this.listenForTransactionStatus(destinationAssetInfoForWaitService, message.destinationChainInfo, destCbs.successCb, destCbs.failCb, "destination");
88
- });
84
+ srcAssetForDepositConfirmation = __assign(__assign({}, ((0, utils_1.findModuleForChainName)(sourceChainInfo.chainName.toLowerCase()) === "evm"
85
+ ? selectedDestinationAsset
86
+ : depositAddressWithTraceId.assetInfo)), { traceId: depositAddressWithTraceId.traceId, sourceOrDestChain: "source" });
87
+ destAssetForTransferEvent = __assign(__assign({}, selectedDestinationAsset), { traceId: traceId, sourceOrDestChain: "destination" });
88
+ this.confirmDeposit({ assetInfo: srcAssetForDepositConfirmation, sourceChainInfo: sourceChainInfo, destinationChainInfo: destinationChainInfo }, sourceCbs.successCb, sourceCbs.failCb, "source")
89
+ .then(function () { return _this.detectTransferOnDestinationChain({ assetInfo: destAssetForTransferEvent, sourceChainInfo: sourceChainInfo, destinationChainInfo: destinationChainInfo }, destCbs.successCb, destCbs.failCb, "destination"); });
89
90
  return [2 /*return*/, depositAddressWithTraceId];
90
91
  }
91
92
  });
@@ -111,18 +112,20 @@ var TransferAssetBridge = /** @class */ (function () {
111
112
  });
112
113
  });
113
114
  };
114
- TransferAssetBridge.prototype.listenForTransactionStatus = function (addressInformation, chainInfo, waitCb, errCb, sOrDChain) {
115
+ TransferAssetBridge.prototype.confirmDeposit = function (assetAndChainInfo, waitCb, errCb, sOrDChain) {
115
116
  return __awaiter(this, void 0, void 0, function () {
116
- var waitingService, e_2;
117
+ var assetInfo, sourceChainInfo, waitingService, e_2;
117
118
  return __generator(this, function (_a) {
118
119
  switch (_a.label) {
119
- case 0: return [4 /*yield*/, (0, status_1.default)(chainInfo.chainSymbol, chainInfo, addressInformation, sOrDChain, this.environment)];
120
+ case 0:
121
+ assetInfo = assetAndChainInfo.assetInfo, sourceChainInfo = assetAndChainInfo.sourceChainInfo;
122
+ return [4 /*yield*/, (0, status_1.default)(sourceChainInfo, assetInfo, sOrDChain, this.environment)];
120
123
  case 1:
121
124
  waitingService = _a.sent();
122
125
  _a.label = 2;
123
126
  case 2:
124
127
  _a.trys.push([2, 4, , 5]);
125
- return [4 /*yield*/, waitingService.wait(addressInformation, waitCb, this.clientSocketConnect)];
128
+ return [4 /*yield*/, waitingService.waitForDepositConfirmation(assetAndChainInfo, waitCb, this.clientSocketConnect)];
126
129
  case 3:
127
130
  _a.sent();
128
131
  return [3 /*break*/, 5];
@@ -135,6 +138,32 @@ var TransferAssetBridge = /** @class */ (function () {
135
138
  });
136
139
  });
137
140
  };
141
+ TransferAssetBridge.prototype.detectTransferOnDestinationChain = function (assetAndChainInfo, waitCb, errCb, sOrDChain) {
142
+ return __awaiter(this, void 0, void 0, function () {
143
+ var assetInfo, destinationChainInfo, waitingService, e_3;
144
+ return __generator(this, function (_a) {
145
+ switch (_a.label) {
146
+ case 0:
147
+ assetInfo = assetAndChainInfo.assetInfo, destinationChainInfo = assetAndChainInfo.destinationChainInfo;
148
+ return [4 /*yield*/, (0, status_1.default)(destinationChainInfo, assetInfo, sOrDChain, this.environment)];
149
+ case 1:
150
+ waitingService = _a.sent();
151
+ _a.label = 2;
152
+ case 2:
153
+ _a.trys.push([2, 4, , 5]);
154
+ return [4 /*yield*/, waitingService.waitForTransferEvent(assetAndChainInfo, waitCb, this.clientSocketConnect)];
155
+ case 3:
156
+ _a.sent();
157
+ return [3 /*break*/, 5];
158
+ case 4:
159
+ e_3 = _a.sent();
160
+ errCb(e_3);
161
+ return [3 /*break*/, 5];
162
+ case 5: return [2 /*return*/];
163
+ }
164
+ });
165
+ });
166
+ };
138
167
  return TransferAssetBridge;
139
168
  }());
140
169
  exports.TransferAssetBridge = TransferAssetBridge;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/TransferAssetBridge/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/TransferAssetBridge/index.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { IAssetInfo, IBlockchainWaitingService, IChainInfo, SourceOrDestination } from "../../interface";
2
- declare type IGetWaitingService = (chainKey: string, chainInfo: IChainInfo, assetInfo: IAssetInfo, sOrDChain: SourceOrDestination, environment: string) => IBlockchainWaitingService | Promise<IBlockchainWaitingService>;
2
+ declare type IGetWaitingService = (chainInfo: IChainInfo, assetInfo: IAssetInfo, sOrDChain: SourceOrDestination, environment: string) => IBlockchainWaitingService | Promise<IBlockchainWaitingService>;
3
3
  declare const getWaitingService: IGetWaitingService;
4
4
  export default getWaitingService;
5
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/TransferAssetBridge/status/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EACV,yBAAyB,EAGzB,UAAU,EACV,mBAAmB,EACnB,MAAuB,iBAAiB,CAAC;AAU1C,aAAK,kBAAkB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,mBAAmB,EAC9B,WAAW,EAAE,MAAM,KAAK,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAClH,QAAA,MAAM,iBAAiB,EAAE,kBAQxB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/TransferAssetBridge/status/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EACV,yBAAyB,EAGzB,UAAU,EACV,mBAAmB,EACnB,MAAuB,iBAAiB,CAAC;AAU1C,aAAK,kBAAkB,GAAG,CAAC,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,mBAAmB,EAC9B,WAAW,EAAE,MAAM,KAAK,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAClH,QAAA,MAAM,iBAAiB,EAAE,kBAQxB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
@@ -6,8 +6,9 @@ chains_1.ChainList.forEach(function (chainInfo) {
6
6
  var chainKey = chainInfo.chainInfo.chainSymbol.toLowerCase();
7
7
  waitingServiceMap[chainKey] = chainInfo.waitingService;
8
8
  });
9
- var getWaitingService = function (chainKey, chainInfo, assetInfo, sOrDChain, environment) {
10
- return waitingServiceMap[chainKey.toLowerCase()](chainInfo, assetInfo, sOrDChain, environment);
9
+ var getWaitingService = function (chainInfo, assetInfo, sOrDChain, environment) {
10
+ var chainKey = chainInfo.chainSymbol.toLowerCase();
11
+ return waitingServiceMap[chainKey](chainInfo, assetInfo, sOrDChain, environment);
11
12
  };
12
13
  exports.default = getWaitingService;
13
14
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/TransferAssetBridge/status/index.ts"],"names":[],"mappings":";;AAQA,uCAAuC;AAEvC,IAAM,iBAAiB,GAA4D,EAAE,CAAC;AAEtF,kBAAS,CAAC,OAAO,CAAC,UAAC,SAAiB;IACnC,IAAM,QAAQ,GAAW,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IACvE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,cAAiD,CAAA;AAC1F,CAAC,CAAC,CAAC;AAOH,IAAM,iBAAiB,GAAuB,UAC7C,QAAgB,EAChB,SAAqB,EACrB,SAAqB,EACrB,SAA8B,EAC9B,WAAmB;IAEnB,OAAO,iBAAiB,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AAChG,CAAC,CAAC;AAEF,kBAAe,iBAAiB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/TransferAssetBridge/status/index.ts"],"names":[],"mappings":";;AAQA,uCAAuC;AAEvC,IAAM,iBAAiB,GAA4D,EAAE,CAAC;AAEtF,kBAAS,CAAC,OAAO,CAAC,UAAC,SAAiB;IACnC,IAAM,QAAQ,GAAW,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IACvE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,cAAiD,CAAA;AAC1F,CAAC,CAAC,CAAC;AAMH,IAAM,iBAAiB,GAAuB,UAC7C,SAAqB,EACrB,SAAqB,EACrB,SAA8B,EAC9B,WAAmB;IAEnB,IAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IACrD,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AAClF,CAAC,CAAC;AAEF,kBAAe,iBAAiB,CAAC"}
@@ -1,10 +1,13 @@
1
1
  import { IAssetInfo } from "../interface";
2
+ export interface IAssetInfoForChain extends IAssetInfo {
3
+ minDepositAmt: number;
4
+ }
2
5
  export interface IAssetConfig {
3
6
  common_key: string;
4
7
  native_chain: string;
5
8
  chain_aliases: {
6
- [key: string]: IAssetInfo;
9
+ [key: string]: IAssetInfoForChain;
7
10
  };
8
11
  }
9
12
  export declare const allAssets: IAssetConfig[];
10
- //# sourceMappingURL=assetsPerEnvironment.d.ts.map
13
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/assets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IACrD,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAA;CACpD;AA6BD,eAAO,MAAM,SAAS,EAAE,YAAY,EAGnC,CAAC"}
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.allAssets = void 0;
4
+ var ust_terra = {
5
+ common_key: "uusd",
6
+ native_chain: "terra",
7
+ chain_aliases: {
8
+ axelar: { assetSymbol: "axelarUST", assetName: "Terra USD", minDepositAmt: 0.1 },
9
+ avalanche: { assetSymbol: "axelarUST", assetName: "Terra USD", minDepositAmt: 10 },
10
+ ethereum: { assetSymbol: "axelarUST", assetName: "Terra USD", minDepositAmt: 100 },
11
+ fantom: { assetSymbol: "axelarUST", assetName: "Terra USD", minDepositAmt: 10 },
12
+ moonbeam: { assetSymbol: "axelarUST", assetName: "Terra USD", minDepositAmt: 10 },
13
+ polygon: { assetSymbol: "axelarUST", assetName: "Terra USD", minDepositAmt: 10 },
14
+ terra: { assetSymbol: "UST", assetName: "Terra USD", minDepositAmt: 0.1 },
15
+ }
16
+ };
17
+ var axl_axelar = {
18
+ common_key: "uaxl",
19
+ native_chain: "axelar",
20
+ chain_aliases: {
21
+ axelar: { assetSymbol: "AXL", assetName: "Axelar", minDepositAmt: 0.1 },
22
+ avalanche: { assetSymbol: "AXL", assetName: "Axelar", minDepositAmt: 10 },
23
+ ethereum: { assetSymbol: "AXL", assetName: "Axelar", minDepositAmt: 100 },
24
+ fantom: { assetSymbol: "AXL", assetName: "Axelar", minDepositAmt: 10 },
25
+ moonbeam: { assetSymbol: "AXL", assetName: "Axelar", minDepositAmt: 10 },
26
+ polygon: { assetSymbol: "AXL", assetName: "Axelar", minDepositAmt: 10 }
27
+ }
28
+ };
29
+ exports.allAssets = [
30
+ axl_axelar,
31
+ ust_terra
32
+ ];
33
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/assets/index.ts"],"names":[],"mappings":";;;AAYA,IAAM,SAAS,GAAiB;IAC/B,UAAU,EAAE,MAAM;IAClB,YAAY,EAAE,OAAO;IACrB,aAAa,EAAE;QACd,MAAM,EAAE,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,EAAE;QAC/E,SAAS,EAAE,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;QACjF,QAAQ,EAAE,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,EAAE;QACjF,MAAM,EAAE,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;QAC9E,QAAQ,EAAE,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;QAChF,OAAO,EAAE,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;QAC/E,KAAK,EAAE,EAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,EAAE;KACxE;CACD,CAAA;AAED,IAAM,UAAU,GAAiB;IAChC,UAAU,EAAE,MAAM;IAClB,YAAY,EAAE,QAAQ;IACtB,aAAa,EAAE;QACd,MAAM,EAAE,EAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE;QACtE,SAAS,EAAE,EAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;QACxE,QAAQ,EAAE,EAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE;QACxE,MAAM,EAAE,EAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;QACrE,QAAQ,EAAE,EAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;QACvE,OAAO,EAAE,EAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;KACtE;CACD,CAAA;AAEY,QAAA,SAAS,GAAmB;IACxC,UAAU;IACV,SAAS;CACT,CAAC"}
@@ -1,8 +1,9 @@
1
- import { IAssetInfo, IBlockchainWaitingService, IChainInfo, StatusResponse } from "../../interface";
1
+ import { IAssetAndChainInfo, IAssetInfo, IBlockchainWaitingService, IChainInfo, StatusResponse } from "../../interface";
2
2
  import { BaseWaitingService } from "../models/BaseWaitingService";
3
3
  import { SocketServices } from "../../services/SocketServices";
4
4
  export default class WaitingService extends BaseWaitingService implements IBlockchainWaitingService {
5
5
  constructor(chainInfo: IChainInfo, assetInfo: IAssetInfo);
6
- wait(depositAddress: IAssetInfo, interimStatusCb: StatusResponse, clientSocketConnect: SocketServices): Promise<any>;
6
+ waitForDepositConfirmation(assetAndChainInfo: IAssetAndChainInfo, interimStatusCb: StatusResponse, clientSocketConnect: SocketServices): Promise<any>;
7
+ waitForTransferEvent(assetAndChainInfo: IAssetAndChainInfo, interimStatusCb: StatusResponse, clientSocketConnect: SocketServices): Promise<any>;
7
8
  }
8
9
  //# sourceMappingURL=WaitingService.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"WaitingService.d.ts","sourceRoot":"","sources":["../../../src/chains/Axelar/WaitingService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,yBAAyB,EAAE,UAAU,EAAwB,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACxH,OAAO,EAAC,kBAAkB,EAAC,MAA2E,8BAA8B,CAAC;AACrI,OAAO,EAAC,cAAc,EAAC,MAA+E,+BAA+B,CAAC;AAEtI,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,kBAAmB,YAAW,yBAAyB;gBAEtF,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU;IAI3C,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc;CAclH"}
1
+ {"version":3,"file":"WaitingService.d.ts","sourceRoot":"","sources":["../../../src/chains/Axelar/WaitingService.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,UAAU,EACV,yBAAyB,EACzB,UAAU,EAEV,cAAc,EACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,kBAAkB,EAAC,MAA2E,8BAA8B,CAAC;AACrI,OAAO,EAAC,cAAc,EAAC,MAA+E,+BAA+B,CAAC;AAEtI,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,kBAAmB,YAAW,yBAAyB;gBAEtF,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU;IAI3C,0BAA0B,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc;IAItI,oBAAoB,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc;CAG7I"}
@@ -51,27 +51,23 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
51
51
  }
52
52
  };
53
53
  Object.defineProperty(exports, "__esModule", { value: true });
54
- var interface_1 = require("../../interface");
55
54
  var BaseWaitingService_1 = require("../models/BaseWaitingService");
56
55
  var WaitingService = /** @class */ (function (_super) {
57
56
  __extends(WaitingService, _super);
58
57
  function WaitingService(chainInfo, assetInfo) {
59
58
  return _super.call(this, 1, assetInfo.assetAddress) || this;
60
59
  }
61
- WaitingService.prototype.wait = function (depositAddress, interimStatusCb, clientSocketConnect) {
60
+ WaitingService.prototype.waitForDepositConfirmation = function (assetAndChainInfo, interimStatusCb, clientSocketConnect) {
62
61
  return __awaiter(this, void 0, void 0, function () {
63
- var data;
64
- var _this = this;
65
62
  return __generator(this, function (_a) {
66
- switch (_a.label) {
67
- case 0: return [4 /*yield*/, clientSocketConnect.emitMessageAndWaitForReply(interface_1.ISocketListenerTypes.WAIT_FOR_AXL_DEPOSIT, depositAddress, interface_1.ISocketListenerTypes.AXL_DEPOSIT_CONFIRMED, (function (data) {
68
- data.axelarRequiredNumConfirmations = _this.numConfirmations;
69
- interimStatusCb(data);
70
- }).bind(this))];
71
- case 1:
72
- data = _a.sent();
73
- return [2 /*return*/, data];
74
- }
63
+ return [2 /*return*/, this.wait(assetAndChainInfo, interimStatusCb, clientSocketConnect)];
64
+ });
65
+ });
66
+ };
67
+ WaitingService.prototype.waitForTransferEvent = function (assetAndChainInfo, interimStatusCb, clientSocketConnect) {
68
+ return __awaiter(this, void 0, void 0, function () {
69
+ return __generator(this, function (_a) {
70
+ return [2 /*return*/, this.wait(assetAndChainInfo, interimStatusCb, clientSocketConnect)];
75
71
  });
76
72
  });
77
73
  };
@@ -1 +1 @@
1
- {"version":3,"file":"WaitingService.js","sourceRoot":"","sources":["../../../src/chains/Axelar/WaitingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwH;AACxH,mEAAqI;AAGrI;IAA4C,kCAAkB;IAE7D,wBAAY,SAAqB,EAAE,SAAqB;eACvD,kBAAM,CAAC,EAAE,SAAS,CAAC,YAAsB,CAAC;IAC3C,CAAC;IAEY,6BAAI,GAAjB,UAAkB,cAA0B,EAAE,eAA+B,EAAE,mBAAmC;;;;;;4BAE/F,qBAAM,mBAAmB,CAAC,0BAA0B,CACrE,gCAAoB,CAAC,oBAAoB,EACzC,cAAc,EACd,gCAAoB,CAAC,qBAAqB,EAC1C,CAAC,UAAC,IAAS;4BACV,IAAI,CAAC,8BAA8B,GAAG,KAAI,CAAC,gBAAgB,CAAC;4BAC5D,eAAe,CAAC,IAAI,CAAC,CAAC;wBACvB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,EAAA;;wBARK,IAAI,GAAQ,SAQjB;wBACD,sBAAO,IAAI,EAAC;;;;KAEZ;IACF,qBAAC;AAAD,CAAC,AApBD,CAA4C,uCAAkB,GAoB7D"}
1
+ {"version":3,"file":"WaitingService.js","sourceRoot":"","sources":["../../../src/chains/Axelar/WaitingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,mEAAqI;AAGrI;IAA4C,kCAAkB;IAE7D,wBAAY,SAAqB,EAAE,SAAqB;eACvD,kBAAM,CAAC,EAAE,SAAS,CAAC,YAAsB,CAAC;IAC3C,CAAC;IAEY,mDAA0B,GAAvC,UAAwC,iBAAqC,EAAE,eAA+B,EAAE,mBAAmC;;;gBAClJ,sBAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,CAAC,EAAC;;;KAC1E;IAEY,6CAAoB,GAAjC,UAAkC,iBAAqC,EAAE,eAA+B,EAAE,mBAAmC;;;gBAC5I,sBAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,CAAC,EAAC;;;KAC1E;IACF,qBAAC;AAAD,CAAC,AAbD,CAA4C,uCAAkB,GAa7D"}
@@ -1,5 +1,6 @@
1
1
  import { BaseWaitingService } from "../models/BaseWaitingService";
2
- import { IAssetInfo, IBlockchainWaitingService, IChainInfo } from "../../interface";
2
+ import { IAssetAndChainInfo, IAssetInfo, IBlockchainWaitingService, IChainInfo } from "../../interface";
3
+ import { SocketServices } from "../../services/SocketServices";
3
4
  export interface UnconfirmedTxRef {
4
5
  address: string;
5
6
  confirmations: number;
@@ -45,7 +46,7 @@ export declare class WaitingService extends BaseWaitingService implements IBlock
45
46
  private maxPollingAttempts;
46
47
  private pollingInterval;
47
48
  constructor(chainInfo: IChainInfo, assetInfo: IAssetInfo);
48
- wait(depositAddress: IAssetInfo, interimStatusCb: StatusResponse): Promise<any>;
49
+ wait(assetAndChainInfo: IAssetAndChainInfo, interimStatusCb: any, clientSocketConnect: SocketServices): Promise<void>;
49
50
  private validate;
50
51
  }
51
52
  //# sourceMappingURL=WaitingService.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"WaitingService.d.ts","sourceRoot":"","sources":["../../../src/chains/Bitcoin/WaitingService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAqC,8BAA8B,CAAC;AAE/F,OAAO,EAAC,UAAU,EAAE,yBAAyB,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAElF,MAAM,WAAW,gBAAgB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,KAAK;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB;IACnC,8BAA8B,EAAE,MAAM,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,gBAAgB,EAAE,CAAC,CAAA;IACnB,kBAAkB,EAAE,gBAAgB,EAAE,CAAA;CACtC;AAED,oBAAY,cAAc,GAAG,oBAAoB,GAC9C,CAAC,MAAM,IAAI,CAAC,CAAC;AAEhB,oBAAY,oBAAoB,GAAG,CAAC,IAAI,EAAE,mBAAmB,KAAK,GAAG,CAAC;AAEtE,qBAAa,cAAe,SAAQ,kBAAmB,YAAW,yBAAyB;IAE1F,OAAO,CAAC,kBAAkB,CAAa;IACvC,OAAO,CAAC,eAAe,CAAkB;gBAE7B,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU;IAK3C,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IA2B5F,OAAO,CAAC,QAAQ;CAOhB"}
1
+ {"version":3,"file":"WaitingService.d.ts","sourceRoot":"","sources":["../../../src/chains/Bitcoin/WaitingService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAyD,8BAA8B,CAAC;AAEnH,OAAO,EAAC,kBAAkB,EAAE,UAAU,EAAE,yBAAyB,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AACtG,OAAO,EAAC,cAAc,EAAC,MAA6D,+BAA+B,CAAC;AAEpH,MAAM,WAAW,gBAAgB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,KAAK;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB;IACnC,8BAA8B,EAAE,MAAM,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,gBAAgB,EAAE,CAAC,CAAA;IACnB,kBAAkB,EAAE,gBAAgB,EAAE,CAAA;CACtC;AAED,oBAAY,cAAc,GAAG,oBAAoB,GAC9C,CAAC,MAAM,IAAI,CAAC,CAAC;AAEhB,oBAAY,oBAAoB,GAAG,CAAC,IAAI,EAAE,mBAAmB,KAAK,GAAG,CAAC;AAEtE,qBAAa,cAAe,SAAQ,kBAAmB,YAAW,yBAAyB;IAE1F,OAAO,CAAC,kBAAkB,CAAa;IACvC,OAAO,CAAC,eAAe,CAAkB;gBAE7B,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU;IAK3C,IAAI,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,GAAG,EAAE,mBAAmB,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlI,OAAO,CAAC,QAAQ;CAOhB"}
@@ -63,13 +63,14 @@ var WaitingService = /** @class */ (function (_super) {
63
63
  console.log("waiting service constructor");
64
64
  return _this;
65
65
  }
66
- WaitingService.prototype.wait = function (depositAddress, interimStatusCb) {
66
+ WaitingService.prototype.wait = function (assetAndChainInfo, interimStatusCb, clientSocketConnect) {
67
67
  return __awaiter(this, void 0, void 0, function () {
68
- var url, asyncRequest;
68
+ var depositAddress, url, asyncRequest;
69
69
  var _this = this;
70
70
  return __generator(this, function (_a) {
71
71
  switch (_a.label) {
72
72
  case 0:
73
+ depositAddress = assetAndChainInfo.assetInfo;
73
74
  url = "https://api.blockcypher.com/v1/btc/test3/addrs/".concat(depositAddress.assetAddress);
74
75
  asyncRequest = function (attempts) { return new Promise(function (res, rej) {
75
76
  fetch(url, {
@@ -93,7 +94,7 @@ var WaitingService = /** @class */ (function (_super) {
93
94
  })];
94
95
  case 1:
95
96
  _a.sent();
96
- return [2 /*return*/, true];
97
+ return [2 /*return*/];
97
98
  }
98
99
  });
99
100
  });
@@ -1 +1 @@
1
- {"version":3,"file":"WaitingService.js","sourceRoot":"","sources":["../../../src/chains/Bitcoin/WaitingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAA+F;AAC/F,sCAAgF;AAkDhF;IAAoC,kCAAkB;IAKrD,wBAAY,SAAqB,EAAE,SAAqB;QAAxD,YACC,kBAAM,CAAC,EAAE,SAAS,CAAC,YAAsB,CAAC,SAE1C;QANO,wBAAkB,GAAW,CAAC,CAAC;QAC/B,qBAAe,GAAW,MAAM,CAAC;QAIxC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;;IAC5C,CAAC;IAEY,6BAAI,GAAjB,UAAkB,cAA0B,EAAE,eAA+B;;;;;;;wBACtE,GAAG,GAAG,yDAAkD,cAAc,CAAC,YAAY,CAAE,CAAC;wBACtF,YAAY,GAAG,UAAC,QAAgB,IAAK,OAAA,IAAI,OAAO,CAAC,UAAC,GAAG,EAAE,GAAG;4BAC/D,KAAK,CAAC,GAAG,EAAE;gCACV,OAAO,EAAE,EAAC,QAAQ,EAAE,KAAK,EAAC;6BAC1B,CAAC;iCACD,IAAI,CAAC,UAAC,QAAa,IAAK,OAAA,QAAQ,CAAC,IAAI,EAAE,EAAf,CAAe,CAAC;iCACxC,IAAI,CAAC,UAAC,IAAyB;gCAC/B,IAAI,CAAC,8BAA8B,GAAG,KAAI,CAAC,gBAAgB,CAAC;gCAC5D,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;gCACzC,GAAG,CAAC,IAAI,CAAC,CAAC;4BACX,CAAC,CAAC;iCACD,KAAK,CAAC,UAAC,GAAQ;gCACf,GAAG,CAAC,GAAG,CAAC,CAAC;4BACV,CAAC,CAAC,CAAA;wBACH,CAAC,CAAC,EAbyC,CAazC,CAAC;wBAEH,qBAAM,IAAA,WAAI,EAAC;gCACV,YAAY,cAAA;gCACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gCAClC,QAAQ,EAAE,IAAI,CAAC,eAAe;gCAC9B,WAAW,EAAE,IAAI,CAAC,kBAAkB;6BACpC,CAAC,EAAA;;wBALF,SAKE,CAAC;wBACH,sBAAO,IAAI,EAAC;;;;KAEZ;IAEO,iCAAQ,GAAhB,UAAiB,GAAwB;;QACxC,OAAO,CAAC,GAAG,CAAC,kBAAkB;eAC1B,CAAC,CAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,MAAM,IAAG,CAAC;mBACtB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,IAAI,IAAI,CAAC,gBAAgB,CACvD,CAAC;IACJ,CAAC;IAEF,qBAAC;AAAD,CAAC,AA5CD,CAAoC,uCAAkB,GA4CrD;AA5CY,wCAAc"}
1
+ {"version":3,"file":"WaitingService.js","sourceRoot":"","sources":["../../../src/chains/Bitcoin/WaitingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAmH;AACnH,sCAAoG;AAmDpG;IAAoC,kCAAkB;IAKrD,wBAAY,SAAqB,EAAE,SAAqB;QAAxD,YACC,kBAAM,CAAC,EAAE,SAAS,CAAC,YAAsB,CAAC,SAE1C;QANO,wBAAkB,GAAW,CAAC,CAAC;QAC/B,qBAAe,GAAW,MAAM,CAAC;QAIxC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;;IAC5C,CAAC;IAEY,6BAAI,GAAjB,UAAkB,iBAAqC,EAAE,eAAoB,EAAE,mBAAmC;;;;;;;wBAC3G,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;wBAC7C,GAAG,GAAG,yDAAkD,cAAc,CAAC,YAAY,CAAE,CAAC;wBACtF,YAAY,GAAG,UAAC,QAAgB,IAAK,OAAA,IAAI,OAAO,CAAC,UAAC,GAAG,EAAE,GAAG;4BAC/D,KAAK,CAAC,GAAG,EAAE;gCACV,OAAO,EAAE,EAAC,QAAQ,EAAE,KAAK,EAAC;6BAC1B,CAAC;iCACD,IAAI,CAAC,UAAC,QAAa,IAAK,OAAA,QAAQ,CAAC,IAAI,EAAE,EAAf,CAAe,CAAC;iCACxC,IAAI,CAAC,UAAC,IAAyB;gCAC/B,IAAI,CAAC,8BAA8B,GAAG,KAAI,CAAC,gBAAgB,CAAC;gCAC5D,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;gCACzC,GAAG,CAAC,IAAI,CAAC,CAAC;4BACX,CAAC,CAAC;iCACD,KAAK,CAAC,UAAC,GAAQ;gCACf,GAAG,CAAC,GAAG,CAAC,CAAC;4BACV,CAAC,CAAC,CAAA;wBACH,CAAC,CAAC,EAbyC,CAazC,CAAC;wBAEH,qBAAM,IAAA,WAAI,EAAC;gCACV,YAAY,cAAA;gCACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gCAClC,QAAQ,EAAE,IAAI,CAAC,eAAe;gCAC9B,WAAW,EAAE,IAAI,CAAC,kBAAkB;6BACpC,CAAC,EAAA;;wBALF,SAKE,CAAC;;;;;KACH;IAEO,iCAAQ,GAAhB,UAAiB,GAAwB;;QACxC,OAAO,CAAC,GAAG,CAAC,kBAAkB;eAC1B,CAAC,CAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,MAAM,IAAG,CAAC;mBACtB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,IAAI,IAAI,CAAC,gBAAgB,CACvD,CAAC;IACJ,CAAC;IAEF,qBAAC;AAAD,CAAC,AA3CD,CAAoC,uCAAkB,GA2CrD;AA3CY,wCAAc"}
@@ -1,8 +1,12 @@
1
- import { IAssetInfo, IBlockchainWaitingService, IChainInfo, StatusResponse } from "../../interface";
1
+ import { IAssetAndChainInfo, IAssetInfo, IBlockchainWaitingService, IChainInfo, StatusResponse } from "../../interface";
2
2
  import { BaseWaitingService } from "../models/BaseWaitingService";
3
3
  import { SocketServices } from "../../services/SocketServices";
4
+ import { ProviderType } from "../../utils/EthersJs/ethersjsProvider";
4
5
  export default class WaitingService extends BaseWaitingService implements IBlockchainWaitingService {
5
- constructor(chainInfo: IChainInfo, assetInfo: IAssetInfo);
6
- wait(depositAddress: IAssetInfo, interimStatusCb: StatusResponse, clientSocketConnect: SocketServices): Promise<any>;
6
+ environment: string;
7
+ providerType: ProviderType;
8
+ constructor(chainInfo: IChainInfo, assetInfo: IAssetInfo, environment: string, providerType: ProviderType);
9
+ waitForDepositConfirmation(assetAndChainInfo: IAssetAndChainInfo, interimStatusCb: StatusResponse, clientSocketConnect: SocketServices): Promise<any>;
10
+ waitForTransferEvent(assetAndChainInfo: IAssetAndChainInfo, interimStatusCb: StatusResponse, clientSocketConnect: SocketServices): Promise<void>;
7
11
  }
8
12
  //# sourceMappingURL=WaitingService.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"WaitingService.d.ts","sourceRoot":"","sources":["../../../src/chains/Ethereum/WaitingService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,yBAAyB,EAAE,UAAU,EAAwB,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACxH,OAAO,EAAC,kBAAkB,EAAC,MAA2E,8BAA8B,CAAC;AACrI,OAAO,EAAC,cAAc,EAAC,MAA+E,+BAA+B,CAAC;AAEtI,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,kBAAmB,YAAW,yBAAyB;gBAEtF,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU;IAI3C,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc;CAclH"}
1
+ {"version":3,"file":"WaitingService.d.ts","sourceRoot":"","sources":["../../../src/chains/Ethereum/WaitingService.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,UAAU,EACV,yBAAyB,EACzB,UAAU,EAEV,cAAc,EACd,MAAkC,iBAAiB,CAAC;AACrD,OAAO,EAAC,kBAAkB,EAAC,MAAQ,8BAA8B,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAY,+BAA+B,CAAC;AAEnE,OAAO,EAAC,YAAY,EAAC,MAAc,uCAAuC,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,kBAAmB,YAAW,yBAAyB;IAE3F,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,YAAY,CAAC;gBAEtB,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAM5F,0BAA0B,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc;IAItI,oBAAoB,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc;CAU7I"}
@@ -50,27 +50,38 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
50
50
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
51
51
  }
52
52
  };
53
+ var __importDefault = (this && this.__importDefault) || function (mod) {
54
+ return (mod && mod.__esModule) ? mod : { "default": mod };
55
+ };
53
56
  Object.defineProperty(exports, "__esModule", { value: true });
54
- var interface_1 = require("../../interface");
55
57
  var BaseWaitingService_1 = require("../models/BaseWaitingService");
58
+ var EthersJsWaitingService_1 = __importDefault(require("../../utils/EthersJs/EthersJsWaitingService"));
56
59
  var WaitingService = /** @class */ (function (_super) {
57
60
  __extends(WaitingService, _super);
58
- function WaitingService(chainInfo, assetInfo) {
59
- return _super.call(this, 1, assetInfo.assetAddress) || this;
61
+ function WaitingService(chainInfo, assetInfo, environment, providerType) {
62
+ var _this = _super.call(this, 1, assetInfo.assetAddress) || this;
63
+ _this.environment = environment;
64
+ _this.providerType = providerType;
65
+ return _this;
60
66
  }
61
- WaitingService.prototype.wait = function (depositAddress, interimStatusCb, clientSocketConnect) {
67
+ WaitingService.prototype.waitForDepositConfirmation = function (assetAndChainInfo, interimStatusCb, clientSocketConnect) {
68
+ return __awaiter(this, void 0, void 0, function () {
69
+ return __generator(this, function (_a) {
70
+ return [2 /*return*/, this.wait(assetAndChainInfo, interimStatusCb, clientSocketConnect)];
71
+ });
72
+ });
73
+ };
74
+ WaitingService.prototype.waitForTransferEvent = function (assetAndChainInfo, interimStatusCb, clientSocketConnect) {
62
75
  return __awaiter(this, void 0, void 0, function () {
63
- var data;
64
- var _this = this;
76
+ var assetInfo, destinationChainInfo;
65
77
  return __generator(this, function (_a) {
66
78
  switch (_a.label) {
67
- case 0: return [4 /*yield*/, clientSocketConnect.emitMessageAndWaitForReply(interface_1.ISocketListenerTypes.WAIT_FOR_EVM_DEPOSIT, depositAddress, interface_1.ISocketListenerTypes.EVM_DEPOSIT_CONFIRMED, (function (data) {
68
- data.axelarRequiredNumConfirmations = _this.numConfirmations;
69
- interimStatusCb(data);
70
- }).bind(this))];
71
- case 1:
72
- data = _a.sent();
73
- return [2 /*return*/, data];
79
+ case 0:
80
+ assetInfo = assetAndChainInfo.assetInfo, destinationChainInfo = assetAndChainInfo.destinationChainInfo;
81
+ return [4 /*yield*/, new EthersJsWaitingService_1.default(destinationChainInfo, assetInfo)
82
+ .build(destinationChainInfo, assetInfo, this.environment, this.providerType)];
83
+ case 1: return [2 /*return*/, (_a.sent())
84
+ .wait(assetAndChainInfo, interimStatusCb, clientSocketConnect)];
74
85
  }
75
86
  });
76
87
  });
@@ -1 +1 @@
1
- {"version":3,"file":"WaitingService.js","sourceRoot":"","sources":["../../../src/chains/Ethereum/WaitingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwH;AACxH,mEAAqI;AAGrI;IAA4C,kCAAkB;IAE7D,wBAAY,SAAqB,EAAE,SAAqB;eACvD,kBAAM,CAAC,EAAE,SAAS,CAAC,YAAsB,CAAC;IAC3C,CAAC;IAEY,6BAAI,GAAjB,UAAkB,cAA0B,EAAE,eAA+B,EAAE,mBAAmC;;;;;;4BAE/F,qBAAM,mBAAmB,CAAC,0BAA0B,CACrE,gCAAoB,CAAC,oBAAoB,EACzC,cAAc,EACd,gCAAoB,CAAC,qBAAqB,EAC1C,CAAC,UAAC,IAAS;4BACV,IAAI,CAAC,8BAA8B,GAAG,KAAI,CAAC,gBAAgB,CAAC;4BAC5D,eAAe,CAAC,IAAI,CAAC,CAAC;wBACvB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,EAAA;;wBARK,IAAI,GAAQ,SAQjB;wBACD,sBAAO,IAAI,EAAC;;;;KAEZ;IACF,qBAAC;AAAD,CAAC,AApBD,CAA4C,uCAAkB,GAoB7D"}
1
+ {"version":3,"file":"WaitingService.js","sourceRoot":"","sources":["../../../src/chains/Ethereum/WaitingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,mEAAkE;AAElE,uGAAiF;AAGjF;IAA4C,kCAAkB;IAK7D,wBAAY,SAAqB,EAAE,SAAqB,EAAE,WAAmB,EAAE,YAA0B;QAAzG,YACC,kBAAM,CAAC,EAAE,SAAS,CAAC,YAAsB,CAAC,SAG1C;QAFA,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,KAAI,CAAC,YAAY,GAAG,YAAY,CAAC;;IAClC,CAAC;IAEY,mDAA0B,GAAvC,UAAwC,iBAAqC,EAAE,eAA+B,EAAE,mBAAmC;;;gBAClJ,sBAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,CAAC,EAAC;;;KAC1E;IAEY,6CAAoB,GAAjC,UAAkC,iBAAqC,EAAE,eAA+B,EAAE,mBAAmC;;;;;;wBAEpI,SAAS,GAA2B,iBAAiB,UAA5C,EAAE,oBAAoB,GAAK,iBAAiB,qBAAtB,CAAuB;wBAEtD,qBAAM,IAAI,gCAAsB,CAAC,oBAAoB,EAAE,SAAS,CAAC;iCACvE,KAAK,CAAC,oBAAoB,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,EAAA;4BAD7E,sBAAO,CAAC,SACqE,CAAC;6BAC5E,IAAI,CAAC,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,CAAC,EAAC;;;;KAEhE;IAEF,qBAAC;AAAD,CAAC,AAzBD,CAA4C,uCAAkB,GAyB7D"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chains/Ethereum/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAE,+BAA+B,EAAE,MAAM,EAAE,UAAU,EAAsB,MAAM,iBAAiB,CAAC;AAGrH,OAAO,EAAC,YAAY,EAAC,MAA8E,uCAAuC,CAAC;AAE3I,MAAM,CAAC,OAAO,OAAO,QAAS,YAAW,MAAM;IAEvC,YAAY,EAAE,YAAY,CAAC;IAE3B,SAAS,EAAE,UAAU,CAO1B;;IAMK,eAAe,gBAAiB,UAAU,aAA2D;IAErG,cAAc,EAAE,+BAA+B,CASrD;CACD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chains/Ethereum/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAE,+BAA+B,EAAE,MAAM,EAAE,UAAU,EAAsB,MAAM,iBAAiB,CAAC;AACrH,OAAO,EAAC,YAAY,EAAC,MAA8E,uCAAuC,CAAC;AAE3I,MAAM,CAAC,OAAO,OAAO,QAAS,YAAW,MAAM;IAEvC,YAAY,EAAE,YAAY,CAAC;IAE3B,SAAS,EAAE,UAAU,CAO1B;;IAMK,eAAe,gBAAiB,UAAU,aAA2D;IAErG,cAAc,EAAE,+BAA+B,CAOrD;CACD"}
@@ -41,7 +41,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
41
41
  Object.defineProperty(exports, "__esModule", { value: true });
42
42
  var WaitingService_1 = __importDefault(require("./WaitingService"));
43
43
  var utils_1 = require("ethers/lib/utils");
44
- var EthersJsWaitingService_1 = __importDefault(require("../../utils/EthersJs/EthersJsWaitingService"));
45
44
  var Ethereum = /** @class */ (function () {
46
45
  function Ethereum() {
47
46
  var _this = this;
@@ -55,22 +54,11 @@ var Ethereum = /** @class */ (function () {
55
54
  };
56
55
  this.validateAddress = function (addressInfo) { return (0, utils_1.isAddress)(addressInfo.assetAddress); };
57
56
  this.waitingService = function (chainInfo, assetInfo, sOrDChain, environment) { return __awaiter(_this, void 0, void 0, function () {
58
- var _a;
59
- return __generator(this, function (_b) {
60
- switch (_b.label) {
61
- case 0:
62
- if (!(sOrDChain === 'source')) return [3 /*break*/, 1];
63
- _a = new WaitingService_1.default(chainInfo, assetInfo);
64
- return [3 /*break*/, 3];
65
- case 1: return [4 /*yield*/, new EthersJsWaitingService_1.default(chainInfo, assetInfo).build(chainInfo, assetInfo, environment, this.providerType)];
66
- case 2:
67
- _a = _b.sent();
68
- _b.label = 3;
69
- case 3: return [2 /*return*/, _a];
70
- }
57
+ return __generator(this, function (_a) {
58
+ return [2 /*return*/, new WaitingService_1.default(chainInfo, assetInfo, environment, this.providerType)];
71
59
  });
72
60
  }); };
73
- this.providerType = "infuraWS";
61
+ this.providerType = "ethereum";
74
62
  }
75
63
  return Ethereum;
76
64
  }());
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chains/Ethereum/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAsH;AACtH,0CAAsH;AAEtH,uGACiJ;AAGjJ;IAaC;QAAA,iBAEC;QAXM,cAAS,GAAe;YAC9B,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,UAAU;YACrB,iBAAiB,EAAE,EAAE;YACrB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,EAAE;YACV,cAAc,EAAE,GAAG;SACnB,CAAC;QAMK,oBAAe,GAAG,UAAC,WAAuB,IAAK,OAAA,IAAA,iBAAiB,EAAC,WAAW,CAAC,YAAsB,CAAC,EAArD,CAAqD,CAAC;QAErG,mBAAc,GAAoC,UACxD,SAAqB,EACrB,SAAqB,EACrB,SAA8B,EAC9B,WAAmB;;;;;6BAEZ,CAAC,SAAS,KAAK,QAAQ,CAAC,EAAxB,wBAAwB;wBAC5B,KAAA,IAAI,wBAAc,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;;4BACxC,qBAAM,IAAI,gCAAsB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,EAAA;;wBAAlH,KAAA,SAAkH,CAAA;;4BAFrH,0BAEsH;;;aACtH,CAAA;QAdA,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC;IAChC,CAAC;IAcF,eAAC;AAAD,CAAC,AA7BD,IA6BC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chains/Ethereum/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAsH;AACtH,0CAAsH;AAItH;IAaC;QAAA,iBAEC;QAXM,cAAS,GAAe;YAC9B,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,UAAU;YACrB,iBAAiB,EAAE,EAAE;YACrB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,EAAE;YACV,cAAc,EAAE,GAAG;SACnB,CAAC;QAMK,oBAAe,GAAG,UAAC,WAAuB,IAAK,OAAA,IAAA,iBAAiB,EAAC,WAAW,CAAC,YAAsB,CAAC,EAArD,CAAqD,CAAC;QAErG,mBAAc,GAAoC,UACxD,SAAqB,EACrB,SAAqB,EACrB,SAA8B,EAC9B,WAAmB;;gBAEnB,sBAAO,IAAI,wBAAc,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,EAAA;;aAC/E,CAAA;QAZA,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC;IAChC,CAAC;IAYF,eAAC;AAAD,CAAC,AA3BD,IA2BC"}
@@ -1,10 +1,8 @@
1
1
  import { IAssetInfo, IChain, IChainInfo } from "../../interface";
2
2
  import Axelar from "../Axelar";
3
- import WaitingService from "./WaitingService";
4
3
  export default class Terra extends Axelar implements IChain {
5
4
  chainInfo: IChainInfo;
6
5
  constructor();
7
6
  validateAddress: (addressInfo: IAssetInfo) => boolean;
8
- waitingService: (chainInfo: IChainInfo, assetInfo: IAssetInfo) => WaitingService;
9
7
  }
10
8
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chains/Terra/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC/D,OAAO,MAAM,MAAgC,WAAW,CAAC;AAEzD,OAAO,cAAc,MAAwB,kBAAkB,CAAC;AAEhE,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,MAAO,YAAW,MAAM;IAEnD,SAAS,EAAE,UAAU,CAO1B;;IAMK,eAAe,gBAAiB,UAAU,aAA6D;IAEvG,cAAc,cAAe,UAAU,aAAa,UAAU,oBAA6C;CAElH"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chains/Terra/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC/D,OAAO,MAAM,MAAgC,WAAW,CAAC;AAIzD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,MAAO,YAAW,MAAM;IAEnD,SAAS,EAAE,UAAU,CAO1B;;IAMK,eAAe,gBAAiB,UAAU,aAA6D;CAE9G"}
@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
20
20
  Object.defineProperty(exports, "__esModule", { value: true });
21
21
  var Axelar_1 = __importDefault(require("../Axelar"));
22
22
  var terra_js_1 = require("@terra-money/terra.js");
23
- var WaitingService_1 = __importDefault(require("./WaitingService"));
23
+ // import WaitingService from "./WaitingService";
24
24
  var Terra = /** @class */ (function (_super) {
25
25
  __extends(Terra, _super);
26
26
  function Terra() {
@@ -34,7 +34,6 @@ var Terra = /** @class */ (function (_super) {
34
34
  txFeeInPercent: 0.1
35
35
  };
36
36
  _this.validateAddress = function (addressInfo) { return terra_js_1.AccAddress.validate(addressInfo.assetAddress); };
37
- _this.waitingService = function (chainInfo, assetInfo) { return new WaitingService_1.default(chainInfo, assetInfo); };
38
37
  return _this;
39
38
  }
40
39
  return Terra;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chains/Terra/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AACA,qDAAyD;AACzD,kDAAoE;AACpE,oEAAgE;AAEhE;IAAmC,yBAAM;IAWxC;QAAA,YACC,iBAAO,SACP;QAXM,eAAS,GAAe;YAC9B,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO;YAClB,iBAAiB,EAAE,CAAC;YACpB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,EAAE;YACV,cAAc,EAAE,GAAG;SACnB,CAAC;QAMK,qBAAe,GAAG,UAAC,WAAuB,IAAK,OAAA,qBAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAsB,CAAC,EAAvD,CAAuD,CAAC;QAEvG,oBAAc,GAAG,UAAC,SAAqB,EAAE,SAAqB,IAAK,OAAA,IAAI,wBAAc,CAAC,SAAS,EAAE,SAAS,CAAC,EAAxC,CAAwC,CAAA;;IAJlH,CAAC;IAMF,YAAC;AAAD,CAAC,AAnBD,CAAmC,gBAAM,GAmBxC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chains/Terra/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AACA,qDAAyD;AACzD,kDAAoE;AACpE,mEAAmE;AAEnE;IAAmC,yBAAM;IAWxC;QAAA,YACC,iBAAO,SACP;QAXM,eAAS,GAAe;YAC9B,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO;YAClB,iBAAiB,EAAE,CAAC;YACpB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,EAAE;YACV,cAAc,EAAE,GAAG;SACnB,CAAC;QAMK,qBAAe,GAAG,UAAC,WAAuB,IAAK,OAAA,qBAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAsB,CAAC,EAAvD,CAAuD,CAAC;;IAF9G,CAAC;IAIF,YAAC;AAAD,CAAC,AAjBD,CAAmC,gBAAM,GAiBxC"}
@@ -8,7 +8,7 @@ var Axelar_1 = __importDefault(require("./Axelar"));
8
8
  var Ethereum_1 = __importDefault(require("./Ethereum"));
9
9
  var Avalanche_1 = __importDefault(require("./Avalanche"));
10
10
  var Terra_1 = __importDefault(require("./Terra"));
11
- var assetsPerEnvironment_1 = require("../constants/assetsPerEnvironment");
11
+ var assets_1 = require("../assets");
12
12
  var Fantom_1 = __importDefault(require("./Fantom"));
13
13
  var Moonbeam_1 = __importDefault(require("./Moonbeam"));
14
14
  var Polygon_1 = __importDefault(require("./Polygon"));
@@ -24,7 +24,7 @@ var rawChains = [
24
24
  exports.ChainList = rawChains;
25
25
  rawChains.forEach(function (_a) {
26
26
  var chainInfo = _a.chainInfo;
27
- var filteredAssetList = assetsPerEnvironment_1.allAssets
27
+ var filteredAssetList = assets_1.allAssets
28
28
  .filter(function (_a) {
29
29
  var chain_aliases = _a.chain_aliases;
30
30
  return Object.keys(chain_aliases).indexOf(chainInfo.chainName.toLowerCase()) > -1;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/chains/index.ts"],"names":[],"mappings":";;;;;;AACA,oDAAiD;AACjD,wDAAmD;AACnD,0DAAoD;AACpD,kDAAgD;AAChD,0EAA0E;AAC1E,oDAAiD;AACjD,wDAAmD;AACnD,sDAAkD;AAElD,IAAM,SAAS,GAAa;IAC3B,IAAI,gBAAM,EAAE;IACZ,IAAI,mBAAS,EAAE;IACf,IAAI,kBAAQ,EAAE;IACd,IAAI,gBAAM,EAAE;IACZ,IAAI,kBAAQ,EAAE;IACd,IAAI,iBAAO,EAAE;IACb,IAAI,eAAK,EAAE;CACX,CAAC;AAoBmB,8BAAS;AAlB9B,SAAS,CAAC,OAAO,CAAC,UAAC,EAAW;QAAV,SAAS,eAAA;IAE5B,IAAM,iBAAiB,GAAmB,gCAAS;SAClD,MAAM,CAAC,UAAC,EAAe;YAAd,aAAa,mBAAA;QAAM,OAAA,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;IAA1E,CAA0E,CAAC,CAAC;IAEzG,IAAM,UAAU,GAAiB,EAAE,CAAC;IAEpC,iBAAiB,CAAC,OAAO,CAAC,UAAC,KAAK;QAC/B,IAAM,WAAW,GAAe,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAA;QACtF,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QAC1C,WAAW,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAC9C,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,MAAM,GAAG,UAAU,CAAC;AAE/B,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/chains/index.ts"],"names":[],"mappings":";;;;;;AACA,oDAAiD;AACjD,wDAAmD;AACnD,0DAAoD;AACpD,kDAAgD;AAChD,oCAAkD;AAClD,oDAAiD;AACjD,wDAAmD;AACnD,sDAAkD;AAElD,IAAM,SAAS,GAAa;IAC3B,IAAI,gBAAM,EAAE;IACZ,IAAI,mBAAS,EAAE;IACf,IAAI,kBAAQ,EAAE;IACd,IAAI,gBAAM,EAAE;IACZ,IAAI,kBAAQ,EAAE;IACd,IAAI,iBAAO,EAAE;IACb,IAAI,eAAK,EAAE;CACX,CAAC;AAoBmB,8BAAS;AAlB9B,SAAS,CAAC,OAAO,CAAC,UAAC,EAAW;QAAV,SAAS,eAAA;IAE5B,IAAM,iBAAiB,GAAmB,kBAAS;SAClD,MAAM,CAAC,UAAC,EAAe;YAAd,aAAa,mBAAA;QAAM,OAAA,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;IAA1E,CAA0E,CAAC,CAAC;IAEzG,IAAM,UAAU,GAAiB,EAAE,CAAC;IAEpC,iBAAiB,CAAC,OAAO,CAAC,UAAC,KAAK;QAC/B,IAAM,WAAW,GAAe,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAA;QACtF,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QAC1C,WAAW,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAC9C,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,MAAM,GAAG,UAAU,CAAC;AAE/B,CAAC,CAAC,CAAA"}
@@ -1,10 +1,13 @@
1
- import { IBlockchainWaitingService } from "../../interface";
1
+ import { IAssetAndChainInfo, IBlockchainWaitingService, StatusResponse } from "../../interface";
2
+ import { SocketServices } from "../../services/SocketServices";
2
3
  export declare class BaseWaitingService implements IBlockchainWaitingService {
3
4
  numConfirmations: number;
4
5
  depositAddress: string;
5
6
  environment: string;
6
7
  constructor(numConfirmations: number, depositAddress: string);
7
- wait(...args: any[]): Promise<void>;
8
+ wait(assetAndChainInfo: IAssetAndChainInfo, interimStatusCb: StatusResponse, clientSocketConnect: SocketServices): Promise<any>;
9
+ waitForDepositConfirmation(...args: any[]): Promise<void>;
10
+ waitForTransferEvent(...args: any[]): Promise<void>;
8
11
  private setNumConfirmations;
9
12
  private setDepositAddress;
10
13
  }
@@ -1 +1 @@
1
- {"version":3,"file":"BaseWaitingService.d.ts","sourceRoot":"","sources":["../../../src/chains/models/BaseWaitingService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,yBAAyB,EAAC,MAAM,iBAAiB,CAAC;AAE1D,qBAAa,kBAAmB,YAAW,yBAAyB;IAE5D,gBAAgB,EAAE,MAAM,CAAK;IAC7B,cAAc,EAAE,MAAM,CAAM;IAC5B,WAAW,EAAE,MAAM,CAAM;gBAEb,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAWtD,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIhC,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;CAIzB"}
1
+ {"version":3,"file":"BaseWaitingService.d.ts","sourceRoot":"","sources":["../../../src/chains/models/BaseWaitingService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAE,yBAAyB,EAAwB,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACpH,OAAO,EAAC,cAAc,EAAC,MAA2E,+BAA+B,CAAC;AAElI,qBAAa,kBAAmB,YAAW,yBAAyB;IAE5D,gBAAgB,EAAE,MAAM,CAAK;IAC7B,cAAc,EAAE,MAAM,CAAM;IAC5B,WAAW,EAAE,MAAM,CAAM;gBAEb,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAUtD,IAAI,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc;IAgBhH,0BAA0B,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIzC,oBAAoB,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIhD,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;CAIzB"}