@rango-dev/queue-manager-rango-preset 0.24.0 → 0.24.1-next.1

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.
@@ -1 +1 @@
1
- {"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../src/migration.ts"],"names":[],"mappings":"AAYA;;;;GAIG;AACH,iBAAS,QAAQ,IAAI,OAAO,CAE3B;AAYD;;;;;GAKG;AACH,iBAAe,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAoF3C;AAED,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC"}
1
+ {"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../src/migration.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,iBAAS,QAAQ,IAAI,OAAO,CAE3B;AAYD;;;;;GAKG;AACH,iBAAe,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAsF3C;AAED,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC"}
@@ -1,5 +1,5 @@
1
- import { RemoveNameField, RouteExecutionEvents, StepEvent } from '../types';
2
- import { PendingSwap, PendingSwapStep } from 'rango-types/lib';
1
+ import type { RemoveNameField, RouteExecutionEvents, StepEvent } from '../types';
2
+ import type { PendingSwap, PendingSwapStep } from 'rango-types';
3
3
  type NotifierParams = {
4
4
  swap: PendingSwap;
5
5
  step: PendingSwapStep | null;
@@ -1 +1 @@
1
- {"version":3,"file":"eventEmitter.d.ts","sourceRoot":"","sources":["../../src/services/eventEmitter.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAIf,oBAAoB,EAGpB,SAAS,EAIV,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAS/D,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;CAC9B,GAAG;IACF,KAAK,EAAE,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,iBAAiB,CAAC,CAAC;CAClE,CAAC;AA0GF,eAAO,MAAM,YAAY,8CAA+B,CAAC;AA0BzD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,QA+F9C"}
1
+ {"version":3,"file":"eventEmitter.d.ts","sourceRoot":"","sources":["../../src/services/eventEmitter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EAGf,oBAAoB,EAEpB,SAAS,EACV,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoBhE,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;CAC9B,GAAG;IACF,KAAK,EAAE,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,iBAAiB,CAAC,CAAC;CAClE,CAAC;AA+GF,eAAO,MAAM,YAAY,8CAA+B,CAAC;AA2BzD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,QAsG9C"}
@@ -1,4 +1,4 @@
1
- import { PendingSwap, PendingSwapStep } from './shared';
2
- import { WalletType } from '@rango-dev/wallets-shared';
1
+ import type { WalletType } from '@rango-dev/wallets-shared';
2
+ import type { PendingSwap, PendingSwapStep } from 'rango-types';
3
3
  export declare function logRPCError(error: unknown, swap: PendingSwap, currentStep: PendingSwapStep | undefined, walletType: WalletType | undefined): void;
4
4
  //# sourceMappingURL=shared-sentry.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"shared-sentry.d.ts","sourceRoot":"","sources":["../src/shared-sentry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,wBAAgB,WAAW,CACzB,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,eAAe,GAAG,SAAS,EACxC,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC,IAAI,CAcN"}
1
+ {"version":3,"file":"shared-sentry.d.ts","sourceRoot":"","sources":["../src/shared-sentry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAIhE,wBAAgB,WAAW,CACzB,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,eAAe,GAAG,SAAS,EACxC,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC,IAAI,CAcN"}
package/dist/shared.d.ts CHANGED
@@ -1,7 +1,7 @@
1
- import { Network, WalletType } from '@rango-dev/wallets-shared';
2
- import { CosmosTransaction, EvmTransaction, SimulationResult, SolanaTransaction, StarknetTransaction, TronTransaction, Transfer as TransferTransaction, AmountRestrictionType, BestRouteResponse, MetaResponse, Token, SwapResult, BlockchainMeta } from 'rango-sdk';
1
+ import type { Network, WalletType } from '@rango-dev/wallets-shared';
2
+ import type { BestRouteResponse, BlockchainMeta, MetaResponse, SwapResult, Token } from 'rango-sdk';
3
+ import type { PendingSwap, PendingSwapStep, SwapSavedSettings, WalletTypeAndAddress } from 'rango-types';
3
4
  import BigNumber from 'bignumber.js';
4
- import { TonTransaction } from 'rango-types';
5
5
  export interface PendingSwapWithQueueID {
6
6
  id: string;
7
7
  swap: PendingSwap;
@@ -34,77 +34,6 @@ export type Wallet = {
34
34
  blockchains: Blockchain[];
35
35
  };
36
36
  export type EventType = 'swap_started' | 'confirm_contract' | 'confirm_transfer' | 'task_failed' | 'task_completed' | 'task_canceled' | 'task_paused' | 'contract_confirmed' | 'confirm_approve_contract' | 'contract_rejected' | 'check_tx_status' | 'check_approve_tx_status' | 'transfer_rejected' | 'transfer_failed' | 'calling_smart_contract' | 'smart_contract_called' | 'smart_contract_call_failed' | 'step_completed_with_output' | 'waiting_for_network_change' | 'waiting_for_connecting_wallet' | 'waiting_for_change_wallet_account' | 'network_changed' | 'not_enough_balance' | 'not_enough_approval' | 'waiting_for_queue' | 'check_fee_failed' | 'route_failed_to_find' | 'transaction_expired';
37
- export type SwapSavedSettings = {
38
- slippage: string;
39
- disabledSwappersIds?: string[];
40
- disabledSwappersGroups?: string[];
41
- infiniteApprove?: boolean;
42
- };
43
- type InternalStepState = 'PENDING' | 'CREATED' | 'WAITING' | 'SIGNED' | 'SUCCESSED' | 'FAILED';
44
- export type SwapperStatusStep = {
45
- name: string;
46
- state: InternalStepState;
47
- current: boolean;
48
- };
49
- export declare enum PendingSwapNetworkStatus {
50
- WaitingForConnectingWallet = "waitingForConnectingWallet",
51
- WaitingForQueue = "waitingForQueue",
52
- WaitingForNetworkChange = "waitingForNetworkChange",
53
- NetworkChanged = "networkChanged"
54
- }
55
- export type SwapExplorerUrl = {
56
- url: string;
57
- description: string | null;
58
- };
59
- export type StepStatus = 'created' | 'running' | 'failed' | 'success' | 'waitingForApproval' | 'approved';
60
- export type PendingSwapStep = {
61
- id: number;
62
- fromBlockchain: string;
63
- fromSymbol: string;
64
- fromSymbolAddress: string | null;
65
- fromDecimals: number;
66
- fromAmountPrecision: string | null;
67
- fromAmountMinValue: string | null;
68
- fromAmountMaxValue: string | null;
69
- fromAmountRestrictionType: AmountRestrictionType | null;
70
- fromLogo: string;
71
- toBlockchain: string;
72
- toSymbol: string;
73
- toSymbolAddress: string | null;
74
- toDecimals: number;
75
- toLogo: string;
76
- swapperId: string;
77
- expectedOutputAmountHumanReadable: string | null;
78
- startTransactionTime: number;
79
- internalSteps: SwapperStatusStep[] | null;
80
- estimatedTimeInSeconds: number | null;
81
- status: StepStatus;
82
- networkStatus: PendingSwapNetworkStatus | null;
83
- executedTransactionId: string | null;
84
- executedTransactionTime: string | null;
85
- explorerUrl: SwapExplorerUrl[] | null;
86
- diagnosisUrl: string | null;
87
- outputAmount: string | null;
88
- cosmosTransaction: CosmosTransaction | null;
89
- transferTransaction: TransferTransaction | null;
90
- solanaTransaction: SolanaTransaction | null;
91
- evmApprovalTransaction: EvmTransaction | null;
92
- evmTransaction: EvmTransaction | null;
93
- tronApprovalTransaction: TronTransaction | null;
94
- tronTransaction: TronTransaction | null;
95
- starknetApprovalTransaction: StarknetTransaction | null;
96
- starknetTransaction: StarknetTransaction | null;
97
- tonTransaction: TonTransaction | null;
98
- swapperLogo: string | null;
99
- swapperType: string | null;
100
- fromBlockchainLogo: string | null;
101
- toBlockchainLogo: string | null;
102
- feeInUsd: string | null;
103
- };
104
- export type WalletTypeAndAddress = {
105
- walletType: WalletType;
106
- address: string;
107
- };
108
37
  export declare enum MessageSeverity {
109
38
  error = "error",
110
39
  warning = "warning",
@@ -112,29 +41,6 @@ export declare enum MessageSeverity {
112
41
  success = "success"
113
42
  }
114
43
  export type SwapStatus = 'running' | 'failed' | 'success';
115
- export type PendingSwap = {
116
- creationTime: string;
117
- finishTime: string | null;
118
- requestId: string;
119
- inputAmount: string;
120
- status: SwapStatus;
121
- isPaused: boolean;
122
- extraMessage: string | null;
123
- extraMessageSeverity: MessageSeverity | null;
124
- extraMessageErrorCode: string | null;
125
- extraMessageDetail: string | null | undefined;
126
- networkStatusExtraMessage: string | null;
127
- networkStatusExtraMessageDetail: string | null;
128
- lastNotificationTime: string | null;
129
- wallets: {
130
- [p: string]: WalletTypeAndAddress;
131
- };
132
- settings: SwapSavedSettings;
133
- steps: PendingSwapStep[];
134
- simulationResult: SimulationResult;
135
- validateBalanceOrFee: boolean;
136
- hasAlreadyProceededToSign?: boolean | null;
137
- };
138
44
  export declare const getCurrentBlockchainOfOrNull: (swap: PendingSwap, step: PendingSwapStep) => Network | null;
139
45
  export declare const getCurrentBlockchainOf: (swap: PendingSwap, step: PendingSwapStep) => Network;
140
46
  export declare const getScannerUrl: (txHash: string, network: Network, blockchainMetaMap: {
@@ -146,11 +52,10 @@ export declare function getNextStep(swap: PendingSwap, currentStep: PendingSwapS
146
52
  */
147
53
  export declare const getCurrentAddressOf: (swap: PendingSwap, step: PendingSwapStep) => string;
148
54
  export declare function getRelatedWallet(swap: PendingSwap, currentStep: PendingSwapStep): WalletTypeAndAddress;
149
- export declare function getRelatedWalletOrNull(swap: PendingSwap, currentStep: PendingSwapStep): WalletTypeAndAddress | null;
55
+ export declare function getRelatedWalletOrNull(swap: PendingSwap, currentStep: PendingSwapStep | null): WalletTypeAndAddress | null;
150
56
  export declare const getUsdPrice: (blockchain: string, symbol: string, address: string | null, allTokens: Token[]) => number | null;
151
57
  export declare function getUsdFeeOfStep(step: SwapResult, allTokens: Token[]): BigNumber;
152
58
  export declare function calculatePendingSwap(inputAmount: string, bestRoute: BestRouteResponse, wallets: {
153
59
  [p: string]: WalletTypeAndAddress;
154
- }, settings: SwapSavedSettings, validateBalanceOrFee: boolean, meta: MetaResponse | null): PendingSwap;
155
- export {};
60
+ }, settings: SwapSavedSettings, validateBalanceOrFee: boolean, meta: Pick<MetaResponse, 'blockchains' | 'tokens'> | null): PendingSwap;
156
61
  //# sourceMappingURL=shared.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -1,10 +1,9 @@
1
- import { QueueStorage, QueueDef } from '@rango-dev/queue-manager-core';
2
- import { QueueContext } from '@rango-dev/queue-manager-core/dist/queue';
3
- import { ConnectResult, Providers } from '@rango-dev/wallets-react';
4
- import { Meta, Network, WalletState, WalletType } from '@rango-dev/wallets-shared';
5
- import { APIErrorCode, EvmBlockchainMeta, SignerFactory } from 'rango-types';
6
- import { Transaction } from 'rango-sdk';
7
- import { PendingSwap, PendingSwapStep, Wallet } from './shared';
1
+ import type { Wallet } from './shared';
2
+ import type { QueueContext, QueueDef, QueueStorage } from '@rango-dev/queue-manager-core';
3
+ import type { ConnectResult } from '@rango-dev/wallets-core';
4
+ import type { Meta, Network, Providers, WalletState, WalletType } from '@rango-dev/wallets-shared';
5
+ import type { Transaction } from 'rango-sdk';
6
+ import type { APIErrorCode, EvmBlockchainMeta, PendingSwap, PendingSwapStep, SignerFactory } from 'rango-types';
8
7
  export type RemoveNameField<T, U extends string> = {
9
8
  [Property in keyof T as Exclude<Property, U>]: T[Property];
10
9
  };
@@ -36,7 +35,7 @@ export interface SwapQueueContext extends QueueContext {
36
35
  wallets: Wallet | null;
37
36
  providers: Providers;
38
37
  getSigners: (type: WalletType) => SignerFactory;
39
- switchNetwork: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
38
+ switchNetwork: (wallet: WalletType, network: Network) => Promise<ConnectResult | undefined> | undefined;
40
39
  canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
41
40
  connect: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
42
41
  state: (type: WalletType) => WalletState;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,9 +1,9 @@
1
1
  {
2
2
  "name": "@rango-dev/queue-manager-rango-preset",
3
- "version": "0.24.0",
3
+ "version": "0.24.1-next.1",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
- "module": "./dist/index.js",
6
+ "source": "./src/index.ts",
7
7
  "main": "./dist/index.js",
8
8
  "exports": {
9
9
  ".": "./dist/index.js"
@@ -15,6 +15,7 @@
15
15
  ],
16
16
  "scripts": {
17
17
  "build": "node ../../scripts/build/command.mjs --path queue-manager/rango-preset",
18
+ "ts-check": "tsc --declaration --emitDeclarationOnly -p ./tsconfig.json",
18
19
  "clean": "rimraf dist",
19
20
  "format": "prettier --write '{.,src}/**/*.{ts,tsx}'",
20
21
  "lint": "eslint \"**/*.{ts,tsx}\" --ignore-path ../../.eslintignore"
@@ -22,7 +23,7 @@
22
23
  "peerDependencies": {
23
24
  "@rango-dev/queue-manager-core": "*",
24
25
  "@rango-dev/queue-manager-react": "*",
25
- "@rango-dev/wallets-react": "*",
26
+ "@rango-dev/wallets-core": "*",
26
27
  "@rango-dev/wallets-shared": "*",
27
28
  "@sentry/browser": "*",
28
29
  "bignumber.js": "*",
@@ -36,7 +37,7 @@
36
37
  "dependencies": {
37
38
  "@sentry/browser": "^6.12.0",
38
39
  "mitt": "^3.0.0",
39
- "rango-types": "^0.1.46",
40
+ "rango-types": "^0.1.57",
40
41
  "uuid": "^9.0.0"
41
42
  },
42
43
  "publishConfig": {
@@ -1,20 +1,21 @@
1
- import { ExecuterActions } from '@rango-dev/queue-manager-core';
1
+ import type { SwapQueueContext, SwapStorage } from '../types';
2
+ import type { ExecuterActions } from '@rango-dev/queue-manager-core';
3
+ import type { Transaction, TransactionStatusResponse } from 'rango-sdk';
4
+ import type { GenericSigner } from 'rango-types';
5
+
6
+ import { DEFAULT_ERROR_CODE } from '../constants';
2
7
  import {
3
8
  delay,
4
9
  getCurrentStep,
5
10
  getCurrentStepTx,
6
11
  getCurrentStepTxType,
12
+ inMemoryTransactionsData,
7
13
  resetNetworkStatus,
8
14
  setCurrentStepTx,
9
15
  updateSwapStatus,
10
- inMemoryTransactionsData,
11
16
  } from '../helpers';
12
- import {
13
- StepEventType,
14
- SwapActionTypes,
15
- SwapQueueContext,
16
- SwapStorage,
17
- } from '../types';
17
+ import { httpService } from '../services';
18
+ import { notifier } from '../services/eventEmitter';
18
19
  import {
19
20
  getCurrentBlockchainOf,
20
21
  getNextStep,
@@ -22,14 +23,11 @@ import {
22
23
  getScannerUrl,
23
24
  MessageSeverity,
24
25
  } from '../shared';
25
- import { Transaction, TransactionStatusResponse } from 'rango-sdk';
26
- import { httpService } from '../services';
27
- import type { GenericSigner } from 'rango-types';
28
26
  import { prettifyErrorMessage } from '../shared-errors';
29
- import { notifier } from '../services/eventEmitter';
30
- import { DEFAULT_ERROR_CODE } from '../constants';
27
+ import { StepEventType, SwapActionTypes } from '../types';
31
28
 
32
- const INTERVAL_FOR_CHECK = 5_000;
29
+ const INTERVAL_FOR_CHECK_STATUS = 5_000;
30
+ const INTERVAL_FOR_CHECK_APPROVAL = 2_000;
33
31
 
34
32
  /**
35
33
  * Subscribe to status of swap transaction by checking from server periodically.
@@ -53,10 +51,11 @@ async function checkTransactionStatus({
53
51
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
54
52
  const currentStep = getCurrentStep(swap)!;
55
53
 
56
- if (!currentStep?.executedTransactionId) return;
54
+ if (!currentStep?.executedTransactionId) {
55
+ return;
56
+ }
57
57
  const tx = getCurrentStepTx(currentStep);
58
58
  let txId = currentStep.executedTransactionId;
59
- let explorerUrlToUpdate = false;
60
59
  let getTxReceiptFailed = false;
61
60
  let status: TransactionStatusResponse | null = null;
62
61
  let signer: GenericSigner<Transaction> | null = null;
@@ -66,11 +65,14 @@ async function checkTransactionStatus({
66
65
  try {
67
66
  const txType = getCurrentStepTxType(currentStep);
68
67
  const sourceWallet = getRelatedWallet(swap, currentStep);
69
- if (txType && sourceWallet)
68
+ if (txType && sourceWallet) {
70
69
  signer = context.getSigners(sourceWallet.walletType).getSigner(txType);
70
+ }
71
71
  } catch (error) {
72
- // wallet is not connected yet
73
- // no need to do anything
72
+ /*
73
+ * wallet is not connected yet
74
+ * no need to do anything
75
+ */
74
76
  }
75
77
 
76
78
  try {
@@ -83,9 +85,6 @@ async function checkTransactionStatus({
83
85
  undefined;
84
86
  const { hash: updatedTxHash, response: updatedTxResponse } =
85
87
  await signer.wait(txId, chainId, txResponse);
86
- if (updatedTxResponse?.isMultiSig) {
87
- explorerUrlToUpdate = !updatedTxResponse.hashWasUpdated;
88
- }
89
88
  if (updatedTxHash !== txId) {
90
89
  currentStep.executedTransactionId =
91
90
  updatedTxHash || currentStep.executedTransactionId;
@@ -108,17 +107,16 @@ async function checkTransactionStatus({
108
107
  }
109
108
  }
110
109
  txId = currentStep.executedTransactionId;
111
- if (updatedTxHash && updatedTxResponse)
110
+ if (updatedTxHash && updatedTxResponse) {
112
111
  setTransactionDataByHash(updatedTxHash, {
113
112
  response: updatedTxResponse,
114
113
  });
114
+ }
115
115
  } else {
116
116
  setTransactionDataByHash(updatedTxHash, {
117
117
  receiptReceived: true,
118
118
  });
119
119
  }
120
- } else if (!signer) {
121
- explorerUrlToUpdate = true;
122
120
  }
123
121
  } catch (error) {
124
122
  const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
@@ -143,8 +141,10 @@ async function checkTransactionStatus({
143
141
  });
144
142
 
145
143
  getTxReceiptFailed = true;
146
- // We shouldn't return here, because we need to trigger check status job in backend.
147
- // This is not a ui requirement but the backend one.
144
+ /*
145
+ * We shouldn't return here, because we need to trigger check status job in backend.
146
+ * This is not a ui requirement but the backend one.
147
+ */
148
148
  }
149
149
 
150
150
  try {
@@ -155,16 +155,22 @@ async function checkTransactionStatus({
155
155
  step: currentStep.id,
156
156
  });
157
157
  } catch (e) {
158
- await delay(INTERVAL_FOR_CHECK);
158
+ await delay(INTERVAL_FOR_CHECK_STATUS);
159
159
  retry();
160
160
  return;
161
161
  }
162
162
 
163
- // If user cancel swap during check status api call,
164
- // or getting transaction receipt failed,
165
- // we should ignore check status response and return
166
- if (getTxReceiptFailed) return failed();
167
- if (currentStep?.status === 'failed') return;
163
+ /*
164
+ * If user cancel swap during check status api call,
165
+ * or getting transaction receipt failed,
166
+ * we should ignore check status response and return
167
+ */
168
+ if (getTxReceiptFailed) {
169
+ return failed();
170
+ }
171
+ if (currentStep?.status === 'failed') {
172
+ return;
173
+ }
168
174
 
169
175
  const outputAmount: string | null =
170
176
  status?.outputAmount ||
@@ -178,9 +184,7 @@ async function checkTransactionStatus({
178
184
  currentStep.diagnosisUrl =
179
185
  status?.diagnosisUrl || currentStep.diagnosisUrl || null;
180
186
  currentStep.outputAmount = outputAmount || currentStep.outputAmount;
181
- currentStep.explorerUrl = !explorerUrlToUpdate
182
- ? status?.explorerUrl || currentStep.explorerUrl
183
- : null;
187
+ currentStep.explorerUrl = status?.explorerUrl || currentStep.explorerUrl;
184
188
  currentStep.internalSteps = status?.steps || null;
185
189
 
186
190
  const newTransaction = status?.newTx;
@@ -192,13 +196,13 @@ async function checkTransactionStatus({
192
196
  setCurrentStepTx(currentStep, newTransaction);
193
197
  }
194
198
 
195
- if (prevOutputAmount === null && outputAmount !== null)
199
+ if (prevOutputAmount === null && outputAmount !== null) {
196
200
  notifier({
197
201
  event: { type: StepEventType.OUTPUT_REVEALED, outputAmount },
198
202
  swap: swap,
199
203
  step: currentStep,
200
204
  });
201
- else if (prevOutputAmount === null && outputAmount === null) {
205
+ } else if (prevOutputAmount === null && outputAmount === null) {
202
206
  // it is needed to set notification after reloading the page
203
207
  notifier({
204
208
  event: { type: StepEventType.CHECK_STATUS },
@@ -241,7 +245,7 @@ async function checkTransactionStatus({
241
245
  schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
242
246
  next();
243
247
  } else {
244
- await delay(INTERVAL_FOR_CHECK);
248
+ await delay(INTERVAL_FOR_CHECK_STATUS);
245
249
  retry();
246
250
  }
247
251
  }
@@ -263,7 +267,7 @@ async function checkApprovalStatus({
263
267
  SwapActionTypes,
264
268
  SwapQueueContext
265
269
  >): Promise<void> {
266
- const swap = getStorage().swapDetails as SwapStorage['swapDetails'];
270
+ const swap = getStorage().swapDetails;
267
271
  const { meta } = context;
268
272
  const { getTransactionDataByHash, setTransactionDataByHash } =
269
273
  inMemoryTransactionsData();
@@ -275,18 +279,23 @@ async function checkApprovalStatus({
275
279
  }
276
280
  const tx = getCurrentStepTx(currentStep);
277
281
 
278
- if (!currentStep?.executedTransactionId) return;
282
+ if (!currentStep?.executedTransactionId) {
283
+ return;
284
+ }
279
285
  let txId = currentStep.executedTransactionId;
280
286
 
281
287
  let signer: GenericSigner<Transaction> | null = null;
282
288
  try {
283
289
  const txType = getCurrentStepTxType(currentStep);
284
290
  const sourceWallet = getRelatedWallet(swap, currentStep);
285
- if (txType && sourceWallet)
291
+ if (txType && sourceWallet) {
286
292
  signer = context.getSigners(sourceWallet.walletType).getSigner(txType);
293
+ }
287
294
  } catch (error) {
288
- // wallet is not connected yet
289
- // no need to do anything
295
+ /*
296
+ * wallet is not connected yet
297
+ * no need to do anything
298
+ */
290
299
  }
291
300
 
292
301
  try {
@@ -321,10 +330,11 @@ async function checkApprovalStatus({
321
330
  }
322
331
  }
323
332
  txId = currentStep.executedTransactionId;
324
- if (updatedTxHash && updatedTxResponse)
333
+ if (updatedTxHash && updatedTxResponse) {
325
334
  setTransactionDataByHash(updatedTxHash, {
326
335
  response: updatedTxResponse,
327
336
  });
337
+ }
328
338
  } else {
329
339
  setTransactionDataByHash(updatedTxHash, {
330
340
  receiptReceived: true,
@@ -361,7 +371,9 @@ async function checkApprovalStatus({
361
371
  currentStep.executedTransactionId
362
372
  );
363
373
  // If user cancel swap during check status api call, we should ignore check approval response
364
- if (currentStep?.status === 'failed') return;
374
+ if (currentStep?.status === 'failed') {
375
+ return;
376
+ }
365
377
 
366
378
  isApproved = response.isApproved;
367
379
  if (
@@ -374,12 +386,16 @@ async function checkApprovalStatus({
374
386
  details = 'Smart contract approval tx failed in blockchain.';
375
387
  } else {
376
388
  message = 'Not enough approval';
377
- if (response.requiredApprovedAmount && response.currentApprovedAmount)
389
+ if (response.requiredApprovedAmount && response.currentApprovedAmount) {
378
390
  details = `Required approval: ${response.requiredApprovedAmount}, current approval: ${response.currentApprovedAmount}`;
379
- else details = `You still don't have enough approval for this swap.`;
391
+ } else {
392
+ details = `You still don't have enough approval for this swap.`;
393
+ }
380
394
  }
381
- // approve transaction failed on
382
- // we should fail the whole swap
395
+ /*
396
+ * approve transaction failed on
397
+ * we should fail the whole swap
398
+ */
383
399
  const updateResult = updateSwapStatus({
384
400
  getStorage,
385
401
  setStorage,
@@ -436,7 +452,7 @@ async function checkApprovalStatus({
436
452
  schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
437
453
  next();
438
454
  } else {
439
- await delay(2000);
455
+ await delay(INTERVAL_FOR_CHECK_APPROVAL);
440
456
  retry();
441
457
  }
442
458
  }
@@ -459,8 +475,10 @@ export async function checkStatus(
459
475
  return;
460
476
  }
461
477
 
462
- // Reset network status
463
- // Because when check status is on `loading` or `failed` status, it shows previous message that isn't related to current state.
478
+ /*
479
+ * Reset network status
480
+ * Because when check status is on `loading` or `failed` status, it shows previous message that isn't related to current state.
481
+ */
464
482
  resetNetworkStatus(actions);
465
483
 
466
484
  if (currentStep.status === 'running') {
@@ -1,29 +1,27 @@
1
- import { ExecuterActions } from '@rango-dev/queue-manager-core';
1
+ import type { SwapActionTypes, SwapQueueContext, SwapStorage } from '../types';
2
+ import type { ExecuterActions } from '@rango-dev/queue-manager-core';
3
+
4
+ import { PendingSwapNetworkStatus } from 'rango-types';
5
+
2
6
  import {
3
7
  ERROR_MESSAGE_DEPENDS_ON_OTHER_QUEUES,
4
8
  ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK,
5
9
  ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION,
6
10
  ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET,
7
11
  } from '../constants';
8
-
9
12
  import {
13
+ claimQueue,
10
14
  getCurrentStep,
15
+ getRequiredWallet,
16
+ isNeedBlockQueueForParallel,
11
17
  isNetworkMatchedForTransaction,
12
18
  isRequiredWalletConnected,
13
- updateNetworkStatus,
14
- singTransaction,
15
19
  resetNetworkStatus,
16
- getRequiredWallet,
17
- isNeedBlockQueueForParallel,
18
- claimQueue,
20
+ signTransaction,
21
+ updateNetworkStatus,
19
22
  } from '../helpers';
20
- import { getCurrentBlockchainOf, PendingSwapNetworkStatus } from '../shared';
21
- import {
22
- BlockReason,
23
- SwapActionTypes,
24
- SwapQueueContext,
25
- SwapStorage,
26
- } from '../types';
23
+ import { getCurrentBlockchainOf } from '../shared';
24
+ import { BlockReason } from '../types';
27
25
 
28
26
  /**
29
27
  * Excecute a created transaction.
@@ -105,19 +103,18 @@ export async function executeTransaction(
105
103
  };
106
104
  requestBlock(blockedFor);
107
105
  return;
108
- } else {
109
- // Update network to mark it as network changed successfully.
110
- updateNetworkStatus(actions, {
111
- message: '',
112
- details: 'Wallet network changed successfully',
113
- status: PendingSwapNetworkStatus.NetworkChanged,
114
- });
115
106
  }
107
+ // Update network to mark it as network changed successfully.
108
+ updateNetworkStatus(actions, {
109
+ message: '',
110
+ details: 'Wallet network changed successfully',
111
+ status: PendingSwapNetworkStatus.NetworkChanged,
112
+ });
116
113
 
117
- /*
118
- For avoiding conflict by making too many requests to wallet, we need to make sure
119
- We only run one request at a time (In parallel mode).
120
- */
114
+ /*
115
+ *For avoiding conflict by making too many requests to wallet, we need to make sure
116
+ *We only run one request at a time (In parallel mode).
117
+ */
121
118
  const needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
122
119
 
123
120
  if (needsToBlockQueue && !isClaimed) {
@@ -131,5 +128,5 @@ export async function executeTransaction(
131
128
  }
132
129
 
133
130
  // All the conditions are met. We can safely send the tx to wallet for sign.
134
- singTransaction(actions);
131
+ signTransaction(actions);
135
132
  }