@paraswap/dex-lib 4.6.3-bunniv2-pricing.0 → 4.6.4
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/abi/BProtocol.json +1155 -0
- package/build/abi/Jarvis.json +1172 -0
- package/build/abi/MStableAsset.json +1545 -0
- package/build/abi/OneInchLp.json +1304 -0
- package/build/abi/Onebit.json +736 -0
- package/build/abi/Shell.json +1294 -0
- package/build/abi/TraderJoeV2Router.json +50 -0
- package/build/abi/miro-migrator/MiroMigrator.abi.json +36 -19
- package/build/abi/wUSDM.json +757 -0
- package/build/abi/zrx.v2.json +1967 -0
- package/build/abi/zrx.v3.json +3454 -0
- package/build/abi/zrx.v4.json +2193 -0
- package/build/dex/OneInchLp.d.ts +24 -0
- package/build/dex/OneInchLp.js +43 -0
- package/build/dex/OneInchLp.js.map +1 -0
- package/build/dex/algebra/lib/AlgebraMath.js +3 -13
- package/build/dex/algebra/lib/AlgebraMath.js.map +1 -1
- package/build/dex/algebra/lib/TickManager.js +0 -5
- package/build/dex/algebra/lib/TickManager.js.map +1 -1
- package/build/dex/bProtocol/bProtocol.d.ts +15 -0
- package/build/dex/bProtocol/bProtocol.js +56 -0
- package/build/dex/bProtocol/bProtocol.js.map +1 -0
- package/build/dex/bProtocol/types.d.ts +11 -0
- package/build/dex/bProtocol/types.js +8 -0
- package/build/dex/bProtocol/types.js.map +1 -0
- package/build/dex/balancer-v3/getPoolsApi.js +6 -3
- package/build/dex/balancer-v3/getPoolsApi.js.map +1 -1
- package/build/dex/bunni-v2/bunni-v2-pool.d.ts +1 -2
- package/build/dex/bunni-v2/bunni-v2-pool.js +4 -14
- package/build/dex/bunni-v2/bunni-v2-pool.js.map +1 -1
- package/build/dex/bunni-v2/bunni-v2.d.ts +2 -4
- package/build/dex/bunni-v2/bunni-v2.js +22 -54
- package/build/dex/bunni-v2/bunni-v2.js.map +1 -1
- package/build/dex/bunni-v2/getOnChainState.d.ts +2 -3
- package/build/dex/bunni-v2/getOnChainState.js +2 -39
- package/build/dex/bunni-v2/getOnChainState.js.map +1 -1
- package/build/dex/bunni-v2/lib/Constants.d.ts +0 -1
- package/build/dex/bunni-v2/lib/Constants.js +1 -2
- package/build/dex/bunni-v2/lib/Constants.js.map +1 -1
- package/build/dex/bunni-v2/types.d.ts +0 -1
- package/build/dex/bunni-v2/utils.js +0 -1
- package/build/dex/bunni-v2/utils.js.map +1 -1
- package/build/dex/jarvis.d.ts +56 -0
- package/build/dex/jarvis.js +163 -0
- package/build/dex/jarvis.js.map +1 -0
- package/build/dex/mStable.d.ts +44 -0
- package/build/dex/mStable.js +75 -0
- package/build/dex/mStable.js.map +1 -0
- package/build/dex/miro-migrator/config.js +3 -10
- package/build/dex/miro-migrator/config.js.map +1 -1
- package/build/dex/miro-migrator/constants.d.ts +1 -0
- package/build/dex/miro-migrator/constants.js +2 -1
- package/build/dex/miro-migrator/constants.js.map +1 -1
- package/build/dex/miro-migrator/miro-migrator-pool.d.ts +8 -5
- package/build/dex/miro-migrator/miro-migrator-pool.js +48 -30
- package/build/dex/miro-migrator/miro-migrator-pool.js.map +1 -1
- package/build/dex/miro-migrator/miro-migrator.d.ts +5 -4
- package/build/dex/miro-migrator/miro-migrator.js +40 -83
- package/build/dex/miro-migrator/miro-migrator.js.map +1 -1
- package/build/dex/miro-migrator/types.d.ts +2 -4
- package/build/dex/miro-migrator/types.js +1 -2
- package/build/dex/miro-migrator/types.js.map +1 -1
- package/build/dex/onebit/onebit.d.ts +16 -0
- package/build/dex/onebit/onebit.js +61 -0
- package/build/dex/onebit/onebit.js.map +1 -0
- package/build/dex/onebit/types.d.ts +14 -0
- package/build/dex/onebit/types.js +8 -0
- package/build/dex/onebit/types.js.map +1 -0
- package/build/dex/pancakeswap-v3/contract-math/Tick.d.ts +1 -1
- package/build/dex/pancakeswap-v3/contract-math/Tick.js +1 -10
- package/build/dex/pancakeswap-v3/contract-math/Tick.js.map +1 -1
- package/build/dex/pancakeswap-v3/contract-math/pancakeswap-v3-math.js +3 -11
- package/build/dex/pancakeswap-v3/contract-math/pancakeswap-v3-math.js.map +1 -1
- package/build/dex/shell.d.ts +25 -0
- package/build/dex/shell.js +41 -0
- package/build/dex/shell.js.map +1 -0
- package/build/dex/trader-joe-v2.d.ts +40 -0
- package/build/dex/trader-joe-v2.js +74 -0
- package/build/dex/trader-joe-v2.js.map +1 -0
- package/build/dex/uniswap-v3/contract-math/Tick.d.ts +1 -1
- package/build/dex/uniswap-v3/contract-math/Tick.js +1 -10
- package/build/dex/uniswap-v3/contract-math/Tick.js.map +1 -1
- package/build/dex/uniswap-v3/contract-math/uniswap-v3-math.js +3 -11
- package/build/dex/uniswap-v3/contract-math/uniswap-v3-math.js.map +1 -1
- package/build/dex/uniswap-v3/contract-math/utils.js +0 -3
- package/build/dex/uniswap-v3/contract-math/utils.js.map +1 -1
- package/build/dex/uniswap-v3/types.d.ts +0 -3
- package/build/dex/uniswap-v3/types.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3-new.d.ts +94 -0
- package/build/dex/uniswap-v3/uniswap-v3-new.js +923 -0
- package/build/dex/uniswap-v3/uniswap-v3-new.js.map +1 -0
- package/build/dex/uniswap-v4/contract-math/Position.d.ts +0 -6
- package/build/dex/uniswap-v4/contract-math/Position.js +0 -29
- package/build/dex/uniswap-v4/contract-math/Position.js.map +1 -1
- package/build/dex/uniswap-v4/contract-math/Tick.d.ts +1 -1
- package/build/dex/uniswap-v4/contract-math/Tick.js +2 -17
- package/build/dex/uniswap-v4/contract-math/Tick.js.map +1 -1
- package/build/dex/uniswap-v4/contract-math/uniswap-v4-pool-math.d.ts +3 -8
- package/build/dex/uniswap-v4/contract-math/uniswap-v4-pool-math.js +8 -57
- package/build/dex/uniswap-v4/contract-math/uniswap-v4-pool-math.js.map +1 -1
- package/build/dex/uniswap-v4/types.d.ts +0 -10
- package/build/dex/uniswap-v4/uniswap-v4-pool.d.ts +4 -5
- package/build/dex/uniswap-v4/uniswap-v4-pool.js +4 -42
- package/build/dex/uniswap-v4/uniswap-v4-pool.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4.d.ts +2 -2
- package/build/dex/uniswap-v4/uniswap-v4.js +4 -17
- package/build/dex/uniswap-v4/uniswap-v4.js.map +1 -1
- package/build/dex/usual-bond/config.d.ts +3 -0
- package/build/dex/usual-bond/config.js +13 -0
- package/build/dex/usual-bond/config.js.map +1 -0
- package/build/dex/usual-bond/types.d.ts +7 -0
- package/build/dex/usual-bond/types.js +3 -0
- package/build/dex/usual-bond/types.js.map +1 -0
- package/build/dex/usual-bond/usual-bond.d.ts +35 -0
- package/build/dex/usual-bond/usual-bond.js +176 -0
- package/build/dex/usual-bond/usual-bond.js.map +1 -0
- package/build/dex/wusdm/config.d.ts +3 -0
- package/build/dex/wusdm/config.js +43 -0
- package/build/dex/wusdm/config.js.map +1 -0
- package/build/dex/wusdm/constants.d.ts +2 -0
- package/build/dex/wusdm/constants.js +6 -0
- package/build/dex/wusdm/constants.js.map +1 -0
- package/build/dex/wusdm/types.d.ts +18 -0
- package/build/dex/wusdm/types.js +11 -0
- package/build/dex/wusdm/types.js.map +1 -0
- package/build/dex/wusdm/wusdm-pool.d.ts +21 -0
- package/build/dex/wusdm/wusdm-pool.js +74 -0
- package/build/dex/wusdm/wusdm-pool.js.map +1 -0
- package/build/dex/wusdm/wusdm.d.ts +46 -0
- package/build/dex/wusdm/wusdm.js +243 -0
- package/build/dex/wusdm/wusdm.js.map +1 -0
- package/build/dex/zerox/config.d.ts +2 -0
- package/build/dex/zerox/config.js +33 -0
- package/build/dex/zerox/config.js.map +1 -0
- package/build/dex/zerox/index.d.ts +22 -0
- package/build/dex/zerox/index.js +225 -0
- package/build/dex/zerox/index.js.map +1 -0
- package/build/dex/zerox/order.d.ts +88 -0
- package/build/dex/zerox/order.js +53 -0
- package/build/dex/zerox/order.js.map +1 -0
- package/build/dex/zerox/types.d.ts +73 -0
- package/build/dex/zerox/types.js +21 -0
- package/build/dex/zerox/types.js.map +1 -0
- package/package.json +1 -1
- package/build/abi/pangolin-v3/PangolinV3StateMulticall.abi.json +0 -796
- package/build/abi/ring-v2/few-wrapped-token.json +0 -587
- package/build/abi/ring-v2/ring-v2-factory.json +0 -125
- package/build/abi/ring-v2/ring-v2-pool.json +0 -461
- package/build/abi/ring-v2/ring-v2-router.json +0 -332
- package/build/abi/uniswap-v4/hooks/cabalcoin-hook.abi.json +0 -682
- package/build/abi/uniswap-v4/hooks/fee-hook.abi.json +0 -1335
- package/build/dex/miro-migrator/miro-migrator-state.d.ts +0 -27
- package/build/dex/miro-migrator/miro-migrator-state.js +0 -89
- package/build/dex/miro-migrator/miro-migrator-state.js.map +0 -1
- package/build/dex/uniswap-v3/forks/pangolin-v3/utils.d.ts +0 -4
- package/build/dex/uniswap-v3/forks/pangolin-v3/utils.js +0 -56
- package/build/dex/uniswap-v3/forks/pangolin-v3/utils.js.map +0 -1
- package/build/dex/uniswap-v4/hooks/cabalcoin-hook/cabalcoin-hook-pool.d.ts +0 -7
- package/build/dex/uniswap-v4/hooks/cabalcoin-hook/cabalcoin-hook-pool.js +0 -28
- package/build/dex/uniswap-v4/hooks/cabalcoin-hook/cabalcoin-hook-pool.js.map +0 -1
- package/build/dex/uniswap-v4/hooks/cabalcoin-hook/types.d.ts +0 -0
- package/build/dex/uniswap-v4/hooks/cabalcoin-hook/types.js +0 -2
- package/build/dex/uniswap-v4/hooks/cabalcoin-hook/types.js.map +0 -1
- package/build/dex/uniswap-v4/hooks/fee-hook/fee-hook-pool.d.ts +0 -7
- package/build/dex/uniswap-v4/hooks/fee-hook/fee-hook-pool.js +0 -28
- package/build/dex/uniswap-v4/hooks/fee-hook/fee-hook-pool.js.map +0 -1
- package/build/dex/uniswap-v4/hooks/fee-hook/types.d.ts +0 -0
- package/build/dex/uniswap-v4/hooks/fee-hook/types.js +0 -2
- package/build/dex/uniswap-v4/hooks/fee-hook/types.js.map +0 -1
- package/build/dex/uniswap-v4/hooks/index.d.ts +0 -2
- package/build/dex/uniswap-v4/hooks/index.js +0 -8
- package/build/dex/uniswap-v4/hooks/index.js.map +0 -1
- package/build/dex/usdc-transmuter/usdc-transmuter-pool.d.ts +0 -26
- package/build/dex/usdc-transmuter/usdc-transmuter-pool.js +0 -75
- package/build/dex/usdc-transmuter/usdc-transmuter-pool.js.map +0 -1
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Interface } from '@ethersproject/abi';
|
|
2
|
+
import { SwapSide } from '../constants';
|
|
3
|
+
import { AdapterExchangeParam, SimpleExchangeParam } from '../types';
|
|
4
|
+
import { IDexTxBuilder } from './idex';
|
|
5
|
+
import { SimpleExchange } from './simple-exchange';
|
|
6
|
+
import { IDexHelper } from '../dex-helper';
|
|
7
|
+
export declare type OneInchLpData = {
|
|
8
|
+
exchange: string;
|
|
9
|
+
};
|
|
10
|
+
declare type OneInchLpParam = [
|
|
11
|
+
src: string,
|
|
12
|
+
dst: string,
|
|
13
|
+
amount: string,
|
|
14
|
+
minReturn: string,
|
|
15
|
+
referral: string
|
|
16
|
+
];
|
|
17
|
+
export declare class OneInchLp extends SimpleExchange implements IDexTxBuilder<OneInchLpData, OneInchLpParam> {
|
|
18
|
+
static dexKeys: string[];
|
|
19
|
+
exchangeRouterInterface: Interface;
|
|
20
|
+
constructor(dexHelper: IDexHelper);
|
|
21
|
+
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: OneInchLpData, side: SwapSide): AdapterExchangeParam;
|
|
22
|
+
getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: OneInchLpData, side: SwapSide): Promise<SimpleExchangeParam>;
|
|
23
|
+
}
|
|
24
|
+
export {};
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.OneInchLp = void 0;
|
|
7
|
+
const abi_1 = require("@ethersproject/abi");
|
|
8
|
+
const constants_1 = require("../constants");
|
|
9
|
+
const simple_exchange_1 = require("./simple-exchange");
|
|
10
|
+
const OneInchLp_json_1 = __importDefault(require("../abi/OneInchLp.json"));
|
|
11
|
+
const utils_1 = require("../utils");
|
|
12
|
+
var OneInchLpFunctions;
|
|
13
|
+
(function (OneInchLpFunctions) {
|
|
14
|
+
OneInchLpFunctions["swap"] = "swap";
|
|
15
|
+
})(OneInchLpFunctions || (OneInchLpFunctions = {}));
|
|
16
|
+
class OneInchLp extends simple_exchange_1.SimpleExchange {
|
|
17
|
+
constructor(dexHelper) {
|
|
18
|
+
super(dexHelper, 'oneinchlp');
|
|
19
|
+
this.exchangeRouterInterface = new abi_1.Interface(OneInchLp_json_1.default);
|
|
20
|
+
}
|
|
21
|
+
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
22
|
+
return {
|
|
23
|
+
targetExchange: data.exchange,
|
|
24
|
+
payload: '0x',
|
|
25
|
+
networkFee: '0',
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
29
|
+
const swapFunction = OneInchLpFunctions.swap;
|
|
30
|
+
const swapFunctionParams = [
|
|
31
|
+
(0, utils_1.isETHAddress)(srcToken) ? constants_1.NULL_ADDRESS : srcToken,
|
|
32
|
+
(0, utils_1.isETHAddress)(destToken) ? constants_1.NULL_ADDRESS : destToken,
|
|
33
|
+
srcAmount,
|
|
34
|
+
destAmount,
|
|
35
|
+
constants_1.NULL_ADDRESS,
|
|
36
|
+
];
|
|
37
|
+
const swapData = this.exchangeRouterInterface.encodeFunctionData(swapFunction, swapFunctionParams);
|
|
38
|
+
return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, data.exchange);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.OneInchLp = OneInchLp;
|
|
42
|
+
OneInchLp.dexKeys = ['oneinchlp'];
|
|
43
|
+
//# sourceMappingURL=OneInchLp.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OneInchLp.js","sourceRoot":"","sources":["../../src/dex/OneInchLp.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAC7D,4CAAsD;AAGtD,uDAAmD;AACnD,2EAAiD;AACjD,oCAAwC;AAcxC,IAAK,kBAEJ;AAFD,WAAK,kBAAkB;IACrB,mCAAa,CAAA;AACf,CAAC,EAFI,kBAAkB,KAAlB,kBAAkB,QAEtB;AAED,MAAa,SACX,SAAQ,gCAAc;IAMtB,YAAY,SAAqB;QAC/B,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC9B,IAAI,CAAC,uBAAuB,GAAG,IAAI,eAAS,CAC1C,wBAA8B,CAC/B,CAAC;IACJ,CAAC;IAED,eAAe,CACb,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAmB,EACnB,IAAc;QAEd,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,QAAQ;YAC7B,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAmB,EACnB,IAAc;QAEd,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC;QAC7C,MAAM,kBAAkB,GAAmB;YACzC,IAAA,oBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,wBAAY,CAAC,CAAC,CAAC,QAAQ;YAChD,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,wBAAY,CAAC,CAAC,CAAC,SAAS;YAClD,SAAS;YACT,UAAU;YACV,wBAAY;SACb,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAC9D,YAAY,EACZ,kBAAkB,CACnB,CAAC;QAEF,OAAO,IAAI,CAAC,qCAAqC,CAC/C,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,QAAQ,EACR,IAAI,CAAC,QAAQ,CACd,CAAC;IACJ,CAAC;;AA1DH,8BA2DC;AAvDQ,iBAAO,GAAG,CAAC,WAAW,CAAC,CAAC"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.AlgebraMath = void 0;
|
|
7
4
|
const core_1 = require("@paraswap/core");
|
|
@@ -13,7 +10,6 @@ const utils_1 = require("../../../utils");
|
|
|
13
10
|
const SwapMath_1 = require("../../uniswap-v3/contract-math/SwapMath");
|
|
14
11
|
const Constants_1 = require("./Constants");
|
|
15
12
|
const bigint_constants_1 = require("../../../bigint-constants");
|
|
16
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
17
13
|
const uniswap_v3_math_1 = require("../../uniswap-v3/contract-math/uniswap-v3-math");
|
|
18
14
|
const constants_1 = require("../../uniswap-v3/constants");
|
|
19
15
|
const TickManager_1 = require("./TickManager");
|
|
@@ -106,7 +102,7 @@ function _priceComputationCycles(networkId, poolState, ticksCopy, state, cache,
|
|
|
106
102
|
tick: { ...ticksCopy[castTickNext] },
|
|
107
103
|
};
|
|
108
104
|
}
|
|
109
|
-
let liquidityNet = Tick_1.Tick.cross(ticksCopy, step.tickNext
|
|
105
|
+
let liquidityNet = Tick_1.Tick.cross(ticksCopy, step.tickNext);
|
|
110
106
|
if (zeroForOne)
|
|
111
107
|
liquidityNet = -liquidityNet;
|
|
112
108
|
state.liquidity = LiquidityMath_1.LiquidityMath.addDelta(state.liquidity, liquidityNet);
|
|
@@ -139,9 +135,6 @@ class AlgebraMathClass {
|
|
|
139
135
|
queryOutputs(networkId, poolState, amounts, zeroForOne, side) {
|
|
140
136
|
const slot0Start = poolState.globalState;
|
|
141
137
|
const isSell = side === core_1.SwapSide.SELL;
|
|
142
|
-
// While calculating, ticks are changing, so to not change the actual state,
|
|
143
|
-
// we use copy
|
|
144
|
-
const ticksCopy = lodash_1.default.cloneDeep(poolState.ticks);
|
|
145
138
|
const sqrtPriceLimitX96 = zeroForOne
|
|
146
139
|
? TickMath_1.TickMath.MIN_SQRT_RATIO + 1n
|
|
147
140
|
: TickMath_1.TickMath.MAX_SQRT_RATIO - 1n;
|
|
@@ -195,7 +188,7 @@ class AlgebraMathClass {
|
|
|
195
188
|
: sqrtPriceLimitX96 > slot0Start.price &&
|
|
196
189
|
sqrtPriceLimitX96 < TickMath_1.TickMath.MAX_SQRT_RATIO, 'SPL', { zeroForOne, sqrtPriceLimitX96, slot0Start }, 'zeroForOne ? sqrtPriceLimitX96 < slot0Start.sqrtPriceX96 && sqrtPriceLimitX96 > TickMath.MIN_SQRT_RATIO : sqrtPriceLimitX96 > slot0Start.sqrtPriceX96 && sqrtPriceLimitX96 < TickMath.MAX_SQRT_RATIO');
|
|
197
190
|
if (!isOutOfRange) {
|
|
198
|
-
const [finalState, { latestFullCycleState, latestFullCycleCache }] = _priceComputationCycles(networkId, poolState,
|
|
191
|
+
const [finalState, { latestFullCycleState, latestFullCycleCache }] = _priceComputationCycles(networkId, poolState, poolState.ticks, state, cache, sqrtPriceLimitX96, zeroForOne, exactInput);
|
|
199
192
|
if (finalState.amountSpecifiedRemaining === 0n &&
|
|
200
193
|
finalState.amountCalculated === 0n) {
|
|
201
194
|
isOutOfRange = true;
|
|
@@ -221,14 +214,12 @@ class AlgebraMathClass {
|
|
|
221
214
|
if (isSell) {
|
|
222
215
|
outputs[i] = BigInt.asUintN(256, -(zeroForOne ? amount1 : amount0));
|
|
223
216
|
tickCounts[i] = latestFullCycleCache.tickCount;
|
|
224
|
-
continue;
|
|
225
217
|
}
|
|
226
218
|
else {
|
|
227
219
|
outputs[i] = zeroForOne
|
|
228
220
|
? BigInt.asUintN(256, amount0)
|
|
229
221
|
: BigInt.asUintN(256, amount1);
|
|
230
222
|
tickCounts[i] = latestFullCycleCache.tickCount;
|
|
231
|
-
continue;
|
|
232
223
|
}
|
|
233
224
|
}
|
|
234
225
|
else {
|
|
@@ -303,10 +294,9 @@ class AlgebraMathClass {
|
|
|
303
294
|
// skip amount0 and amount1 as already read from event
|
|
304
295
|
const [, , globalLiquidityDelta] = this._getAmountsForLiquidity(bottomTick, topTick, liquidityDelta, cache.tick, cache.price);
|
|
305
296
|
if (globalLiquidityDelta != 0n) {
|
|
306
|
-
let liquidityBefore = liquidity;
|
|
307
297
|
// skip oracle logic
|
|
308
298
|
// same as UniswapV3Pool line 361 -> liquidity = LiquidityMath.addDelta(liquidityBefore, params.liquidityDelta);
|
|
309
|
-
state.liquidity = LiquidityMath_1.LiquidityMath.addDelta(
|
|
299
|
+
state.liquidity = LiquidityMath_1.LiquidityMath.addDelta(liquidity, liquidityDelta);
|
|
310
300
|
}
|
|
311
301
|
}
|
|
312
302
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlgebraMath.js","sourceRoot":"","sources":["../../../../src/dex/algebra/lib/AlgebraMath.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AlgebraMath.js","sourceRoot":"","sources":["../../../../src/dex/algebra/lib/AlgebraMath.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,11 +44,6 @@ class TickManager {
|
|
|
44
44
|
let flipped = liquidityGrossAfter === 0n;
|
|
45
45
|
if (liquidityGrossBefore === 0n) {
|
|
46
46
|
flipped = !flipped;
|
|
47
|
-
if (tick <= tickCurrent) {
|
|
48
|
-
info.secondsPerLiquidityOutsideX128 = secondsPerLiquidityCumulativeX128;
|
|
49
|
-
info.tickCumulativeOutside = tickCumulative;
|
|
50
|
-
info.secondsOutside = time;
|
|
51
|
-
}
|
|
52
47
|
info.initialized = true;
|
|
53
48
|
}
|
|
54
49
|
// data.liquidityTotal = liquidityTotalAfter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TickManager.js","sourceRoot":"","sources":["../../../../src/dex/algebra/lib/TickManager.ts"],"names":[],"mappings":";;;AACA,gFAA6E;AAC7E,0CAA0C;AAE1C,0DAA4D;AAG5D,MAAa,WAAW;IACtB,MAAM,CAAC,MAAM,CACX,KAAuC,EACvC,IAAY,EACZ,WAAmB,EACnB,cAAsB,EACtB,iCAAyC,EACzC,cAAsB,EACtB,IAAY,EACZ,KAAc,EACd,YAAoB;QAEpB,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAErC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,IAAI,GAAG,EAAE,GAAG,0BAAc,EAAE,CAAC;YAC7B,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;QACnC,CAAC;QAED,sDAAsD;QACtD,8FAA8F;QAC9F,6EAA6E;QAC7E,MAAM,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC;QACjD,MAAM,mBAAmB,GAAG,6BAAa,CAAC,QAAQ,CAChD,oBAAoB,EACpB,cAAc,CACf,CAAC;QACF,IAAA,gBAAQ,EACN,mBAAmB,IAAI,YAAY,EACnC,IAAI,EACJ,EAAE,mBAAmB,EAAE,YAAY,EAAE,EACrC,qCAAqC,CACtC,CAAC;QAEF,qDAAqD;QACrD,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC;QAE7C,6GAA6G;QAC7G,8BAA8B;QAC9B,kEAAkE;QAClE,mEAAmE;QACnE,EAAE;QACF,6CAA6C;QAC7C,IAAI,CAAC,YAAY,GAAG,KAAK;YACvB,CAAC,CAAC,MAAM,CAAC,MAAM,CACX,GAAG,EACH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,cAAc,CACxD;YACH,CAAC,CAAC,MAAM,CAAC,MAAM,CACX,GAAG,EACH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,cAAc,CACxD,CAAC;QAEN,wCAAwC;QACxC,mCAAmC;QACnC,wBAAwB;QACxB,wGAAwG;QACxG,+BAA+B;QAC/B,wDAAwD;QACxD,wDAAwD;QACxD,qEAAqE;QACrE,iDAAiD;QACjD,qCAAqC;QACrC,MAAM;QACN,6BAA6B;QAC7B,IAAI;QAEJ,IAAI,OAAO,GAAG,mBAAmB,KAAK,EAAE,CAAC;QACzC,IAAI,oBAAoB,KAAK,EAAE,EAAE,CAAC;YAChC,OAAO,GAAG,CAAC,OAAO,CAAC;YACnB,IAAI,
|
|
1
|
+
{"version":3,"file":"TickManager.js","sourceRoot":"","sources":["../../../../src/dex/algebra/lib/TickManager.ts"],"names":[],"mappings":";;;AACA,gFAA6E;AAC7E,0CAA0C;AAE1C,0DAA4D;AAG5D,MAAa,WAAW;IACtB,MAAM,CAAC,MAAM,CACX,KAAuC,EACvC,IAAY,EACZ,WAAmB,EACnB,cAAsB,EACtB,iCAAyC,EACzC,cAAsB,EACtB,IAAY,EACZ,KAAc,EACd,YAAoB;QAEpB,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAErC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,IAAI,GAAG,EAAE,GAAG,0BAAc,EAAE,CAAC;YAC7B,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;QACnC,CAAC;QAED,sDAAsD;QACtD,8FAA8F;QAC9F,6EAA6E;QAC7E,MAAM,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC;QACjD,MAAM,mBAAmB,GAAG,6BAAa,CAAC,QAAQ,CAChD,oBAAoB,EACpB,cAAc,CACf,CAAC;QACF,IAAA,gBAAQ,EACN,mBAAmB,IAAI,YAAY,EACnC,IAAI,EACJ,EAAE,mBAAmB,EAAE,YAAY,EAAE,EACrC,qCAAqC,CACtC,CAAC;QAEF,qDAAqD;QACrD,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC;QAE7C,6GAA6G;QAC7G,8BAA8B;QAC9B,kEAAkE;QAClE,mEAAmE;QACnE,EAAE;QACF,6CAA6C;QAC7C,IAAI,CAAC,YAAY,GAAG,KAAK;YACvB,CAAC,CAAC,MAAM,CAAC,MAAM,CACX,GAAG,EACH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,cAAc,CACxD;YACH,CAAC,CAAC,MAAM,CAAC,MAAM,CACX,GAAG,EACH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,cAAc,CACxD,CAAC;QAEN,wCAAwC;QACxC,mCAAmC;QACnC,wBAAwB;QACxB,wGAAwG;QACxG,+BAA+B;QAC/B,wDAAwD;QACxD,wDAAwD;QACxD,qEAAqE;QACrE,iDAAiD;QACjD,qCAAqC;QACrC,MAAM;QACN,6BAA6B;QAC7B,IAAI;QAEJ,IAAI,OAAO,GAAG,mBAAmB,KAAK,EAAE,CAAC;QACzC,IAAI,oBAAoB,KAAK,EAAE,EAAE,CAAC;YAChC,OAAO,GAAG,CAAC,OAAO,CAAC;YACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,6CAA6C;QAC7C,IAAI,CAAC,cAAc,GAAG,mBAAmB,CAAC;QAE1C,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AA9ED,kCA8EC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Interface } from '@ethersproject/abi';
|
|
2
|
+
import { SwapSide } from '../../constants';
|
|
3
|
+
import { AdapterExchangeParam, Address, DexExchangeParam, NumberAsString, SimpleExchangeParam } from '../../types';
|
|
4
|
+
import { IDexTxBuilder } from '../idex';
|
|
5
|
+
import { SimpleExchange } from '../simple-exchange';
|
|
6
|
+
import { IDexHelper } from '../../dex-helper';
|
|
7
|
+
import { BProtocolData, BProtocolParam } from './types';
|
|
8
|
+
export declare class BProtocol extends SimpleExchange implements IDexTxBuilder<BProtocolData, BProtocolParam> {
|
|
9
|
+
static dexKeys: string[];
|
|
10
|
+
exchangeRouterInterface: Interface;
|
|
11
|
+
constructor(dexHelper: IDexHelper);
|
|
12
|
+
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: BProtocolData, side: SwapSide): AdapterExchangeParam;
|
|
13
|
+
getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: BProtocolData, side: SwapSide): Promise<SimpleExchangeParam>;
|
|
14
|
+
getDexParam(_srcToken: Address, _destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: BProtocolData, _side: SwapSide): DexExchangeParam;
|
|
15
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.BProtocol = void 0;
|
|
7
|
+
const abi_1 = require("@ethersproject/abi");
|
|
8
|
+
const constants_1 = require("../../constants");
|
|
9
|
+
const simple_exchange_1 = require("../simple-exchange");
|
|
10
|
+
const BProtocol_json_1 = __importDefault(require("../../abi/BProtocol.json"));
|
|
11
|
+
const types_1 = require("./types");
|
|
12
|
+
const utils_1 = require("../../executor/utils");
|
|
13
|
+
class BProtocol extends simple_exchange_1.SimpleExchange {
|
|
14
|
+
constructor(dexHelper) {
|
|
15
|
+
super(dexHelper, 'bprotocol');
|
|
16
|
+
this.exchangeRouterInterface = new abi_1.Interface(BProtocol_json_1.default);
|
|
17
|
+
}
|
|
18
|
+
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
19
|
+
return {
|
|
20
|
+
targetExchange: data.exchange,
|
|
21
|
+
payload: '0x',
|
|
22
|
+
networkFee: '0',
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
26
|
+
const swapFunction = types_1.BProtocolFunctions.swap;
|
|
27
|
+
const swapFunctionParams = [
|
|
28
|
+
srcAmount,
|
|
29
|
+
destAmount,
|
|
30
|
+
this.augustusAddress,
|
|
31
|
+
];
|
|
32
|
+
const swapData = this.exchangeRouterInterface.encodeFunctionData(swapFunction, swapFunctionParams);
|
|
33
|
+
return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, data.exchange);
|
|
34
|
+
}
|
|
35
|
+
getDexParam(_srcToken, _destToken, srcAmount, destAmount, recipient, data, _side) {
|
|
36
|
+
const swapFunction = types_1.BProtocolFunctions.swap;
|
|
37
|
+
const swapFunctionParams = [
|
|
38
|
+
srcAmount,
|
|
39
|
+
destAmount,
|
|
40
|
+
recipient,
|
|
41
|
+
];
|
|
42
|
+
const swapData = this.exchangeRouterInterface.encodeFunctionData(swapFunction, swapFunctionParams);
|
|
43
|
+
return {
|
|
44
|
+
needWrapNative: this.needWrapNative,
|
|
45
|
+
dexFuncHasRecipient: true,
|
|
46
|
+
exchangeData: swapData,
|
|
47
|
+
targetExchange: data.exchange,
|
|
48
|
+
returnAmountPos: _side === constants_1.SwapSide.SELL
|
|
49
|
+
? (0, utils_1.extractReturnAmountPosition)(this.exchangeRouterInterface, swapFunction)
|
|
50
|
+
: undefined,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
exports.BProtocol = BProtocol;
|
|
55
|
+
BProtocol.dexKeys = ['bprotocol'];
|
|
56
|
+
//# sourceMappingURL=bProtocol.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bProtocol.js","sourceRoot":"","sources":["../../../src/dex/bProtocol/bProtocol.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAC7D,+CAA2C;AAS3C,wDAAoD;AACpD,8EAAoD;AAEpD,mCAA4E;AAC5E,gDAAmE;AAEnE,MAAa,SACX,SAAQ,gCAAc;IAMtB,YAAY,SAAqB;QAC/B,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC9B,IAAI,CAAC,uBAAuB,GAAG,IAAI,eAAS,CAC1C,wBAA8B,CAC/B,CAAC;IACJ,CAAC;IAED,eAAe,CACb,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAmB,EACnB,IAAc;QAEd,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,QAAQ;YAC7B,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAmB,EACnB,IAAc;QAEd,MAAM,YAAY,GAAG,0BAAkB,CAAC,IAAI,CAAC;QAC7C,MAAM,kBAAkB,GAAmB;YACzC,SAAS;YACT,UAAU;YACV,IAAI,CAAC,eAAe;SACrB,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAC9D,YAAY,EACZ,kBAAkB,CACnB,CAAC;QAEF,OAAO,IAAI,CAAC,qCAAqC,CAC/C,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,QAAQ,EACR,IAAI,CAAC,QAAQ,CACd,CAAC;IACJ,CAAC;IAED,WAAW,CACT,SAAkB,EAClB,UAAmB,EACnB,SAAyB,EACzB,UAA0B,EAC1B,SAAkB,EAClB,IAAmB,EACnB,KAAe;QAEf,MAAM,YAAY,GAAG,0BAAkB,CAAC,IAAI,CAAC;QAC7C,MAAM,kBAAkB,GAAmB;YACzC,SAAS;YACT,UAAU;YACV,SAAS;SACV,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAC9D,YAAY,EACZ,kBAAkB,CACnB,CAAC;QACF,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,mBAAmB,EAAE,IAAI;YACzB,YAAY,EAAE,QAAQ;YACtB,cAAc,EAAE,IAAI,CAAC,QAAQ;YAC7B,eAAe,EACb,KAAK,KAAK,oBAAQ,CAAC,IAAI;gBACrB,CAAC,CAAC,IAAA,mCAA2B,EACzB,IAAI,CAAC,uBAAuB,EAC5B,YAAY,CACb;gBACH,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC;;AA1FH,8BA2FC;AAvFQ,iBAAO,GAAG,CAAC,WAAW,CAAC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BProtocolFunctions = void 0;
|
|
4
|
+
var BProtocolFunctions;
|
|
5
|
+
(function (BProtocolFunctions) {
|
|
6
|
+
BProtocolFunctions["swap"] = "swap";
|
|
7
|
+
})(BProtocolFunctions = exports.BProtocolFunctions || (exports.BProtocolFunctions = {}));
|
|
8
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/bProtocol/types.ts"],"names":[],"mappings":";;;AAUA,IAAY,kBAEX;AAFD,WAAY,kBAAkB;IAC5B,mCAAa,CAAA;AACf,CAAC,EAFW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAE7B"}
|
|
@@ -38,6 +38,7 @@ function createQuery(networkId, poolTypes, hooks, timestamp) {
|
|
|
38
38
|
version
|
|
39
39
|
poolTokens {
|
|
40
40
|
address
|
|
41
|
+
index
|
|
41
42
|
weight
|
|
42
43
|
canUseBufferForSwaps
|
|
43
44
|
underlyingToken {
|
|
@@ -80,14 +81,16 @@ function toImmutablePoolStateMap(pools, hooksConfigMap) {
|
|
|
80
81
|
const poolType = pool.type === reClammPool_1.ReClammApiName && pool.version === 2
|
|
81
82
|
? 'RECLAMM_V2'
|
|
82
83
|
: pool.type;
|
|
84
|
+
// Sort pool tokens by index in ascending order
|
|
85
|
+
const sortedPoolTokens = [...pool.poolTokens].sort((a, b) => a.index - b.index);
|
|
83
86
|
const immutablePoolState = {
|
|
84
87
|
poolAddress: pool.id,
|
|
85
88
|
version: pool.version,
|
|
86
|
-
tokens:
|
|
87
|
-
tokensUnderlying:
|
|
89
|
+
tokens: sortedPoolTokens.map(t => t.address),
|
|
90
|
+
tokensUnderlying: sortedPoolTokens.map(t => t.underlyingToken && t.canUseBufferForSwaps
|
|
88
91
|
? t.underlyingToken.address
|
|
89
92
|
: null),
|
|
90
|
-
weights:
|
|
93
|
+
weights: sortedPoolTokens.map(t => scaleOrDefault(t.weight, 18, 0n)),
|
|
91
94
|
poolType: poolType,
|
|
92
95
|
hookAddress: getHookAddress(pool.hook, poolType),
|
|
93
96
|
hookType: getHookType(pool.hook, poolType, hooksConfigMap),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPoolsApi.js","sourceRoot":"","sources":["../../../src/dex/balancer-v3/getPoolsApi.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"getPoolsApi.js","sourceRoot":"","sources":["../../../src/dex/balancer-v3/getPoolsApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,6 @@ export declare class BunniV2EventPool extends StatefulEventSubscriber<ProtocolSt
|
|
|
56
56
|
swapFee: bigint;
|
|
57
57
|
totalLiquidity: bigint;
|
|
58
58
|
};
|
|
59
|
-
|
|
60
|
-
_updateVaultSharePrices(blockNumber?: number): Promise<void>;
|
|
59
|
+
_updateVaultSharePrices(): Promise<void>;
|
|
61
60
|
private _K;
|
|
62
61
|
}
|
|
@@ -245,7 +245,8 @@ class BunniV2EventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
|
|
|
245
245
|
}
|
|
246
246
|
}
|
|
247
247
|
// update the total supply (always 1e18 on the first deposit)
|
|
248
|
-
newPoolState.totalSupply +=
|
|
248
|
+
newPoolState.totalSupply +=
|
|
249
|
+
newPoolState.totalSupply === 0n ? 1000000000000000000n : shares;
|
|
249
250
|
newState.poolStates[poolId] = newPoolState;
|
|
250
251
|
return newState;
|
|
251
252
|
}
|
|
@@ -476,20 +477,9 @@ class BunniV2EventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
|
|
|
476
477
|
_quoteSwap(state, vaults, params, blockNumber, blockTimestamp) {
|
|
477
478
|
return (0, BunniQuoter_1.quoteSwap)(state, params, blockNumber, blockTimestamp, this.state?.hookFeeModifier || 0n, this.config.bunniHook.deploymentBlock, this._K(blockNumber), vaults, this.config);
|
|
478
479
|
}
|
|
479
|
-
async
|
|
480
|
-
const _blockNumber = blockNumber || this.dexHelper.blockManager.getLatestBlockNumber();
|
|
480
|
+
async _updateVaultSharePrices() {
|
|
481
481
|
if (this.state !== null) {
|
|
482
|
-
|
|
483
|
-
await (0, getOnChainState_1.updatePoolTotalValueLocked)(newState, this.dexHelper);
|
|
484
|
-
this.setState(newState, _blockNumber);
|
|
485
|
-
}
|
|
486
|
-
}
|
|
487
|
-
async _updateVaultSharePrices(blockNumber) {
|
|
488
|
-
const _blockNumber = blockNumber || this.dexHelper.blockManager.getLatestBlockNumber();
|
|
489
|
-
if (this.state !== null) {
|
|
490
|
-
const newState = lodash_1.default.cloneDeep(this.state);
|
|
491
|
-
await (0, getOnChainState_1.updateVaultSharePrices)(newState, this.dexHelper);
|
|
492
|
-
this.setState(newState, _blockNumber);
|
|
482
|
+
await (0, getOnChainState_1.updateVaultSharePrices)(Object.values(this.state.vaultStates), this.dexHelper);
|
|
493
483
|
}
|
|
494
484
|
}
|
|
495
485
|
_K(blockNumber) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bunni-v2-pool.js","sourceRoot":"","sources":["../../../src/dex/bunni-v2/bunni-v2-pool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bunni-v2-pool.js","sourceRoot":"","sources":["../../../src/dex/bunni-v2/bunni-v2-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,6 @@ export declare class BunniV2 extends SimpleExchange implements IDex<BunniV2Data>
|
|
|
24
24
|
logger: Logger;
|
|
25
25
|
quoterInterface: Interface;
|
|
26
26
|
erc4626Interface: Interface;
|
|
27
|
-
updatePoolTotalValueLockedTimer?: NodeJS.Timeout;
|
|
28
27
|
updateVaultSharePricesTimer?: NodeJS.Timeout;
|
|
29
28
|
constructor(network: Network, dexKey: string, dexHelper: IDexHelper);
|
|
30
29
|
initializePricing(blockNumber: number): Promise<void>;
|
|
@@ -38,14 +37,13 @@ export declare class BunniV2 extends SimpleExchange implements IDex<BunniV2Data>
|
|
|
38
37
|
getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<null | ExchangePrices<BunniV2Data>>;
|
|
39
38
|
getOffChainPrices(zeroForOne: boolean, amounts: bigint[], pool: PoolState, vaults: {
|
|
40
39
|
[address: string]: VaultState;
|
|
41
|
-
}, side: SwapSide, blockNumber:
|
|
40
|
+
}, side: SwapSide, blockNumber: number): Promise<bigint[]>;
|
|
42
41
|
getOnChainPrices(zeroForOne: boolean, amounts: bigint[], poolKey: PoolKey, side: SwapSide, blockNumber: number): Promise<bigint[]>;
|
|
43
42
|
getCalldataGasCost(poolPrices: PoolPrices<BunniV2Data>): number | number[];
|
|
44
43
|
getDexParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, recipient: Address, data: BunniV2Data, side: SwapSide): DexExchangeParam;
|
|
45
44
|
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: BunniV2Data, side: SwapSide): AdapterExchangeParam;
|
|
46
45
|
updatePoolState(): AsyncOrSync<void>;
|
|
47
46
|
getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
|
|
48
|
-
|
|
49
|
-
updateVaultSharePrices(blockNumber?: number): Promise<void>;
|
|
47
|
+
updateVaultSharePrices(): Promise<void>;
|
|
50
48
|
releaseResources(): AsyncOrSync<void>;
|
|
51
49
|
}
|