@paraswap/dex-lib 2.42.13 → 2.42.14-algebra-price-fix.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.vscode/launch.json +39 -0
- package/.vscode/settings.json +2 -0
- package/.vscode/tasks.json +15 -0
- package/build/dex/algebra/lib/AlgebraMath.js +3 -1
- package/build/dex/algebra/lib/AlgebraMath.js.map +1 -1
- package/build/dex/algebra/scripts/validate-state.d.ts +1 -0
- package/build/dex/algebra/scripts/validate-state.js +195 -0
- package/build/dex/algebra/scripts/validate-state.js.map +1 -0
- package/package.json +1 -1
- package/src/dex/algebra/lib/AlgebraMath.ts +13 -1
- package/src/dex/algebra/scripts/validate-state.ts +292 -0
- package/build/abi/kyberswap-elastic/IAntiSnipAttackPositionManager.json +0 -1276
- package/build/abi/kyberswap-elastic/IFactory.json +0 -550
- package/build/abi/kyberswap-elastic/IPool.json +0 -1042
- package/build/abi/kyberswap-elastic/IQuoterV2.json +0 -226
- package/build/abi/kyberswap-elastic/IRouter.json +0 -239
- package/build/abi/kyberswap-elastic/TicksFeesReader.json +0 -142
- package/build/abi/wombat/asset.json +0 -769
- package/build/abi/wombat/bmw.json +0 -1247
- package/build/abi/wombat/pool.json +0 -1364
- package/build/dex/baseswap-v3/baseswap-v3-factory.d.ts +0 -26
- package/build/dex/baseswap-v3/baseswap-v3-factory.js +0 -44
- package/build/dex/baseswap-v3/baseswap-v3-factory.js.map +0 -1
- package/build/dex/baseswap-v3/baseswap-v3-pool.d.ts +0 -46
- package/build/dex/baseswap-v3/baseswap-v3-pool.js +0 -312
- package/build/dex/baseswap-v3/baseswap-v3-pool.js.map +0 -1
- package/build/dex/baseswap-v3/baseswap-v3.d.ts +0 -71
- package/build/dex/baseswap-v3/baseswap-v3.js +0 -752
- package/build/dex/baseswap-v3/baseswap-v3.js.map +0 -1
- package/build/dex/baseswap-v3/config.d.ts +0 -9
- package/build/dex/baseswap-v3/config.js +0 -48
- package/build/dex/baseswap-v3/config.js.map +0 -1
- package/build/dex/baseswap-v3/constants.d.ts +0 -28
- package/build/dex/baseswap-v3/constants.js +0 -35
- package/build/dex/baseswap-v3/constants.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/BitMath.d.ts +0 -4
- package/build/dex/baseswap-v3/contract-math/BitMath.js +0 -93
- package/build/dex/baseswap-v3/contract-math/BitMath.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/FixedPoint128.d.ts +0 -3
- package/build/dex/baseswap-v3/contract-math/FixedPoint128.js +0 -8
- package/build/dex/baseswap-v3/contract-math/FixedPoint128.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/FixedPoint96.d.ts +0 -4
- package/build/dex/baseswap-v3/contract-math/FixedPoint96.js +0 -9
- package/build/dex/baseswap-v3/contract-math/FixedPoint96.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/FullMath.d.ts +0 -4
- package/build/dex/baseswap-v3/contract-math/FullMath.js +0 -19
- package/build/dex/baseswap-v3/contract-math/FullMath.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/LiquidityMath.d.ts +0 -3
- package/build/dex/baseswap-v3/contract-math/LiquidityMath.js +0 -22
- package/build/dex/baseswap-v3/contract-math/LiquidityMath.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/Oracle.d.ts +0 -10
- package/build/dex/baseswap-v3/contract-math/Oracle.js +0 -133
- package/build/dex/baseswap-v3/contract-math/Oracle.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/SqrtPriceMath.d.ts +0 -10
- package/build/dex/baseswap-v3/contract-math/SqrtPriceMath.js +0 -91
- package/build/dex/baseswap-v3/contract-math/SqrtPriceMath.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/SwapMath.d.ts +0 -8
- package/build/dex/baseswap-v3/contract-math/SwapMath.js +0 -70
- package/build/dex/baseswap-v3/contract-math/SwapMath.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/Tick.d.ts +0 -7
- package/build/dex/baseswap-v3/contract-math/Tick.js +0 -45
- package/build/dex/baseswap-v3/contract-math/Tick.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/TickBitMap.d.ts +0 -7
- package/build/dex/baseswap-v3/contract-math/TickBitMap.js +0 -84
- package/build/dex/baseswap-v3/contract-math/TickBitMap.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/TickMath.d.ts +0 -8
- package/build/dex/baseswap-v3/contract-math/TickMath.js +0 -162
- package/build/dex/baseswap-v3/contract-math/TickMath.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/UnsafeMath.d.ts +0 -3
- package/build/dex/baseswap-v3/contract-math/UnsafeMath.js +0 -10
- package/build/dex/baseswap-v3/contract-math/UnsafeMath.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/uniswap-v3-math.d.ts +0 -37
- package/build/dex/baseswap-v3/contract-math/uniswap-v3-math.js +0 -393
- package/build/dex/baseswap-v3/contract-math/uniswap-v3-math.js.map +0 -1
- package/build/dex/baseswap-v3/contract-math/utils.d.ts +0 -7
- package/build/dex/baseswap-v3/contract-math/utils.js +0 -42
- package/build/dex/baseswap-v3/contract-math/utils.js.map +0 -1
- package/build/dex/baseswap-v3/types.d.ts +0 -164
- package/build/dex/baseswap-v3/types.js +0 -9
- package/build/dex/baseswap-v3/types.js.map +0 -1
- package/build/dex/baseswap-v3/utils.d.ts +0 -6
- package/build/dex/baseswap-v3/utils.js +0 -65
- package/build/dex/baseswap-v3/utils.js.map +0 -1
- package/build/dex/hello/config.d.ts +0 -4
- package/build/dex/hello/config.js +0 -15
- package/build/dex/hello/config.js.map +0 -1
- package/build/dex/hello/hello-pool.d.ts +0 -39
- package/build/dex/hello/hello-pool.js +0 -64
- package/build/dex/hello/hello-pool.js.map +0 -1
- package/build/dex/hello/hello.d.ts +0 -37
- package/build/dex/hello/hello.js +0 -126
- package/build/dex/hello/hello.js.map +0 -1
- package/build/dex/hello/types.d.ts +0 -6
- package/build/dex/hello/types.js +0 -3
- package/build/dex/hello/types.js.map +0 -1
- package/build/dex/kyberswap-elastic/config.d.ts +0 -4
- package/build/dex/kyberswap-elastic/config.js +0 -80
- package/build/dex/kyberswap-elastic/config.js.map +0 -1
- package/build/dex/kyberswap-elastic/constants.d.ts +0 -17
- package/build/dex/kyberswap-elastic/constants.js +0 -42
- package/build/dex/kyberswap-elastic/constants.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/FixedPoint96.d.ts +0 -4
- package/build/dex/kyberswap-elastic/contract-math/FixedPoint96.js +0 -9
- package/build/dex/kyberswap-elastic/contract-math/FixedPoint96.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/FullMath.d.ts +0 -5
- package/build/dex/kyberswap-elastic/contract-math/FullMath.js +0 -22
- package/build/dex/kyberswap-elastic/contract-math/FullMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/LiqDeltaMath.d.ts +0 -3
- package/build/dex/kyberswap-elastic/contract-math/LiqDeltaMath.js +0 -12
- package/build/dex/kyberswap-elastic/contract-math/LiqDeltaMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/LiquidityMath.d.ts +0 -3
- package/build/dex/kyberswap-elastic/contract-math/LiquidityMath.js +0 -22
- package/build/dex/kyberswap-elastic/contract-math/LiquidityMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/QtyDeltaMath.d.ts +0 -5
- package/build/dex/kyberswap-elastic/contract-math/QtyDeltaMath.js +0 -25
- package/build/dex/kyberswap-elastic/contract-math/QtyDeltaMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/QuadMath.d.ts +0 -4
- package/build/dex/kyberswap-elastic/contract-math/QuadMath.js +0 -27
- package/build/dex/kyberswap-elastic/contract-math/QuadMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/ReinvestmentMath.d.ts +0 -3
- package/build/dex/kyberswap-elastic/contract-math/ReinvestmentMath.js +0 -14
- package/build/dex/kyberswap-elastic/contract-math/ReinvestmentMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/SafeCast.d.ts +0 -8
- package/build/dex/kyberswap-elastic/contract-math/SafeCast.js +0 -30
- package/build/dex/kyberswap-elastic/contract-math/SafeCast.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/SqrtPriceMath.d.ts +0 -10
- package/build/dex/kyberswap-elastic/contract-math/SqrtPriceMath.js +0 -91
- package/build/dex/kyberswap-elastic/contract-math/SqrtPriceMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/SwapMath.d.ts +0 -13
- package/build/dex/kyberswap-elastic/contract-math/SwapMath.js +0 -188
- package/build/dex/kyberswap-elastic/contract-math/SwapMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/TickLinkedList.d.ts +0 -6
- package/build/dex/kyberswap-elastic/contract-math/TickLinkedList.js +0 -41
- package/build/dex/kyberswap-elastic/contract-math/TickLinkedList.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/TickMath.d.ts +0 -9
- package/build/dex/kyberswap-elastic/contract-math/TickMath.js +0 -165
- package/build/dex/kyberswap-elastic/contract-math/TickMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/UnsafeMath.d.ts +0 -3
- package/build/dex/kyberswap-elastic/contract-math/UnsafeMath.js +0 -10
- package/build/dex/kyberswap-elastic/contract-math/UnsafeMath.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/kyberswap-elastic-math.d.ts +0 -28
- package/build/dex/kyberswap-elastic/contract-math/kyberswap-elastic-math.js +0 -502
- package/build/dex/kyberswap-elastic/contract-math/kyberswap-elastic-math.js.map +0 -1
- package/build/dex/kyberswap-elastic/contract-math/utils.d.ts +0 -3
- package/build/dex/kyberswap-elastic/contract-math/utils.js +0 -16
- package/build/dex/kyberswap-elastic/contract-math/utils.js.map +0 -1
- package/build/dex/kyberswap-elastic/errors.d.ts +0 -2
- package/build/dex/kyberswap-elastic/errors.js +0 -6
- package/build/dex/kyberswap-elastic/errors.js.map +0 -1
- package/build/dex/kyberswap-elastic/kyberswap-elastic-pool.d.ts +0 -80
- package/build/dex/kyberswap-elastic/kyberswap-elastic-pool.js +0 -458
- package/build/dex/kyberswap-elastic/kyberswap-elastic-pool.js.map +0 -1
- package/build/dex/kyberswap-elastic/kyberswap-elastic.d.ts +0 -53
- package/build/dex/kyberswap-elastic/kyberswap-elastic.js +0 -610
- package/build/dex/kyberswap-elastic/kyberswap-elastic.js.map +0 -1
- package/build/dex/kyberswap-elastic/types.d.ts +0 -134
- package/build/dex/kyberswap-elastic/types.js +0 -9
- package/build/dex/kyberswap-elastic/types.js.map +0 -1
- package/build/dex/kyberswap-elastic/utils/decoders.d.ts +0 -9
- package/build/dex/kyberswap-elastic/utils/decoders.js +0 -78
- package/build/dex/kyberswap-elastic/utils/decoders.js.map +0 -1
- package/build/dex/morphex/config.d.ts +0 -11
- package/build/dex/morphex/config.js +0 -43
- package/build/dex/morphex/config.js.map +0 -1
- package/build/dex/morphex/morphex.d.ts +0 -25
- package/build/dex/morphex/morphex.js +0 -19
- package/build/dex/morphex/morphex.js.map +0 -1
- package/build/dex/my-test-dex/config.d.ts +0 -4
- package/build/dex/my-test-dex/config.js +0 -15
- package/build/dex/my-test-dex/config.js.map +0 -1
- package/build/dex/my-test-dex/my-test-dex-pool.d.ts +0 -39
- package/build/dex/my-test-dex/my-test-dex-pool.js +0 -64
- package/build/dex/my-test-dex/my-test-dex-pool.js.map +0 -1
- package/build/dex/my-test-dex/my-test-dex.d.ts +0 -37
- package/build/dex/my-test-dex/my-test-dex.js +0 -126
- package/build/dex/my-test-dex/my-test-dex.js.map +0 -1
- package/build/dex/my-test-dex/types.d.ts +0 -6
- package/build/dex/my-test-dex/types.js +0 -3
- package/build/dex/my-test-dex/types.js.map +0 -1
- package/build/dex/solidly/forks-override/fvm.d.ts +0 -20
- package/build/dex/solidly/forks-override/fvm.js +0 -42
- package/build/dex/solidly/forks-override/fvm.js.map +0 -1
- package/build/dex/wombat/config.d.ts +0 -5
- package/build/dex/wombat/config.js +0 -50
- package/build/dex/wombat/config.js.map +0 -1
- package/build/dex/wombat/types.d.ts +0 -33
- package/build/dex/wombat/types.js +0 -3
- package/build/dex/wombat/types.js.map +0 -1
- package/build/dex/wombat/utils.d.ts +0 -9
- package/build/dex/wombat/utils.js +0 -66
- package/build/dex/wombat/utils.js.map +0 -1
- package/build/dex/wombat/wombat-bmw.d.ts +0 -40
- package/build/dex/wombat/wombat-bmw.js +0 -145
- package/build/dex/wombat/wombat-bmw.js.map +0 -1
- package/build/dex/wombat/wombat-pool.d.ts +0 -22
- package/build/dex/wombat/wombat-pool.js +0 -161
- package/build/dex/wombat/wombat-pool.js.map +0 -1
- package/build/dex/wombat/wombat-quoter.d.ts +0 -16
- package/build/dex/wombat/wombat-quoter.js +0 -176
- package/build/dex/wombat/wombat-quoter.js.map +0 -1
- package/build/dex/wombat/wombat.d.ts +0 -55
- package/build/dex/wombat/wombat.js +0 -292
- package/build/dex/wombat/wombat.js.map +0 -1
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": "0.2.0",
|
|
3
|
+
"configurations": [
|
|
4
|
+
{
|
|
5
|
+
"type": "node",
|
|
6
|
+
"request": "launch",
|
|
7
|
+
"name": "Current",
|
|
8
|
+
"program": "${file}",
|
|
9
|
+
"preLaunchTask": "npm: build",
|
|
10
|
+
"sourceMaps": true,
|
|
11
|
+
"smartStep": true,
|
|
12
|
+
"internalConsoleOptions": "openOnSessionStart",
|
|
13
|
+
"outFiles": ["${workspaceFolder}/build/**/*.js"]
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
"type": "node",
|
|
17
|
+
"request": "launch",
|
|
18
|
+
"name": "Debug Jest Tests",
|
|
19
|
+
"program": "${workspaceFolder}/node_modules/ts-node/dist/bin.js",
|
|
20
|
+
"args": [
|
|
21
|
+
"--project",
|
|
22
|
+
"tsconfig.json",
|
|
23
|
+
"${workspaceFolder}/src/dex/algebra/scripts/validate-state.ts",
|
|
24
|
+
// "${workspaceFolder}/scripts/dex-integration.ts",
|
|
25
|
+
"test",
|
|
26
|
+
"gmx"
|
|
27
|
+
],
|
|
28
|
+
"console": "integratedTerminal",
|
|
29
|
+
"internalConsoleOptions": "neverOpen",
|
|
30
|
+
// "disableOptimisticBPs": true,
|
|
31
|
+
"runtimeArgs": ["--nolazy"],
|
|
32
|
+
"sourceMaps": true,
|
|
33
|
+
"smartStep": true,
|
|
34
|
+
"skipFiles": ["<node_internals>/**"],
|
|
35
|
+
"cwd": "${workspaceFolder}",
|
|
36
|
+
// "protocol": "inspector"
|
|
37
|
+
}
|
|
38
|
+
]
|
|
39
|
+
}
|
|
@@ -368,7 +368,7 @@ class AlgebraMathClass {
|
|
|
368
368
|
TickTable_1.TickTable.nextInitializedTickWithinOneWord(poolState, currentTick, zeroToOne, false, poolState.areTicksCompressed ? poolState.tickSpacing : undefined);
|
|
369
369
|
step.nextTickPrice = TickMath_1.TickMath.getSqrtRatioAtTick(step.nextTick);
|
|
370
370
|
// equivalent of PriceMovementMath.movePriceTowardsTarget
|
|
371
|
-
const result = SwapMath_1.SwapMath.computeSwapStep(
|
|
371
|
+
const result = SwapMath_1.SwapMath.computeSwapStep(currentPrice, zeroToOne == step.nextTickPrice < newSqrtPriceX96
|
|
372
372
|
? newSqrtPriceX96
|
|
373
373
|
: step.nextTickPrice, currentLiquidity, amountRequired, cache.fee);
|
|
374
374
|
[currentPrice, step.input, step.output, step.feeAmount] = [
|
|
@@ -415,6 +415,8 @@ class AlgebraMathClass {
|
|
|
415
415
|
break;
|
|
416
416
|
}
|
|
417
417
|
}
|
|
418
|
+
(0, utils_1._require)(currentPrice == newSqrtPriceX96, `LOGIC ERROR: calculated currentPrice and price from event ('newSqrtPriceX96') should always be equal at the end`, { currentPrice, newSqrtPriceX96 });
|
|
419
|
+
(0, utils_1._require)(currentTick == newTick, `LOGIC ERROR: calculated currentTick and tick from event ('newTick') should always be equal at the end`, { currentTick, newTick });
|
|
418
420
|
let [amount0, amount1] = zeroToOne == cache.exactInput // the amount to provide could be less then initially specified (e.g. reached limit)
|
|
419
421
|
? [cache.amountRequiredInitial - amountRequired, cache.amountCalculated] // the amount to get could be less then initially specified (e.g. reached limit)
|
|
420
422
|
: [
|
|
@@ -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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,195 @@
|
|
|
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
|
+
/* eslint-disable no-console */
|
|
7
|
+
const dotenv_1 = __importDefault(require("dotenv"));
|
|
8
|
+
dotenv_1.default.config();
|
|
9
|
+
const constants_1 = require("../../../constants");
|
|
10
|
+
const dex_helper_1 = require("../../../dex-helper");
|
|
11
|
+
const algebra_1 = require("../algebra");
|
|
12
|
+
const decoders_1 = require("../../../lib/decoders");
|
|
13
|
+
const utils_1 = require("../utils");
|
|
14
|
+
const multi_wrapper_1 = require("../../../lib/multi-wrapper");
|
|
15
|
+
const web3_1 = __importDefault(require("web3"));
|
|
16
|
+
const multi_v2_json_1 = __importDefault(require("../../../abi/multi-v2.json"));
|
|
17
|
+
const erc20_json_1 = __importDefault(require("../../../abi/erc20.json"));
|
|
18
|
+
const log4js_1 = require("../../../lib/log4js");
|
|
19
|
+
const utils_2 = require("ethers/lib/utils");
|
|
20
|
+
const AlgebraStateMulticall_abi_json_1 = __importDefault(require("../../../abi/algebra/AlgebraStateMulticall.abi.json"));
|
|
21
|
+
const constants_2 = require("../constants");
|
|
22
|
+
const ethers_1 = require("ethers");
|
|
23
|
+
// public RPC, replace to RPC with archive node
|
|
24
|
+
const web3Provider = new web3_1.default('');
|
|
25
|
+
// pool and tokens for specific broken tx - 0x9a296a13f7c5eb8ce838e15ecbe3888e8998a14803a1ec46838611e1ff118d6e
|
|
26
|
+
const factoryAddress = '0x1a3c9b1d2f0529d97f2afc5136cc23e58f1fd35b';
|
|
27
|
+
const poolAddress = '0xb1026b8e7276e7ac75410f1fcbbe21796e8f7526';
|
|
28
|
+
const srcToken = {
|
|
29
|
+
address: `0x82af49447d8a07e3bd95bd0d56f35241523fbab1`,
|
|
30
|
+
decimals: 18,
|
|
31
|
+
};
|
|
32
|
+
const destToken = {
|
|
33
|
+
address: '0xaf88d065e77c8cc2239327c5edb3a432268e5831',
|
|
34
|
+
decimals: 6,
|
|
35
|
+
};
|
|
36
|
+
const blockHeaders = {};
|
|
37
|
+
const multiContract = new web3Provider.eth.Contract(multi_v2_json_1.default, '0x7eCfBaa8742fDf5756DAC92fbc8b90a19b8815bF');
|
|
38
|
+
const stateMultiContract = new web3Provider.eth.Contract(AlgebraStateMulticall_abi_json_1.default, '0x2cB568442a102dF518b3D37CBD0d2884523C940B');
|
|
39
|
+
const multiWrapper = new multi_wrapper_1.MultiWrapper(multiContract, (0, log4js_1.getLogger)(`Ticks`));
|
|
40
|
+
const erc20Interface = new utils_2.Interface(erc20_json_1.default);
|
|
41
|
+
function getBitmapRangeToRequest() {
|
|
42
|
+
return constants_2.TICK_BITMAP_TO_USE + constants_2.TICK_BITMAP_BUFFER;
|
|
43
|
+
}
|
|
44
|
+
async function _fetchPoolState_v1_9SingleStep(blockNumber) {
|
|
45
|
+
const callData = [
|
|
46
|
+
{
|
|
47
|
+
target: srcToken.address,
|
|
48
|
+
callData: erc20Interface.encodeFunctionData('balanceOf', [poolAddress]),
|
|
49
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
target: destToken.address,
|
|
53
|
+
callData: erc20Interface.encodeFunctionData('balanceOf', [poolAddress]),
|
|
54
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
target: stateMultiContract.options.address,
|
|
58
|
+
callData: stateMultiContract.methods
|
|
59
|
+
.getFullStateWithRelativeBitmaps(factoryAddress, srcToken.address, destToken.address, getBitmapRangeToRequest(), getBitmapRangeToRequest())
|
|
60
|
+
.encodeABI(),
|
|
61
|
+
decodeFunction: utils_1.decodeStateMultiCallResultWithRelativeBitmapsV1_9,
|
|
62
|
+
},
|
|
63
|
+
];
|
|
64
|
+
const [resBalance0, resBalance1, resState] = await multiWrapper.tryAggregate(false, callData, blockNumber, multiWrapper.defaultBatchSize, false);
|
|
65
|
+
const [balance0, balance1, _state] = [
|
|
66
|
+
resBalance0.returnData,
|
|
67
|
+
resBalance1.returnData,
|
|
68
|
+
resState.returnData,
|
|
69
|
+
];
|
|
70
|
+
return [balance0, balance1, _state];
|
|
71
|
+
}
|
|
72
|
+
function preprocessField(value) {
|
|
73
|
+
if (typeof value === 'bigint' ||
|
|
74
|
+
typeof value === 'number' ||
|
|
75
|
+
ethers_1.ethers.BigNumber.isBigNumber(value)) {
|
|
76
|
+
return value.toString();
|
|
77
|
+
}
|
|
78
|
+
return value;
|
|
79
|
+
}
|
|
80
|
+
function compareAndLogDifferences(obj1, obj2, keyNames, checkEachKey = false) {
|
|
81
|
+
let isValid = true;
|
|
82
|
+
let keys = keyNames;
|
|
83
|
+
if (checkEachKey) {
|
|
84
|
+
// find common keys
|
|
85
|
+
const keys1 = Object.keys(obj1);
|
|
86
|
+
const keys2 = new Set(Object.keys(obj2));
|
|
87
|
+
keys = keys1.filter(key => keys2.has(key));
|
|
88
|
+
}
|
|
89
|
+
for (let fieldName of keys) {
|
|
90
|
+
const value1 = preprocessField(obj1[fieldName]);
|
|
91
|
+
const value2 = preprocessField(obj2[fieldName]);
|
|
92
|
+
if (value1 !== value2) {
|
|
93
|
+
console.log(`${fieldName.toString()} mismatch: actual: ${value1} vs pool: ${value2}`);
|
|
94
|
+
isValid = false;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return isValid;
|
|
98
|
+
}
|
|
99
|
+
async function isPoolStateEqualToReal(state, blockNumber) {
|
|
100
|
+
const [balance0, balance1, contractState] = await _fetchPoolState_v1_9SingleStep(blockNumber);
|
|
101
|
+
const isValidBalances = compareAndLogDifferences(state, { balance0, balance1, ...contractState }, ['balance0', 'balance1', 'liquidity', 'tickSpacing']);
|
|
102
|
+
const isValidGlobalState = compareAndLogDifferences(state.globalState, contractState.globalState,
|
|
103
|
+
// can check only for one of them, because they are directly co-related
|
|
104
|
+
['price', 'tick']);
|
|
105
|
+
const isValidTickBitmap = compareAndLogDifferences(state.tickBitmap, contractState.tickBitmap, [], true);
|
|
106
|
+
let isValidTicks = true;
|
|
107
|
+
for (let tick of contractState.ticks) {
|
|
108
|
+
const stateTick = state?.ticks[tick.index];
|
|
109
|
+
const isValidTick = compareAndLogDifferences(stateTick, tick.value, [
|
|
110
|
+
'liquidityGross',
|
|
111
|
+
'liquidityNet',
|
|
112
|
+
// next fields doesn't affect pricing, so skip checks
|
|
113
|
+
// 'initialized',
|
|
114
|
+
// 'secondsOutside',
|
|
115
|
+
// 'secondsPerLiquidityOutsideX128',
|
|
116
|
+
// 'tickCumulativeOutside'
|
|
117
|
+
]);
|
|
118
|
+
if (isValidTicks && !isValidTick) {
|
|
119
|
+
isValidTicks = false;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
return (isValidBalances && isValidGlobalState && isValidTicks && isValidTickBitmap);
|
|
123
|
+
}
|
|
124
|
+
async function checkPoolStateForBlockRange(startBlockNumber, endBlockNumber) {
|
|
125
|
+
const network = constants_1.Network.ARBITRUM;
|
|
126
|
+
const dexKey = 'CamelotV3';
|
|
127
|
+
const dexHelper = new dex_helper_1.DummyDexHelper(network);
|
|
128
|
+
const algebra = new algebra_1.Algebra(network, dexKey, dexHelper);
|
|
129
|
+
const pool = await algebra.getPool(srcToken.address, destToken.address, startBlockNumber);
|
|
130
|
+
const logsToDispatch = await dexHelper.provider.getLogs({
|
|
131
|
+
fromBlock: startBlockNumber,
|
|
132
|
+
toBlock: endBlockNumber,
|
|
133
|
+
address: poolAddress,
|
|
134
|
+
});
|
|
135
|
+
console.log(logsToDispatch.length);
|
|
136
|
+
// group logs by block number
|
|
137
|
+
const logsByBlockNumber = {};
|
|
138
|
+
for (let log of logsToDispatch) {
|
|
139
|
+
if (!logsByBlockNumber[log.blockNumber]) {
|
|
140
|
+
logsByBlockNumber[log.blockNumber] = [];
|
|
141
|
+
}
|
|
142
|
+
logsByBlockNumber[log.blockNumber].push(log);
|
|
143
|
+
}
|
|
144
|
+
const sortedBlocks = Object.keys(logsByBlockNumber)
|
|
145
|
+
.map(Number)
|
|
146
|
+
.sort((a, b) => Number(a) - Number(b));
|
|
147
|
+
for (let blockNumber of sortedBlocks) {
|
|
148
|
+
if (!blockHeaders[blockNumber]) {
|
|
149
|
+
blockHeaders[blockNumber] = await dexHelper.web3Provider.eth.getBlock(blockNumber);
|
|
150
|
+
}
|
|
151
|
+
await pool?.update(logsByBlockNumber[blockNumber], {
|
|
152
|
+
[blockNumber]: blockHeaders[blockNumber],
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
const state = pool?.getState(startBlockNumber);
|
|
156
|
+
return isPoolStateEqualToReal(state, endBlockNumber);
|
|
157
|
+
}
|
|
158
|
+
async function findBreakingBlock(startBlock, endBlock) {
|
|
159
|
+
let left = startBlock;
|
|
160
|
+
let right = endBlock;
|
|
161
|
+
// If the state is valid at the start, then there's no breaking block in the range
|
|
162
|
+
if (await checkPoolStateForBlockRange(left, right)) {
|
|
163
|
+
return -1; // Indicates no breaking block found
|
|
164
|
+
}
|
|
165
|
+
while (left <= right) {
|
|
166
|
+
const mid = left + Math.floor((right - left) / 2);
|
|
167
|
+
const isValid = await checkPoolStateForBlockRange(startBlock, mid);
|
|
168
|
+
if (isValid) {
|
|
169
|
+
// If the state is valid up to mid, the issue must be in the second half
|
|
170
|
+
left = mid + 1;
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
// If the state is not valid up to mid, the issue is in the first half
|
|
174
|
+
// But we need to check if mid is the first occurrence of the issue
|
|
175
|
+
if (mid === startBlock ||
|
|
176
|
+
(await checkPoolStateForBlockRange(startBlock, mid - 1))) {
|
|
177
|
+
return mid; // Found the breaking block
|
|
178
|
+
}
|
|
179
|
+
right = mid - 1;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
return -1; // Should not reach here if there's a breaking block
|
|
183
|
+
}
|
|
184
|
+
async function main() {
|
|
185
|
+
// use findBreakingBlock to find the block where the state is broken
|
|
186
|
+
// console.log(await findBreakingBlock(startBlockNumber, endBlockNumber));
|
|
187
|
+
// previously broken block 150502863
|
|
188
|
+
// console.log(await checkPoolStateForBlockRange(150502853, 150502873));
|
|
189
|
+
// console.log(await checkPoolStateForBlockRange(152087800, 152287800));
|
|
190
|
+
// console.log(await checkPoolStateForBlockRange(152100945, 152100947));
|
|
191
|
+
}
|
|
192
|
+
main()
|
|
193
|
+
.then(() => console.log('Done'))
|
|
194
|
+
.catch(e => console.error(e));
|
|
195
|
+
//# sourceMappingURL=validate-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-state.js","sourceRoot":"","sources":["../../../../src/dex/algebra/scripts/validate-state.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -588,7 +588,7 @@ class AlgebraMathClass {
|
|
|
588
588
|
|
|
589
589
|
// equivalent of PriceMovementMath.movePriceTowardsTarget
|
|
590
590
|
const result = SwapMath.computeSwapStep(
|
|
591
|
-
|
|
591
|
+
currentPrice,
|
|
592
592
|
zeroToOne == step.nextTickPrice < newSqrtPriceX96
|
|
593
593
|
? newSqrtPriceX96
|
|
594
594
|
: step.nextTickPrice,
|
|
@@ -651,6 +651,18 @@ class AlgebraMathClass {
|
|
|
651
651
|
}
|
|
652
652
|
}
|
|
653
653
|
|
|
654
|
+
_require(
|
|
655
|
+
currentPrice == newSqrtPriceX96,
|
|
656
|
+
`LOGIC ERROR: calculated currentPrice and price from event ('newSqrtPriceX96') should always be equal at the end`,
|
|
657
|
+
{ currentPrice, newSqrtPriceX96 },
|
|
658
|
+
);
|
|
659
|
+
|
|
660
|
+
_require(
|
|
661
|
+
currentTick == newTick,
|
|
662
|
+
`LOGIC ERROR: calculated currentTick and tick from event ('newTick') should always be equal at the end`,
|
|
663
|
+
{ currentTick, newTick },
|
|
664
|
+
);
|
|
665
|
+
|
|
654
666
|
let [amount0, amount1] =
|
|
655
667
|
zeroToOne == cache.exactInput // the amount to provide could be less then initially specified (e.g. reached limit)
|
|
656
668
|
? [cache.amountRequiredInitial - amountRequired, cache.amountCalculated] // the amount to get could be less then initially specified (e.g. reached limit)
|