@paraswap/dex-lib 4.7.27-1 → 4.7.27
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.js +3 -3
- package/build/dex/algebra-integral/algebra-integral-factory.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 +1 -1
|
@@ -10,6 +10,7 @@ const erc20_json_1 = __importDefault(require("../../abi/erc20.json"));
|
|
|
10
10
|
const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
|
|
11
11
|
const constants_1 = require("../../constants");
|
|
12
12
|
const constants_2 = require("./constants");
|
|
13
|
+
const decoders_1 = require("../../lib/decoders");
|
|
13
14
|
/*
|
|
14
15
|
* "Stateless" event subscriber in order to capture "PoolCreated" event on new pools created.
|
|
15
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)
|
|
@@ -162,7 +163,6 @@ class AlgebraIntegralFactory extends stateful_event_subscriber_1.StatefulEventSu
|
|
|
162
163
|
async updatePoolsTvl() {
|
|
163
164
|
if (this.pools.length === 0)
|
|
164
165
|
return;
|
|
165
|
-
const decodeBalance = (data) => BigInt(data || 0);
|
|
166
166
|
// Build multicall to fetch token balances for all pools
|
|
167
167
|
const balanceCalls = this.pools.flatMap(pool => [
|
|
168
168
|
{
|
|
@@ -170,14 +170,14 @@ class AlgebraIntegralFactory extends stateful_event_subscriber_1.StatefulEventSu
|
|
|
170
170
|
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
171
171
|
pool.poolAddress,
|
|
172
172
|
]),
|
|
173
|
-
decodeFunction:
|
|
173
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
174
174
|
},
|
|
175
175
|
{
|
|
176
176
|
target: pool.token1,
|
|
177
177
|
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
178
178
|
pool.poolAddress,
|
|
179
179
|
]),
|
|
180
|
-
decodeFunction:
|
|
180
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
181
181
|
},
|
|
182
182
|
]);
|
|
183
183
|
const balanceResults = await this.dexHelper.multiWrapper.tryAggregate(false, balanceCalls);
|
|
@@ -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;AAC5E,sEAA4C;AAE5C,+EAA0E;AAI1E,+CAAgF;AAChF,2CAAsD;
|
|
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;AAC5E,sEAA4C;AAE5C,+EAA0E;AAI1E,+CAAgF;AAChF,2CAAsD;AACtD,iDAAqD;AAErD;;;GAGG;AACH,MAAa,sBAAuB,SAAQ,mDAAqC;IAWpE;IACC;IACA;IAEA;IACA;IACA;IAhBZ,QAAQ,GAEJ,EAAE,CAAC;IAEP,UAAU,CAAoB;IAEtB,KAAK,GAAW,EAAE,CAAC;IACnB,cAAc,GAAG,IAAI,eAAS,CAAC,oBAAQ,CAAC,CAAC;IAEjD,YACW,UAAkB,EACjB,OAAe,EACf,SAAqB,EAC/B,MAAc,EACJ,cAAuB,EACvB,WAAmB,EACnB,eAAe,IAAI,eAAS,CAAC,iCAAU,CAAC;QAElD,KAAK,CAAC,UAAU,EAAE,GAAG,UAAU,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAR5D,eAAU,GAAV,UAAU,CAAQ;QACjB,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAErB,mBAAc,GAAd,cAAc,CAAS;QACvB,gBAAW,GAAX,WAAW,CAAQ;QACnB,iBAAY,GAAZ,YAAY,CAA4B;QAIlD,IAAI,CAAC,mBAAmB,GAAG,CAAC,cAAc,CAAC,CAAC;QAE5C,IAAI,CAAC,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEhE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,WAAmB;QAClC,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,CAA6B,EAC7B,GAAkB;QAElB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,wBAAwB,CAC7B,QAAiB,EACjB,SAAkB;QAElB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE5D,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG;YAClC,SAAS,CAAC,WAAW,EAAE;YACvB,UAAU,CAAC,WAAW,EAAE;SACzB,CAAC;QAEF,OAAO,IAAI,CAAC,KAAK;aACd,MAAM,CACL,IAAI,CAAC,EAAE,CACL,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,CAAC;YAC7D,CAAC,IAAI,CAAC,MAAM,KAAK,YAAY,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,CAChE;aACA,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,mCAAuB,CAAC;aACtD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,cAAc;YACd,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;YACpC,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;gBAClB,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,WAAmB;QACrD,MAAM,mBAAmB,GAAG,IAAI,CAAC;QACjC,IAAI,KAAK,GAAW,EAAE,CAAC;QACvB,IAAI,IAAI,GAAG,CAAC,CAAC;QAEb,IAAI,YAAY,GACd,MAAM,IAAI,CAAC,4CAA4C,CACrD,WAAW,EACX,IAAI,EACJ,mBAAmB,CACpB,CAAC;QACJ,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAEnC,OAAO,YAAY,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;YACnD,IAAI,IAAI,mBAAmB,CAAC;YAC5B,YAAY,GAAG,MAAM,IAAI,CAAC,4CAA4C,CACpE,WAAW,EACX,IAAI,EACJ,mBAAmB,CACpB,CAAC;YAEF,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,4CAA4C,CACxD,WAAmB,EACnB,IAAY,EACZ,KAAa,EACb,WAAW,GAAG,KAAK;QAEnB,MAAM,UAAU,GAAG;;UAEb,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,WAAW,IAAI;;;;;;;;;;;;;;;;MAgB1D,CAAC;QAEH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,aAAa,CAYxD,IAAI,CAAC,WAAW,EAChB;YACE,KAAK,EAAE,UAAU;YACjB,SAAS,EAAE;gBACT,IAAI;gBACJ,KAAK,EAAE,KAAK;aACb;SACF,EACD,EAAE,OAAO,EAAE,4BAAgB,EAAE,CAC9B,CAAC;QAEF,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACpC,IACE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;gBAC/C,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EACnD,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,IAAI,CAAC,UAAU,4CAA4C,CAC/D,CAAC;gBACF,OAAO,IAAI,CAAC,4CAA4C,CACtD,WAAW,EACX,IAAI,EACJ,KAAK,EACL,IAAI,CACL,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE;YAClC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE;YACpC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE;YACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;YACrC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;SAClD,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAqB;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAG,wBAAY,CAAC,CAAC,8CAA8C;QAE7E,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACzD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACd,WAAW;gBACX,MAAM;gBACN,MAAM;gBACN,QAAQ;gBACR,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,KAAqB;QAC7C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAEnD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACzD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACd,WAAW;gBACX,MAAM;gBACN,MAAM;gBACN,QAAQ;gBACR,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEpC,wDAAwD;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9C;gBACE,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,WAAW,EAAE;oBAC5D,IAAI,CAAC,WAAW;iBACjB,CAAC;gBACF,cAAc,EAAE,0BAAe;aAChC;YACD;gBACE,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,WAAW,EAAE;oBAC5D,IAAI,CAAC,WAAW;iBACjB,CAAC;gBACF,cAAc,EAAE,0BAAe;aAChC;SACF,CAAC,CAAC;QAEH,MAAM,cAAc,GAClB,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,CAC5C,KAAK,EACL,YAAY,CACb,CAAC;QAEJ,yCAAyC;QACzC,MAAM,YAAY,GAAuB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACtE,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO;gBAC5C,CAAC,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU;gBAClC,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO;gBAChD,CAAC,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU;gBACtC,CAAC,CAAC,EAAE,CAAC;YAEP,OAAO;gBACL;oBACE,IAAI,CAAC,MAAM,KAAK,wBAAY,CAAC,WAAW,EAAE;wBACxC,CAAC,CAAC,yBAAa;wBACf,CAAC,CAAC,IAAI,CAAC,MAAM;oBACf,QAAQ;iBACT;gBACD;oBACE,IAAI,CAAC,MAAM,KAAK,wBAAY,CAAC,WAAW,EAAE;wBACxC,CAAC,CAAC,yBAAa;wBACf,CAAC,CAAC,IAAI,CAAC,MAAM;oBACf,QAAQ;iBACT;aACoB,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,iBAAiB;QACjB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAExE,kBAAkB;QAClB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAvRD,wDAuRC"}
|
|
@@ -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":"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"}
|
|
@@ -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
|
};
|