@paraswap/dex-lib 2.35.3 → 2.35.5
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,5 +1,5 @@
|
|
|
1
1
|
import BigNumber from 'bignumber.js';
|
|
2
|
-
import { Token, ExchangePrices, ExchangeTxInfo, PreprocessTransactionOptions, Config, PoolLiquidity } from '../../types';
|
|
2
|
+
import { Token, ExchangePrices, ExchangeTxInfo, PreprocessTransactionOptions, Config, PoolLiquidity, Address } from '../../types';
|
|
3
3
|
import { Network, SwapSide } from '../../constants';
|
|
4
4
|
import { IDexHelper } from '../../dex-helper';
|
|
5
5
|
import { ParaSwapLimitOrders } from '../paraswap-limit-orders/paraswap-limit-orders';
|
|
@@ -22,6 +22,7 @@ export declare class GenericRFQ extends ParaSwapLimitOrders {
|
|
|
22
22
|
static builderDexKeysWithNetwork(config: Config): void;
|
|
23
23
|
constructor(network: Network, dexKey: string, dexHelper: IDexHelper, config: RFQConfig);
|
|
24
24
|
initializePricing(blockNumber: number): Promise<void>;
|
|
25
|
+
getIdentifier(srcToken: Address, destToken: Address): string;
|
|
25
26
|
getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
|
|
26
27
|
calcOutsFromAmounts(amounts: BigNumber[], outMultiplier: BigNumber, amountsWithRates: PriceAndAmountBigNumber[]): bigint[];
|
|
27
28
|
getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<ExchangePrices<ParaSwapLimitOrdersData> | null>;
|
|
@@ -38,12 +38,13 @@ class GenericRFQ extends paraswap_limit_orders_1.ParaSwapLimitOrders {
|
|
|
38
38
|
}
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
|
+
getIdentifier(srcToken, destToken) {
|
|
42
|
+
// Keep only destination token in order to prevent taping into the same market maker liquidity during same swap (double spending)
|
|
43
|
+
return `${this.dexKey}_${destToken}`.toLowerCase();
|
|
44
|
+
}
|
|
41
45
|
async getPoolIdentifiers(srcToken, destToken, side, blockNumber) {
|
|
42
|
-
const _srcToken = this.dexHelper.config.wrapETH(srcToken);
|
|
43
46
|
const _destToken = this.dexHelper.config.wrapETH(destToken);
|
|
44
|
-
return [
|
|
45
|
-
`${this.dexKey}_${_srcToken.address}_${_destToken.address}`.toLowerCase(),
|
|
46
|
-
];
|
|
47
|
+
return [this.getIdentifier(srcToken.address, _destToken.address)];
|
|
47
48
|
}
|
|
48
49
|
calcOutsFromAmounts(amounts, outMultiplier, amountsWithRates) {
|
|
49
50
|
let lastOrderIndex = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generic-rfq.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/generic-rfq.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;
|
|
1
|
+
{"version":3,"file":"generic-rfq.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/generic-rfq.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
PreprocessTransactionOptions,
|
|
7
7
|
Config,
|
|
8
8
|
PoolLiquidity,
|
|
9
|
+
Address,
|
|
9
10
|
} from '../../types';
|
|
10
11
|
import { Network, SwapSide } from '../../constants';
|
|
11
12
|
import { IDexHelper } from '../../dex-helper';
|
|
@@ -61,17 +62,19 @@ export class GenericRFQ extends ParaSwapLimitOrders {
|
|
|
61
62
|
return;
|
|
62
63
|
}
|
|
63
64
|
|
|
65
|
+
getIdentifier(srcToken: Address, destToken: Address) {
|
|
66
|
+
// Keep only destination token in order to prevent taping into the same market maker liquidity during same swap (double spending)
|
|
67
|
+
return `${this.dexKey}_${destToken}`.toLowerCase();
|
|
68
|
+
}
|
|
69
|
+
|
|
64
70
|
async getPoolIdentifiers(
|
|
65
71
|
srcToken: Token,
|
|
66
72
|
destToken: Token,
|
|
67
73
|
side: SwapSide,
|
|
68
74
|
blockNumber: number,
|
|
69
75
|
): Promise<string[]> {
|
|
70
|
-
const _srcToken = this.dexHelper.config.wrapETH(srcToken);
|
|
71
76
|
const _destToken = this.dexHelper.config.wrapETH(destToken);
|
|
72
|
-
return [
|
|
73
|
-
`${this.dexKey}_${_srcToken.address}_${_destToken.address}`.toLowerCase(),
|
|
74
|
-
];
|
|
77
|
+
return [this.getIdentifier(srcToken.address, _destToken.address)];
|
|
75
78
|
}
|
|
76
79
|
|
|
77
80
|
calcOutsFromAmounts(
|