@paraswap/dex-lib 2.42.28 → 2.42.29-wombat.2
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/{algebra/AlgebraPool.abi.json → solidly-v3/SolidlyV3Pool.abi.json} +293 -282
- package/build/abi/solidly-v3/SolidlyV3StateMulticall.abi.json +375 -0
- package/build/abi/trader-joe-v2_1/FactoryABI.json +0 -0
- package/build/abi/trader-joe-v2_1/PairABI.json +1493 -0
- package/build/abi/trader-joe-v2_1/RouterABI.json +1489 -0
- package/build/abi/wombat/pool-v2.json +1289 -0
- package/build/abi/wombat/pool-v3.json +2013 -0
- package/build/config.js +2 -2
- package/build/dex/index.js +4 -1
- package/build/dex/index.js.map +1 -1
- package/build/dex/solidly-v3/config.d.ts +9 -0
- package/build/dex/solidly-v3/config.js +58 -0
- package/build/dex/solidly-v3/config.js.map +1 -0
- package/build/dex/solidly-v3/constants.d.ts +27 -0
- package/build/dex/solidly-v3/constants.js +34 -0
- package/build/dex/solidly-v3/constants.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/BitMath.d.ts +4 -0
- package/build/dex/solidly-v3/contract-math/BitMath.js +93 -0
- package/build/dex/solidly-v3/contract-math/BitMath.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/FixedPoint128.d.ts +3 -0
- package/build/dex/solidly-v3/contract-math/FixedPoint128.js +8 -0
- package/build/dex/solidly-v3/contract-math/FixedPoint128.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/FixedPoint96.d.ts +4 -0
- package/build/dex/solidly-v3/contract-math/FixedPoint96.js +9 -0
- package/build/dex/solidly-v3/contract-math/FixedPoint96.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/FullMath.d.ts +4 -0
- package/build/dex/solidly-v3/contract-math/FullMath.js +19 -0
- package/build/dex/solidly-v3/contract-math/FullMath.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/LiquidityMath.d.ts +3 -0
- package/build/dex/solidly-v3/contract-math/LiquidityMath.js +22 -0
- package/build/dex/solidly-v3/contract-math/LiquidityMath.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/SqrtPriceMath.d.ts +10 -0
- package/build/dex/solidly-v3/contract-math/SqrtPriceMath.js +91 -0
- package/build/dex/solidly-v3/contract-math/SqrtPriceMath.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/SwapMath.d.ts +8 -0
- package/build/dex/solidly-v3/contract-math/SwapMath.js +70 -0
- package/build/dex/solidly-v3/contract-math/SwapMath.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/Tick.d.ts +7 -0
- package/build/dex/solidly-v3/contract-math/Tick.js +36 -0
- package/build/dex/solidly-v3/contract-math/Tick.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/TickBitMap.d.ts +7 -0
- package/build/dex/solidly-v3/contract-math/TickBitMap.js +84 -0
- package/build/dex/solidly-v3/contract-math/TickBitMap.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/TickMath.d.ts +8 -0
- package/build/dex/solidly-v3/contract-math/TickMath.js +162 -0
- package/build/dex/solidly-v3/contract-math/TickMath.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/UnsafeMath.d.ts +3 -0
- package/build/dex/solidly-v3/contract-math/UnsafeMath.js +10 -0
- package/build/dex/solidly-v3/contract-math/UnsafeMath.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/uniswap-v3-math.d.ts +31 -0
- package/build/dex/solidly-v3/contract-math/uniswap-v3-math.js +363 -0
- package/build/dex/solidly-v3/contract-math/uniswap-v3-math.js.map +1 -0
- package/build/dex/solidly-v3/contract-math/utils.d.ts +7 -0
- package/build/dex/solidly-v3/contract-math/utils.js +39 -0
- package/build/dex/solidly-v3/contract-math/utils.js.map +1 -0
- package/build/dex/solidly-v3/solidly-v3-factory.d.ts +26 -0
- package/build/dex/solidly-v3/solidly-v3-factory.js +44 -0
- package/build/dex/solidly-v3/solidly-v3-factory.js.map +1 -0
- package/build/dex/{algebra/algebra-pool.d.ts → solidly-v3/solidly-v3-pool.d.ts} +14 -16
- package/build/dex/{algebra/algebra-pool.js → solidly-v3/solidly-v3-pool.js} +127 -165
- package/build/dex/solidly-v3/solidly-v3-pool.js.map +1 -0
- package/build/dex/solidly-v3/solidly-v3.d.ts +67 -0
- package/build/dex/solidly-v3/solidly-v3.js +590 -0
- package/build/dex/solidly-v3/solidly-v3.js.map +1 -0
- package/build/dex/solidly-v3/types.d.ts +132 -0
- package/build/dex/solidly-v3/types.js +9 -0
- package/build/dex/solidly-v3/types.js.map +1 -0
- package/build/dex/solidly-v3/utils.d.ts +6 -0
- package/build/dex/solidly-v3/utils.js +53 -0
- package/build/dex/solidly-v3/utils.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/config.d.ts +4 -0
- package/build/dex/trader-joe-v2-1-2/config.js +43 -0
- package/build/dex/trader-joe-v2-1-2/config.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/constants.d.ts +17 -0
- package/build/dex/trader-joe-v2-1-2/constants.js +19 -0
- package/build/dex/trader-joe-v2-1-2/constants.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2-pool.d.ts +60 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2-pool.js +199 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2-pool.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2.d.ts +49 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2.js +269 -0
- package/build/dex/trader-joe-v2-1-2/trader-joe-v2-1-2.js.map +1 -0
- package/build/dex/trader-joe-v2-1-2/types.d.ts +81 -0
- package/build/dex/trader-joe-v2-1-2/types.js +9 -0
- package/build/dex/trader-joe-v2-1-2/types.js.map +1 -0
- package/build/dex/trader-joe-v2_1/config.d.ts +4 -0
- package/build/dex/trader-joe-v2_1/config.js +43 -0
- package/build/dex/trader-joe-v2_1/config.js.map +1 -0
- package/build/dex/trader-joe-v2_1/constants.d.ts +16 -0
- package/build/dex/trader-joe-v2_1/constants.js +18 -0
- package/build/dex/trader-joe-v2_1/constants.js.map +1 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2.1.d.ts +0 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2.1.js +384 -0
- package/build/dex/trader-joe-v2_1/trader-joe-v2.1.js.map +1 -0
- package/build/dex/trader-joe-v2_1/types.d.ts +39 -0
- package/build/dex/trader-joe-v2_1/types.js +3 -0
- package/build/dex/trader-joe-v2_1/types.js.map +1 -0
- package/build/dex/wombat/types.d.ts +2 -0
- package/build/dex/wombat/utils.d.ts +1 -0
- package/build/dex/wombat/utils.js +14 -1
- package/build/dex/wombat/utils.js.map +1 -1
- package/build/dex/wombat/wombat-bmw.d.ts +2 -2
- package/build/dex/wombat/wombat-bmw.js +8 -25
- package/build/dex/wombat/wombat-bmw.js.map +1 -1
- package/build/dex/wombat/wombat-pool-poller.d.ts +22 -0
- package/build/dex/wombat/wombat-pool-poller.js +164 -0
- package/build/dex/wombat/wombat-pool-poller.js.map +1 -0
- package/build/dex/wombat/wombat-pool.d.ts +51 -17
- package/build/dex/wombat/wombat-pool.js +393 -112
- package/build/dex/wombat/wombat-pool.js.map +1 -1
- package/build/dex/wombat/wombat.d.ts +1 -1
- package/build/dex/wombat/wombat.js +12 -18
- package/build/dex/wombat/wombat.js.map +1 -1
- package/package.json +1 -1
- package/src/abi/solidly-v3/SolidlyV3Pool.abi.json +738 -0
- package/src/abi/solidly-v3/SolidlyV3StateMulticall.abi.json +375 -0
- package/src/abi/wombat/pool-v3.json +2013 -0
- package/src/config.ts +2 -2
- package/src/dex/index.ts +4 -1
- package/src/dex/solidly-v3/config.ts +64 -0
- package/src/dex/solidly-v3/constants.ts +42 -0
- package/src/dex/solidly-v3/contract-math/BitMath.ts +90 -0
- package/src/dex/solidly-v3/contract-math/FixedPoint128.ts +3 -0
- package/src/dex/solidly-v3/contract-math/FixedPoint96.ts +4 -0
- package/src/dex/solidly-v3/contract-math/FullMath.ts +30 -0
- package/src/dex/solidly-v3/contract-math/LiquidityMath.ts +17 -0
- package/src/dex/solidly-v3/contract-math/SqrtPriceMath.ts +226 -0
- package/src/dex/solidly-v3/contract-math/SwapMath.ts +139 -0
- package/src/dex/solidly-v3/contract-math/Tick.ts +66 -0
- package/src/dex/solidly-v3/contract-math/TickBitMap.ts +123 -0
- package/src/dex/solidly-v3/contract-math/TickMath.ts +211 -0
- package/src/dex/solidly-v3/contract-math/UnsafeMath.ts +5 -0
- package/src/dex/solidly-v3/contract-math/uniswap-v3-math.ts +570 -0
- package/src/dex/solidly-v3/contract-math/utils.ts +50 -0
- package/src/dex/solidly-v3/solidly-v3-e2e.test.ts +124 -0
- package/src/dex/solidly-v3/solidly-v3-events.test.ts +144 -0
- package/src/dex/solidly-v3/solidly-v3-factory.ts +73 -0
- package/src/dex/solidly-v3/solidly-v3-integration.test.ts +358 -0
- package/src/dex/solidly-v3/solidly-v3-pool.ts +494 -0
- package/src/dex/solidly-v3/solidly-v3.ts +988 -0
- package/src/dex/solidly-v3/types.ts +158 -0
- package/src/dex/solidly-v3/utils.ts +71 -0
- package/src/dex/uniswap-v3/uniswap-v3-events.test.ts +3 -0
- package/src/dex/wombat/types.ts +5 -0
- package/src/dex/wombat/utils.ts +20 -0
- package/src/dex/wombat/wombat-bmw.ts +8 -31
- package/src/dex/wombat/wombat-e2e.test.ts +13 -1
- package/src/dex/wombat/wombat-events.test.ts +147 -0
- package/src/dex/wombat/wombat-integration.test.ts +101 -111
- package/src/dex/wombat/wombat-pool.ts +620 -171
- package/src/dex/wombat/wombat.ts +13 -23
- package/tests/constants-e2e.ts +11 -1
- package/build/abi/uniswap-v3/UniswapV3Quoter.abi.json +0 -193
- package/build/dex/algebra/algebra-pool.js.map +0 -1
- package/build/dex/quickswap/camelot-v3.d.ts +0 -6
- package/build/dex/quickswap/camelot-v3.js +0 -19
- package/build/dex/quickswap/camelot-v3.js.map +0 -1
- package/build/dex/quickswap/zyberswap-v3.d.ts +0 -6
- package/build/dex/quickswap/zyberswap-v3.js +0 -19
- package/build/dex/quickswap/zyberswap-v3.js.map +0 -1
- package/build/dex/uniswap-v2/rebase-tokens.json +0 -7
- /package/src/abi/wombat/{pool.json → pool-v2.json} +0 -0
|
@@ -3,50 +3,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.SolidlyV3EventPool = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
8
|
const abi_1 = require("@ethersproject/abi");
|
|
9
|
+
const ethers_1 = require("ethers");
|
|
9
10
|
const ts_essentials_1 = require("ts-essentials");
|
|
10
|
-
const utils_1 = require("../../utils");
|
|
11
11
|
const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
12
|
+
const SolidlyV3Pool_abi_json_1 = __importDefault(require("../../abi/solidly-v3/SolidlyV3Pool.abi.json"));
|
|
13
|
+
const utils_1 = require("../../utils");
|
|
14
|
+
const uniswap_v3_math_1 = require("./contract-math/uniswap-v3-math");
|
|
15
|
+
const constants_1 = require("./constants");
|
|
16
|
+
const TickBitMap_1 = require("./contract-math/TickBitMap");
|
|
15
17
|
const decoders_1 = require("../../lib/decoders");
|
|
16
18
|
const utils_2 = require("./utils");
|
|
17
|
-
const
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
super(parentName, `${token0}_${token1}`, dexHelper, logger, true, mapKey);
|
|
19
|
+
const utils_3 = require("./contract-math/utils");
|
|
20
|
+
const FEES_TO_TICK_SPACING = {
|
|
21
|
+
500: 10n,
|
|
22
|
+
};
|
|
23
|
+
class SolidlyV3EventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
|
|
24
|
+
constructor(dexHelper, parentName, stateMultiContract, decodeStateMultiCallResultWithRelativeBitmaps, erc20Interface, factoryAddress, tickSpacing, token0, token1, logger, mapKey = '', poolInitCodeHash) {
|
|
25
|
+
super(parentName, `${token0}_${token1}_${tickSpacing}`, dexHelper, logger, true, mapKey);
|
|
25
26
|
this.dexHelper = dexHelper;
|
|
26
27
|
this.stateMultiContract = stateMultiContract;
|
|
28
|
+
this.decodeStateMultiCallResultWithRelativeBitmaps = decodeStateMultiCallResultWithRelativeBitmaps;
|
|
27
29
|
this.erc20Interface = erc20Interface;
|
|
28
30
|
this.factoryAddress = factoryAddress;
|
|
31
|
+
this.tickSpacing = tickSpacing;
|
|
29
32
|
this.poolInitCodeHash = poolInitCodeHash;
|
|
30
|
-
this.poolDeployer = poolDeployer;
|
|
31
33
|
this.handlers = {};
|
|
32
|
-
this.poolIface = new abi_1.Interface(
|
|
34
|
+
this.poolIface = new abi_1.Interface(SolidlyV3Pool_abi_json_1.default);
|
|
33
35
|
this.initFailed = false;
|
|
34
36
|
this.initRetryAttemptCount = 0;
|
|
37
|
+
// this.feeCodeAsString = feeCode.toString();
|
|
38
|
+
this.tickSpacingAsString = tickSpacing.toString();
|
|
35
39
|
this.token0 = token0.toLowerCase();
|
|
36
40
|
this.token1 = token1.toLowerCase();
|
|
37
41
|
this.logDecoder = (log) => this.poolIface.parseLog(log);
|
|
38
42
|
this.addressesSubscribed = new Array(1);
|
|
39
|
-
|
|
43
|
+
// Add handlers
|
|
40
44
|
this.handlers['Swap'] = this.handleSwapEvent.bind(this);
|
|
41
|
-
this.handlers['Mint'] = this.handleMintEvent.bind(this);
|
|
42
45
|
this.handlers['Burn'] = this.handleBurnEvent.bind(this);
|
|
43
|
-
this.handlers['
|
|
46
|
+
this.handlers['Mint'] = this.handleMintEvent.bind(this);
|
|
47
|
+
// Wen need them to keep balance of the pool up to date
|
|
44
48
|
this.handlers['Collect'] = this.handleCollectEvent.bind(this);
|
|
45
|
-
|
|
49
|
+
// Almost the same as Collect, but for pool owners
|
|
50
|
+
this.handlers['CollectProtocol'] = this.handleCollectEvent.bind(this);
|
|
51
|
+
this.handlers['Flash'] = this.handleFlashEvent.bind(this);
|
|
52
|
+
this.handlers['SetFee'] = this.handleSetFeeEvent.bind(this);
|
|
46
53
|
}
|
|
47
54
|
get poolAddress() {
|
|
48
55
|
if (this._poolAddress === undefined) {
|
|
49
|
-
this._poolAddress = this._computePoolAddress(this.token0, this.token1);
|
|
56
|
+
this._poolAddress = this._computePoolAddress(this.token0, this.token1, this.tickSpacing);
|
|
50
57
|
}
|
|
51
58
|
return this._poolAddress;
|
|
52
59
|
}
|
|
@@ -66,14 +73,19 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
|
|
|
66
73
|
processLog(state, log, blockHeader) {
|
|
67
74
|
try {
|
|
68
75
|
const event = this.logDecoder(log);
|
|
76
|
+
const uniswapV3EventLoggingSampleRate = this.dexHelper.config.data.uniswapV3EventLoggingSampleRate;
|
|
77
|
+
if (!this.dexHelper.config.isSlave &&
|
|
78
|
+
uniswapV3EventLoggingSampleRate &&
|
|
79
|
+
(0, utils_1.isSampled)(uniswapV3EventLoggingSampleRate)) {
|
|
80
|
+
this.logger.info(`event=${event.name} - block=${blockHeader.number}. Log sampled at rate ${uniswapV3EventLoggingSampleRate * 100}%`);
|
|
81
|
+
}
|
|
69
82
|
if (event.name in this.handlers) {
|
|
70
83
|
// Because we have observations in array which is mutable by nature, there is a
|
|
71
84
|
// ts compile error: https://stackoverflow.com/questions/53412934/disable-allowing-assigning-readonly-types-to-non-readonly-types
|
|
72
85
|
// And there is no good workaround, so turn off the type checker for this line
|
|
73
86
|
const _state = lodash_1.default.cloneDeep(state);
|
|
74
87
|
try {
|
|
75
|
-
|
|
76
|
-
return newState;
|
|
88
|
+
return this.handlers[event.name](event, _state, log, blockHeader);
|
|
77
89
|
}
|
|
78
90
|
catch (e) {
|
|
79
91
|
if (e instanceof Error &&
|
|
@@ -84,7 +96,7 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
|
|
|
84
96
|
this.logger.error(`${this.parentName}: Pool ${this.poolAddress}, ` +
|
|
85
97
|
`network=${this.dexHelper.config.data.network}: Unexpected ` +
|
|
86
98
|
`error while handling event on blockNumber=${blockHeader.number}, ` +
|
|
87
|
-
`blockHash=${blockHeader.hash} and parentHash=${blockHeader.parentHash} for
|
|
99
|
+
`blockHash=${blockHeader.hash} and parentHash=${blockHeader.parentHash} for UniswapV3, ${JSON.stringify(event)}`, e);
|
|
88
100
|
}
|
|
89
101
|
_state.isValid = false;
|
|
90
102
|
return _state;
|
|
@@ -96,135 +108,87 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
|
|
|
96
108
|
}
|
|
97
109
|
return null; // ignore unrecognized event
|
|
98
110
|
}
|
|
111
|
+
_getStateRequestCallData() {
|
|
112
|
+
if (!this._stateRequestCallData) {
|
|
113
|
+
const callData = [
|
|
114
|
+
{
|
|
115
|
+
target: this.token0,
|
|
116
|
+
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
117
|
+
this.poolAddress,
|
|
118
|
+
]),
|
|
119
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
120
|
+
},
|
|
121
|
+
{
|
|
122
|
+
target: this.token1,
|
|
123
|
+
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
124
|
+
this.poolAddress,
|
|
125
|
+
]),
|
|
126
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
target: this.stateMultiContract.options.address,
|
|
130
|
+
callData: this.stateMultiContract.methods
|
|
131
|
+
.getFullStateWithRelativeBitmaps(this.factoryAddress, this.token0, this.token1, this.tickSpacing, this.getBitmapRangeToRequest(), this.getBitmapRangeToRequest())
|
|
132
|
+
.encodeABI(),
|
|
133
|
+
decodeFunction: this.decodeStateMultiCallResultWithRelativeBitmaps !== undefined
|
|
134
|
+
? this.decodeStateMultiCallResultWithRelativeBitmaps
|
|
135
|
+
: utils_2.decodeStateMultiCallResultWithRelativeBitmaps,
|
|
136
|
+
},
|
|
137
|
+
];
|
|
138
|
+
this._stateRequestCallData = callData;
|
|
139
|
+
}
|
|
140
|
+
return this._stateRequestCallData;
|
|
141
|
+
}
|
|
99
142
|
getBitmapRangeToRequest() {
|
|
100
143
|
return constants_1.TICK_BITMAP_TO_USE + constants_1.TICK_BITMAP_BUFFER;
|
|
101
144
|
}
|
|
102
|
-
async
|
|
103
|
-
const callData =
|
|
104
|
-
{
|
|
105
|
-
target: this.token0,
|
|
106
|
-
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
107
|
-
this.poolAddress,
|
|
108
|
-
]),
|
|
109
|
-
decodeFunction: decoders_1.uint256ToBigInt,
|
|
110
|
-
},
|
|
111
|
-
{
|
|
112
|
-
target: this.token1,
|
|
113
|
-
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
114
|
-
this.poolAddress,
|
|
115
|
-
]),
|
|
116
|
-
decodeFunction: decoders_1.uint256ToBigInt,
|
|
117
|
-
},
|
|
118
|
-
{
|
|
119
|
-
target: this.stateMultiContract.options.address,
|
|
120
|
-
callData: this.stateMultiContract.methods
|
|
121
|
-
.getFullStateWithRelativeBitmaps(this.factoryAddress, this.token0, this.token1, this.getBitmapRangeToRequest(), this.getBitmapRangeToRequest())
|
|
122
|
-
.encodeABI(),
|
|
123
|
-
decodeFunction: utils_2.decodeStateMultiCallResultWithRelativeBitmaps,
|
|
124
|
-
},
|
|
125
|
-
];
|
|
145
|
+
async generateState(blockNumber) {
|
|
146
|
+
const callData = this._getStateRequestCallData();
|
|
126
147
|
const [resBalance0, resBalance1, resState] = await this.dexHelper.multiWrapper.tryAggregate(false, callData, blockNumber, this.dexHelper.multiWrapper.defaultBatchSize, false);
|
|
148
|
+
// Quite ugly solution, but this is the one that fits to current flow.
|
|
149
|
+
// I think UniswapV3 callbacks subscriptions are complexified for no reason.
|
|
150
|
+
// Need to be revisited later
|
|
127
151
|
(0, ts_essentials_1.assert)(resState.success, 'Pool does not exist');
|
|
128
152
|
const [balance0, balance1, _state] = [
|
|
129
153
|
resBalance0.returnData,
|
|
130
154
|
resBalance1.returnData,
|
|
131
155
|
resState.returnData,
|
|
132
156
|
];
|
|
133
|
-
return [balance0, balance1, _state];
|
|
134
|
-
}
|
|
135
|
-
async _fetchPoolStateMultiStep(blockNumber) {
|
|
136
|
-
const balancesAndGlobalStateCalldata = [
|
|
137
|
-
{
|
|
138
|
-
target: this.token0,
|
|
139
|
-
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
140
|
-
this.poolAddress,
|
|
141
|
-
]),
|
|
142
|
-
decodeFunction: decoders_1.uint256ToBigInt,
|
|
143
|
-
},
|
|
144
|
-
{
|
|
145
|
-
target: this.token1,
|
|
146
|
-
callData: this.erc20Interface.encodeFunctionData('balanceOf', [
|
|
147
|
-
this.poolAddress,
|
|
148
|
-
]),
|
|
149
|
-
decodeFunction: decoders_1.uint256ToBigInt,
|
|
150
|
-
},
|
|
151
|
-
{
|
|
152
|
-
target: this.stateMultiContract.options.address,
|
|
153
|
-
callData: this.stateMultiContract.methods
|
|
154
|
-
.getFullStateWithoutTicks(this.factoryAddress, this.token0, this.token1, 0, 0)
|
|
155
|
-
.encodeABI(),
|
|
156
|
-
decodeFunction: utils_2.decodeStateMultiCallResultWithRelativeBitmaps,
|
|
157
|
-
},
|
|
158
|
-
];
|
|
159
|
-
const [resBalance0, resBalance1, stateWithoutTicksAndTickBitmap] = await this.dexHelper.multiWrapper.tryAggregate(false, balancesAndGlobalStateCalldata, blockNumber, this.dexHelper.multiWrapper.defaultBatchSize, false);
|
|
160
|
-
(0, ts_essentials_1.assert)(stateWithoutTicksAndTickBitmap.success, 'Pool does not exist');
|
|
161
|
-
const [balance0, balance1, _stateWithoutTicksAndTickBitmap] = [
|
|
162
|
-
resBalance0.returnData,
|
|
163
|
-
resBalance1.returnData,
|
|
164
|
-
stateWithoutTicksAndTickBitmap.returnData,
|
|
165
|
-
];
|
|
166
|
-
const { globalState: { tick }, } = _stateWithoutTicksAndTickBitmap;
|
|
167
|
-
const currentBitmapIndex = (0, utils_1.int16)((BigInt(tick) / Constants_1.Constants.TICK_SPACING) >> 8n);
|
|
168
|
-
const buffer = this.getBitmapRangeToRequest();
|
|
169
|
-
const startBitMapIndex = currentBitmapIndex - buffer;
|
|
170
|
-
const endBitMapIndex = currentBitmapIndex + buffer;
|
|
171
|
-
const allBitMapIndices = Array.from({ length: 2 * Number(buffer) + 1 }, () => startBitMapIndex + endBitMapIndex);
|
|
172
|
-
const ticksAndBitMaps = await Promise.all(allBitMapIndices.map(relativeTick => {
|
|
173
|
-
return this.stateMultiContract.methods
|
|
174
|
-
.getAdditionalBitmapWithTicks(this.factoryAddress, this.token0, this.token1, relativeTick, relativeTick)
|
|
175
|
-
.call();
|
|
176
|
-
}));
|
|
177
|
-
const _state = {
|
|
178
|
-
..._stateWithoutTicksAndTickBitmap,
|
|
179
|
-
tickBitmap: ticksAndBitMaps.flatMap(v => v[0]),
|
|
180
|
-
ticks: ticksAndBitMaps.flatMap(v => v[1]),
|
|
181
|
-
};
|
|
182
|
-
return [balance0, balance1, _state];
|
|
183
|
-
}
|
|
184
|
-
async _fetchInitStateMultiStrategies(blockNumber) {
|
|
185
|
-
try {
|
|
186
|
-
return await this._fetchPoolStateSingleStep(blockNumber);
|
|
187
|
-
}
|
|
188
|
-
catch (e) {
|
|
189
|
-
if (e instanceof Error && e.message.includes('Pool does not exist'))
|
|
190
|
-
throw e;
|
|
191
|
-
if (this.dexHelper.config.data.network != constants_2.Network.ZKEVM)
|
|
192
|
-
throw e;
|
|
193
|
-
return this._fetchPoolStateMultiStep(blockNumber);
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
|
-
async generateState(blockNumber) {
|
|
197
|
-
const [balance0, balance1, _state] = await this._fetchInitStateMultiStrategies(blockNumber);
|
|
198
157
|
const tickBitmap = {};
|
|
199
158
|
const ticks = {};
|
|
200
159
|
(0, utils_3._reduceTickBitmap)(tickBitmap, _state.tickBitmap);
|
|
201
160
|
(0, utils_3._reduceTicks)(ticks, _state.ticks);
|
|
202
|
-
const
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
tick: (0, utils_1.bigIntify)(_state.globalState.tick),
|
|
208
|
-
};
|
|
209
|
-
const currentTick = globalState.tick;
|
|
210
|
-
const startTickBitmap = TickBitMap_1.TickBitMap.position(BigInt(currentTick) / Constants_1.Constants.TICK_SPACING)[0];
|
|
161
|
+
const currentTick = (0, utils_1.bigIntify)(_state.slot0.tick);
|
|
162
|
+
const tickSpacing = (0, utils_1.bigIntify)(_state.tickSpacing);
|
|
163
|
+
const fee = (0, utils_1.bigIntify)(_state.slot0.fee);
|
|
164
|
+
const startTickBitmap = TickBitMap_1.TickBitMap.position(currentTick / tickSpacing)[0];
|
|
165
|
+
const requestedRange = this.getBitmapRangeToRequest();
|
|
211
166
|
return {
|
|
212
167
|
pool: _state.pool,
|
|
213
168
|
blockTimestamp: (0, utils_1.bigIntify)(_state.blockTimestamp),
|
|
214
|
-
|
|
169
|
+
slot0: {
|
|
170
|
+
sqrtPriceX96: (0, utils_1.bigIntify)(_state.slot0.sqrtPriceX96),
|
|
171
|
+
tick: currentTick,
|
|
172
|
+
fee: (0, utils_1.bigIntify)(_state.slot0.fee),
|
|
173
|
+
},
|
|
215
174
|
liquidity: (0, utils_1.bigIntify)(_state.liquidity),
|
|
216
|
-
tickSpacing
|
|
217
|
-
maxLiquidityPerTick:
|
|
175
|
+
tickSpacing,
|
|
176
|
+
maxLiquidityPerTick: (0, utils_1.bigIntify)(_state.maxLiquidityPerTick),
|
|
218
177
|
tickBitmap,
|
|
219
178
|
ticks,
|
|
220
|
-
startTickBitmap,
|
|
221
179
|
isValid: true,
|
|
180
|
+
startTickBitmap,
|
|
181
|
+
lowestKnownTick: (BigInt.asIntN(24, startTickBitmap - requestedRange) << 8n) *
|
|
182
|
+
tickSpacing,
|
|
183
|
+
highestKnownTick: ((BigInt.asIntN(24, startTickBitmap + requestedRange) << 8n) +
|
|
184
|
+
BigInt.asIntN(24, 255n)) *
|
|
185
|
+
tickSpacing,
|
|
222
186
|
balance0,
|
|
223
187
|
balance1,
|
|
224
188
|
};
|
|
225
189
|
}
|
|
226
190
|
handleSwapEvent(event, pool, log, blockHeader) {
|
|
227
|
-
const newSqrtPriceX96 = (0, utils_1.bigIntify)(event.args.
|
|
191
|
+
const newSqrtPriceX96 = (0, utils_1.bigIntify)(event.args.sqrtPriceX96);
|
|
228
192
|
const amount0 = (0, utils_1.bigIntify)(event.args.amount0);
|
|
229
193
|
const amount1 = (0, utils_1.bigIntify)(event.args.amount1);
|
|
230
194
|
const newTick = (0, utils_1.bigIntify)(event.args.tick);
|
|
@@ -238,7 +202,7 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
|
|
|
238
202
|
}
|
|
239
203
|
else {
|
|
240
204
|
const zeroForOne = amount0 > 0n;
|
|
241
|
-
|
|
205
|
+
uniswap_v3_math_1.uniswapV3Math.swapFromEvent(pool, newSqrtPriceX96, newTick, newLiquidity, zeroForOne);
|
|
242
206
|
if (zeroForOne) {
|
|
243
207
|
if (amount1 < 0n) {
|
|
244
208
|
pool.balance1 -= BigInt.asUintN(256, -amount1);
|
|
@@ -261,45 +225,43 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
|
|
|
261
225
|
}
|
|
262
226
|
pool.balance1 += BigInt.asUintN(256, amount1);
|
|
263
227
|
}
|
|
264
|
-
if (communityFee > 0n) {
|
|
265
|
-
// _payCommunityFee
|
|
266
|
-
if (zeroForOne) {
|
|
267
|
-
pool.balance0 -= communityFee;
|
|
268
|
-
}
|
|
269
|
-
else {
|
|
270
|
-
pool.balance1 -= communityFee;
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
228
|
return pool;
|
|
274
229
|
}
|
|
275
230
|
}
|
|
231
|
+
handleBurnEvent(event, pool, log, blockHeader) {
|
|
232
|
+
const amount = (0, utils_1.bigIntify)(event.args.amount);
|
|
233
|
+
const tickLower = (0, utils_1.bigIntify)(event.args.tickLower);
|
|
234
|
+
const tickUpper = (0, utils_1.bigIntify)(event.args.tickUpper);
|
|
235
|
+
pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
|
|
236
|
+
uniswap_v3_math_1.uniswapV3Math._modifyPosition(pool, {
|
|
237
|
+
tickLower,
|
|
238
|
+
tickUpper,
|
|
239
|
+
liquidityDelta: -BigInt.asIntN(128, BigInt.asIntN(256, amount)),
|
|
240
|
+
});
|
|
241
|
+
// From this transaction I conclude that there is no balance change from
|
|
242
|
+
// Burn event: https://dashboard.tenderly.co/tx/mainnet/0xfccf5341147ac3ad0e66452273d12dfc3219e81f8fb369a6cdecfb24b9b9d078/logs
|
|
243
|
+
// And it aligns with UniswapV3 doc:
|
|
244
|
+
// https://github.com/Uniswap/v3-core/blob/05c10bf6d547d6121622ac51c457f93775e1df09/contracts/interfaces/pool/IUniswapV3PoolActions.sol#L59
|
|
245
|
+
// It just updates positions and tokensOwed which may be requested calling collect
|
|
246
|
+
// So, we don't need to update pool.balances0 and pool.balances1 here
|
|
247
|
+
return pool;
|
|
248
|
+
}
|
|
276
249
|
handleMintEvent(event, pool, log, blockHeader) {
|
|
277
|
-
const
|
|
278
|
-
const
|
|
279
|
-
const
|
|
250
|
+
const amount = (0, utils_1.bigIntify)(event.args.amount);
|
|
251
|
+
const tickLower = (0, utils_1.bigIntify)(event.args.tickLower);
|
|
252
|
+
const tickUpper = (0, utils_1.bigIntify)(event.args.tickUpper);
|
|
280
253
|
const amount0 = (0, utils_1.bigIntify)(event.args.amount0);
|
|
281
254
|
const amount1 = (0, utils_1.bigIntify)(event.args.amount1);
|
|
282
255
|
pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
|
|
283
|
-
|
|
256
|
+
uniswap_v3_math_1.uniswapV3Math._modifyPosition(pool, {
|
|
257
|
+
tickLower,
|
|
258
|
+
tickUpper,
|
|
259
|
+
liquidityDelta: amount,
|
|
260
|
+
});
|
|
284
261
|
pool.balance0 += amount0;
|
|
285
262
|
pool.balance1 += amount1;
|
|
286
263
|
return pool;
|
|
287
264
|
}
|
|
288
|
-
handleBurnEvent(event, pool, log, blockHeader) {
|
|
289
|
-
const bottomTick = (0, utils_1.bigIntify)(event.args.bottomTick);
|
|
290
|
-
const topTick = (0, utils_1.bigIntify)(event.args.topTick);
|
|
291
|
-
const amount = (0, utils_1.bigIntify)(event.args.liquidityAmount);
|
|
292
|
-
pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
|
|
293
|
-
AlgebraMath_1.AlgebraMath._updatePositionTicksAndFees(pool, bottomTick, topTick, -BigInt.asIntN(128, BigInt.asIntN(256, amount)));
|
|
294
|
-
// no balance change
|
|
295
|
-
return pool;
|
|
296
|
-
}
|
|
297
|
-
handleNewFee(event, pool, log, blockHeader) {
|
|
298
|
-
const fee = (0, utils_1.bigIntify)(event.args.fee);
|
|
299
|
-
pool.globalState.fee = fee;
|
|
300
|
-
pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
|
|
301
|
-
return pool;
|
|
302
|
-
}
|
|
303
265
|
handleCollectEvent(event, pool, log, blockHeader) {
|
|
304
266
|
const amount0 = (0, utils_1.bigIntify)(event.args.amount0);
|
|
305
267
|
const amount1 = (0, utils_1.bigIntify)(event.args.amount1);
|
|
@@ -316,21 +278,21 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
|
|
|
316
278
|
pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
|
|
317
279
|
return pool;
|
|
318
280
|
}
|
|
319
|
-
|
|
320
|
-
const
|
|
321
|
-
|
|
322
|
-
pool.globalState.communityFeeToken0 = communityFeeToken0;
|
|
323
|
-
pool.globalState.communityFeeToken1 = communityFeeToken1;
|
|
281
|
+
handleSetFeeEvent(event, pool, log, blockHeader) {
|
|
282
|
+
const feeNew = (0, utils_1.bigIntify)(event.args.feeNew);
|
|
283
|
+
pool.slot0.fee = feeNew;
|
|
324
284
|
pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
|
|
325
285
|
return pool;
|
|
326
286
|
}
|
|
327
|
-
_computePoolAddress(token0, token1) {
|
|
287
|
+
_computePoolAddress(token0, token1, tickSpacing) {
|
|
328
288
|
// https://github.com/Uniswap/v3-periphery/blob/main/contracts/libraries/PoolAddress.sol
|
|
329
289
|
if (token0 > token1)
|
|
330
290
|
[token0, token1] = [token1, token0];
|
|
331
|
-
const encodedKey = ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'address'
|
|
332
|
-
|
|
291
|
+
const encodedKey = ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'address', 'int24'],
|
|
292
|
+
// [token0, token1, BigInt.asUintN(24, fee)],
|
|
293
|
+
[token0, token1, BigInt.asUintN(24, tickSpacing)]));
|
|
294
|
+
return ethers_1.ethers.utils.getCreate2Address(this.factoryAddress, encodedKey, this.poolInitCodeHash);
|
|
333
295
|
}
|
|
334
296
|
}
|
|
335
|
-
exports.
|
|
336
|
-
//# sourceMappingURL=
|
|
297
|
+
exports.SolidlyV3EventPool = SolidlyV3EventPool;
|
|
298
|
+
//# sourceMappingURL=solidly-v3-pool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"solidly-v3-pool.js","sourceRoot":"","sources":["../../../src/dex/solidly-v3/solidly-v3-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { Interface } from '@ethersproject/abi';
|
|
3
|
+
import { Token, Address, ExchangePrices, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger, PoolPrices, PreprocessTransactionOptions, ExchangeTxInfo } from '../../types';
|
|
4
|
+
import { SwapSide, Network } from '../../constants';
|
|
5
|
+
import { IDex } from '../../dex/idex';
|
|
6
|
+
import { IDexHelper } from '../../dex-helper/idex-helper';
|
|
7
|
+
import { DexParams, SolidlyV3Data, UniswapV3Param } from './types';
|
|
8
|
+
import { SimpleExchange } from '../simple-exchange';
|
|
9
|
+
import { SolidlyV3EventPool } from './solidly-v3-pool';
|
|
10
|
+
import { OptimalSwapExchange } from '@paraswap/core';
|
|
11
|
+
import { OnPoolCreatedCallback } from './solidly-v3-factory';
|
|
12
|
+
export declare class SolidlyV3 extends SimpleExchange implements IDex<SolidlyV3Data, UniswapV3Param> {
|
|
13
|
+
protected network: Network;
|
|
14
|
+
protected dexHelper: IDexHelper;
|
|
15
|
+
protected adapters: import("../../types").AdapterMappings;
|
|
16
|
+
readonly poolIface: Interface;
|
|
17
|
+
readonly quoterIface: Interface;
|
|
18
|
+
protected config: DexParams;
|
|
19
|
+
protected poolsToPreload: {
|
|
20
|
+
token0: string;
|
|
21
|
+
token1: string;
|
|
22
|
+
}[];
|
|
23
|
+
readonly isFeeOnTransferSupported: boolean;
|
|
24
|
+
readonly eventPools: Record<string, SolidlyV3EventPool | null>;
|
|
25
|
+
readonly hasConstantPriceLargeAmounts = false;
|
|
26
|
+
readonly needWrapNative = true;
|
|
27
|
+
readonly directSwapIface: Interface;
|
|
28
|
+
intervalTask?: NodeJS.Timeout;
|
|
29
|
+
static dexKeysWithNetwork: {
|
|
30
|
+
key: string;
|
|
31
|
+
networks: Network[];
|
|
32
|
+
}[];
|
|
33
|
+
logger: Logger;
|
|
34
|
+
private stateMultiContract;
|
|
35
|
+
private notExistingPoolSetKey;
|
|
36
|
+
private readonly factory;
|
|
37
|
+
constructor(network: Network, dexKey: string, dexHelper: IDexHelper, adapters?: import("../../types").AdapterMappings, poolIface?: Interface, quoterIface?: Interface, config?: DexParams, poolsToPreload?: {
|
|
38
|
+
token0: string;
|
|
39
|
+
token1: string;
|
|
40
|
+
}[]);
|
|
41
|
+
get supportedTickSpacings(): bigint[];
|
|
42
|
+
getAdapters(side: SwapSide): {
|
|
43
|
+
name: string;
|
|
44
|
+
index: number;
|
|
45
|
+
}[] | null;
|
|
46
|
+
getPoolIdentifier(srcAddress: Address, destAddress: Address, tickSpacing: bigint): string;
|
|
47
|
+
initializePricing(blockNumber: number): Promise<void>;
|
|
48
|
+
onPoolCreatedDeleteFromNonExistingSet: OnPoolCreatedCallback;
|
|
49
|
+
getPool(srcAddress: Address, destAddress: Address, tickSpacing: bigint, blockNumber: number): Promise<SolidlyV3EventPool | null>;
|
|
50
|
+
addMasterPool(poolKey: string, blockNumber: number): Promise<boolean>;
|
|
51
|
+
getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
|
|
52
|
+
getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<null | ExchangePrices<SolidlyV3Data>>;
|
|
53
|
+
getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: SolidlyV3Data, side: SwapSide): AdapterExchangeParam;
|
|
54
|
+
getCalldataGasCost(poolPrices: PoolPrices<SolidlyV3Data>): number | number[];
|
|
55
|
+
getTokenFromAddress(address: Address): Token;
|
|
56
|
+
preProcessTransaction(optimalSwapExchange: OptimalSwapExchange<SolidlyV3Data>, srcToken: Token, _0: Token, _1: SwapSide, options: PreprocessTransactionOptions): Promise<[OptimalSwapExchange<SolidlyV3Data>, ExchangeTxInfo]>;
|
|
57
|
+
getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: SolidlyV3Data, side: SwapSide): Promise<SimpleExchangeParam>;
|
|
58
|
+
getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
|
|
59
|
+
private _getPoolsFromIdentifiers;
|
|
60
|
+
private _getLoweredAddresses;
|
|
61
|
+
private _sortTokens;
|
|
62
|
+
private _toLowerForAllConfigAddresses;
|
|
63
|
+
private _getOutputs;
|
|
64
|
+
private _querySubgraph;
|
|
65
|
+
private _encodePath;
|
|
66
|
+
releaseResources(): void;
|
|
67
|
+
}
|