@paraswap/dex-lib 4.0.23 → 4.0.24-bal-v2-gyro-e-pricing-bug.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GyroEPool.js","sourceRoot":"","sources":["../../../../../src/dex/balancer-v2/pools/gyro/GyroEPool.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAC/C,wDAAqD;AAErD,0DAA+C;AAC/C,qDAA+D;AAC/D,uCAIqB;AAErB,6DAAiD;AACjD,4CAM4B;AAC5B,kGAAmE;
|
|
1
|
+
{"version":3,"file":"GyroEPool.js","sourceRoot":"","sources":["../../../../../src/dex/balancer-v2/pools/gyro/GyroEPool.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paraswap/dex-lib",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.24-bal-v2-gyro-e-pricing-bug.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"repository": "https://github.com/paraswap/paraswap-dex-lib",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"dependencies": {
|
|
54
54
|
"@0x/utils": "^4.5.2",
|
|
55
55
|
"@balancer-labs/balancer-maths": "^0.0.19",
|
|
56
|
-
"@balancer-labs/sor": "4.1.
|
|
56
|
+
"@balancer-labs/sor": "4.1.3",
|
|
57
57
|
"@bgd-labs/aave-address-book": "4.7.0",
|
|
58
58
|
"@ethersproject/abi": "^5.7.0",
|
|
59
59
|
"@hashflow/sdk": "^2.2.7",
|
|
@@ -697,29 +697,25 @@ describe('BalancerV2', function () {
|
|
|
697
697
|
});
|
|
698
698
|
|
|
699
699
|
describe('WETH / USDC', () => {
|
|
700
|
-
const gyroEAddr = '
|
|
700
|
+
const gyroEAddr = '0x1a63b425600d775a1e1bfc212f021273812c3b16';
|
|
701
701
|
|
|
702
702
|
it('SELL WETH -> USDC getPoolIdentifiers and getPricesVolume', async function () {
|
|
703
703
|
const network = Network.BASE;
|
|
704
704
|
|
|
705
705
|
const dexHelper = new DummyDexHelper(network);
|
|
706
706
|
const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
|
|
707
|
-
// const blocknumber =
|
|
707
|
+
// const blocknumber = 25726105;
|
|
708
708
|
const balancerV2 = new BalancerV2(network, dexKey, dexHelper);
|
|
709
709
|
const tokens = Tokens[network];
|
|
710
710
|
|
|
711
|
+
console.log('BLOCK NUMBER: ', blocknumber);
|
|
712
|
+
|
|
711
713
|
const amounts = [
|
|
712
714
|
0n,
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
5n * BI_POWS[18],
|
|
718
|
-
6n * BI_POWS[18],
|
|
719
|
-
7n * BI_POWS[18],
|
|
720
|
-
8n * BI_POWS[18],
|
|
721
|
-
9n * BI_POWS[18],
|
|
722
|
-
10n * BI_POWS[18],
|
|
715
|
+
1000000000000n, // works
|
|
716
|
+
1200000000000n, // works
|
|
717
|
+
// 3900000000000n, // not working
|
|
718
|
+
// 4000000000000n, // not working
|
|
723
719
|
];
|
|
724
720
|
|
|
725
721
|
await balancerV2.initializePricing(blocknumber);
|
|
@@ -754,6 +750,9 @@ describe('BalancerV2', function () {
|
|
|
754
750
|
const isPoolPrice = poolPrices!.find(price =>
|
|
755
751
|
price.data.poolId.includes(gyroEAddr),
|
|
756
752
|
);
|
|
753
|
+
|
|
754
|
+
console.log('isPoolPrice: ', isPoolPrice);
|
|
755
|
+
|
|
757
756
|
expect(isPoolPrice).toBeDefined();
|
|
758
757
|
|
|
759
758
|
const onChainPrices = await getOnChainPricingForWeightedPool(
|