@rango-dev/queue-manager-rango-preset 0.1.10-next.95 → 0.1.10-next.98
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/dist/actions/executeTransaction.d.ts.map +1 -1
- package/dist/helpers.d.ts +5 -1
- package/dist/helpers.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/queue-manager-rango-preset.cjs.development.js +47 -20
- package/dist/queue-manager-rango-preset.cjs.development.js.map +1 -1
- package/dist/queue-manager-rango-preset.cjs.production.min.js +1 -1
- package/dist/queue-manager-rango-preset.cjs.production.min.js.map +1 -1
- package/dist/queue-manager-rango-preset.esm.js +47 -21
- package/dist/queue-manager-rango-preset.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/actions/executeTransaction.ts +7 -3
- package/src/helpers.ts +40 -6
- package/src/index.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"","sources":["../src/actions/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAkBhE,OAAO,EAEL,eAAe,EACf,gBAAgB,EAChB,WAAW,EACZ,MAAM,UAAU,CAAC;AAElB;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,eAAe,CAAC,WAAW,EAAE,eAAe,EAAE,gBAAgB,CAAC,GACvE,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"","sources":["../src/actions/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAkBhE,OAAO,EAEL,eAAe,EACf,gBAAgB,EAChB,WAAW,EACZ,MAAM,UAAU,CAAC;AAElB;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,eAAe,CAAC,WAAW,EAAE,eAAe,EAAE,gBAAgB,CAAC,GACvE,OAAO,CAAC,IAAI,CAAC,CAoFf"}
|
package/dist/helpers.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ExecuterActions } from '@rango-dev/queue-manager-core';
|
|
1
|
+
import { ExecuterActions, QueueInfo } from '@rango-dev/queue-manager-core';
|
|
2
2
|
import { SwapActionTypes, SwapQueueContext, SwapQueueDef, SwapStorage } from './types';
|
|
3
3
|
import { Meta, Network, WalletState, WalletType } from '@rango-dev/wallets-shared';
|
|
4
4
|
import { Providers } from '@rango-dev/wallets-core';
|
|
@@ -161,5 +161,9 @@ export declare function retryOn(wallet_network: string, manager?: Manager, optio
|
|
|
161
161
|
}): void;
|
|
162
162
|
export declare function isNeedBlockQueueForParallel(step: PendingSwapStep): boolean;
|
|
163
163
|
export declare function throwOnOK(rawResponse: Promise<CreateTransactionResponse>): Promise<CreateTransactionResponse>;
|
|
164
|
+
export declare function cancelSwap(swap: QueueInfo): {
|
|
165
|
+
swap: PendingSwap;
|
|
166
|
+
step: PendingSwapStep | null;
|
|
167
|
+
};
|
|
164
168
|
export {};
|
|
165
169
|
//# sourceMappingURL=helpers.d.ts.map
|
package/dist/helpers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["src/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -9,6 +9,6 @@ import { SwapQueueDef } from './types';
|
|
|
9
9
|
export declare const swapQueueDef: SwapQueueDef;
|
|
10
10
|
export { SwapQueueContext, SwapStorage } from './types';
|
|
11
11
|
export { PendingSwapWithQueueID } from './shared';
|
|
12
|
-
export { updateSwapStatus, checkWaitingForNetworkChange, getCurrentStep, getEvmProvider, getRelatedWallet, } from './helpers';
|
|
12
|
+
export { updateSwapStatus, checkWaitingForNetworkChange, getCurrentStep, getEvmProvider, getRelatedWallet, cancelSwap, } from './helpers';
|
|
13
13
|
export { useMigration, useQueueManager } from './hooks';
|
|
14
14
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,YAAY,EAAE,MAAM,SAAS,CAAC;AAYrE;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,EAAE,YAmB1B,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAGlD,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC5B,cAAc,EACd,cAAc,EACd,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,YAAY,EAAE,MAAM,SAAS,CAAC;AAYrE;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,EAAE,YAmB1B,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAGlD,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC5B,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,UAAU,GACX,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC"}
|
|
@@ -712,6 +712,14 @@ function claimQueue() {
|
|
|
712
712
|
}
|
|
713
713
|
};
|
|
714
714
|
}
|
|
715
|
+
/**
|
|
716
|
+
*
|
|
717
|
+
* Returns "wallet and network" separately, even if the wallet is dashed inside.
|
|
718
|
+
*
|
|
719
|
+
*/
|
|
720
|
+
function splitWalletNetwork(input) {
|
|
721
|
+
return input == null ? void 0 : input.split(/-(?=[^-]*$)/);
|
|
722
|
+
}
|
|
715
723
|
/**
|
|
716
724
|
*
|
|
717
725
|
* Returns `steps`, if it's a `running` swap.
|
|
@@ -1793,9 +1801,9 @@ function checkWaitingForConnectWalletChange(params) {
|
|
|
1793
1801
|
var wallet_network = params.wallet_network,
|
|
1794
1802
|
evmChains = params.evmChains,
|
|
1795
1803
|
manager = params.manager;
|
|
1796
|
-
var
|
|
1797
|
-
wallet =
|
|
1798
|
-
network =
|
|
1804
|
+
var _splitWalletNetwork = splitWalletNetwork(wallet_network),
|
|
1805
|
+
wallet = _splitWalletNetwork[0],
|
|
1806
|
+
network = _splitWalletNetwork[1];
|
|
1799
1807
|
// We only need change network for EVM chains.
|
|
1800
1808
|
if (!evmChains.some(function (chain) {
|
|
1801
1809
|
return chain.name == network;
|
|
@@ -1813,7 +1821,7 @@ function checkWaitingForConnectWalletChange(params) {
|
|
|
1813
1821
|
var task = q.list.state.tasks[taskId];
|
|
1814
1822
|
return task.status === queueManagerCore.Status.BLOCKED && [BlockReason.WAIT_FOR_CONNECT_WALLET].includes((_task$blockedFor = task.blockedFor) == null ? void 0 : _task$blockedFor.reason);
|
|
1815
1823
|
});
|
|
1816
|
-
if (currentStepRequiredWallet === wallet && hasWaitingForConnect) {
|
|
1824
|
+
if (currentStepRequiredWallet === wallet && hasWaitingForConnect && getCurrentBlockchainOfOrNull(swap, currentStep) != network) {
|
|
1817
1825
|
var queueInstance = q.list;
|
|
1818
1826
|
var _getRequiredWallet5 = getRequiredWallet(swap),
|
|
1819
1827
|
type = _getRequiredWallet5.type;
|
|
@@ -1877,9 +1885,9 @@ function retryOn(wallet_network, manager, options) {
|
|
|
1877
1885
|
fallbackToOnlyWallet: true
|
|
1878
1886
|
};
|
|
1879
1887
|
}
|
|
1880
|
-
var
|
|
1881
|
-
wallet =
|
|
1882
|
-
network =
|
|
1888
|
+
var _splitWalletNetwork2 = splitWalletNetwork(wallet_network),
|
|
1889
|
+
wallet = _splitWalletNetwork2[0],
|
|
1890
|
+
network = _splitWalletNetwork2[1];
|
|
1883
1891
|
if (!wallet || !network) {
|
|
1884
1892
|
return;
|
|
1885
1893
|
}
|
|
@@ -1894,7 +1902,7 @@ function retryOn(wallet_network, manager, options) {
|
|
|
1894
1902
|
var currentStep = getCurrentStep(swap);
|
|
1895
1903
|
if (currentStep) {
|
|
1896
1904
|
var _queueStorage$swapDet2, _queueStorage$swapDet3;
|
|
1897
|
-
if (currentStep
|
|
1905
|
+
if (getCurrentBlockchainOfOrNull(swap, currentStep) == network && (queueStorage == null ? void 0 : (_queueStorage$swapDet2 = queueStorage.swapDetails.wallets[network]) == null ? void 0 : _queueStorage$swapDet2.walletType) === wallet) {
|
|
1898
1906
|
walletAndNetworkMatched.push(q.list);
|
|
1899
1907
|
} else if ((queueStorage == null ? void 0 : (_queueStorage$swapDet3 = queueStorage.swapDetails.wallets[currentStep.fromBlockchain]) == null ? void 0 : _queueStorage$swapDet3.walletType) === wallet) {
|
|
1900
1908
|
onlyWalletMatched.push(q.list);
|
|
@@ -1965,6 +1973,18 @@ function _throwOnOK() {
|
|
|
1965
1973
|
}));
|
|
1966
1974
|
return _throwOnOK.apply(this, arguments);
|
|
1967
1975
|
}
|
|
1976
|
+
function cancelSwap(swap) {
|
|
1977
|
+
swap.actions.cancel();
|
|
1978
|
+
return updateSwapStatus({
|
|
1979
|
+
getStorage: swap.actions.getStorage,
|
|
1980
|
+
setStorage: swap.actions.setStorage,
|
|
1981
|
+
message: 'Swap canceled by user.',
|
|
1982
|
+
details: "Warning: If you've already signed and sent a transaction, it won't be affected, but next swap steps will not be executed.",
|
|
1983
|
+
nextStatus: 'failed',
|
|
1984
|
+
nextStepStatus: 'failed',
|
|
1985
|
+
errorCode: 'USER_CANCEL'
|
|
1986
|
+
});
|
|
1987
|
+
}
|
|
1968
1988
|
|
|
1969
1989
|
var INTERVAL_FOR_CHECK = 2000;
|
|
1970
1990
|
/**
|
|
@@ -2299,7 +2319,7 @@ function executeTransaction(_x) {
|
|
|
2299
2319
|
function _executeTransaction() {
|
|
2300
2320
|
_executeTransaction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(actions) {
|
|
2301
2321
|
var _context$_queue;
|
|
2302
|
-
var getStorage, context, meta, wallets, providers, isClaimed, requestBlock, swap, currentStep, isWrongAddress, _getRequiredWallet, type, address, description, blockedFor, needsToBlockQueue, _blockedFor, networkMatched, fromBlockchain, details, _blockedFor2;
|
|
2322
|
+
var getStorage, context, meta, wallets, providers, isClaimed, requestBlock, swap, currentStep, isWrongAddress, _wallets$blockchains, _getRequiredWallet, type, address, isWalletInCompatible, description, blockedFor, needsToBlockQueue, _blockedFor, networkMatched, fromBlockchain, details, _blockedFor2;
|
|
2303
2323
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
2304
2324
|
while (1) switch (_context.prev = _context.next) {
|
|
2305
2325
|
case 0:
|
|
@@ -2318,25 +2338,31 @@ function _executeTransaction() {
|
|
|
2318
2338
|
/* Make sure wallet is connected and also the connected wallet is matched with tx by checking address. */
|
|
2319
2339
|
isWrongAddress = !isRequiredWalletConnected(swap, context.state);
|
|
2320
2340
|
if (!isWrongAddress) {
|
|
2321
|
-
_context.next =
|
|
2341
|
+
_context.next = 15;
|
|
2322
2342
|
break;
|
|
2323
2343
|
}
|
|
2324
2344
|
_getRequiredWallet = getRequiredWallet(swap), type = _getRequiredWallet.type, address = _getRequiredWallet.address;
|
|
2325
|
-
|
|
2345
|
+
isWalletInCompatible = wallets == null ? void 0 : (_wallets$blockchains = wallets.blockchains) == null ? void 0 : _wallets$blockchains.find(function (w) {
|
|
2346
|
+
var _w$accounts;
|
|
2347
|
+
return !((_w$accounts = w.accounts) != null && _w$accounts.find(function (account) {
|
|
2348
|
+
return account.walletType === type;
|
|
2349
|
+
}));
|
|
2350
|
+
});
|
|
2351
|
+
description = !wallets || isWalletInCompatible ? ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type) : ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address);
|
|
2326
2352
|
blockedFor = {
|
|
2327
2353
|
reason: BlockReason.WAIT_FOR_CONNECT_WALLET,
|
|
2328
2354
|
description: description
|
|
2329
2355
|
};
|
|
2330
2356
|
requestBlock(blockedFor);
|
|
2331
2357
|
return _context.abrupt("return");
|
|
2332
|
-
case
|
|
2358
|
+
case 15:
|
|
2333
2359
|
/*
|
|
2334
2360
|
For avoiding conflict by making too many requests to wallet, we need to make sure
|
|
2335
2361
|
We only run one request at a time (In parallel mode).
|
|
2336
2362
|
*/
|
|
2337
2363
|
needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
|
|
2338
2364
|
if (!(needsToBlockQueue && !isClaimed && context.claimedBy)) {
|
|
2339
|
-
_context.next =
|
|
2365
|
+
_context.next = 20;
|
|
2340
2366
|
break;
|
|
2341
2367
|
}
|
|
2342
2368
|
_blockedFor = {
|
|
@@ -2346,13 +2372,13 @@ function _executeTransaction() {
|
|
|
2346
2372
|
};
|
|
2347
2373
|
requestBlock(_blockedFor);
|
|
2348
2374
|
return _context.abrupt("return");
|
|
2349
|
-
case
|
|
2350
|
-
_context.next =
|
|
2375
|
+
case 20:
|
|
2376
|
+
_context.next = 22;
|
|
2351
2377
|
return isNetworkMatchedForTransaction(swap, currentStep, wallets, meta, providers);
|
|
2352
|
-
case
|
|
2378
|
+
case 22:
|
|
2353
2379
|
networkMatched = _context.sent;
|
|
2354
2380
|
if (networkMatched) {
|
|
2355
|
-
_context.next =
|
|
2381
|
+
_context.next = 31;
|
|
2356
2382
|
break;
|
|
2357
2383
|
}
|
|
2358
2384
|
fromBlockchain = getCurrentBlockchainOf(swap, currentStep);
|
|
@@ -2363,17 +2389,17 @@ function _executeTransaction() {
|
|
|
2363
2389
|
};
|
|
2364
2390
|
requestBlock(_blockedFor2);
|
|
2365
2391
|
return _context.abrupt("return");
|
|
2366
|
-
case
|
|
2392
|
+
case 31:
|
|
2367
2393
|
// Update network to mark it as network changed successfully.
|
|
2368
2394
|
updateNetworkStatus(actions, {
|
|
2369
2395
|
message: '',
|
|
2370
2396
|
details: 'Wallet network changed successfully',
|
|
2371
2397
|
status: PendingSwapNetworkStatus.NetworkChanged
|
|
2372
2398
|
});
|
|
2373
|
-
case
|
|
2399
|
+
case 32:
|
|
2374
2400
|
// All the conditions are met. We can safely send the tx to wallet for sign.
|
|
2375
2401
|
singTransaction(actions);
|
|
2376
|
-
case
|
|
2402
|
+
case 33:
|
|
2377
2403
|
case "end":
|
|
2378
2404
|
return _context.stop();
|
|
2379
2405
|
}
|
|
@@ -2671,6 +2697,7 @@ var swapQueueDef = {
|
|
|
2671
2697
|
}
|
|
2672
2698
|
};
|
|
2673
2699
|
|
|
2700
|
+
exports.cancelSwap = cancelSwap;
|
|
2674
2701
|
exports.checkWaitingForNetworkChange = checkWaitingForNetworkChange;
|
|
2675
2702
|
exports.getCurrentStep = getCurrentStep;
|
|
2676
2703
|
exports.getEvmProvider = getEvmProvider;
|