@yaswap/evm 2.5.1 → 2.5.2

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @yaswap/evm
2
2
 
3
+ ## 2.5.2
4
+
5
+ ### Patch Changes
6
+
7
+ - Add missing logic to find claim and refund transaction for EVM chain
8
+ - Updated dependencies
9
+ - @yaswap/client@2.5.2
10
+ - @yaswap/errors@2.5.2
11
+ - @yaswap/logger@2.5.2
12
+ - @yaswap/types@2.5.2
13
+ - @yaswap/utils@2.5.2
14
+
3
15
  ## 2.5.1
4
16
 
5
17
  ### Patch Changes
@@ -3,7 +3,6 @@ import { FeeType, SwapParams, Transaction } from '@yaswap/types';
3
3
  import { Signer } from '@ethersproject/abstract-signer';
4
4
  import { BaseProvider, Log } from '@ethersproject/providers';
5
5
  import { LiqualityHTLC } from '../typechain';
6
- import { ClaimEvent, RefundEvent } from '../typechain/LiqualityHTLC';
7
6
  import { EthersTransactionResponse, EvmSwapOptions, ScraperTransaction } from '../types';
8
7
  import { EvmBaseWalletProvider } from '../wallet/EvmBaseWalletProvider';
9
8
  export declare abstract class EvmBaseSwapProvider extends Swap<BaseProvider, Signer, EvmBaseWalletProvider<BaseProvider>> {
@@ -26,6 +25,6 @@ export declare abstract class EvmBaseSwapProvider extends Swap<BaseProvider, Sig
26
25
  protected tryParseLog(log: Log): import("@ethersproject/abi").LogDescription;
27
26
  abstract findInitiateSwapTransaction(swapParams: SwapParams, _blockNumber?: number): Promise<Transaction<ScraperTransaction>>;
28
27
  abstract findFundSwapTransaction(swapParams: SwapParams, initiationTxHash: string, blockNumber?: number): Promise<Transaction | null>;
29
- abstract findRefundSwapTransaction(swapParams: SwapParams, initTxHash: string, blockNumber?: number): Promise<Transaction<RefundEvent>>;
30
- abstract findClaimSwapTransaction(swapParams: SwapParams, initTxHash: string, _blockNumber?: number): Promise<Transaction<ClaimEvent>>;
28
+ abstract findRefundSwapTransaction(swapParams: SwapParams, initTxHash: string, blockNumber?: number): Promise<Transaction<ScraperTransaction>>;
29
+ abstract findClaimSwapTransaction(swapParams: SwapParams, initTxHash: string, _blockNumber?: number): Promise<Transaction<ScraperTransaction>>;
31
30
  }
@@ -1,6 +1,5 @@
1
1
  import { SwapParams, Transaction } from '@yaswap/types';
2
2
  import { BaseProvider } from '@ethersproject/providers';
3
- import { ClaimEvent, RefundEvent } from '../typechain/LiqualityHTLC';
4
3
  import { EvmSwapOptions, ScraperTransaction } from '../types';
5
4
  import { EvmBaseWalletProvider } from '../wallet/EvmBaseWalletProvider';
6
5
  import { EvmBaseSwapProvider } from './EvmBaseSwapProvider';
@@ -14,8 +13,7 @@ export declare class EvmSwapProvider extends EvmBaseSwapProvider {
14
13
  findInitiateSwapTransaction(swapParams: SwapParams): Promise<Transaction<ScraperTransaction>>;
15
14
  findErc20Events(erc20ContractAddress: string, address: string, predicate: (tx: Transaction<ScraperTransaction>) => boolean, fromBlock?: number, toBlock?: number, limit?: number, sort?: string): Promise<Transaction<ScraperTransaction>>;
16
15
  findFundSwapTransaction(swapParams: SwapParams, initiationTxHash: string): Promise<Transaction>;
17
- findClaimSwapTransaction(swapParams: SwapParams, initTxHash: string): Promise<Transaction<ClaimEvent>>;
18
- findRefundSwapTransaction(swapParams: SwapParams, initTxHash: string): Promise<Transaction<RefundEvent>>;
19
- private searchLogs;
20
- private findTx;
16
+ findAddressEvent(type: string, contractAddress: string): Promise<Transaction<ScraperTransaction>>;
17
+ findClaimSwapTransaction(swapParams: SwapParams, initiationTxHash: string): Promise<Transaction<ScraperTransaction>>;
18
+ findRefundSwapTransaction(swapParams: SwapParams, initiationTxHash: string): Promise<Transaction<ScraperTransaction>>;
21
19
  }
@@ -139,65 +139,41 @@ class EvmSwapProvider extends EvmBaseSwapProvider_1.EvmBaseSwapProvider {
139
139
  return tx;
140
140
  });
141
141
  }
142
- findClaimSwapTransaction(swapParams, initTxHash) {
143
- var _a, _b;
142
+ findAddressEvent(type, contractAddress) {
144
143
  return __awaiter(this, void 0, void 0, function* () {
145
- const foundTx = yield this.findTx(swapParams, initTxHash, 'Claim');
146
- const secret = (_b = (_a = foundTx === null || foundTx === void 0 ? void 0 : foundTx._raw) === null || _a === void 0 ? void 0 : _a.args) === null || _b === void 0 ? void 0 : _b.secret;
147
- if (secret) {
148
- return Object.assign(Object.assign({}, foundTx), { secret: (0, utils_1.remove0x)(secret) });
144
+ const data = yield this._httpClient.nodeGet(`/events/${type}/${contractAddress}`);
145
+ const { tx } = data.data;
146
+ if (tx && tx.status === true) {
147
+ return this.ensureFeeInfo(this.normalizeTransactionResponse(tx));
149
148
  }
150
149
  });
151
150
  }
152
- findRefundSwapTransaction(swapParams, initTxHash) {
151
+ findClaimSwapTransaction(swapParams, initiationTxHash) {
153
152
  return __awaiter(this, void 0, void 0, function* () {
154
- return this.findTx(swapParams, initTxHash, 'Refund');
155
- });
156
- }
157
- searchLogs(callback, currentBlock) {
158
- return __awaiter(this, void 0, void 0, function* () {
159
- // let from = Math.sub(currentBlock, this.swapOptions.numberOfBlocksPerRequest).toString();
160
- let from = utils_1.Math.sub(currentBlock, 0).toString();
161
- let to = currentBlock.toString();
162
- // while (Math.gte(from, Math.sub(currentBlock, this.swapOptions.totalNumberOfBlocks))) {
163
- while (utils_1.Math.gte(from, utils_1.Math.sub(currentBlock, 0))) {
164
- const result = yield callback(Number(from), Number(to));
165
- if (result) {
166
- return result;
167
- }
168
- // from = Math.sub(from, this.swapOptions.numberOfBlocksPerRequest).toString();
169
- // to = Math.sub(to, this.swapOptions.numberOfBlocksPerRequest).toString();
170
- from = utils_1.Math.sub(from, 0).toString();
171
- to = utils_1.Math.sub(to, 0).toString();
153
+ this.validateSwapParams(swapParams);
154
+ const initiationTransaction = yield this.walletProvider.getChainProvider().getTransactionByHash(initiationTxHash);
155
+ if (!initiationTransaction)
156
+ throw new errors_1.TxNotFoundError(`Transaction not found: ${initiationTxHash}`);
157
+ if (initiationTransaction.status === types_1.TxStatus.Pending) {
158
+ throw new errors_1.PendingTxError(`Transaction receipt is not available: ${initiationTxHash}`);
159
+ }
160
+ const tx = yield this.findAddressEvent('swapClaim', initiationTransaction.contractAddress);
161
+ if (tx) {
162
+ (0, utils_1.validateSecretAndHash)(tx.secret, swapParams.secretHash);
163
+ return tx;
172
164
  }
173
165
  });
174
166
  }
175
- findTx(swapParams, initTxHash, eventFilter) {
176
- var _a;
167
+ findRefundSwapTransaction(swapParams, initiationTxHash) {
177
168
  return __awaiter(this, void 0, void 0, function* () {
178
- const txReceipt = yield this.walletProvider.getChainProvider().getTransactionByHash(initTxHash);
179
- if (txReceipt === null || txReceipt === void 0 ? void 0 : txReceipt.logs) {
180
- for (const log of txReceipt.logs) {
181
- const initiate = this.tryParseLog(log);
182
- if (((_a = initiate === null || initiate === void 0 ? void 0 : initiate.args) === null || _a === void 0 ? void 0 : _a.id) && initiate.args.htlc) {
183
- yield this.verifyInitiateSwapTransaction(swapParams, Object.assign(Object.assign({}, txReceipt), { _raw: initiate }));
184
- const currentBlock = yield this.walletProvider.getChainProvider().getBlockHeight();
185
- return yield this.searchLogs((from, to) => __awaiter(this, void 0, void 0, function* () {
186
- const event = yield this.contract.queryFilter(this.contract.filters[eventFilter](initiate.args.id), from, to);
187
- if (event.length > 1) {
188
- throw Error(`This should never happen. Found more than one ${eventFilter} TX`);
189
- }
190
- else {
191
- if (event[0]) {
192
- const tx = yield this.walletProvider.getChainProvider().getTransactionByHash(event[0].transactionHash);
193
- return Object.assign(Object.assign({}, tx), { _raw: event[0] });
194
- }
195
- }
196
- }), currentBlock);
197
- }
198
- }
169
+ this.validateSwapParams(swapParams);
170
+ const initiationTransaction = yield this.walletProvider.getChainProvider().getTransactionByHash(initiationTxHash);
171
+ if (!initiationTransaction)
172
+ throw new errors_1.TxNotFoundError(`Transaction not found: ${initiationTxHash}`);
173
+ if (initiationTransaction.status === types_1.TxStatus.Pending) {
174
+ throw new errors_1.PendingTxError(`Transaction receipt is not available: ${initiationTxHash}`);
199
175
  }
200
- return null;
176
+ return this.findAddressEvent('swapRefund', initiationTransaction.contractAddress);
201
177
  });
202
178
  }
203
179
  }
@@ -1 +1 @@
1
- {"version":3,"file":"EvmSwapProvider.js","sourceRoot":"","sources":["../../../lib/swap/EvmSwapProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EvmSwapProvider.js","sourceRoot":"","sources":["../../../lib/swap/EvmSwapProvider.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yaswap/evm",
3
- "version": "2.5.1",
3
+ "version": "2.5.2",
4
4
  "description": "",
5
5
  "author": "yaswap",
6
6
  "homepage": "",
@@ -27,11 +27,11 @@
27
27
  "@ethersproject/wallet": "5.7.0",
28
28
  "@liquality/fee-suggestions": "2.0.2",
29
29
  "@metamask/eth-sig-util": "4.0.1",
30
- "@yaswap/client": "2.5.1",
31
- "@yaswap/errors": "2.5.1",
32
- "@yaswap/logger": "2.5.1",
33
- "@yaswap/types": "2.5.1",
34
- "@yaswap/utils": "2.5.1",
30
+ "@yaswap/client": "2.5.2",
31
+ "@yaswap/errors": "2.5.2",
32
+ "@yaswap/logger": "2.5.2",
33
+ "@yaswap/types": "2.5.2",
34
+ "@yaswap/utils": "2.5.2",
35
35
  "ethers": "5.7.0"
36
36
  },
37
37
  "devDependencies": {