@paraswap/dex-lib 4.8.44 → 5.0.0-native-dex-math.0
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/README.md +3 -3
- package/build/dex/aave-gsm/config.js +2 -2
- package/build/dex/aave-v3-pt-roll-over/aave-v3-pt-roll-over.d.ts +2 -2
- package/build/dex/aave-v3-pt-roll-over/aave-v3-pt-roll-over.js +1 -1
- package/build/dex/aave-v3-pt-roll-over/aave-v3-pt-roll-over.js.map +1 -1
- package/build/dex/aave-v3-stata/aave-v3-stata.d.ts +2 -2
- package/build/dex/aave-v3-stata/aave-v3-stata.js +1 -1
- package/build/dex/aave-v3-stata/aave-v3-stata.js.map +1 -1
- package/build/dex/aave-v3-stata-v2/aave-v3-stata-v2.d.ts +2 -2
- package/build/dex/aave-v3-stata-v2/aave-v3-stata-v2.js +1 -1
- package/build/dex/aave-v3-stata-v2/aave-v3-stata-v2.js.map +1 -1
- package/build/dex/angle-staked-stable/angle-staked-stable.d.ts +2 -2
- package/build/dex/angle-staked-stable/angle-staked-stable.js +1 -1
- package/build/dex/angle-staked-stable/angle-staked-stable.js.map +1 -1
- package/build/dex/angle-transmuter/angle-transmuter.d.ts +2 -2
- package/build/dex/angle-transmuter/angle-transmuter.js +1 -1
- package/build/dex/angle-transmuter/angle-transmuter.js.map +1 -1
- package/build/dex/balancer-v2/balancer-v2.d.ts +2 -2
- package/build/dex/balancer-v2/balancer-v2.js +1 -1
- package/build/dex/balancer-v2/balancer-v2.js.map +1 -1
- package/build/dex/ekubo/ekubo.d.ts +2 -2
- package/build/dex/ekubo/ekubo.js +1 -1
- package/build/dex/ekubo/ekubo.js.map +1 -1
- package/build/dex/ekubo-v3/ekubo-v3.d.ts +2 -2
- package/build/dex/ekubo-v3/ekubo-v3.js +1 -1
- package/build/dex/ekubo-v3/ekubo-v3.js.map +1 -1
- package/build/dex/erc4626/erc4626.d.ts +2 -2
- package/build/dex/erc4626/erc4626.js +1 -1
- package/build/dex/erc4626/erc4626.js.map +1 -1
- package/build/dex/fluid-dex/fluid-dex.d.ts +2 -2
- package/build/dex/fluid-dex/fluid-dex.js +1 -1
- package/build/dex/fluid-dex/fluid-dex.js.map +1 -1
- package/build/dex/idex.d.ts +2 -6
- package/build/dex/metric/config.js +5 -5
- package/build/dex/oswap/oswap.d.ts +2 -2
- package/build/dex/oswap/oswap.js +1 -1
- package/build/dex/oswap/oswap.js.map +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.d.ts +2 -0
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.js +5 -0
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.js.map +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3.d.ts +6 -3
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js +85 -9
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js.map +1 -1
- package/build/dex/solidly-v3/solidly-v3-pool.d.ts +3 -0
- package/build/dex/solidly-v3/solidly-v3-pool.js +8 -0
- package/build/dex/solidly-v3/solidly-v3-pool.js.map +1 -1
- package/build/dex/solidly-v3/solidly-v3.d.ts +5 -2
- package/build/dex/solidly-v3/solidly-v3.js +84 -8
- package/build/dex/solidly-v3/solidly-v3.js.map +1 -1
- package/build/dex/spark/spark-psm.d.ts +1 -2
- package/build/dex/spark/spark-psm.js +1 -1
- package/build/dex/spark/spark-psm.js.map +1 -1
- package/build/dex/spark/spark.d.ts +2 -2
- package/build/dex/spark/spark.js +1 -1
- package/build/dex/spark/spark.js.map +1 -1
- package/build/dex/tessera/config.js +2 -2
- package/build/dex/uniswap-v3/scripts/measure-calc-time.js +222 -110
- package/build/dex/uniswap-v3/scripts/measure-calc-time.js.map +1 -1
- package/build/dex/uniswap-v3/types.d.ts +1 -0
- package/build/dex/uniswap-v3/types.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3-pool.d.ts +2 -0
- package/build/dex/uniswap-v3/uniswap-v3-pool.js +5 -0
- package/build/dex/uniswap-v3/uniswap-v3-pool.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3.d.ts +11 -3
- package/build/dex/uniswap-v3/uniswap-v3.js +86 -9
- package/build/dex/uniswap-v3/uniswap-v3.js.map +1 -1
- package/build/dex/uniswap-v4/types.d.ts +1 -0
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.d.ts +2 -0
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.js +3 -0
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4-pool.d.ts +3 -0
- package/build/dex/uniswap-v4/uniswap-v4-pool.js +18 -0
- package/build/dex/uniswap-v4/uniswap-v4-pool.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4.d.ts +3 -1
- package/build/dex/uniswap-v4/uniswap-v4.js +74 -14
- package/build/dex/uniswap-v4/uniswap-v4.js.map +1 -1
- package/build/generic-swap-transaction-builder.d.ts +29 -4
- package/build/generic-swap-transaction-builder.js +113 -14
- package/build/generic-swap-transaction-builder.js.map +1 -1
- package/build/implementations/local-paraswap-sdk.js +6 -3
- package/build/implementations/local-paraswap-sdk.js.map +1 -1
- package/build/lens.js +1 -1
- package/build/pricing-helper.d.ts +1 -1
- package/build/pricing-helper.js +2 -2
- package/build/pricing-helper.js.map +1 -1
- package/build/transaction-builder.d.ts +1 -2
- package/build/transaction-builder.js +1 -1
- package/build/transaction-builder.js.map +1 -1
- package/native/Cargo.lock +331 -0
- package/native/Cargo.toml +22 -0
- package/native/build.rs +5 -0
- package/native/package-lock.json +32 -0
- package/native/package.json +20 -0
- package/native/src/config.rs +73 -0
- package/native/src/lib.rs +528 -0
- package/native/src/math/bit_math.rs +177 -0
- package/native/src/math/full_math.rs +217 -0
- package/native/src/math/liquidity_math.rs +72 -0
- package/native/src/math/mod.rs +10 -0
- package/native/src/math/oracle.rs +493 -0
- package/native/src/math/sqrt_price_math.rs +272 -0
- package/native/src/math/swap_math.rs +306 -0
- package/native/src/math/tick.rs +239 -0
- package/native/src/math/tick_bitmap.rs +312 -0
- package/native/src/math/tick_math.rs +321 -0
- package/native/src/math/unsafe_math.rs +67 -0
- package/native/src/pool_state.rs +41 -0
- package/native/src/query_outputs.rs +379 -0
- package/native/src/v4_query_outputs.rs +255 -0
- package/package.json +21 -5
|
@@ -14,6 +14,7 @@ const utils_2 = require("../../utils");
|
|
|
14
14
|
const uniswap_v4_pool_math_1 = require("./contract-math/uniswap-v4-pool-math");
|
|
15
15
|
const constants_1 = require("./constants");
|
|
16
16
|
const decoders_1 = require("../../lib/decoders");
|
|
17
|
+
const native_bridge_1 = require("./contract-math/native-bridge");
|
|
17
18
|
class UniswapV4Pool extends stateful_event_subscriber_1.StatefulEventSubscriber {
|
|
18
19
|
dexHelper;
|
|
19
20
|
network;
|
|
@@ -31,6 +32,7 @@ class UniswapV4Pool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
31
32
|
stateViewIface;
|
|
32
33
|
poolManagerIface;
|
|
33
34
|
stateMulticallIface;
|
|
35
|
+
registry = null;
|
|
34
36
|
constructor(dexHelper, parentName, network, config, logger, mapKey = '', poolId, token0, token1, fee, hooks, tickSpacing, hook) {
|
|
35
37
|
super(parentName, poolId, dexHelper, logger, true, mapKey);
|
|
36
38
|
this.dexHelper = dexHelper;
|
|
@@ -60,6 +62,22 @@ class UniswapV4Pool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
60
62
|
async initialize(blockNumber, options) {
|
|
61
63
|
await super.initialize(blockNumber, options);
|
|
62
64
|
}
|
|
65
|
+
_setState(state, blockNumber, reason) {
|
|
66
|
+
super._setState(state, blockNumber);
|
|
67
|
+
if (this.registry && state) {
|
|
68
|
+
const pool = {
|
|
69
|
+
id: this.poolId,
|
|
70
|
+
key: {
|
|
71
|
+
currency0: this.token0,
|
|
72
|
+
currency1: this.token1,
|
|
73
|
+
fee: this.fee,
|
|
74
|
+
tickSpacing: parseInt(this.tickSpacing),
|
|
75
|
+
hooks: this.hooks,
|
|
76
|
+
},
|
|
77
|
+
};
|
|
78
|
+
(0, native_bridge_1.v4RegistrySetPool)(this.registry, this.poolId, state, pool, this.network);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
63
81
|
getPoolIdentifierData() {
|
|
64
82
|
return {
|
|
65
83
|
poolId: this.poolId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniswap-v4-pool.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4-pool.ts"],"names":[],"mappings":";;;;;;AAAA,+EAGyC;AAIzC,4CAAwD;AACxD,mGAA6E;AAC7E,uGAAiF;AACjF,6GAAuF;AAGvF,oDAAuB;AACvB,uCAAiD;AACjD,+EAAyE;AACzE,2CAKqB;AAGrB,iDAA4D;
|
|
1
|
+
{"version":3,"file":"uniswap-v4-pool.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { Pool, UniswapV4Data } from './types';
|
|
|
8
8
|
import { Interface } from '@ethersproject/abi';
|
|
9
9
|
import { DeepReadonly } from 'ts-essentials';
|
|
10
10
|
import { PoolState } from './types';
|
|
11
|
+
import { RustV4RegistryType } from './contract-math/native-bridge';
|
|
11
12
|
import { SwapSide } from '@paraswap/core';
|
|
12
13
|
import { IBaseHook } from './hooks/types';
|
|
13
14
|
export declare class UniswapV4 extends SimpleExchange implements IDex<UniswapV4Data> {
|
|
@@ -25,6 +26,7 @@ export declare class UniswapV4 extends SimpleExchange implements IDex<UniswapV4D
|
|
|
25
26
|
key: string;
|
|
26
27
|
networks: Network[];
|
|
27
28
|
}[];
|
|
29
|
+
readonly v4Registry: RustV4RegistryType | null;
|
|
28
30
|
private wethAddress;
|
|
29
31
|
private supportedHooks;
|
|
30
32
|
constructor(network: Network, dexKey: string, dexHelper: IDexHelper, routerAddress?: string, quoterAddress?: string, poolManagerAddress?: string);
|
|
@@ -32,7 +34,7 @@ export declare class UniswapV4 extends SimpleExchange implements IDex<UniswapV4D
|
|
|
32
34
|
addMasterPool(poolKey: string, blockNumber: number): Promise<boolean>;
|
|
33
35
|
getPoolIdentifiers(from: Token, to: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
|
|
34
36
|
protected _getOutputs(pool: Pool, state: DeepReadonly<PoolState>, amounts: bigint[], zeroForOne: boolean, side: SwapSide, hook?: IBaseHook): bigint[] | null;
|
|
35
|
-
getPricesVolume(from: Token, to: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<ExchangePrices<UniswapV4Data> | null>;
|
|
37
|
+
getPricesVolume(from: Token, to: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[], transferFees?: {}, isFirstSwap?: boolean, useRust?: boolean): Promise<ExchangePrices<UniswapV4Data> | null>;
|
|
36
38
|
getCalldataGasCost(poolPrices: PoolPrices<UniswapV4Data>): number | number[];
|
|
37
39
|
getAdapters(side: SwapSide): {
|
|
38
40
|
name: string;
|
|
@@ -49,6 +49,7 @@ const decoders_1 = require("../../lib/decoders");
|
|
|
49
49
|
const encoder_1 = require("./encoder");
|
|
50
50
|
const uniswap_v4_pool_manager_1 = require("./uniswap-v4-pool-manager");
|
|
51
51
|
const uniswap_v4_pool_math_1 = require("./contract-math/uniswap-v4-pool-math");
|
|
52
|
+
const native_bridge_1 = require("./contract-math/native-bridge");
|
|
52
53
|
const core_1 = require("@paraswap/core");
|
|
53
54
|
const subgraph_1 = require("./subgraph");
|
|
54
55
|
const constants_2 = require("./constants");
|
|
@@ -67,6 +68,7 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
67
68
|
quoterIface;
|
|
68
69
|
poolManager;
|
|
69
70
|
static dexKeysWithNetwork = (0, utils_1.getDexKeysWithNetwork)(config_1.UniswapV4Config);
|
|
71
|
+
v4Registry = (0, native_bridge_1.createV4Registry)();
|
|
70
72
|
wethAddress;
|
|
71
73
|
supportedHooks = [];
|
|
72
74
|
constructor(network, dexKey, dexHelper, routerAddress = config_1.UniswapV4Config[dexKey][network].router, quoterAddress = config_1.UniswapV4Config[dexKey][network].quoter, poolManagerAddress = config_1.UniswapV4Config[dexKey][network].poolManager) {
|
|
@@ -84,6 +86,8 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
84
86
|
this.supportedHooks =
|
|
85
87
|
dexConfig.supportedHooks?.map(Hook => new Hook(this.dexHelper, network, this.logger)) ?? [];
|
|
86
88
|
this.poolManager = new uniswap_v4_pool_manager_1.UniswapV4PoolManager(dexHelper, dexKey, network, dexConfig, this.supportedHooks, this.logger, this.cacheStateKey);
|
|
89
|
+
this.poolManager.v4Registry = this.v4Registry;
|
|
90
|
+
this.logger.info(`${dexKey}: native Rust math ${this.v4Registry ? 'enabled' : 'not available'}`);
|
|
87
91
|
}
|
|
88
92
|
async initializePricing(blockNumber) {
|
|
89
93
|
await this.poolManager.initialize(blockNumber);
|
|
@@ -121,11 +125,11 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
121
125
|
return null;
|
|
122
126
|
}
|
|
123
127
|
}
|
|
124
|
-
async getPricesVolume(from, to, amounts, side, blockNumber, limitPools) {
|
|
128
|
+
async getPricesVolume(from, to, amounts, side, blockNumber, limitPools, transferFees, isFirstSwap, useRust) {
|
|
125
129
|
const pools = await this.poolManager.getAvailablePoolsForPair(from.address.toLowerCase(), to.address.toLowerCase(), blockNumber);
|
|
126
130
|
const availablePools = limitPools?.filter(t => pools.find(p => p.id === t)) ??
|
|
127
131
|
pools.map(t => t.id);
|
|
128
|
-
const
|
|
132
|
+
const resolved = await Promise.all(availablePools.map(async (poolId) => {
|
|
129
133
|
const pool = pools.find(p => p.id === poolId);
|
|
130
134
|
const fromAddress = from.address.toLowerCase();
|
|
131
135
|
const poolCurrency0 = pool.key.currency0;
|
|
@@ -134,24 +138,79 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
134
138
|
const currency0IsEth = poolCurrency0 === constants_1.NULL_ADDRESS;
|
|
135
139
|
const currency0IsWeth = poolCurrency0 === this.wethAddress;
|
|
136
140
|
const zeroForOne = fromAddress === poolCurrency0 ||
|
|
137
|
-
(isFromEth && currency0IsEth) ||
|
|
138
|
-
(isFromEth && currency0IsWeth) ||
|
|
139
|
-
(isFromWeth && currency0IsEth);
|
|
140
|
-
// WETH is src and WETH pool is handled in fromAddress === poolCurrency0 case
|
|
141
|
+
(isFromEth && currency0IsEth) ||
|
|
142
|
+
(isFromEth && currency0IsWeth) ||
|
|
143
|
+
(isFromWeth && currency0IsEth);
|
|
141
144
|
const eventPool = await this.poolManager.getEventPool(poolId, blockNumber);
|
|
142
|
-
const poolState =
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
145
|
+
const poolState = eventPool?.getState(blockNumber) || null;
|
|
146
|
+
return { pool, poolId, zeroForOne, eventPool, poolState };
|
|
147
|
+
}));
|
|
148
|
+
// Collect pools eligible for batch Rust query:
|
|
149
|
+
// must have valid state, no hook (hooks need JS evaluation),
|
|
150
|
+
// and all share the same zeroForOne direction
|
|
151
|
+
const eligible = [];
|
|
152
|
+
for (const r of resolved) {
|
|
153
|
+
if (r.poolState && r.poolState.isValid && !r.eventPool?.hook) {
|
|
154
|
+
eligible.push(r);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
// Group eligible pools by zeroForOne for batch Rust queries
|
|
158
|
+
const useBatchRust = useRust !== false && this.v4Registry && eligible.length > 0;
|
|
159
|
+
let batchResults = null;
|
|
160
|
+
if (useBatchRust) {
|
|
161
|
+
const sideNum = side === core_1.SwapSide.SELL ? 0 : 1;
|
|
162
|
+
// Group by zeroForOne direction
|
|
163
|
+
const zeroForOneKeys = eligible
|
|
164
|
+
.filter(e => e.zeroForOne)
|
|
165
|
+
.map(e => e.poolId);
|
|
166
|
+
const oneForZeroKeys = eligible
|
|
167
|
+
.filter(e => !e.zeroForOne)
|
|
168
|
+
.map(e => e.poolId);
|
|
169
|
+
batchResults = new Map();
|
|
170
|
+
try {
|
|
171
|
+
if (zeroForOneKeys.length > 0) {
|
|
172
|
+
const raw = this.v4Registry.queryMany(zeroForOneKeys, amounts, true, sideNum);
|
|
173
|
+
for (const r of raw) {
|
|
174
|
+
batchResults.set(r.key, r.outputs);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
if (oneForZeroKeys.length > 0) {
|
|
178
|
+
const raw = this.v4Registry.queryMany(oneForZeroKeys, amounts, false, sideNum);
|
|
179
|
+
for (const r of raw) {
|
|
180
|
+
batchResults.set(r.key, r.outputs);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
catch (e) {
|
|
185
|
+
this.logger.debug('V4 batch Rust query failed, falling back to per-pool', e);
|
|
186
|
+
batchResults = null;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
const pricesPromises = resolved.map(async ({ pool, poolId, zeroForOne, eventPool, poolState }) => {
|
|
190
|
+
let prices = null;
|
|
191
|
+
let usedRust = false;
|
|
192
|
+
// Try batch Rust results first
|
|
193
|
+
if (batchResults && !eventPool?.hook) {
|
|
194
|
+
const rustOutputs = batchResults.get(poolId);
|
|
195
|
+
if (rustOutputs && rustOutputs.length > 0) {
|
|
196
|
+
prices = rustOutputs;
|
|
197
|
+
usedRust = true;
|
|
198
|
+
}
|
|
146
199
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
200
|
+
// Fallback to per-pool JS math or RPC
|
|
201
|
+
if (!prices) {
|
|
202
|
+
if (poolState !== null && poolState.isValid) {
|
|
203
|
+
prices = this._getOutputs(pool, poolState, amounts, zeroForOne, side, eventPool?.hook);
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
this.logger.warn(`${this.dexKey}-${this.network}: pool ${poolId} state was not found...falling back to rpc`);
|
|
207
|
+
prices = await this.queryPriceFromRpc(zeroForOne, amounts, pool, side, blockNumber);
|
|
208
|
+
}
|
|
150
209
|
}
|
|
151
210
|
if (prices === null) {
|
|
152
211
|
return null;
|
|
153
212
|
}
|
|
154
|
-
if (prices
|
|
213
|
+
if (prices.every(price => price === 0n || price === 1n)) {
|
|
155
214
|
return null;
|
|
156
215
|
}
|
|
157
216
|
return {
|
|
@@ -169,6 +228,7 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
169
228
|
zeroForOne,
|
|
170
229
|
},
|
|
171
230
|
],
|
|
231
|
+
useRust: usedRust,
|
|
172
232
|
},
|
|
173
233
|
poolAddresses: [this.poolManagerAddress],
|
|
174
234
|
exchange: this.dexKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniswap-v4.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"uniswap-v4.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,46 @@
|
|
|
1
|
-
import { Address, DexExchangeParamWithBooleanNeedWrapNative, OptimalRate, OptimalSwap, OptimalSwapExchange, TxObject } from './types';
|
|
1
|
+
import { Address, DexExchangeParam, DexExchangeParamWithBooleanNeedWrapNative, OptimalRate, OptimalSwap, OptimalSwapExchange, TxObject } from './types';
|
|
2
2
|
import { AbiCoder, Interface } from '@ethersproject/abi';
|
|
3
3
|
import { DepositWithdrawReturn } from './dex/weth/types';
|
|
4
4
|
import { DexAdapterService } from './dex';
|
|
5
5
|
import { ExecutorDetector } from './executor/ExecutorDetector';
|
|
6
6
|
import { ExecutorBytecodeBuilder } from './executor/ExecutorBytecodeBuilder';
|
|
7
|
-
import { IDexTxBuilder } from './dex/idex';
|
|
8
7
|
import { SwapSide } from '@paraswap/core';
|
|
8
|
+
export declare function normaliseRemoteDexExchangeParam(raw: unknown): DexExchangeParam;
|
|
9
|
+
export type NewDexConfig = {
|
|
10
|
+
needWrapNative: boolean;
|
|
11
|
+
};
|
|
12
|
+
export type NewDexsConfig = {
|
|
13
|
+
[dexKey: string]: NewDexConfig;
|
|
14
|
+
};
|
|
15
|
+
type NewDexEntry = NewDexConfig & {
|
|
16
|
+
key: string;
|
|
17
|
+
};
|
|
9
18
|
export declare class GenericSwapTransactionBuilder {
|
|
10
19
|
protected dexAdapterService: DexAdapterService;
|
|
11
20
|
protected wExchangeNetworkToKey: Record<number, string>;
|
|
21
|
+
protected newDexsApiUrl?: string | undefined;
|
|
22
|
+
protected newDexs?: NewDexsConfig | undefined;
|
|
23
|
+
protected skipApprovalCheck: boolean;
|
|
12
24
|
augustusV6Interface: Interface;
|
|
13
25
|
augustusV6Address: Address;
|
|
14
26
|
erc20Interface: Interface;
|
|
15
27
|
abiCoder: AbiCoder;
|
|
16
28
|
executorDetector: ExecutorDetector;
|
|
17
|
-
constructor(dexAdapterService: DexAdapterService, wExchangeNetworkToKey?: Record<number, string
|
|
29
|
+
constructor(dexAdapterService: DexAdapterService, wExchangeNetworkToKey?: Record<number, string>, newDexsApiUrl?: string | undefined, newDexs?: NewDexsConfig | undefined, skipApprovalCheck?: boolean);
|
|
18
30
|
protected getDepositWithdrawWethCallData(srcAmountWeth: bigint, destAmountWeth: bigint, side: SwapSide, priceRoute: OptimalRate, exchangeParams: DexExchangeParamWithBooleanNeedWrapNative[]): DepositWithdrawReturn | undefined;
|
|
31
|
+
protected findNewDex(exchange: string): NewDexEntry | undefined;
|
|
19
32
|
protected buildCalls(priceRoute: OptimalRate, minMaxAmount: string, bytecodeBuilder: ExecutorBytecodeBuilder, userAddress: string): Promise<string>;
|
|
33
|
+
protected fetchRemoteDexParam(args: {
|
|
34
|
+
dexKey: string;
|
|
35
|
+
srcToken: Address;
|
|
36
|
+
destToken: Address;
|
|
37
|
+
srcAmount: string;
|
|
38
|
+
destAmount: string;
|
|
39
|
+
recipient: Address;
|
|
40
|
+
data: any;
|
|
41
|
+
side: SwapSide;
|
|
42
|
+
executorAddress: Address;
|
|
43
|
+
}): Promise<DexExchangeParam>;
|
|
20
44
|
protected _build(priceRoute: OptimalRate, minMaxAmount: string, quotedAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, takeSurplus: boolean, isCapSurplus: boolean, isSurplusToUser: boolean, isDirectFeeTransfer: boolean, beneficiary: Address, permit: string, uuid: string): Promise<{
|
|
21
45
|
encoder: (...params: any[]) => string;
|
|
22
46
|
params: (string | string[])[];
|
|
@@ -46,7 +70,7 @@ export declare class GenericSwapTransactionBuilder {
|
|
|
46
70
|
}): Promise<TxObject | (string | string[])[]>;
|
|
47
71
|
private packPartnerAndFeeData;
|
|
48
72
|
getExecutionContractAddress(priceRoute: OptimalRate): Address;
|
|
49
|
-
getDexCallsParams(priceRoute: OptimalRate, routeIndex: number, swap: OptimalSwap, swapIndex: number, se: OptimalSwapExchange<any>, minMaxAmount: string,
|
|
73
|
+
getDexCallsParams(priceRoute: OptimalRate, routeIndex: number, swap: OptimalSwap, swapIndex: number, se: OptimalSwapExchange<any>, minMaxAmount: string, dexNeedWrapNative: boolean, executionContractAddress: string): {
|
|
50
74
|
srcToken: Address;
|
|
51
75
|
destToken: Address;
|
|
52
76
|
recipient: Address;
|
|
@@ -58,3 +82,4 @@ export declare class GenericSwapTransactionBuilder {
|
|
|
58
82
|
private addDexExchangeApproveParams;
|
|
59
83
|
private hasAnyRouteWithEthAndDifferentNeedWrapNative;
|
|
60
84
|
}
|
|
85
|
+
export {};
|
|
@@ -4,19 +4,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.GenericSwapTransactionBuilder = void 0;
|
|
7
|
+
exports.normaliseRemoteDexExchangeParam = normaliseRemoteDexExchangeParam;
|
|
7
8
|
const ethers_1 = require("ethers");
|
|
8
9
|
const constants_1 = require("./constants");
|
|
9
10
|
const abi_1 = require("@ethersproject/abi");
|
|
11
|
+
const joi_1 = __importDefault(require("joi"));
|
|
10
12
|
const ABI_json_1 = __importDefault(require("./abi/augustus-v6/ABI.json"));
|
|
13
|
+
const validators_1 = require("./lib/validators");
|
|
11
14
|
const utils_1 = require("./utils");
|
|
12
15
|
const weth_1 = require("./dex/weth/weth");
|
|
13
16
|
const erc20_json_1 = __importDefault(require("./abi/erc20.json"));
|
|
14
17
|
const ExecutorDetector_1 = require("./executor/ExecutorDetector");
|
|
15
18
|
const core_1 = require("@paraswap/core");
|
|
16
19
|
const { utils: { hexlify, hexConcat, hexZeroPad }, } = ethers_1.ethers;
|
|
20
|
+
const REMOTE_DEX_PARAM_TIMEOUT_MS = 10_000;
|
|
21
|
+
// `.empty(null)` makes joi treat a JSON `null` as missing (i.e. undefined),
|
|
22
|
+
// which is what downstream `value !== undefined` checks expect — see
|
|
23
|
+
// docs/specs/get-dex-param.md §3.1 and DEX-PARAM-API.md:123 (returnAmountPos
|
|
24
|
+
// may be omitted *or* null on BUY).
|
|
25
|
+
const remoteDexExchangeParamSchema = joi_1.default
|
|
26
|
+
.object({
|
|
27
|
+
needWrapNative: joi_1.default.boolean().required(),
|
|
28
|
+
exchangeData: joi_1.default.string().required(),
|
|
29
|
+
targetExchange: joi_1.default.string().required(),
|
|
30
|
+
dexFuncHasRecipient: joi_1.default.boolean().required(),
|
|
31
|
+
needUnwrapNative: joi_1.default.boolean().empty(null),
|
|
32
|
+
skipApproval: joi_1.default.boolean().empty(null),
|
|
33
|
+
wethAddress: joi_1.default.string().empty(null),
|
|
34
|
+
specialDexFlag: joi_1.default.number().integer().min(0).max(255).empty(null),
|
|
35
|
+
transferSrcTokenBeforeSwap: joi_1.default.string().empty(null),
|
|
36
|
+
spender: joi_1.default.string().empty(null),
|
|
37
|
+
sendEthButSupportsInsertFromAmount: joi_1.default.boolean().empty(null),
|
|
38
|
+
specialDexSupportsInsertFromAmount: joi_1.default.boolean().empty(null),
|
|
39
|
+
swappedAmountNotPresentInExchangeData: joi_1.default.boolean().empty(null),
|
|
40
|
+
returnAmountPos: joi_1.default.number().integer().min(0).max(255).empty(null),
|
|
41
|
+
insertFromAmountPos: joi_1.default.number().integer().min(0).max(65535).empty(null),
|
|
42
|
+
amountsPacked128: joi_1.default.boolean().empty(null),
|
|
43
|
+
permit2Approval: joi_1.default.boolean().empty(null),
|
|
44
|
+
})
|
|
45
|
+
.unknown(true);
|
|
46
|
+
function normaliseRemoteDexExchangeParam(raw) {
|
|
47
|
+
return (0, validators_1.validateAndCast)(raw, remoteDexExchangeParamSchema, 'DexExchangeParam');
|
|
48
|
+
}
|
|
17
49
|
class GenericSwapTransactionBuilder {
|
|
18
50
|
dexAdapterService;
|
|
19
51
|
wExchangeNetworkToKey;
|
|
52
|
+
newDexsApiUrl;
|
|
53
|
+
newDexs;
|
|
54
|
+
skipApprovalCheck;
|
|
20
55
|
augustusV6Interface;
|
|
21
56
|
augustusV6Address;
|
|
22
57
|
erc20Interface;
|
|
@@ -27,9 +62,15 @@ class GenericSwapTransactionBuilder {
|
|
|
27
62
|
prev[network] = current.key;
|
|
28
63
|
}
|
|
29
64
|
return prev;
|
|
30
|
-
}, {})
|
|
65
|
+
}, {}), newDexsApiUrl,
|
|
66
|
+
// Held by reference, not snapshotted: callers can mutate this map between
|
|
67
|
+
// `buildCalls` invocations and the next call will see the new state.
|
|
68
|
+
newDexs, skipApprovalCheck = false) {
|
|
31
69
|
this.dexAdapterService = dexAdapterService;
|
|
32
70
|
this.wExchangeNetworkToKey = wExchangeNetworkToKey;
|
|
71
|
+
this.newDexsApiUrl = newDexsApiUrl;
|
|
72
|
+
this.newDexs = newDexs;
|
|
73
|
+
this.skipApprovalCheck = skipApprovalCheck;
|
|
33
74
|
this.abiCoder = new abi_1.AbiCoder();
|
|
34
75
|
this.erc20Interface = new abi_1.Interface(erc20_json_1.default);
|
|
35
76
|
this.augustusV6Interface = new abi_1.Interface(ABI_json_1.default);
|
|
@@ -45,18 +86,57 @@ class GenericSwapTransactionBuilder {
|
|
|
45
86
|
return;
|
|
46
87
|
return this.dexAdapterService.getTxBuilderDexByKey(this.wExchangeNetworkToKey[this.dexAdapterService.network]).getDepositWithdrawParam(srcAmountWeth.toString(), destAmountWeth.toString(), side, core_1.ParaSwapVersion.V6);
|
|
47
88
|
}
|
|
89
|
+
findNewDex(exchange) {
|
|
90
|
+
if (!this.newDexs)
|
|
91
|
+
return undefined;
|
|
92
|
+
const exchangeKey = exchange.toLowerCase();
|
|
93
|
+
const newDexKey = Object.keys(this.newDexs).find(dexKey => dexKey.toLowerCase() === exchangeKey);
|
|
94
|
+
return newDexKey === undefined
|
|
95
|
+
? undefined
|
|
96
|
+
: { key: newDexKey, ...this.newDexs[newDexKey] };
|
|
97
|
+
}
|
|
48
98
|
async buildCalls(priceRoute, minMaxAmount, bytecodeBuilder, userAddress) {
|
|
49
99
|
const side = priceRoute.side;
|
|
50
100
|
const rawDexParams = await Promise.all(priceRoute.bestRoute.flatMap((route, routeIndex) => route.swaps.flatMap((swap, swapIndex) => swap.swapExchanges.map(async (se) => {
|
|
51
|
-
const
|
|
101
|
+
const newDex = this.findNewDex(se.exchange);
|
|
52
102
|
const executorAddress = bytecodeBuilder.getAddress();
|
|
53
|
-
|
|
54
|
-
let
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
103
|
+
let dexNeedWrapNative;
|
|
104
|
+
let dex;
|
|
105
|
+
if (newDex) {
|
|
106
|
+
dexNeedWrapNative = newDex.needWrapNative;
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
dex = this.dexAdapterService.getTxBuilderDexByKey(se.exchange);
|
|
110
|
+
dexNeedWrapNative =
|
|
111
|
+
typeof dex.needWrapNative === 'function'
|
|
112
|
+
? dex.needWrapNative(priceRoute, swap, se)
|
|
113
|
+
: dex.needWrapNative;
|
|
114
|
+
}
|
|
115
|
+
const { srcToken, destToken, srcAmount, destAmount, recipient, wethDeposit, wethWithdraw, } = this.getDexCallsParams(priceRoute, routeIndex, swap, swapIndex, se, minMaxAmount, dexNeedWrapNative, executorAddress);
|
|
116
|
+
let dexParams;
|
|
117
|
+
if (newDex) {
|
|
118
|
+
dexParams = await this.fetchRemoteDexParam({
|
|
119
|
+
dexKey: newDex.key,
|
|
120
|
+
srcToken,
|
|
121
|
+
destToken,
|
|
122
|
+
srcAmount: side === core_1.SwapSide.BUY ? se.srcAmount : srcAmount,
|
|
123
|
+
destAmount,
|
|
124
|
+
recipient,
|
|
125
|
+
data: se.data,
|
|
126
|
+
side,
|
|
127
|
+
executorAddress,
|
|
128
|
+
});
|
|
129
|
+
// The local `newDexs[*].needWrapNative` is the single source of
|
|
130
|
+
// truth: it already drove `getDexCallsParams` (and therefore
|
|
131
|
+
// `wethDeposit`/`wethWithdraw`). Keep the executor builder in
|
|
132
|
+
// lockstep so the wrap accounting and the bytecode wiring
|
|
133
|
+
// can't diverge.
|
|
134
|
+
dexParams.needWrapNative = newDex.needWrapNative;
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
dexParams = await dex.getDexParam(srcToken, destToken, side === core_1.SwapSide.BUY ? se.srcAmount : srcAmount, // in other case we would not be able to make insert from amount on Ex3
|
|
138
|
+
destAmount, recipient, se.data, side, executorAddress);
|
|
139
|
+
}
|
|
60
140
|
if (typeof dexParams.needWrapNative === 'function') {
|
|
61
141
|
dexParams.needWrapNative = dexParams.needWrapNative(priceRoute, swap, se);
|
|
62
142
|
}
|
|
@@ -80,6 +160,26 @@ class GenericSwapTransactionBuilder {
|
|
|
80
160
|
const buildExchangeParams = await this.addDexExchangeApproveParams(bytecodeBuilder, priceRoute, exchangeParams, maybeWethCallData);
|
|
81
161
|
return bytecodeBuilder.buildByteCode(priceRoute, buildExchangeParams, userAddress, maybeWethCallData);
|
|
82
162
|
}
|
|
163
|
+
async fetchRemoteDexParam(args) {
|
|
164
|
+
if (!this.newDexsApiUrl) {
|
|
165
|
+
throw new Error(`[GenericSwapTransactionBuilder] new-dex API URL not configured; cannot encode swap for ${args.dexKey}`);
|
|
166
|
+
}
|
|
167
|
+
const chainId = this.dexAdapterService.network;
|
|
168
|
+
const base = this.newDexsApiUrl.replace(/\/+$/, '');
|
|
169
|
+
const url = `${base}/api/v1/dexs/${chainId}/${encodeURIComponent(args.dexKey)}/dex-param`;
|
|
170
|
+
const body = {
|
|
171
|
+
srcToken: args.srcToken,
|
|
172
|
+
destToken: args.destToken,
|
|
173
|
+
srcAmount: args.srcAmount,
|
|
174
|
+
destAmount: args.destAmount,
|
|
175
|
+
recipient: args.recipient,
|
|
176
|
+
executorAddress: args.executorAddress,
|
|
177
|
+
side: args.side,
|
|
178
|
+
data: args.data,
|
|
179
|
+
};
|
|
180
|
+
const raw = await this.dexAdapterService.dexHelper.httpRequest.post(url, body, REMOTE_DEX_PARAM_TIMEOUT_MS);
|
|
181
|
+
return normaliseRemoteDexExchangeParam(raw);
|
|
182
|
+
}
|
|
83
183
|
async _build(priceRoute, minMaxAmount, quotedAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus, isCapSurplus, isSurplusToUser, isDirectFeeTransfer, beneficiary, permit, uuid) {
|
|
84
184
|
const executorName = this.executorDetector.getExecutorByPriceRoute(priceRoute);
|
|
85
185
|
const executionContractAddress = this.getExecutionContractAddress(priceRoute);
|
|
@@ -268,7 +368,7 @@ class GenericSwapTransactionBuilder {
|
|
|
268
368
|
const bytecodeBuilder = this.executorDetector.getBytecodeBuilder(executorName);
|
|
269
369
|
return bytecodeBuilder.getAddress();
|
|
270
370
|
}
|
|
271
|
-
getDexCallsParams(priceRoute, routeIndex, swap, swapIndex, se, minMaxAmount,
|
|
371
|
+
getDexCallsParams(priceRoute, routeIndex, swap, swapIndex, se, minMaxAmount, dexNeedWrapNative, executionContractAddress) {
|
|
272
372
|
const wethAddress = this.dexAdapterService.dexHelper.config.data.wrappedNativeTokenAddress;
|
|
273
373
|
const side = priceRoute.side;
|
|
274
374
|
const isMegaSwap = priceRoute.bestRoute.length > 1;
|
|
@@ -289,9 +389,6 @@ class GenericSwapTransactionBuilder {
|
|
|
289
389
|
// even if the individual dex is rekt by slippage the swap
|
|
290
390
|
// should work if the final slippage check passes.
|
|
291
391
|
const _destAmount = side === core_1.SwapSide.SELL ? '1' : se.destAmount;
|
|
292
|
-
const dexNeedWrapNative = typeof dex.needWrapNative === 'function'
|
|
293
|
-
? dex.needWrapNative(priceRoute, swap, se)
|
|
294
|
-
: dex.needWrapNative;
|
|
295
392
|
if ((0, utils_1.isETHAddress)(swap.srcToken) && dexNeedWrapNative) {
|
|
296
393
|
_src = wethAddress;
|
|
297
394
|
wethDeposit = BigInt(_srcAmount);
|
|
@@ -338,7 +435,9 @@ class GenericSwapTransactionBuilder {
|
|
|
338
435
|
}
|
|
339
436
|
currentExchangeParamIndex++;
|
|
340
437
|
})));
|
|
341
|
-
const approvals =
|
|
438
|
+
const approvals = this.skipApprovalCheck // used only for testing outdated price routes
|
|
439
|
+
? tokenTargetMapping.map(t => false)
|
|
440
|
+
: await this.dexAdapterService.dexHelper.augustusApprovals.hasApprovals(spender, tokenTargetMapping.map(t => t.params));
|
|
342
441
|
const dexExchangeBuildParams = [
|
|
343
442
|
...dexExchangeParams,
|
|
344
443
|
];
|