@rango-dev/queue-manager-rango-preset 0.22.1-next.2 → 0.22.1-next.4
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/index.js +1 -1
- package/dist/index.js.map +4 -4
- package/dist/shared.d.ts +4 -4
- package/dist/shared.d.ts.map +1 -1
- package/dist/types.d.ts +8 -8
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/shared.ts +49 -28
- package/src/types.ts +12 -8
package/dist/shared.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Network, WalletType } from '@rango-dev/wallets-shared';
|
|
2
|
-
import {
|
|
1
|
+
import type { Network, WalletType } from '@rango-dev/wallets-shared';
|
|
2
|
+
import type { AmountRestrictionType, BestRouteResponse, BlockchainMeta, CosmosTransaction, EvmTransaction, MetaResponse, SimulationResult, SolanaTransaction, StarknetTransaction, SwapResult, Token, Transfer as TransferTransaction, TronTransaction } from 'rango-sdk';
|
|
3
|
+
import type { TonTransaction } 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;
|
|
@@ -151,6 +151,6 @@ export declare const getUsdPrice: (blockchain: string, symbol: string, address:
|
|
|
151
151
|
export declare function getUsdFeeOfStep(step: SwapResult, allTokens: Token[]): BigNumber;
|
|
152
152
|
export declare function calculatePendingSwap(inputAmount: string, bestRoute: BestRouteResponse, wallets: {
|
|
153
153
|
[p: string]: WalletTypeAndAddress;
|
|
154
|
-
}, settings: SwapSavedSettings, validateBalanceOrFee: boolean, meta: MetaResponse | null): PendingSwap;
|
|
154
|
+
}, settings: SwapSavedSettings, validateBalanceOrFee: boolean, meta: Pick<MetaResponse, 'blockchains' | 'tokens'> | null): PendingSwap;
|
|
155
155
|
export {};
|
|
156
156
|
//# sourceMappingURL=shared.d.ts.map
|
package/dist/shared.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
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,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { Transaction } from 'rango-sdk';
|
|
7
|
-
import {
|
|
1
|
+
import type { PendingSwap, PendingSwapStep, Wallet } from './shared';
|
|
2
|
+
import type { QueueDef, QueueStorage } from '@rango-dev/queue-manager-core';
|
|
3
|
+
import type { QueueContext } from '@rango-dev/queue-manager-core/dist/queue';
|
|
4
|
+
import type { ConnectResult, Providers } from '@rango-dev/wallets-react';
|
|
5
|
+
import type { Meta, Network, WalletState, WalletType } from '@rango-dev/wallets-shared';
|
|
6
|
+
import type { Transaction } from 'rango-sdk';
|
|
7
|
+
import type { APIErrorCode, EvmBlockchainMeta, SignerFactory } from 'rango-types';
|
|
8
8
|
export type RemoveNameField<T, U extends string> = {
|
|
9
9
|
[Property in keyof T as Exclude<Property, U>]: T[Property];
|
|
10
10
|
};
|
|
@@ -36,7 +36,7 @@ export interface SwapQueueContext extends QueueContext {
|
|
|
36
36
|
wallets: Wallet | null;
|
|
37
37
|
providers: Providers;
|
|
38
38
|
getSigners: (type: WalletType) => SignerFactory;
|
|
39
|
-
switchNetwork: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
|
|
39
|
+
switchNetwork: (wallet: WalletType, network: Network) => Promise<ConnectResult | undefined> | undefined;
|
|
40
40
|
canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
|
|
41
41
|
connect: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
|
|
42
42
|
state: (type: WalletType) => WalletState;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/shared.ts
CHANGED
|
@@ -1,31 +1,32 @@
|
|
|
1
|
-
import { Network, WalletType } from '@rango-dev/wallets-shared';
|
|
2
|
-
import {
|
|
1
|
+
import type { Network, WalletType } from '@rango-dev/wallets-shared';
|
|
2
|
+
import type {
|
|
3
|
+
AmountRestrictionType,
|
|
4
|
+
BestRouteResponse,
|
|
5
|
+
BlockchainMeta,
|
|
3
6
|
CosmosTransaction,
|
|
4
7
|
EvmTransaction,
|
|
8
|
+
MetaResponse,
|
|
5
9
|
SimulationResult,
|
|
6
10
|
SolanaTransaction,
|
|
7
11
|
StarknetTransaction,
|
|
8
|
-
TronTransaction,
|
|
9
|
-
Transfer as TransferTransaction,
|
|
10
|
-
AmountRestrictionType,
|
|
11
|
-
BestRouteResponse,
|
|
12
|
-
MetaResponse,
|
|
13
|
-
Token,
|
|
14
12
|
SwapResult,
|
|
15
|
-
|
|
13
|
+
Token,
|
|
14
|
+
Transfer as TransferTransaction,
|
|
15
|
+
TronTransaction,
|
|
16
16
|
} from 'rango-sdk';
|
|
17
|
+
import type { TonTransaction } from 'rango-types';
|
|
17
18
|
|
|
18
|
-
import { PrettyError } from './shared-errors';
|
|
19
19
|
import BigNumber from 'bignumber.js';
|
|
20
|
-
import { numberToString } from './numbers';
|
|
21
20
|
import {
|
|
22
|
-
TonTransaction,
|
|
23
21
|
isCosmosBlockchain,
|
|
24
22
|
isEvmBlockchain,
|
|
25
23
|
isStarknetBlockchain,
|
|
26
24
|
isTronBlockchain,
|
|
27
25
|
} from 'rango-types';
|
|
28
26
|
|
|
27
|
+
import { numberToString } from './numbers';
|
|
28
|
+
import { PrettyError } from './shared-errors';
|
|
29
|
+
|
|
29
30
|
export interface PendingSwapWithQueueID {
|
|
30
31
|
id: string;
|
|
31
32
|
swap: PendingSwap;
|
|
@@ -170,8 +171,10 @@ export type PendingSwapStep = {
|
|
|
170
171
|
starknetTransaction: StarknetTransaction | null;
|
|
171
172
|
tonTransaction: TonTransaction | null;
|
|
172
173
|
|
|
173
|
-
|
|
174
|
-
|
|
174
|
+
/*
|
|
175
|
+
* missing fields in older versions
|
|
176
|
+
* keeping null for backward compatability
|
|
177
|
+
*/
|
|
175
178
|
swapperLogo: string | null;
|
|
176
179
|
swapperType: string | null;
|
|
177
180
|
fromBlockchainLogo: string | null;
|
|
@@ -240,16 +243,22 @@ export const getCurrentBlockchainOf = (
|
|
|
240
243
|
step.cosmosTransaction?.blockChain ||
|
|
241
244
|
step.solanaTransaction?.blockChain ||
|
|
242
245
|
step.tonTransaction?.blockChain;
|
|
243
|
-
if (b1)
|
|
246
|
+
if (b1) {
|
|
247
|
+
return b1;
|
|
248
|
+
}
|
|
244
249
|
|
|
245
250
|
const transferAddress = step.transferTransaction?.fromWalletAddress;
|
|
246
|
-
if (!transferAddress)
|
|
251
|
+
if (!transferAddress) {
|
|
252
|
+
throw PrettyError.BlockchainMissing();
|
|
253
|
+
}
|
|
247
254
|
|
|
248
255
|
const blockchain =
|
|
249
256
|
Object.keys(swap.wallets).find(
|
|
250
257
|
(b) => swap.wallets[b]?.address === transferAddress
|
|
251
258
|
) || null;
|
|
252
|
-
if (blockchain == null)
|
|
259
|
+
if (blockchain == null) {
|
|
260
|
+
throw PrettyError.BlockchainMissing();
|
|
261
|
+
}
|
|
253
262
|
|
|
254
263
|
return blockchain;
|
|
255
264
|
};
|
|
@@ -257,14 +266,15 @@ export const getCurrentBlockchainOf = (
|
|
|
257
266
|
const getBlockchainMetaExplorerBaseUrl = (
|
|
258
267
|
blockchainMeta: BlockchainMeta
|
|
259
268
|
): string | undefined => {
|
|
260
|
-
if (isCosmosBlockchain(blockchainMeta))
|
|
269
|
+
if (isCosmosBlockchain(blockchainMeta)) {
|
|
261
270
|
return blockchainMeta.info?.explorerUrlToTx;
|
|
262
|
-
else if (
|
|
271
|
+
} else if (
|
|
263
272
|
isEvmBlockchain(blockchainMeta) ||
|
|
264
273
|
isStarknetBlockchain(blockchainMeta) ||
|
|
265
274
|
isTronBlockchain(blockchainMeta)
|
|
266
|
-
)
|
|
275
|
+
) {
|
|
267
276
|
return blockchainMeta.info.transactionUrl;
|
|
277
|
+
}
|
|
268
278
|
return;
|
|
269
279
|
};
|
|
270
280
|
|
|
@@ -275,9 +285,12 @@ export const getScannerUrl = (
|
|
|
275
285
|
): string | undefined => {
|
|
276
286
|
const blockchainMeta = blockchainMetaMap[network];
|
|
277
287
|
const baseUrl = getBlockchainMetaExplorerBaseUrl(blockchainMeta);
|
|
278
|
-
if (!baseUrl)
|
|
279
|
-
|
|
288
|
+
if (!baseUrl) {
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
291
|
+
if (baseUrl.indexOf('/{txHash}') !== -1) {
|
|
280
292
|
return baseUrl.replace('{txHash}', txHash?.toLowerCase());
|
|
293
|
+
}
|
|
281
294
|
return `${baseUrl}/${txHash?.toLowerCase()}`;
|
|
282
295
|
};
|
|
283
296
|
|
|
@@ -316,7 +329,9 @@ export const getCurrentAddressOf = (
|
|
|
316
329
|
? { address: step.transferTransaction?.fromWalletAddress }
|
|
317
330
|
: null) ||
|
|
318
331
|
null;
|
|
319
|
-
if (result == null)
|
|
332
|
+
if (result == null) {
|
|
333
|
+
throw PrettyError.WalletMissing();
|
|
334
|
+
}
|
|
320
335
|
return result.address;
|
|
321
336
|
};
|
|
322
337
|
|
|
@@ -333,10 +348,11 @@ export function getRelatedWallet(
|
|
|
333
348
|
const wallet = walletKV?.v || null;
|
|
334
349
|
|
|
335
350
|
const walletType = wallet?.walletType;
|
|
336
|
-
if (wallet === null)
|
|
351
|
+
if (wallet === null) {
|
|
337
352
|
throw PrettyError.AssertionFailed(
|
|
338
353
|
`Wallet for source ${blockchain} not passed: walletType: ${walletType}`
|
|
339
354
|
);
|
|
355
|
+
}
|
|
340
356
|
return wallet;
|
|
341
357
|
}
|
|
342
358
|
|
|
@@ -373,7 +389,9 @@ export function getUsdFeeOfStep(
|
|
|
373
389
|
let totalFeeInUsd = new BigNumber(0);
|
|
374
390
|
for (let i = 0; i < step.fee.length; i++) {
|
|
375
391
|
const fee = step.fee[i];
|
|
376
|
-
if (fee.expenseType === 'DECREASE_FROM_OUTPUT')
|
|
392
|
+
if (fee.expenseType === 'DECREASE_FROM_OUTPUT') {
|
|
393
|
+
continue;
|
|
394
|
+
}
|
|
377
395
|
|
|
378
396
|
const unitPrice = getUsdPrice(
|
|
379
397
|
fee.asset.blockchain,
|
|
@@ -395,10 +413,12 @@ export function calculatePendingSwap(
|
|
|
395
413
|
wallets: { [p: string]: WalletTypeAndAddress },
|
|
396
414
|
settings: SwapSavedSettings,
|
|
397
415
|
validateBalanceOrFee: boolean,
|
|
398
|
-
meta: MetaResponse | null
|
|
416
|
+
meta: Pick<MetaResponse, 'blockchains' | 'tokens'> | null
|
|
399
417
|
): PendingSwap {
|
|
400
418
|
const simulationResult = bestRoute.result;
|
|
401
|
-
if (!simulationResult)
|
|
419
|
+
if (!simulationResult) {
|
|
420
|
+
throw Error('Simulation result should not be null');
|
|
421
|
+
}
|
|
402
422
|
|
|
403
423
|
return {
|
|
404
424
|
creationTime: new Date().getTime().toString(),
|
|
@@ -452,7 +472,8 @@ export function calculatePendingSwap(
|
|
|
452
472
|
expectedOutputAmountHumanReadable: swap.toAmount,
|
|
453
473
|
outputAmount: '',
|
|
454
474
|
feeInUsd: meta
|
|
455
|
-
?
|
|
475
|
+
? // eslint-disable-next-line @typescript-eslint/no-magic-numbers
|
|
476
|
+
numberToString(getUsdFeeOfStep(swap, meta?.tokens), null, 8)
|
|
456
477
|
: null,
|
|
457
478
|
estimatedTimeInSeconds: swap.estimatedTimeInSeconds || null,
|
|
458
479
|
|
package/src/types.ts
CHANGED
|
@@ -1,15 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
1
|
+
import type { PendingSwap, PendingSwapStep, Wallet } from './shared';
|
|
2
|
+
import type { QueueDef, QueueStorage } from '@rango-dev/queue-manager-core';
|
|
3
|
+
import type { QueueContext } from '@rango-dev/queue-manager-core/dist/queue';
|
|
4
|
+
import type { ConnectResult, Providers } from '@rango-dev/wallets-react';
|
|
5
|
+
import type {
|
|
5
6
|
Meta,
|
|
6
7
|
Network,
|
|
7
8
|
WalletState,
|
|
8
9
|
WalletType,
|
|
9
10
|
} from '@rango-dev/wallets-shared';
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
|
|
11
|
+
import type { Transaction } from 'rango-sdk';
|
|
12
|
+
import type {
|
|
13
|
+
APIErrorCode,
|
|
14
|
+
EvmBlockchainMeta,
|
|
15
|
+
SignerFactory,
|
|
16
|
+
} from 'rango-types';
|
|
13
17
|
|
|
14
18
|
export type RemoveNameField<T, U extends string> = {
|
|
15
19
|
[Property in keyof T as Exclude<Property, U>]: T[Property];
|
|
@@ -61,7 +65,7 @@ export interface SwapQueueContext extends QueueContext {
|
|
|
61
65
|
switchNetwork: (
|
|
62
66
|
wallet: WalletType,
|
|
63
67
|
network: Network
|
|
64
|
-
) => Promise<ConnectResult> | undefined;
|
|
68
|
+
) => Promise<ConnectResult | undefined> | undefined;
|
|
65
69
|
canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
|
|
66
70
|
connect: (
|
|
67
71
|
wallet: WalletType,
|