@paraswap/dex-lib 3.8.23-remove-logs-oswap → 3.8.23-remove-logs-oswap.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,6 +1,6 @@
|
|
|
1
1
|
import { Interface } from '@ethersproject/abi';
|
|
2
2
|
import { AsyncOrSync } from 'ts-essentials';
|
|
3
|
-
import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, PoolLiquidity, Logger, NumberAsString, DexExchangeParam } from '../../types';
|
|
3
|
+
import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, PoolLiquidity, Logger, NumberAsString, DexExchangeParam, TransferFeeParams } from '../../types';
|
|
4
4
|
import { SwapSide, Network } from '../../constants';
|
|
5
5
|
import { Context, IDex } from '../../dex/idex';
|
|
6
6
|
import { IDexHelper } from '../../dex-helper/idex-helper';
|
|
@@ -17,7 +17,7 @@ export declare class OSwap extends SimpleExchange implements IDex<OSwapData> {
|
|
|
17
17
|
};
|
|
18
18
|
readonly hasConstantPriceLargeAmounts = false;
|
|
19
19
|
readonly needWrapNative = true;
|
|
20
|
-
readonly isFeeOnTransferSupported =
|
|
20
|
+
readonly isFeeOnTransferSupported = true;
|
|
21
21
|
static dexKeysWithNetwork: {
|
|
22
22
|
key: string;
|
|
23
23
|
networks: Network[];
|
|
@@ -36,7 +36,7 @@ export declare class OSwap extends SimpleExchange implements IDex<OSwapData> {
|
|
|
36
36
|
getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
|
|
37
37
|
calcPrice(pool: OSwapPool, state: OSwapPoolState, from: Token, amount: bigint, side: SwapSide, checkLiquidity?: boolean): bigint;
|
|
38
38
|
hasEnoughLiquidity(pool: OSwapPool, state: OSwapPoolState, from: Token, amount: bigint, needed: bigint, side: SwapSide): boolean;
|
|
39
|
-
getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<null | ExchangePrices<OSwapData>>;
|
|
39
|
+
getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[], transferFees?: TransferFeeParams): Promise<null | ExchangePrices<OSwapData>>;
|
|
40
40
|
getCalldataGasCost(poolPrices: PoolPrices<OSwapData>): number | number[];
|
|
41
41
|
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: OSwapData, side: SwapSide): AdapterExchangeParam;
|
|
42
42
|
getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: OSwapData, side: SwapSide, _: Context, executorAddress: Address): DexExchangeParam;
|
package/build/dex/oswap/oswap.js
CHANGED
|
@@ -36,6 +36,7 @@ const config_1 = require("./config");
|
|
|
36
36
|
const oswap_pool_1 = require("./oswap-pool");
|
|
37
37
|
const oswap_abi_json_1 = __importDefault(require("../../abi/oswap/oswap.abi.json"));
|
|
38
38
|
const utils_2 = require("../../executor/utils");
|
|
39
|
+
const token_transfer_fee_1 = require("../../lib/token-transfer-fee");
|
|
39
40
|
class OSwap extends simple_exchange_1.SimpleExchange {
|
|
40
41
|
constructor(network, dexKey, dexHelper, adapters = config_1.Adapters[network] || {}) {
|
|
41
42
|
super(dexHelper, dexKey);
|
|
@@ -47,7 +48,7 @@ class OSwap extends simple_exchange_1.SimpleExchange {
|
|
|
47
48
|
this.hasConstantPriceLargeAmounts = false;
|
|
48
49
|
// This may change in the future, but currently OSwap does not support native ETH.
|
|
49
50
|
this.needWrapNative = true;
|
|
50
|
-
this.isFeeOnTransferSupported =
|
|
51
|
+
this.isFeeOnTransferSupported = true;
|
|
51
52
|
this.logger = dexHelper.getLogger(dexKey);
|
|
52
53
|
this.iOSwap = new abi_1.Interface(oswap_abi_json_1.default);
|
|
53
54
|
this.pools = config_1.OSwapConfig[dexKey][network].pools;
|
|
@@ -135,7 +136,12 @@ class OSwap extends simple_exchange_1.SimpleExchange {
|
|
|
135
136
|
// If limitPools is defined only pools in limitPools
|
|
136
137
|
// should be used. If limitPools is undefined then
|
|
137
138
|
// any pool can be used.
|
|
138
|
-
async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools
|
|
139
|
+
async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools, transferFees = {
|
|
140
|
+
srcFee: 0,
|
|
141
|
+
destFee: 0,
|
|
142
|
+
srcDexFee: 0,
|
|
143
|
+
destDexFee: 0,
|
|
144
|
+
}) {
|
|
139
145
|
try {
|
|
140
146
|
// Get the pool to use.
|
|
141
147
|
const pool = this.getPoolByTokenPair(srcToken, destToken);
|
|
@@ -154,10 +160,13 @@ class OSwap extends simple_exchange_1.SimpleExchange {
|
|
|
154
160
|
const unitAmount = (0, utils_1.getBigIntPow)(18);
|
|
155
161
|
const unitPrice = this.calcPrice(pool, state, srcToken, unitAmount, side, false);
|
|
156
162
|
const prices = amounts.map(amount => this.calcPrice(pool, state, srcToken, amount, side));
|
|
163
|
+
const [unitPriceWithFee, ...pricesWithFee] = (0, token_transfer_fee_1.applyTransferFee)([unitPrice, ...prices], side, side === constants_1.SwapSide.SELL ? transferFees.srcFee : transferFees.destFee, side === constants_1.SwapSide.SELL
|
|
164
|
+
? constants_1.SRC_TOKEN_PARASWAP_TRANSFERS
|
|
165
|
+
: constants_1.DEST_TOKEN_PARASWAP_TRANSFERS);
|
|
157
166
|
return [
|
|
158
167
|
{
|
|
159
|
-
prices,
|
|
160
|
-
unit:
|
|
168
|
+
prices: pricesWithFee,
|
|
169
|
+
unit: unitPriceWithFee,
|
|
161
170
|
data: {
|
|
162
171
|
pool: pool.address,
|
|
163
172
|
path: [srcToken.address, destToken.address],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oswap.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA+C;
|
|
1
|
+
{"version":3,"file":"oswap.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/dex/oswap/oswap.ts
CHANGED
|
@@ -10,8 +10,14 @@ import {
|
|
|
10
10
|
Logger,
|
|
11
11
|
NumberAsString,
|
|
12
12
|
DexExchangeParam,
|
|
13
|
+
TransferFeeParams,
|
|
13
14
|
} from '../../types';
|
|
14
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
SwapSide,
|
|
17
|
+
Network,
|
|
18
|
+
DEST_TOKEN_PARASWAP_TRANSFERS,
|
|
19
|
+
SRC_TOKEN_PARASWAP_TRANSFERS,
|
|
20
|
+
} from '../../constants';
|
|
15
21
|
import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
|
|
16
22
|
import { getDexKeysWithNetwork, getBigIntPow } from '../../utils';
|
|
17
23
|
import { Context, IDex } from '../../dex/idex';
|
|
@@ -25,6 +31,7 @@ import { OSwapConfig, Adapters, OSWAP_GAS_COST } from './config';
|
|
|
25
31
|
import { OSwapEventPool } from './oswap-pool';
|
|
26
32
|
import OSwapABI from '../../abi/oswap/oswap.abi.json';
|
|
27
33
|
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
34
|
+
import { applyTransferFee } from '../../lib/token-transfer-fee';
|
|
28
35
|
|
|
29
36
|
export class OSwap extends SimpleExchange implements IDex<OSwapData> {
|
|
30
37
|
readonly eventPools: { [id: string]: OSwapEventPool } = {};
|
|
@@ -34,7 +41,7 @@ export class OSwap extends SimpleExchange implements IDex<OSwapData> {
|
|
|
34
41
|
// This may change in the future, but currently OSwap does not support native ETH.
|
|
35
42
|
readonly needWrapNative = true;
|
|
36
43
|
|
|
37
|
-
readonly isFeeOnTransferSupported =
|
|
44
|
+
readonly isFeeOnTransferSupported = true;
|
|
38
45
|
|
|
39
46
|
public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
|
|
40
47
|
getDexKeysWithNetwork(OSwapConfig);
|
|
@@ -190,6 +197,12 @@ export class OSwap extends SimpleExchange implements IDex<OSwapData> {
|
|
|
190
197
|
side: SwapSide,
|
|
191
198
|
blockNumber: number,
|
|
192
199
|
limitPools?: string[],
|
|
200
|
+
transferFees: TransferFeeParams = {
|
|
201
|
+
srcFee: 0,
|
|
202
|
+
destFee: 0,
|
|
203
|
+
srcDexFee: 0,
|
|
204
|
+
destDexFee: 0,
|
|
205
|
+
},
|
|
193
206
|
): Promise<null | ExchangePrices<OSwapData>> {
|
|
194
207
|
try {
|
|
195
208
|
// Get the pool to use.
|
|
@@ -223,10 +236,19 @@ export class OSwap extends SimpleExchange implements IDex<OSwapData> {
|
|
|
223
236
|
this.calcPrice(pool, state, srcToken, amount, side),
|
|
224
237
|
);
|
|
225
238
|
|
|
239
|
+
const [unitPriceWithFee, ...pricesWithFee] = applyTransferFee(
|
|
240
|
+
[unitPrice, ...prices],
|
|
241
|
+
side,
|
|
242
|
+
side === SwapSide.SELL ? transferFees.srcFee : transferFees.destFee,
|
|
243
|
+
side === SwapSide.SELL
|
|
244
|
+
? SRC_TOKEN_PARASWAP_TRANSFERS
|
|
245
|
+
: DEST_TOKEN_PARASWAP_TRANSFERS,
|
|
246
|
+
);
|
|
247
|
+
|
|
226
248
|
return [
|
|
227
249
|
{
|
|
228
|
-
prices,
|
|
229
|
-
unit:
|
|
250
|
+
prices: pricesWithFee,
|
|
251
|
+
unit: unitPriceWithFee,
|
|
230
252
|
data: {
|
|
231
253
|
pool: pool.address,
|
|
232
254
|
path: [srcToken.address, destToken.address],
|