@paraswap/dex-lib 4.7.27-ekubo-v3.0 → 4.7.28
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/build/dex/algebra-integral/algebra-integral-factory.d.ts +3 -1
- package/build/dex/algebra-integral/algebra-integral-factory.js +59 -1
- package/build/dex/algebra-integral/algebra-integral-factory.js.map +1 -1
- package/build/dex/algebra-integral/algebra-integral.d.ts +3 -0
- package/build/dex/algebra-integral/algebra-integral.js +112 -4
- package/build/dex/algebra-integral/algebra-integral.js.map +1 -1
- package/build/dex/algebra-integral/constants.d.ts +2 -0
- package/build/dex/algebra-integral/constants.js +5 -1
- package/build/dex/algebra-integral/constants.js.map +1 -1
- package/build/dex/generic-rfq/validators.js +1 -1
- package/build/dex/generic-rfq/validators.js.map +1 -1
- package/build/dex/index.js +0 -2
- package/build/dex/index.js.map +1 -1
- package/build/dex/oswap/config.js +16 -0
- package/build/dex/oswap/config.js.map +1 -1
- package/build/dex/oswap/oswap-pool.d.ts +17 -1
- package/build/dex/oswap/oswap-pool.js +95 -2
- package/build/dex/oswap/oswap-pool.js.map +1 -1
- package/build/dex/oswap/oswap.d.ts +3 -2
- package/build/dex/oswap/oswap.js +59 -3
- package/build/dex/oswap/oswap.js.map +1 -1
- package/build/dex/oswap/types.d.ts +8 -1
- package/package.json +3 -3
|
@@ -17,13 +17,15 @@ export declare class AlgebraIntegralFactory extends StatefulEventSubscriber<Fact
|
|
|
17
17
|
};
|
|
18
18
|
logDecoder: (log: Log) => any;
|
|
19
19
|
private pools;
|
|
20
|
+
private erc20Interface;
|
|
20
21
|
constructor(parentName: string, network: number, dexHelper: IDexHelper, logger: Logger, factoryAddress: Address, subgraphURL: string, factoryIface?: Interface);
|
|
21
22
|
initialize(blockNumber: number): Promise<void>;
|
|
22
23
|
generateState(): FactoryState;
|
|
23
24
|
protected processLog(_: DeepReadonly<FactoryState>, log: Readonly<Log>): Promise<FactoryState>;
|
|
24
|
-
getAvailablePoolsForPair(srcToken: Address, destToken: Address
|
|
25
|
+
getAvailablePoolsForPair(srcToken: Address, destToken: Address): Pool[];
|
|
25
26
|
queryAllAvailablePools(blockNumber: number): Promise<Pool[]>;
|
|
26
27
|
private queryOnePageForAllAvailablePoolsFromSubgraph;
|
|
27
28
|
handleNewPool(event: LogDescription): Promise<void>;
|
|
28
29
|
handleNewCustomPool(event: LogDescription): Promise<void>;
|
|
30
|
+
updatePoolsTvl(): Promise<void>;
|
|
29
31
|
}
|
|
@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.AlgebraIntegralFactory = void 0;
|
|
7
7
|
const abi_1 = require("@ethersproject/abi");
|
|
8
8
|
const AlgebraFactory_abi_json_1 = __importDefault(require("../../abi/algebra-integral/AlgebraFactory.abi.json"));
|
|
9
|
+
const erc20_json_1 = __importDefault(require("../../abi/erc20.json"));
|
|
9
10
|
const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
|
|
10
11
|
const constants_1 = require("../../constants");
|
|
12
|
+
const constants_2 = require("./constants");
|
|
13
|
+
const decoders_1 = require("../../lib/decoders");
|
|
11
14
|
/*
|
|
12
15
|
* "Stateless" event subscriber in order to capture "PoolCreated" event on new pools created.
|
|
13
16
|
* State is present, but it's a placeholder to actually make the events reach handlers (if there's no previous state - `processBlockLogs` is not called)
|
|
@@ -22,6 +25,7 @@ class AlgebraIntegralFactory extends stateful_event_subscriber_1.StatefulEventSu
|
|
|
22
25
|
handlers = {};
|
|
23
26
|
logDecoder;
|
|
24
27
|
pools = [];
|
|
28
|
+
erc20Interface = new abi_1.Interface(erc20_json_1.default);
|
|
25
29
|
constructor(parentName, network, dexHelper, logger, factoryAddress, subgraphURL, factoryIface = new abi_1.Interface(AlgebraFactory_abi_json_1.default)) {
|
|
26
30
|
super(parentName, `${parentName} Factory`, dexHelper, logger, false);
|
|
27
31
|
this.parentName = parentName;
|
|
@@ -48,7 +52,7 @@ class AlgebraIntegralFactory extends stateful_event_subscriber_1.StatefulEventSu
|
|
|
48
52
|
}
|
|
49
53
|
return {};
|
|
50
54
|
}
|
|
51
|
-
getAvailablePoolsForPair(srcToken, destToken
|
|
55
|
+
getAvailablePoolsForPair(srcToken, destToken) {
|
|
52
56
|
const _srcToken = this.dexHelper.config.wrapETH(srcToken);
|
|
53
57
|
const _destToken = this.dexHelper.config.wrapETH(destToken);
|
|
54
58
|
const [_srcAddress, _destAddress] = [
|
|
@@ -58,6 +62,7 @@ class AlgebraIntegralFactory extends stateful_event_subscriber_1.StatefulEventSu
|
|
|
58
62
|
return this.pools
|
|
59
63
|
.filter(pool => (pool.token0 === _srcAddress && pool.token1 === _destAddress) ||
|
|
60
64
|
(pool.token0 === _destAddress && pool.token1 === _srcAddress))
|
|
65
|
+
.filter(pool => pool.tvlUSD >= constants_2.MIN_USD_TVL_FOR_PRICING)
|
|
61
66
|
.sort((a, b) => {
|
|
62
67
|
// sort by tvl
|
|
63
68
|
const tvlDiff = b.tvlUSD - a.tvlUSD;
|
|
@@ -155,6 +160,59 @@ class AlgebraIntegralFactory extends stateful_event_subscriber_1.StatefulEventSu
|
|
|
155
160
|
});
|
|
156
161
|
}
|
|
157
162
|
}
|
|
163
|
+
async updatePoolsTvl() {
|
|
164
|
+
if (this.pools.length === 0)
|
|
165
|
+
return;
|
|
166
|
+
// Build multicall to fetch token balances for all pools
|
|
167
|
+
const balanceCalls = this.pools.flatMap(pool => [
|
|
168
|
+
{
|
|
169
|
+
target: pool.token0,
|
|
170
|
+
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
171
|
+
pool.poolAddress,
|
|
172
|
+
]),
|
|
173
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
174
|
+
},
|
|
175
|
+
{
|
|
176
|
+
target: pool.token1,
|
|
177
|
+
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
178
|
+
pool.poolAddress,
|
|
179
|
+
]),
|
|
180
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
181
|
+
},
|
|
182
|
+
]);
|
|
183
|
+
const balanceResults = await this.dexHelper.multiWrapper.tryAggregate(false, balanceCalls);
|
|
184
|
+
// Build token amounts for USD conversion
|
|
185
|
+
const tokenAmounts = this.pools.flatMap((pool, i) => {
|
|
186
|
+
const balance0 = balanceResults[i * 2].success
|
|
187
|
+
? balanceResults[i * 2].returnData
|
|
188
|
+
: 0n;
|
|
189
|
+
const balance1 = balanceResults[i * 2 + 1].success
|
|
190
|
+
? balanceResults[i * 2 + 1].returnData
|
|
191
|
+
: 0n;
|
|
192
|
+
return [
|
|
193
|
+
[
|
|
194
|
+
pool.token0 === constants_1.NULL_ADDRESS.toLowerCase()
|
|
195
|
+
? constants_1.ETHER_ADDRESS
|
|
196
|
+
: pool.token0,
|
|
197
|
+
balance0,
|
|
198
|
+
],
|
|
199
|
+
[
|
|
200
|
+
pool.token1 === constants_1.NULL_ADDRESS.toLowerCase()
|
|
201
|
+
? constants_1.ETHER_ADDRESS
|
|
202
|
+
: pool.token1,
|
|
203
|
+
balance1,
|
|
204
|
+
],
|
|
205
|
+
];
|
|
206
|
+
});
|
|
207
|
+
// Get USD values
|
|
208
|
+
const usdValues = await this.dexHelper.getUsdTokenAmounts(tokenAmounts);
|
|
209
|
+
// Update pool TVL
|
|
210
|
+
this.pools.forEach((pool, i) => {
|
|
211
|
+
const tvl0 = usdValues[i * 2] || 0;
|
|
212
|
+
const tvl1 = usdValues[i * 2 + 1] || 0;
|
|
213
|
+
pool.tvlUSD = tvl0 + tvl1;
|
|
214
|
+
});
|
|
215
|
+
}
|
|
158
216
|
}
|
|
159
217
|
exports.AlgebraIntegralFactory = AlgebraIntegralFactory;
|
|
160
218
|
//# sourceMappingURL=algebra-integral-factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"algebra-integral-factory.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/algebra-integral-factory.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAE/C,iHAA4E;
|
|
1
|
+
{"version":3,"file":"algebra-integral-factory.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/algebra-integral-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare class AlgebraIntegral extends SimpleExchange implements IDex<Alge
|
|
|
16
16
|
readonly needWrapNative = true;
|
|
17
17
|
readonly isFeeOnTransferSupported = true;
|
|
18
18
|
private readonly factory;
|
|
19
|
+
private updatePoolsTvlTimer?;
|
|
19
20
|
static dexKeysWithNetwork: {
|
|
20
21
|
key: string;
|
|
21
22
|
networks: Network[];
|
|
@@ -41,8 +42,10 @@ export declare class AlgebraIntegral extends SimpleExchange implements IDex<Alge
|
|
|
41
42
|
getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: AlgebraIntegralData, side: SwapSide): DexExchangeParam;
|
|
42
43
|
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: AlgebraIntegralData, side: SwapSide): AdapterExchangeParam;
|
|
43
44
|
getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
|
|
45
|
+
private _getPoolBalances;
|
|
44
46
|
private _querySubgraph;
|
|
45
47
|
private _encodePath;
|
|
46
48
|
private _sortTokens;
|
|
47
49
|
private _getLoweredAddresses;
|
|
50
|
+
releaseResources(): void;
|
|
48
51
|
}
|
|
@@ -64,6 +64,7 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
|
|
|
64
64
|
needWrapNative = true;
|
|
65
65
|
isFeeOnTransferSupported = true;
|
|
66
66
|
factory;
|
|
67
|
+
updatePoolsTvlTimer;
|
|
67
68
|
static dexKeysWithNetwork = (0, utils_2.getDexKeysWithNetwork)(config_1.AlgebraIntegralConfig);
|
|
68
69
|
logger;
|
|
69
70
|
constructor(network, dexKey, dexHelper, routerIface = new utils_1.Interface(SwapRouter_abi_json_1.default), quoterIface = new utils_1.Interface(Quoter_abi_json_1.default), config = config_1.AlgebraIntegralConfig[dexKey][network]) {
|
|
@@ -79,6 +80,23 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
|
|
|
79
80
|
}
|
|
80
81
|
async initializePricing(blockNumber) {
|
|
81
82
|
await this.factory.initialize(blockNumber);
|
|
83
|
+
// Set up TVL update timer (slave only)
|
|
84
|
+
if (!this.updatePoolsTvlTimer && this.dexHelper.config.isSlave) {
|
|
85
|
+
try {
|
|
86
|
+
await this.factory.updatePoolsTvl();
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
this.logger.error(`${this.dexKey}: Failed to update pool TVL on initialize:`, error);
|
|
90
|
+
}
|
|
91
|
+
this.updatePoolsTvlTimer = setInterval(async () => {
|
|
92
|
+
try {
|
|
93
|
+
await this.factory.updatePoolsTvl();
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
this.logger.error(`${this.dexKey}: Failed to update pool TVL:`, error);
|
|
97
|
+
}
|
|
98
|
+
}, constants_2.POOL_TVL_UPDATE_INTERVAL * 1000);
|
|
99
|
+
}
|
|
82
100
|
}
|
|
83
101
|
getAdapters(side) {
|
|
84
102
|
return null;
|
|
@@ -97,7 +115,7 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
|
|
|
97
115
|
const [_srcAddress, _destAddress] = this._getLoweredAddresses(_srcToken, _destToken);
|
|
98
116
|
if (_srcAddress === _destAddress)
|
|
99
117
|
return [];
|
|
100
|
-
const pools =
|
|
118
|
+
const pools = this.factory.getAvailablePoolsForPair(_srcAddress, _destAddress);
|
|
101
119
|
if (pools.length === 0)
|
|
102
120
|
return [];
|
|
103
121
|
return pools.map(pool => this.getPoolIdentifier(_srcAddress, _destAddress, pool.deployer));
|
|
@@ -186,7 +204,7 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
|
|
|
186
204
|
const [_srcAddress, _destAddress] = this._getLoweredAddresses(_srcToken, _destToken);
|
|
187
205
|
if (_srcAddress === _destAddress)
|
|
188
206
|
return null;
|
|
189
|
-
let pools =
|
|
207
|
+
let pools = this.factory.getAvailablePoolsForPair(_srcAddress, _destAddress);
|
|
190
208
|
if (limitPools && limitPools.length > 0) {
|
|
191
209
|
const limitPoolsSet = new Set(limitPools);
|
|
192
210
|
pools = pools.filter(pool => {
|
|
@@ -345,8 +363,91 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
|
|
|
345
363
|
],
|
|
346
364
|
liquidityUSD: parseFloat(pool.totalValueLockedUSD) * constants_2.ALGEBRA_EFFICIENCY_FACTOR,
|
|
347
365
|
}));
|
|
348
|
-
const
|
|
349
|
-
|
|
366
|
+
const allPools = pools0.concat(pools1);
|
|
367
|
+
if (allPools.length === 0)
|
|
368
|
+
return [];
|
|
369
|
+
// Get on-chain balances
|
|
370
|
+
const poolBalances = await this._getPoolBalances(allPools.map(p => [
|
|
371
|
+
p.address,
|
|
372
|
+
_tokenAddress,
|
|
373
|
+
p.connectorTokens[0].address,
|
|
374
|
+
]));
|
|
375
|
+
// Build token amounts for USD conversion
|
|
376
|
+
const tokensAmounts = allPools
|
|
377
|
+
.map((p, i) => {
|
|
378
|
+
return [
|
|
379
|
+
[_tokenAddress, poolBalances[i][0]],
|
|
380
|
+
[p.connectorTokens[0].address, poolBalances[i][1]],
|
|
381
|
+
];
|
|
382
|
+
})
|
|
383
|
+
.flat();
|
|
384
|
+
// Get USD values
|
|
385
|
+
const poolUsdBalances = await this.dexHelper.getUsdTokenAmounts(tokensAmounts);
|
|
386
|
+
// Calculate liquidity per pool
|
|
387
|
+
const pools = allPools.map((pool, i) => {
|
|
388
|
+
const tokenUsdBalance = poolUsdBalances[i * 2];
|
|
389
|
+
const connectorTokenUsdBalance = poolUsdBalances[i * 2 + 1];
|
|
390
|
+
let tokenUsdLiquidity = null;
|
|
391
|
+
if (tokenUsdBalance) {
|
|
392
|
+
tokenUsdLiquidity = tokenUsdBalance * constants_2.ALGEBRA_EFFICIENCY_FACTOR;
|
|
393
|
+
}
|
|
394
|
+
let connectorTokenUsdLiquidity = null;
|
|
395
|
+
if (connectorTokenUsdBalance) {
|
|
396
|
+
connectorTokenUsdLiquidity =
|
|
397
|
+
connectorTokenUsdBalance * constants_2.ALGEBRA_EFFICIENCY_FACTOR;
|
|
398
|
+
}
|
|
399
|
+
// Update connector token liquidity for directional swaps
|
|
400
|
+
if (tokenUsdLiquidity) {
|
|
401
|
+
pool.connectorTokens[0] = {
|
|
402
|
+
...pool.connectorTokens[0],
|
|
403
|
+
liquidityUSD: tokenUsdLiquidity,
|
|
404
|
+
};
|
|
405
|
+
}
|
|
406
|
+
// Use connector token liquidity as primary, fallback to token liquidity
|
|
407
|
+
const liquidityUSD = connectorTokenUsdLiquidity || tokenUsdLiquidity || 0;
|
|
408
|
+
return {
|
|
409
|
+
...pool,
|
|
410
|
+
liquidityUSD,
|
|
411
|
+
};
|
|
412
|
+
});
|
|
413
|
+
// Filter by minimum TVL and sort
|
|
414
|
+
return pools
|
|
415
|
+
.filter(pool => (pool.liquidityUSD + (pool.connectorTokens[0]?.liquidityUSD ?? 0)) /
|
|
416
|
+
constants_2.ALGEBRA_EFFICIENCY_FACTOR >=
|
|
417
|
+
constants_2.MIN_USD_TVL_FOR_PRICING)
|
|
418
|
+
.sort((a, b) => b.liquidityUSD - a.liquidityUSD)
|
|
419
|
+
.slice(0, limit);
|
|
420
|
+
}
|
|
421
|
+
async _getPoolBalances(pools) {
|
|
422
|
+
const callData = pools
|
|
423
|
+
.map(pool => [
|
|
424
|
+
{
|
|
425
|
+
target: pool[1],
|
|
426
|
+
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
427
|
+
pool[0],
|
|
428
|
+
]),
|
|
429
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
430
|
+
},
|
|
431
|
+
{
|
|
432
|
+
target: pool[2],
|
|
433
|
+
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
434
|
+
pool[0],
|
|
435
|
+
]),
|
|
436
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
437
|
+
},
|
|
438
|
+
])
|
|
439
|
+
.flat();
|
|
440
|
+
const balanceOfCalls = await this.dexHelper.multiWrapper.tryAggregate(false, callData);
|
|
441
|
+
const balances = [];
|
|
442
|
+
for (let i = 0; i < balanceOfCalls.length; i += 2) {
|
|
443
|
+
const balanceToken0 = balanceOfCalls[i];
|
|
444
|
+
const balanceToken1 = balanceOfCalls[i + 1];
|
|
445
|
+
balances.push([
|
|
446
|
+
balanceToken0.success ? balanceToken0.returnData : null,
|
|
447
|
+
balanceToken1.success ? balanceToken1.returnData : null,
|
|
448
|
+
]);
|
|
449
|
+
}
|
|
450
|
+
return balances;
|
|
350
451
|
}
|
|
351
452
|
async _querySubgraph(query, variables, timeout = 30000) {
|
|
352
453
|
try {
|
|
@@ -386,6 +487,13 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
|
|
|
386
487
|
_getLoweredAddresses(srcToken, destToken) {
|
|
387
488
|
return [srcToken.address.toLowerCase(), destToken.address.toLowerCase()];
|
|
388
489
|
}
|
|
490
|
+
releaseResources() {
|
|
491
|
+
if (this.updatePoolsTvlTimer) {
|
|
492
|
+
clearInterval(this.updatePoolsTvlTimer);
|
|
493
|
+
this.updatePoolsTvlTimer = undefined;
|
|
494
|
+
this.logger.info(`${this.dexKey}: cleared updatePoolsTvlTimer`);
|
|
495
|
+
}
|
|
496
|
+
}
|
|
389
497
|
}
|
|
390
498
|
exports.AlgebraIntegral = AlgebraIntegral;
|
|
391
499
|
//# sourceMappingURL=algebra-integral.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"algebra-integral.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/algebra-integral.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"algebra-integral.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/algebra-integral.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ALGEBRA_EFFICIENCY_FACTOR = exports.ALGEBRA_GAS_COST = exports.ALGEBRA_QUOTE_GASLIMIT = void 0;
|
|
3
|
+
exports.POOL_TVL_UPDATE_INTERVAL = exports.MIN_USD_TVL_FOR_PRICING = exports.ALGEBRA_EFFICIENCY_FACTOR = exports.ALGEBRA_GAS_COST = exports.ALGEBRA_QUOTE_GASLIMIT = void 0;
|
|
4
4
|
exports.ALGEBRA_QUOTE_GASLIMIT = 2_000_000;
|
|
5
5
|
exports.ALGEBRA_GAS_COST = 180_000;
|
|
6
6
|
exports.ALGEBRA_EFFICIENCY_FACTOR = 3;
|
|
7
|
+
// Minimum TVL in USD for a pool to be considered for pricing
|
|
8
|
+
exports.MIN_USD_TVL_FOR_PRICING = 50_000; // $50,000
|
|
9
|
+
// TVL update interval in seconds
|
|
10
|
+
exports.POOL_TVL_UPDATE_INTERVAL = 5 * 60; // 5 minutes
|
|
7
11
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,SAAS,CAAC;AACnC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,yBAAyB,GAAG,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,SAAS,CAAC;AACnC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,yBAAyB,GAAG,CAAC,CAAC;AAE3C,6DAA6D;AAChD,QAAA,uBAAuB,GAAG,MAAM,CAAC,CAAC,UAAU;AAEzD,iCAAiC;AACpB,QAAA,wBAAwB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,YAAY"}
|
|
@@ -99,7 +99,7 @@ const ext = {
|
|
|
99
99
|
const minAsk = values.asks
|
|
100
100
|
.map(numbers => new bignumber_js_1.default(numbers[0]))
|
|
101
101
|
.reduce((previousValue, currentValue) => currentValue.lte(previousValue) ? currentValue : previousValue, new bignumber_js_1.default('123456789012345678901234567890'));
|
|
102
|
-
return maxBid
|
|
102
|
+
return maxBid.lt(minAsk)
|
|
103
103
|
? values
|
|
104
104
|
: helpers.message({
|
|
105
105
|
custom: 'the maximum bid is higher than minimum ask',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/validators.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/validators.ts"],"names":[],"mappings":"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"}
|
package/build/dex/index.js
CHANGED
|
@@ -102,7 +102,6 @@ const wrapped_m_m_1 = require("./usual/wrapped-m-m");
|
|
|
102
102
|
const usual_pp_1 = require("./usual-pp/usual-pp");
|
|
103
103
|
const algebra_integral_1 = require("./algebra-integral/algebra-integral");
|
|
104
104
|
const ekubo_1 = require("./ekubo/ekubo");
|
|
105
|
-
const ekubo_v3_1 = require("./ekubo-v3/ekubo-v3");
|
|
106
105
|
const uniswap_v4_1 = require("./uniswap-v4/uniswap-v4");
|
|
107
106
|
const pancake_swap_v2_1 = require("./uniswap-v2/pancake-swap-v2");
|
|
108
107
|
const optimizer_6 = require("./uniswap-v4/optimizer");
|
|
@@ -208,7 +207,6 @@ const Dexes = [
|
|
|
208
207
|
usual_m_usd0_1.UsualMUsd0,
|
|
209
208
|
usual_pp_1.UsualPP,
|
|
210
209
|
ekubo_1.Ekubo,
|
|
211
|
-
ekubo_v3_1.EkuboV3,
|
|
212
210
|
miro_migrator_1.MiroMigrator,
|
|
213
211
|
aave_v3_pt_roll_over_1.AaveV3PtRollOver,
|
|
214
212
|
ring_v2_1.RingV2,
|
package/build/dex/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dex/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,kDAA8C;AAE9C,qDAAiD;AACjD,2DAAuD;AACvD,sCAAmC;AACnC,0EAAsE;AACtE,wDAAoD;AACpD,2DAAuD;AACvD,uDAA0D;AAC1D,wDAAoD;AACpD,sDAAwD;AACxD,sDAAsD;AACtD,gDAA6C;AAC7C,4CAAyC;AACzC,kDAA+C;AAC/C,+CAA2C;AAC3C,+CAA2C;AAC3C,+CAA2C;AAC3C,uCAAmC;AACnC,+CAA4C;AAC5C,yCAAsC;AAEtC,4CAAwC;AAExC,sCAAmC;AACnC,kDAA+C;AAC/C,mCAAgC;AAChC,qDAAgD;AAChD,yFAAoF;AACpF,iDAAkD;AAClD,+CAA4C;AAC5C,wDAAoD;AACpD,4DAAyD;AACzD,0DAAuD;AACvD,kEAA+D;AAC/D,sEAAmE;AACnE,wEAAqE;AACrE,qDAAkD;AAClD,kEAA+D;AAC/D,2DAAuD;AACvD,uDAA0D;AAC1D,kDAA8C;AAC9C,0EAAqE;AACrE,2DAAwD;AACxD,0EAAqE;AACrE,gFAA0E;AAC1E,4DAA4D;AAC5D,2DAAuD;AACvD,4CAAyC;AACzC,+CAA4C;AAC5C,+CAA4C;AAC5C,kDAA+C;AAC/C,iEAA6D;AAC7D,2DAAuD;AACvD,2DAAuD;AACvD,2DAAuD;AACvD,2DAAuD;AACvD,kDAA8C;AAC9C,uEAAiE;AACjE,uEAAiE;AACjE,oEAAgE;AAChE,+CAA4C;AAC5C,0EAAsE;AACtE,mFAA8E;AAC9E,+CAA4C;AAC5C,yCAAsC;AACtC,4CAAyC;AACzC,yCAAsC;AACtC,kEAA+D;AAC/D,yEAAqE;AACrE,uCAAoC;AACpC,4CAAyC;AACzC,yCAAsC;AACtC,iDAA6C;AAC7C,uGAAmG;AACnG,iEAA4D;AAC5D,0EAAoE;AACpE,yCAAsC;AACtC,qDAAiD;AACjD,oEAA+D;AAC/D,gFAA4E;AAC5E,0EAAqE;AACrE,kDAA8C;AAC9C,kDAA8C;AAC9C,4CAAyC;AACzC,2DAAuD;AACvD,uDAA0D;AAC1D,iEAA6D;AAC7D,4CAAyC;AACzC,4CAAyC;AACzC,mDAA+C;AAC/C,6DAAwD;AACxD,6DAAwD;AACxD,iEAA2D;AAC3D,uDAAkD;AAClD,qDAAgD;AAChD,qDAAgD;AAChD,kDAA8C;AAC9C,0EAAsE;AACtE,yCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dex/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,22 @@ exports.OSwapConfig = {
|
|
|
16
16
|
token0: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', // WETH
|
|
17
17
|
token1: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84', // STETH
|
|
18
18
|
},
|
|
19
|
+
{
|
|
20
|
+
id: 'OSwap_0xceda2d856238aa0d12f6329de20b9115f07c366d', // Pool identifier: `{dex_key}_{pool_address}`
|
|
21
|
+
address: '0xceda2d856238aa0d12f6329de20b9115f07c366d', // Address of the pool
|
|
22
|
+
token0: '0x4c9edd5852cd905f086c759e8383e09bff1e68b3', // USDe
|
|
23
|
+
token1: '0x9d39a5de30e57443bff2a8307a4256c8797a3497', // sUSDe
|
|
24
|
+
erc4626: {
|
|
25
|
+
assetToken: '0x4c9edd5852cd905f086c759e8383e09bff1e68b3', // USDe
|
|
26
|
+
vaultToken: '0x9d39a5de30e57443bff2a8307a4256c8797a3497', // sUSDe (ERC4626 vault)
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
id: 'OSwap_0xfb0a3cf9b019bfd8827443d131b235b3e0fc58d2', // Pool identifier: `{dex_key}_{pool_address}`
|
|
31
|
+
address: '0xfb0a3cf9b019bfd8827443d131b235b3e0fc58d2', // Address of the pool
|
|
32
|
+
token0: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', // WETH
|
|
33
|
+
token1: '0x35fa164735182de50811e8e2e824cfb9b6118ac2', // eETH
|
|
34
|
+
},
|
|
19
35
|
],
|
|
20
36
|
},
|
|
21
37
|
[constants_1.Network.SONIC]: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/oswap/config.ts"],"names":[],"mappings":";;;AAEA,+CAAoD;AAEvC,QAAA,cAAc,GAAG,MAAM,CAAC;AAErC,aAAa;AACb,yCAAyC;AACzC,iDAAiD;AACpC,QAAA,WAAW,GAA4B;IAClD,KAAK,EAAE;QACL,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;YACjB,KAAK,EAAE;gBACL;oBACE,EAAE,EAAE,kDAAkD,EAAE,8CAA8C;oBACtG,OAAO,EAAE,4CAA4C,EAAE,sBAAsB;oBAC7E,MAAM,EAAE,4CAA4C,EAAE,OAAO;oBAC7D,MAAM,EAAE,4CAA4C,EAAE,QAAQ;iBAC/D;aACF;SACF;QACD,CAAC,mBAAO,CAAC,KAAK,CAAC,EAAE;YACf,KAAK,EAAE;gBACL;oBACE,EAAE,EAAE,kDAAkD,EAAE,8CAA8C;oBACtG,OAAO,EAAE,4CAA4C,EAAE,sBAAsB;oBAC7E,MAAM,EAAE,4CAA4C,EAAE,KAAK;oBAC3D,MAAM,EAAE,4CAA4C,EAAE,KAAK;iBAC5D;aACF;SACF;KACF;CACF,CAAC;AAEW,QAAA,QAAQ,GAAoC;IACvD,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;QACjB,2DAA2D;QAC3D,mEAAmE;QACnE,CAAC,oBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAClD,CAAC,oBAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;KACrD;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/oswap/config.ts"],"names":[],"mappings":";;;AAEA,+CAAoD;AAEvC,QAAA,cAAc,GAAG,MAAM,CAAC;AAErC,aAAa;AACb,yCAAyC;AACzC,iDAAiD;AACpC,QAAA,WAAW,GAA4B;IAClD,KAAK,EAAE;QACL,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;YACjB,KAAK,EAAE;gBACL;oBACE,EAAE,EAAE,kDAAkD,EAAE,8CAA8C;oBACtG,OAAO,EAAE,4CAA4C,EAAE,sBAAsB;oBAC7E,MAAM,EAAE,4CAA4C,EAAE,OAAO;oBAC7D,MAAM,EAAE,4CAA4C,EAAE,QAAQ;iBAC/D;gBACD;oBACE,EAAE,EAAE,kDAAkD,EAAE,8CAA8C;oBACtG,OAAO,EAAE,4CAA4C,EAAE,sBAAsB;oBAC7E,MAAM,EAAE,4CAA4C,EAAE,OAAO;oBAC7D,MAAM,EAAE,4CAA4C,EAAE,QAAQ;oBAC9D,OAAO,EAAE;wBACP,UAAU,EAAE,4CAA4C,EAAE,OAAO;wBACjE,UAAU,EAAE,4CAA4C,EAAE,wBAAwB;qBACnF;iBACF;gBACD;oBACE,EAAE,EAAE,kDAAkD,EAAE,8CAA8C;oBACtG,OAAO,EAAE,4CAA4C,EAAE,sBAAsB;oBAC7E,MAAM,EAAE,4CAA4C,EAAE,OAAO;oBAC7D,MAAM,EAAE,4CAA4C,EAAE,OAAO;iBAC9D;aACF;SACF;QACD,CAAC,mBAAO,CAAC,KAAK,CAAC,EAAE;YACf,KAAK,EAAE;gBACL;oBACE,EAAE,EAAE,kDAAkD,EAAE,8CAA8C;oBACtG,OAAO,EAAE,4CAA4C,EAAE,sBAAsB;oBAC7E,MAAM,EAAE,4CAA4C,EAAE,KAAK;oBAC3D,MAAM,EAAE,4CAA4C,EAAE,KAAK;iBAC5D;aACF;SACF;KACF;CACF,CAAC;AAEW,QAAA,QAAQ,GAAoC;IACvD,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;QACjB,2DAA2D;QAC3D,mEAAmE;QACnE,CAAC,oBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAClD,CAAC,oBAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;KACrD;CACF,CAAC"}
|
|
@@ -11,12 +11,13 @@ export declare class OSwapEventPool extends StatefulEventSubscriber<OSwapPoolSta
|
|
|
11
11
|
protected dexHelper: IDexHelper;
|
|
12
12
|
protected iOSwap: Interface;
|
|
13
13
|
protected iERC20: Interface;
|
|
14
|
+
protected iERC4626: Interface;
|
|
14
15
|
handlers: {
|
|
15
16
|
[event: string]: (event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>) => DeepReadonly<OSwapPoolState> | null;
|
|
16
17
|
};
|
|
17
18
|
logDecoder: (log: Log) => any;
|
|
18
19
|
addressesSubscribed: string[];
|
|
19
|
-
constructor(parentName: string, pool: OSwapPool, network: number, dexHelper: IDexHelper, logger: Logger, iOSwap?: Interface, iERC20?: Interface);
|
|
20
|
+
constructor(parentName: string, pool: OSwapPool, network: number, dexHelper: IDexHelper, logger: Logger, iOSwap?: Interface, iERC20?: Interface, iERC4626?: Interface);
|
|
20
21
|
protected parseLog(log: Log): import("@ethersproject/abi").LogDescription;
|
|
21
22
|
/**
|
|
22
23
|
* The function is called every time any of the subscribed
|
|
@@ -46,6 +47,7 @@ export declare class OSwapEventPool extends StatefulEventSubscriber<OSwapPoolSta
|
|
|
46
47
|
/**
|
|
47
48
|
* Process the transfer events for tokens in/out of the pool
|
|
48
49
|
* to keep the state's token balances up to date.
|
|
50
|
+
* Also handles ERC4626 asset transfers to vault for ERC4626 pools.
|
|
49
51
|
*/
|
|
50
52
|
handleTransfer(event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>): DeepReadonly<OSwapPoolState> | null;
|
|
51
53
|
handleRedeemRequested(event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>): {
|
|
@@ -55,6 +57,8 @@ export declare class OSwapEventPool extends StatefulEventSubscriber<OSwapPoolSta
|
|
|
55
57
|
balance0: string;
|
|
56
58
|
balance1: string;
|
|
57
59
|
withdrawsClaimed: string;
|
|
60
|
+
totalAssets?: string;
|
|
61
|
+
totalShares?: string;
|
|
58
62
|
};
|
|
59
63
|
handleRedeemClaimed(event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>): {
|
|
60
64
|
withdrawsClaimed: string;
|
|
@@ -63,5 +67,17 @@ export declare class OSwapEventPool extends StatefulEventSubscriber<OSwapPoolSta
|
|
|
63
67
|
balance0: string;
|
|
64
68
|
balance1: string;
|
|
65
69
|
withdrawsQueued: string;
|
|
70
|
+
totalAssets?: string;
|
|
71
|
+
totalShares?: string;
|
|
66
72
|
};
|
|
73
|
+
/**
|
|
74
|
+
* Handle ERC4626 Deposit event from vault.
|
|
75
|
+
* Updates totalShares when assets are deposited.
|
|
76
|
+
*/
|
|
77
|
+
handleERC4626Deposit(event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>): DeepReadonly<OSwapPoolState> | null;
|
|
78
|
+
/**
|
|
79
|
+
* Handle ERC4626 Withdraw event from vault.
|
|
80
|
+
* Updates both totalAssets and totalShares when assets are withdrawn.
|
|
81
|
+
*/
|
|
82
|
+
handleERC4626Withdraw(event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>): DeepReadonly<OSwapPoolState> | null;
|
|
67
83
|
}
|
|
@@ -10,6 +10,7 @@ const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
|
|
|
10
10
|
const decoders_1 = require("../../lib/decoders");
|
|
11
11
|
const oswap_abi_json_1 = __importDefault(require("../../abi/oswap/oswap.abi.json"));
|
|
12
12
|
const ERC20_abi_json_1 = __importDefault(require("../../abi/ERC20.abi.json"));
|
|
13
|
+
const ERC4626_json_1 = __importDefault(require("../../abi/ERC4626.json"));
|
|
13
14
|
class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
|
|
14
15
|
parentName;
|
|
15
16
|
pool;
|
|
@@ -17,10 +18,11 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
17
18
|
dexHelper;
|
|
18
19
|
iOSwap;
|
|
19
20
|
iERC20;
|
|
21
|
+
iERC4626;
|
|
20
22
|
handlers = {};
|
|
21
23
|
logDecoder;
|
|
22
24
|
addressesSubscribed;
|
|
23
|
-
constructor(parentName, pool, network, dexHelper, logger, iOSwap = new abi_1.Interface(oswap_abi_json_1.default), iERC20 = new abi_1.Interface(ERC20_abi_json_1.default)) {
|
|
25
|
+
constructor(parentName, pool, network, dexHelper, logger, iOSwap = new abi_1.Interface(oswap_abi_json_1.default), iERC20 = new abi_1.Interface(ERC20_abi_json_1.default), iERC4626 = new abi_1.Interface(ERC4626_json_1.default)) {
|
|
24
26
|
super(parentName, pool.id, dexHelper, logger);
|
|
25
27
|
this.parentName = parentName;
|
|
26
28
|
this.pool = pool;
|
|
@@ -28,17 +30,33 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
28
30
|
this.dexHelper = dexHelper;
|
|
29
31
|
this.iOSwap = iOSwap;
|
|
30
32
|
this.iERC20 = iERC20;
|
|
33
|
+
this.iERC4626 = iERC4626;
|
|
31
34
|
this.logDecoder = (log) => this.parseLog(log);
|
|
32
35
|
this.addressesSubscribed = [pool.address, pool.token0, pool.token1];
|
|
33
36
|
this.handlers['TraderateChanged'] = this.handleTraderateChanged.bind(this);
|
|
34
37
|
this.handlers['Transfer'] = this.handleTransfer.bind(this);
|
|
35
38
|
this.handlers['RedeemRequested'] = this.handleRedeemRequested.bind(this);
|
|
36
39
|
this.handlers['RedeemClaimed'] = this.handleRedeemClaimed.bind(this);
|
|
40
|
+
if (pool.erc4626) {
|
|
41
|
+
this.handlers['Deposit'] = this.handleERC4626Deposit.bind(this);
|
|
42
|
+
this.handlers['Withdraw'] = this.handleERC4626Withdraw.bind(this);
|
|
43
|
+
}
|
|
37
44
|
}
|
|
38
45
|
parseLog(log) {
|
|
39
46
|
if (log.address.toLowerCase() === this.pool.address) {
|
|
40
47
|
return this.iOSwap.parseLog(log);
|
|
41
48
|
}
|
|
49
|
+
const erc4626 = this.pool.erc4626;
|
|
50
|
+
// Check if this is an ERC4626 event from the configured vault token.
|
|
51
|
+
if (erc4626 &&
|
|
52
|
+
log.address.toLowerCase() === erc4626.vaultToken.toLowerCase()) {
|
|
53
|
+
try {
|
|
54
|
+
return this.iERC4626.parseLog(log);
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
// If it's not an ERC4626 event, fall through to ERC20
|
|
58
|
+
}
|
|
59
|
+
}
|
|
42
60
|
return this.iERC20.parseLog(log);
|
|
43
61
|
}
|
|
44
62
|
/**
|
|
@@ -108,9 +126,21 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
108
126
|
decodeFunction: decoders_1.uint256ToBigInt,
|
|
109
127
|
},
|
|
110
128
|
];
|
|
129
|
+
// For ERC4626 pools, also fetch vault state
|
|
130
|
+
if (this.pool.erc4626) {
|
|
131
|
+
callData.push({
|
|
132
|
+
target: this.pool.erc4626.vaultToken,
|
|
133
|
+
callData: this.iERC4626.encodeFunctionData('totalAssets', []),
|
|
134
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
135
|
+
}, {
|
|
136
|
+
target: this.pool.erc4626.vaultToken,
|
|
137
|
+
callData: this.iERC4626.encodeFunctionData('totalSupply', []),
|
|
138
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
139
|
+
});
|
|
140
|
+
}
|
|
111
141
|
const results = await this.dexHelper.multiWrapper.aggregate(callData, blockNumber, this.dexHelper.multiWrapper.defaultBatchSize);
|
|
112
142
|
const [balance0, balance1, traderate0, traderate1, withdrawsQueued, withdrawsClaimed,] = results;
|
|
113
|
-
|
|
143
|
+
const baseState = {
|
|
114
144
|
balance0: balance0.toString(),
|
|
115
145
|
balance1: balance1.toString(),
|
|
116
146
|
traderate0: traderate0.toString(),
|
|
@@ -118,6 +148,12 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
118
148
|
withdrawsQueued: withdrawsQueued.toString(),
|
|
119
149
|
withdrawsClaimed: withdrawsClaimed.toString(),
|
|
120
150
|
};
|
|
151
|
+
// Add ERC4626 state if configured
|
|
152
|
+
if (this.pool.erc4626 && results.length >= 8) {
|
|
153
|
+
baseState.totalAssets = results[6].toString();
|
|
154
|
+
baseState.totalShares = results[7].toString();
|
|
155
|
+
}
|
|
156
|
+
return baseState;
|
|
121
157
|
}
|
|
122
158
|
async getStateOrGenerate(blockNumber, readonly = true) {
|
|
123
159
|
let state = this.getState(blockNumber);
|
|
@@ -141,6 +177,7 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
141
177
|
/**
|
|
142
178
|
* Process the transfer events for tokens in/out of the pool
|
|
143
179
|
* to keep the state's token balances up to date.
|
|
180
|
+
* Also handles ERC4626 asset transfers to vault for ERC4626 pools.
|
|
144
181
|
*/
|
|
145
182
|
handleTransfer(event, state, log) {
|
|
146
183
|
let balance0 = BigInt(state.balance0);
|
|
@@ -149,6 +186,20 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
149
186
|
const fromAddress = event.args.from.toLowerCase();
|
|
150
187
|
const toAddress = event.args.to.toLowerCase();
|
|
151
188
|
const amount = event.args.value.toBigInt();
|
|
189
|
+
const erc4626 = this.pool.erc4626;
|
|
190
|
+
const assetToken = erc4626?.assetToken.toLowerCase();
|
|
191
|
+
const vaultToken = erc4626?.vaultToken.toLowerCase();
|
|
192
|
+
// Check if this is an ERC4626 asset transfer to vault
|
|
193
|
+
// Note: We need to update totalAssets AND balance if the transfer is from/to the pool
|
|
194
|
+
let updatedTotalAssets = undefined;
|
|
195
|
+
if (erc4626 &&
|
|
196
|
+
tokenAddress === assetToken &&
|
|
197
|
+
toAddress === vaultToken &&
|
|
198
|
+
state.totalAssets) {
|
|
199
|
+
// Asset transfer to vault increases totalAssets
|
|
200
|
+
updatedTotalAssets = (BigInt(state.totalAssets) + amount).toString();
|
|
201
|
+
}
|
|
202
|
+
// Update pool balances for transfers from/to the pool
|
|
152
203
|
if (fromAddress == this.pool.address) {
|
|
153
204
|
if (tokenAddress === this.pool.token0) {
|
|
154
205
|
balance0 -= amount;
|
|
@@ -165,10 +216,14 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
165
216
|
balance1 += amount;
|
|
166
217
|
}
|
|
167
218
|
}
|
|
219
|
+
// Return updated state with both balance and totalAssets updates
|
|
168
220
|
return {
|
|
169
221
|
...state,
|
|
170
222
|
balance0: balance0.toString(),
|
|
171
223
|
balance1: balance1.toString(),
|
|
224
|
+
...(updatedTotalAssets !== undefined && {
|
|
225
|
+
totalAssets: updatedTotalAssets,
|
|
226
|
+
}),
|
|
172
227
|
};
|
|
173
228
|
}
|
|
174
229
|
handleRedeemRequested(event, state, log) {
|
|
@@ -185,6 +240,44 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
185
240
|
withdrawsClaimed: (withdrawsClaimed + assets).toString(),
|
|
186
241
|
};
|
|
187
242
|
}
|
|
243
|
+
/**
|
|
244
|
+
* Handle ERC4626 Deposit event from vault.
|
|
245
|
+
* Updates totalShares when assets are deposited.
|
|
246
|
+
*/
|
|
247
|
+
handleERC4626Deposit(event, state, log) {
|
|
248
|
+
if (!state.totalShares) {
|
|
249
|
+
// If state doesn't have ERC4626 fields initialized, don't update
|
|
250
|
+
return null;
|
|
251
|
+
}
|
|
252
|
+
const shares = event.args.shares
|
|
253
|
+
? BigInt(event.args.shares.toString())
|
|
254
|
+
: 0n;
|
|
255
|
+
return {
|
|
256
|
+
...state,
|
|
257
|
+
totalShares: (BigInt(state.totalShares) + shares).toString(),
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
/**
|
|
261
|
+
* Handle ERC4626 Withdraw event from vault.
|
|
262
|
+
* Updates both totalAssets and totalShares when assets are withdrawn.
|
|
263
|
+
*/
|
|
264
|
+
handleERC4626Withdraw(event, state, log) {
|
|
265
|
+
if (!state.totalAssets || !state.totalShares) {
|
|
266
|
+
// If state doesn't have ERC4626 fields initialized, don't update
|
|
267
|
+
return null;
|
|
268
|
+
}
|
|
269
|
+
const assets = event.args.assets
|
|
270
|
+
? BigInt(event.args.assets.toString())
|
|
271
|
+
: 0n;
|
|
272
|
+
const shares = event.args.shares
|
|
273
|
+
? BigInt(event.args.shares.toString())
|
|
274
|
+
: 0n;
|
|
275
|
+
return {
|
|
276
|
+
...state,
|
|
277
|
+
totalAssets: (BigInt(state.totalAssets) - assets).toString(),
|
|
278
|
+
totalShares: (BigInt(state.totalShares) - shares).toString(),
|
|
279
|
+
};
|
|
280
|
+
}
|
|
188
281
|
}
|
|
189
282
|
exports.OSwapEventPool = OSwapEventPool;
|
|
190
283
|
//# sourceMappingURL=oswap-pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oswap-pool.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap-pool.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAG/C,uCAAiD;AACjD,+EAA0E;AAG1E,iDAAqD;AAErD,oFAAsD;AACtD,8EAAgD;AAEhD,MAAa,cAAe,SAAQ,mDAAuC;IAc9D;IACA;IACC;IACA;IAEA;IACA;
|
|
1
|
+
{"version":3,"file":"oswap-pool.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap-pool.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAG/C,uCAAiD;AACjD,+EAA0E;AAG1E,iDAAqD;AAErD,oFAAsD;AACtD,8EAAgD;AAChD,0EAAgD;AAEhD,MAAa,cAAe,SAAQ,mDAAuC;IAc9D;IACA;IACC;IACA;IAEA;IACA;IACA;IApBZ,QAAQ,GAMJ,EAAE,CAAC;IAEP,UAAU,CAAoB;IAE9B,mBAAmB,CAAW;IAE9B,YACW,UAAkB,EAClB,IAAe,EACd,OAAe,EACf,SAAqB,EAC/B,MAAc,EACJ,SAAS,IAAI,eAAS,CAAC,wBAAQ,CAAC,EAChC,SAAS,IAAI,eAAS,CAAC,wBAAQ,CAAC,EAChC,WAAW,IAAI,eAAS,CAAC,sBAAU,CAAC;QAE9C,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QATrC,eAAU,GAAV,UAAU,CAAQ;QAClB,SAAI,GAAJ,IAAI,CAAW;QACd,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAErB,WAAM,GAAN,MAAM,CAA0B;QAChC,WAAM,GAAN,MAAM,CAA0B;QAChC,aAAQ,GAAR,QAAQ,CAA4B;QAI9C,IAAI,CAAC,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,CAAC,mBAAmB,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAErE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAES,QAAQ,CAAC,GAAQ;QACzB,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAClC,qEAAqE;QACrE,IACE,OAAO;YACP,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,EAC9D,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACrC,CAAC;YAAC,MAAM,CAAC;gBACP,sDAAsD;YACxD,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED;;;;;;;;OAQG;IACO,UAAU,CAClB,KAAmC,EACnC,GAAkB;QAElB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAA,0BAAkB,EAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,aAAa,CACjB,WAAmB;QAEnB,MAAM,QAAQ,GAA8B;YAC1C;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;gBACxB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE;oBACpD,IAAI,CAAC,IAAI,CAAC,OAAO;iBAClB,CAAC;gBACF,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;gBACxB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE;oBACpD,IAAI,CAAC,IAAI,CAAC,OAAO;iBAClB,CAAC;gBACF,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBACzB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC1D,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBACzB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC1D,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBACzB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBAC/D,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBACzB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAChE,cAAc,EAAE,0BAAe;aAChC;SACF,CAAC;QAEF,4CAA4C;QAC5C,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CACX;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU;gBACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,aAAa,EAAE,EAAE,CAAC;gBAC7D,cAAc,EAAE,0BAAe;aAChC,EACD;gBACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU;gBACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,aAAa,EAAE,EAAE,CAAC;gBAC7D,cAAc,EAAE,0BAAe;aAChC,CACF,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,CACzD,QAAQ,EACR,WAAW,EACX,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,gBAAgB,CAC7C,CAAC;QAEF,MAAM,CACJ,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EACjB,GAAG,OAAO,CAAC;QAEZ,MAAM,SAAS,GAAmB;YAChC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;YAC7B,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;YACjC,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;YACjC,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;YAC3C,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ,EAAE;SAC9C,CAAC;QAEF,kCAAkC;QAClC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC7C,SAAS,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC9C,SAAS,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAChD,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,WAAmB,EACnB,WAAoB,IAAI;QAExB,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAI,CAAC,QAAQ;gBAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,sBAAsB,CACpB,KAAU,EACV,KAAmC,EACnC,GAAkB;QAElB,OAAO;YACL,GAAG,KAAK;YACR,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;YAC5C,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;SAC7C,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,cAAc,CACZ,KAAU,EACV,KAAmC,EACnC,GAAkB;QAElB,IAAI,QAAQ,GAAW,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,QAAQ,GAAW,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE9C,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAE3C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAClC,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;QAErD,sDAAsD;QACtD,sFAAsF;QACtF,IAAI,kBAAkB,GAAuB,SAAS,CAAC;QACvD,IACE,OAAO;YACP,YAAY,KAAK,UAAU;YAC3B,SAAS,KAAK,UAAU;YACxB,KAAK,CAAC,WAAW,EACjB,CAAC;YACD,gDAAgD;YAChD,kBAAkB,GAAG,CACnB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,MAAM,CACnC,CAAC,QAAQ,EAAE,CAAC;QACf,CAAC;QAED,sDAAsD;QACtD,IAAI,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,YAAY,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACtC,QAAQ,IAAI,MAAM,CAAC;YACrB,CAAC;iBAAM,IAAI,YAAY,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC7C,QAAQ,IAAI,MAAM,CAAC;YACrB,CAAC;QACH,CAAC;QAED,IAAI,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI,YAAY,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACtC,QAAQ,IAAI,MAAM,CAAC;YACrB,CAAC;iBAAM,IAAI,YAAY,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC7C,QAAQ,IAAI,MAAM,CAAC;YACrB,CAAC;QACH,CAAC;QAED,iEAAiE;QACjE,OAAO;YACL,GAAG,KAAK;YACR,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;YAC7B,GAAG,CAAC,kBAAkB,KAAK,SAAS,IAAI;gBACtC,WAAW,EAAE,kBAAkB;aAChC,CAAC;SACH,CAAC;IACJ,CAAC;IAED,qBAAqB,CACnB,KAAU,EACV,KAAmC,EACnC,GAAkB;QAElB,OAAO;YACL,GAAG,KAAK;YACR,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;SAC9C,CAAC;IACJ,CAAC;IAED,mBAAmB,CACjB,KAAU,EACV,KAAmC,EACnC,GAAkB;QAElB,MAAM,gBAAgB,GAAW,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAChE,MAAM,MAAM,GAAW,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEpD,OAAO;YACL,GAAG,KAAK;YACR,gBAAgB,EAAE,CAAC,gBAAgB,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE;SACzD,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,oBAAoB,CAClB,KAAU,EACV,KAAmC,EACnC,GAAkB;QAElB,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACvB,iEAAiE;YACjE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM;YAC9B,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO;YACL,GAAG,KAAK;YACR,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE;SAC7D,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,qBAAqB,CACnB,KAAU,EACV,KAAmC,EACnC,GAAkB;QAElB,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YAC7C,iEAAiE;YACjE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM;YAC9B,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM;YAC9B,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO;YACL,GAAG,KAAK;YACR,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE;YAC5D,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE;SAC7D,CAAC;IACJ,CAAC;CACF;AA9VD,wCA8VC"}
|
|
@@ -24,7 +24,7 @@ export declare class OSwap extends SimpleExchange implements IDex<OSwapData> {
|
|
|
24
24
|
}[];
|
|
25
25
|
logger: Logger;
|
|
26
26
|
readonly iOSwap: Interface;
|
|
27
|
-
readonly pools: [
|
|
27
|
+
readonly pools: OSwapPool[];
|
|
28
28
|
constructor(network: Network, dexKey: string, dexHelper: IDexHelper, adapters?: import("../../types").AdapterMappings);
|
|
29
29
|
getAdapters(side: SwapSide): {
|
|
30
30
|
name: string;
|
|
@@ -34,7 +34,8 @@ export declare class OSwap extends SimpleExchange implements IDex<OSwapData> {
|
|
|
34
34
|
getPoolById(id: string): OSwapPool | null;
|
|
35
35
|
getPoolsByTokenAddress(tokenAddress: Address): OSwapPool[];
|
|
36
36
|
getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
|
|
37
|
-
|
|
37
|
+
convertAmount(pool: OSwapPool, from: Address, amount: bigint, state: OSwapPoolState): bigint;
|
|
38
|
+
private calcPrice;
|
|
38
39
|
hasEnoughLiquidity(pool: OSwapPool, state: OSwapPoolState, from: Token, amount: bigint, needed: bigint, side: SwapSide): boolean;
|
|
39
40
|
getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[], transferFees?: TransferFeeParams): Promise<null | ExchangePrices<OSwapData>>;
|
|
40
41
|
getCalldataGasCost(poolPrices: PoolPrices<OSwapData>): number | number[];
|
package/build/dex/oswap/oswap.js
CHANGED
|
@@ -122,16 +122,72 @@ class OSwap extends simple_exchange_1.SimpleExchange {
|
|
|
122
122
|
const pool = this.getPoolByTokenPair(srcToken, destToken);
|
|
123
123
|
return pool ? [pool.id] : [];
|
|
124
124
|
}
|
|
125
|
+
// Convert amount using pool-specific logic.
|
|
126
|
+
// For ERC4626 pools, uses convertToAssets/convertToShares calculated locally.
|
|
127
|
+
// For other pools, returns the amount as-is.
|
|
128
|
+
convertAmount(pool, from, amount, state) {
|
|
129
|
+
const erc4626 = pool.erc4626;
|
|
130
|
+
if (erc4626) {
|
|
131
|
+
// Use ERC4626 conversion formula matching Solidity _convert function.
|
|
132
|
+
if (!state.totalAssets || !state.totalShares) {
|
|
133
|
+
this.logger.error(`convertAmount: Missing ERC4626 state for pool ${pool.id}`);
|
|
134
|
+
return 0n;
|
|
135
|
+
}
|
|
136
|
+
const totalAssets = BigInt(state.totalAssets);
|
|
137
|
+
const totalShares = BigInt(state.totalShares);
|
|
138
|
+
if (totalAssets === 0n || totalShares === 0n) {
|
|
139
|
+
return 0n;
|
|
140
|
+
}
|
|
141
|
+
const fromAddress = from.toLowerCase();
|
|
142
|
+
const isFromAsset = fromAddress === erc4626.assetToken.toLowerCase();
|
|
143
|
+
const isFromVault = fromAddress === erc4626.vaultToken.toLowerCase();
|
|
144
|
+
if (!isFromAsset && !isFromVault) {
|
|
145
|
+
this.logger.error(`convertAmount: Token ${from} not in ERC4626 pool ${pool.id}`);
|
|
146
|
+
return 0n;
|
|
147
|
+
}
|
|
148
|
+
if (isFromAsset) {
|
|
149
|
+
return (amount * totalShares) / totalAssets;
|
|
150
|
+
}
|
|
151
|
+
return (amount * totalAssets) / totalShares;
|
|
152
|
+
}
|
|
153
|
+
return amount;
|
|
154
|
+
}
|
|
125
155
|
// Sell: Given "amount" of "from" token, how much of "to" token will be received by the trader.
|
|
126
156
|
// Buy: Given "amount" of "dest" token, how much of "to" token is required from the trader.
|
|
127
157
|
// Note: OSwap traderate is at precision 36.
|
|
128
158
|
calcPrice(pool, state, from, amount, side, checkLiquidity = true) {
|
|
159
|
+
// For BUY side, amount represents the destination token amount, so we need to convert
|
|
160
|
+
// based on the destination token direction, not the source token.
|
|
161
|
+
// For SELL side, amount represents the source token amount, so we convert based on from.
|
|
162
|
+
let convertedAmount;
|
|
163
|
+
if (side === constants_1.SwapSide.BUY && pool.erc4626) {
|
|
164
|
+
// For BUY side on ERC4626 pools, amount is destToken amount.
|
|
165
|
+
// Convert the opposite direction to keep pricing in the source units.
|
|
166
|
+
const fromAddress = from.address.toLowerCase();
|
|
167
|
+
const assetToken = pool.erc4626.assetToken.toLowerCase();
|
|
168
|
+
const vaultToken = pool.erc4626.vaultToken.toLowerCase();
|
|
169
|
+
const tokenToConvert = fromAddress === assetToken ? vaultToken : assetToken;
|
|
170
|
+
convertedAmount = this.convertAmount(pool, tokenToConvert, amount, state);
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
// For SELL side, amount is from token, convert normally
|
|
174
|
+
convertedAmount = this.convertAmount(pool, from.address, amount, state);
|
|
175
|
+
}
|
|
129
176
|
const rate = from.address.toLowerCase() === pool.token0
|
|
130
177
|
? BigInt(state.traderate0)
|
|
131
178
|
: BigInt(state.traderate1);
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
179
|
+
let price;
|
|
180
|
+
if (side === constants_1.SwapSide.SELL) {
|
|
181
|
+
price = (convertedAmount * rate) / (0, utils_1.getBigIntPow)(36);
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
if (convertedAmount === 0n) {
|
|
185
|
+
price = 0n;
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
price = (convertedAmount * (0, utils_1.getBigIntPow)(36)) / rate + 3n;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
135
191
|
if (checkLiquidity &&
|
|
136
192
|
!this.hasEnoughLiquidity(pool, state, from, amount, price, side)) {
|
|
137
193
|
return 0n;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oswap.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oswap.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,12 @@ export type OSwapPoolState = {
|
|
|
6
6
|
balance1: string;
|
|
7
7
|
withdrawsQueued: string;
|
|
8
8
|
withdrawsClaimed: string;
|
|
9
|
+
totalAssets?: string;
|
|
10
|
+
totalShares?: string;
|
|
11
|
+
};
|
|
12
|
+
export type OSwapERC4626Config = {
|
|
13
|
+
assetToken: Address;
|
|
14
|
+
vaultToken: Address;
|
|
9
15
|
};
|
|
10
16
|
export type OSwapData = {
|
|
11
17
|
pool: Address;
|
|
@@ -16,7 +22,8 @@ export type OSwapPool = {
|
|
|
16
22
|
address: Address;
|
|
17
23
|
token0: Address;
|
|
18
24
|
token1: Address;
|
|
25
|
+
erc4626?: OSwapERC4626Config;
|
|
19
26
|
};
|
|
20
27
|
export type DexParams = {
|
|
21
|
-
pools: [
|
|
28
|
+
pools: OSwapPool[];
|
|
22
29
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paraswap/dex-lib",
|
|
3
|
-
"version": "4.7.
|
|
3
|
+
"version": "4.7.28",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"repository": "https://github.com/paraswap/paraswap-dex-lib",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"@types/async": "^3.2.15",
|
|
16
16
|
"@types/axios": "0.14.0",
|
|
17
17
|
"@types/express": "^4.17.14",
|
|
18
|
-
"@types/jest": "
|
|
18
|
+
"@types/jest": "26.0.24",
|
|
19
19
|
"@types/lodash": "4.14.178",
|
|
20
20
|
"@types/node": "^20",
|
|
21
21
|
"@types/uuid": "^9.0.1",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"eslint-plugin-import": "^2.26.0",
|
|
31
31
|
"express": "^4.18.2",
|
|
32
32
|
"husky": "^8.0.2",
|
|
33
|
-
"jest": "^
|
|
33
|
+
"jest": "^29.0.3",
|
|
34
34
|
"prettier": "^2.8.1",
|
|
35
35
|
"pretty-quick": "^3.1.3",
|
|
36
36
|
"ts-jest": "^29.2.5",
|