@clober/v2-sdk 1.0.0-rc.42 → 1.0.0-rc.43
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/dist/cjs/calls/pool/burn.js +3 -3
- package/dist/cjs/calls/pool/mint.js +3 -3
- package/dist/cjs/calls/pool/wrap.js +4 -4
- package/dist/cjs/entities/pool/apis/index.js +10 -1
- package/dist/cjs/entities/pool/apis/index.js.map +1 -1
- package/dist/cjs/entities/pool/apis/snapshot.js +3 -3
- package/dist/cjs/entities/pool/model.js +18 -5
- package/dist/cjs/entities/pool/model.js.map +1 -1
- package/dist/esm/calls/pool/burn.js +3 -3
- package/dist/esm/calls/pool/mint.js +3 -3
- package/dist/esm/calls/pool/wrap.js +4 -4
- package/dist/esm/entities/pool/apis/index.js +10 -1
- package/dist/esm/entities/pool/apis/index.js.map +1 -1
- package/dist/esm/entities/pool/apis/snapshot.js +3 -3
- package/dist/esm/entities/pool/model.js +18 -5
- package/dist/esm/entities/pool/model.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/types/entities/pool/apis/index.d.ts.map +1 -1
- package/dist/types/entities/pool/model.d.ts +4 -2
- package/dist/types/entities/pool/model.d.ts.map +1 -1
- package/dist/types/entities/pool/types.d.ts +3 -2
- package/dist/types/entities/pool/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -27,7 +27,7 @@ const removeLiquidity = async ({ chainId, userAddress, token0, token1, salt, amo
|
|
|
27
27
|
})
|
|
28
28
|
`);
|
|
29
29
|
}
|
|
30
|
-
const burnAmount = (0, viem_1.parseUnits)(amount, pool.
|
|
30
|
+
const burnAmount = (0, viem_1.parseUnits)(amount, pool.lpCurrency.decimals);
|
|
31
31
|
const slippageLimitPercent = options?.slippage ?? 2;
|
|
32
32
|
const withdrawAmountA = (burnAmount * pool.liquidityA) / pool.totalSupply;
|
|
33
33
|
const withdrawAmountB = (burnAmount * pool.liquidityB) / pool.totalSupply;
|
|
@@ -48,7 +48,7 @@ const removeLiquidity = async ({ chainId, userAddress, token0, token1, salt, amo
|
|
|
48
48
|
direction: 'out',
|
|
49
49
|
},
|
|
50
50
|
lpCurrency: {
|
|
51
|
-
currency: pool.
|
|
51
|
+
currency: pool.lpCurrency,
|
|
52
52
|
amount: '0',
|
|
53
53
|
direction: 'in',
|
|
54
54
|
},
|
|
@@ -77,7 +77,7 @@ const removeLiquidity = async ({ chainId, userAddress, token0, token1, salt, amo
|
|
|
77
77
|
direction: 'out',
|
|
78
78
|
},
|
|
79
79
|
lpCurrency: {
|
|
80
|
-
currency: pool.
|
|
80
|
+
currency: pool.lpCurrency,
|
|
81
81
|
amount: amount,
|
|
82
82
|
direction: 'in',
|
|
83
83
|
},
|
|
@@ -99,7 +99,7 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
99
99
|
direction: 'in',
|
|
100
100
|
},
|
|
101
101
|
lpCurrency: {
|
|
102
|
-
currency: pool.
|
|
102
|
+
currency: pool.lpCurrency,
|
|
103
103
|
amount: '0',
|
|
104
104
|
direction: 'out',
|
|
105
105
|
},
|
|
@@ -152,8 +152,8 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
152
152
|
direction: currencyBResultAmount >= 0 ? 'in' : 'out',
|
|
153
153
|
},
|
|
154
154
|
lpCurrency: {
|
|
155
|
-
currency: pool.
|
|
156
|
-
amount: (0, viem_1.formatUnits)(mintAmount, pool.
|
|
155
|
+
currency: pool.lpCurrency,
|
|
156
|
+
amount: (0, viem_1.formatUnits)(mintAmount, pool.lpCurrency.decimals),
|
|
157
157
|
direction: 'out',
|
|
158
158
|
},
|
|
159
159
|
},
|
|
@@ -25,7 +25,7 @@ const wrapToERC20 = async ({ chainId, userAddress, token0, token1, salt, amount,
|
|
|
25
25
|
currency: {
|
|
26
26
|
name: `Wrapped Clober Liquidity Vault ${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
27
27
|
symbol: `wCLV-${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
28
|
-
decimals: pool.
|
|
28
|
+
decimals: pool.lpCurrency.decimals,
|
|
29
29
|
address,
|
|
30
30
|
},
|
|
31
31
|
amount,
|
|
@@ -40,7 +40,7 @@ const wrapToERC20 = async ({ chainId, userAddress, token0, token1, salt, amount,
|
|
|
40
40
|
args: [
|
|
41
41
|
addresses_1.CONTRACT_ADDRESSES[chainId].Rebalancer,
|
|
42
42
|
BigInt(pool.key),
|
|
43
|
-
(0, viem_1.parseUnits)(amount, pool.
|
|
43
|
+
(0, viem_1.parseUnits)(amount, pool.lpCurrency.decimals),
|
|
44
44
|
],
|
|
45
45
|
}, options?.gasLimit),
|
|
46
46
|
};
|
|
@@ -69,7 +69,7 @@ const unwrapFromERC20 = async ({ chainId, userAddress, token0, token1, salt, amo
|
|
|
69
69
|
currency: {
|
|
70
70
|
name: `Wrapped Clober Liquidity Vault ${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
71
71
|
symbol: `wCLV-${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
72
|
-
decimals: pool.
|
|
72
|
+
decimals: pool.lpCurrency.decimals,
|
|
73
73
|
address,
|
|
74
74
|
},
|
|
75
75
|
amount,
|
|
@@ -92,7 +92,7 @@ const unwrapFromERC20 = async ({ chainId, userAddress, token0, token1, salt, amo
|
|
|
92
92
|
},
|
|
93
93
|
],
|
|
94
94
|
functionName: 'withdrawTo',
|
|
95
|
-
args: [userAddress, (0, viem_1.parseUnits)(amount, pool.
|
|
95
|
+
args: [userAddress, (0, viem_1.parseUnits)(amount, pool.lpCurrency.decimals)],
|
|
96
96
|
}, options?.gasLimit),
|
|
97
97
|
};
|
|
98
98
|
}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.fetchPool = void 0;
|
|
4
|
+
const viem_1 = require("viem");
|
|
4
5
|
const addresses_1 = require("../../../constants/chain-configs/addresses");
|
|
5
6
|
const rebalancer_abi_1 = require("../../../constants/abis/rebalancer/rebalancer-abi");
|
|
6
7
|
const strategy_abi_1 = require("../../../constants/abis/rebalancer/strategy-abi");
|
|
7
8
|
const apis_1 = require("../../market/apis");
|
|
8
9
|
const model_1 = require("../model");
|
|
9
10
|
const pool_key_1 = require("../utils/pool-key");
|
|
11
|
+
const wrapped_6909_factory_abi_1 = require("../../../constants/abis/rebalancer/wrapped-6909-factory-abi");
|
|
10
12
|
async function fetchPool(publicClient, chainId, tokenAddresses, salt, useSubgraph, market) {
|
|
11
13
|
if (tokenAddresses.length !== 2) {
|
|
12
14
|
throw new Error('Invalid token pair');
|
|
@@ -15,7 +17,7 @@ async function fetchPool(publicClient, chainId, tokenAddresses, salt, useSubgrap
|
|
|
15
17
|
market = (await (0, apis_1.fetchMarket)(publicClient, chainId, tokenAddresses, useSubgraph)).toJson();
|
|
16
18
|
}
|
|
17
19
|
const poolKey = (0, pool_key_1.toPoolKey)(BigInt(market.bidBook.id), BigInt(market.askBook.id), salt);
|
|
18
|
-
const [{ bookIdA, bookIdB, reserveA, reserveB, orderListA, orderListB }, totalSupply, [totalLiquidityA, totalLiquidityB], paused,] = await publicClient.multicall({
|
|
20
|
+
const [{ bookIdA, bookIdB, reserveA, reserveB, orderListA, orderListB }, totalSupply, [totalLiquidityA, totalLiquidityB], paused, wrapped6909Address,] = await publicClient.multicall({
|
|
19
21
|
allowFailure: false,
|
|
20
22
|
contracts: [
|
|
21
23
|
{
|
|
@@ -42,6 +44,12 @@ async function fetchPool(publicClient, chainId, tokenAddresses, salt, useSubgrap
|
|
|
42
44
|
functionName: 'isPaused',
|
|
43
45
|
args: [poolKey],
|
|
44
46
|
},
|
|
47
|
+
{
|
|
48
|
+
address: addresses_1.CONTRACT_ADDRESSES[chainId].Wrapped6909Factory,
|
|
49
|
+
abi: wrapped_6909_factory_abi_1.WRAPPED_6909_FACTORY_ABI,
|
|
50
|
+
functionName: 'getWrapped6909Address',
|
|
51
|
+
args: [addresses_1.CONTRACT_ADDRESSES[chainId].Rebalancer, BigInt(poolKey)],
|
|
52
|
+
},
|
|
45
53
|
],
|
|
46
54
|
});
|
|
47
55
|
const liquidityA = totalLiquidityA.reserve +
|
|
@@ -57,6 +65,7 @@ async function fetchPool(publicClient, chainId, tokenAddresses, salt, useSubgrap
|
|
|
57
65
|
bookIdA,
|
|
58
66
|
bookIdB,
|
|
59
67
|
poolKey,
|
|
68
|
+
wrappedTokenAddress: (0, viem_1.getAddress)(wrapped6909Address),
|
|
60
69
|
salt,
|
|
61
70
|
totalSupply: BigInt(totalSupply),
|
|
62
71
|
decimals: 18,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/entities/pool/apis/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/entities/pool/apis/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ const fetchPoolSnapshotFromSubgraph = async (chainId, poolKey) => {
|
|
|
23
23
|
symbol: pool.tokenB.symbol,
|
|
24
24
|
decimals: Number(pool.tokenB.decimals),
|
|
25
25
|
};
|
|
26
|
-
const
|
|
26
|
+
const lpCurrency = {
|
|
27
27
|
id: pool.id,
|
|
28
28
|
address: (0, views_1.getContractAddresses)({ chainId }).Rebalancer,
|
|
29
29
|
name: pool.tokenA.name + '/' + pool.tokenB.name,
|
|
@@ -44,7 +44,7 @@ const fetchPoolSnapshotFromSubgraph = async (chainId, poolKey) => {
|
|
|
44
44
|
value: (0, viem_1.formatUnits)(BigInt(pool.initialTokenBAmount), Number(pool.tokenB.decimals)),
|
|
45
45
|
},
|
|
46
46
|
lpToken: {
|
|
47
|
-
currency:
|
|
47
|
+
currency: lpCurrency,
|
|
48
48
|
value: (0, viem_1.formatUnits)(BigInt(pool.initialTotalSupply), 18),
|
|
49
49
|
},
|
|
50
50
|
lpPriceUSD: pool.initialLPPriceUSD,
|
|
@@ -53,7 +53,7 @@ const fetchPoolSnapshotFromSubgraph = async (chainId, poolKey) => {
|
|
|
53
53
|
},
|
|
54
54
|
currencyA,
|
|
55
55
|
currencyB,
|
|
56
|
-
|
|
56
|
+
lpCurrency,
|
|
57
57
|
volumeUSD24h: poolDayDatas.sort((a, b) => b.date - a.date)?.[0]?.volumeUSD ?? '0',
|
|
58
58
|
lpPriceUSD: pool.lpPriceUSD,
|
|
59
59
|
totalTvlUSD: pool.totalValueLockedUSD,
|
|
@@ -4,7 +4,7 @@ exports.PoolModel = void 0;
|
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
5
|
const addresses_1 = require("../../constants/chain-configs/addresses");
|
|
6
6
|
class PoolModel {
|
|
7
|
-
constructor({ chainId, market, isOpened, bookIdA, bookIdB, poolKey, totalSupply, decimals, reserveA, reserveB, liquidityA, liquidityB, cancelableA, cancelableB, claimableA, claimableB, orderListA, orderListB, paused, salt, }) {
|
|
7
|
+
constructor({ chainId, market, isOpened, bookIdA, bookIdB, poolKey, wrappedTokenAddress, totalSupply, decimals, reserveA, reserveB, liquidityA, liquidityB, cancelableA, cancelableB, claimableA, claimableB, orderListA, orderListB, paused, salt, }) {
|
|
8
8
|
Object.defineProperty(this, "chainId", {
|
|
9
9
|
enumerable: true,
|
|
10
10
|
configurable: true,
|
|
@@ -53,7 +53,7 @@ class PoolModel {
|
|
|
53
53
|
writable: true,
|
|
54
54
|
value: void 0
|
|
55
55
|
});
|
|
56
|
-
Object.defineProperty(this, "
|
|
56
|
+
Object.defineProperty(this, "lpCurrency", {
|
|
57
57
|
enumerable: true,
|
|
58
58
|
configurable: true,
|
|
59
59
|
writable: true,
|
|
@@ -65,6 +65,12 @@ class PoolModel {
|
|
|
65
65
|
writable: true,
|
|
66
66
|
value: void 0
|
|
67
67
|
});
|
|
68
|
+
Object.defineProperty(this, "wrappedLpCurrency", {
|
|
69
|
+
enumerable: true,
|
|
70
|
+
configurable: true,
|
|
71
|
+
writable: true,
|
|
72
|
+
value: void 0
|
|
73
|
+
});
|
|
68
74
|
Object.defineProperty(this, "decimals", {
|
|
69
75
|
enumerable: true,
|
|
70
76
|
configurable: true,
|
|
@@ -151,7 +157,8 @@ class PoolModel {
|
|
|
151
157
|
strategy: this.strategy,
|
|
152
158
|
currencyA: this.currencyA,
|
|
153
159
|
currencyB: this.currencyB,
|
|
154
|
-
|
|
160
|
+
lpCurrency: this.lpCurrency,
|
|
161
|
+
wrappedLpCurrency: this.wrappedLpCurrency,
|
|
155
162
|
liquidityA: {
|
|
156
163
|
total: {
|
|
157
164
|
currency: this.currencyA,
|
|
@@ -189,7 +196,7 @@ class PoolModel {
|
|
|
189
196
|
},
|
|
190
197
|
},
|
|
191
198
|
totalSupply: {
|
|
192
|
-
currency: this.
|
|
199
|
+
currency: this.lpCurrency,
|
|
193
200
|
value: (0, viem_1.formatUnits)(this.totalSupply, this.decimals),
|
|
194
201
|
},
|
|
195
202
|
orderListA: this.orderListA.map((order) => order.toString()),
|
|
@@ -220,13 +227,19 @@ class PoolModel {
|
|
|
220
227
|
else {
|
|
221
228
|
throw new Error('Invalid book id');
|
|
222
229
|
}
|
|
223
|
-
this.
|
|
230
|
+
this.lpCurrency = {
|
|
224
231
|
address: addresses_1.CONTRACT_ADDRESSES[chainId].Rebalancer,
|
|
225
232
|
id: poolKey,
|
|
226
233
|
name: `${this.currencyA.symbol}-${this.currencyB.symbol} LP Token`,
|
|
227
234
|
symbol: `${this.currencyA.symbol}-${this.currencyB.symbol}`,
|
|
228
235
|
decimals: decimals,
|
|
229
236
|
};
|
|
237
|
+
this.wrappedLpCurrency = {
|
|
238
|
+
address: wrappedTokenAddress,
|
|
239
|
+
name: `Wrapped ${this.currencyA.symbol}-${this.currencyB.symbol} LP Token`,
|
|
240
|
+
symbol: `w${this.currencyA.symbol}-${this.currencyB.symbol}`,
|
|
241
|
+
decimals: decimals,
|
|
242
|
+
};
|
|
230
243
|
this.totalSupply = totalSupply;
|
|
231
244
|
this.decimals = decimals;
|
|
232
245
|
this.liquidityA = liquidityA;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/entities/pool/model.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAGlC,uEAA4E;AAG5E,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/entities/pool/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export const removeLiquidity = async ({ chainId, userAddress, token0, token1, sa
|
|
|
25
25
|
})
|
|
26
26
|
`);
|
|
27
27
|
}
|
|
28
|
-
const burnAmount = parseUnits(amount, pool.
|
|
28
|
+
const burnAmount = parseUnits(amount, pool.lpCurrency.decimals);
|
|
29
29
|
const slippageLimitPercent = options?.slippage ?? 2;
|
|
30
30
|
const withdrawAmountA = (burnAmount * pool.liquidityA) / pool.totalSupply;
|
|
31
31
|
const withdrawAmountB = (burnAmount * pool.liquidityB) / pool.totalSupply;
|
|
@@ -46,7 +46,7 @@ export const removeLiquidity = async ({ chainId, userAddress, token0, token1, sa
|
|
|
46
46
|
direction: 'out',
|
|
47
47
|
},
|
|
48
48
|
lpCurrency: {
|
|
49
|
-
currency: pool.
|
|
49
|
+
currency: pool.lpCurrency,
|
|
50
50
|
amount: '0',
|
|
51
51
|
direction: 'in',
|
|
52
52
|
},
|
|
@@ -75,7 +75,7 @@ export const removeLiquidity = async ({ chainId, userAddress, token0, token1, sa
|
|
|
75
75
|
direction: 'out',
|
|
76
76
|
},
|
|
77
77
|
lpCurrency: {
|
|
78
|
-
currency: pool.
|
|
78
|
+
currency: pool.lpCurrency,
|
|
79
79
|
amount: amount,
|
|
80
80
|
direction: 'in',
|
|
81
81
|
},
|
|
@@ -149,7 +149,7 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
149
149
|
direction: 'in',
|
|
150
150
|
},
|
|
151
151
|
lpCurrency: {
|
|
152
|
-
currency: pool.
|
|
152
|
+
currency: pool.lpCurrency,
|
|
153
153
|
amount: '0',
|
|
154
154
|
direction: 'out',
|
|
155
155
|
},
|
|
@@ -202,8 +202,8 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
202
202
|
direction: currencyBResultAmount >= 0 ? 'in' : 'out',
|
|
203
203
|
},
|
|
204
204
|
lpCurrency: {
|
|
205
|
-
currency: pool.
|
|
206
|
-
amount: formatUnits(mintAmount, pool.
|
|
205
|
+
currency: pool.lpCurrency,
|
|
206
|
+
amount: formatUnits(mintAmount, pool.lpCurrency.decimals),
|
|
207
207
|
direction: 'out',
|
|
208
208
|
},
|
|
209
209
|
},
|
|
@@ -45,7 +45,7 @@ export const wrapToERC20 = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
45
45
|
currency: {
|
|
46
46
|
name: `Wrapped Clober Liquidity Vault ${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
47
47
|
symbol: `wCLV-${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
48
|
-
decimals: pool.
|
|
48
|
+
decimals: pool.lpCurrency.decimals,
|
|
49
49
|
address,
|
|
50
50
|
},
|
|
51
51
|
amount,
|
|
@@ -60,7 +60,7 @@ export const wrapToERC20 = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
60
60
|
args: [
|
|
61
61
|
CONTRACT_ADDRESSES[chainId].Rebalancer,
|
|
62
62
|
BigInt(pool.key),
|
|
63
|
-
parseUnits(amount, pool.
|
|
63
|
+
parseUnits(amount, pool.lpCurrency.decimals),
|
|
64
64
|
],
|
|
65
65
|
}, options?.gasLimit),
|
|
66
66
|
};
|
|
@@ -111,7 +111,7 @@ export const unwrapFromERC20 = async ({ chainId, userAddress, token0, token1, sa
|
|
|
111
111
|
currency: {
|
|
112
112
|
name: `Wrapped Clober Liquidity Vault ${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
113
113
|
symbol: `wCLV-${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
114
|
-
decimals: pool.
|
|
114
|
+
decimals: pool.lpCurrency.decimals,
|
|
115
115
|
address,
|
|
116
116
|
},
|
|
117
117
|
amount,
|
|
@@ -134,7 +134,7 @@ export const unwrapFromERC20 = async ({ chainId, userAddress, token0, token1, sa
|
|
|
134
134
|
},
|
|
135
135
|
],
|
|
136
136
|
functionName: 'withdrawTo',
|
|
137
|
-
args: [userAddress, parseUnits(amount, pool.
|
|
137
|
+
args: [userAddress, parseUnits(amount, pool.lpCurrency.decimals)],
|
|
138
138
|
}, options?.gasLimit),
|
|
139
139
|
};
|
|
140
140
|
}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { getAddress } from 'viem';
|
|
1
2
|
import { CONTRACT_ADDRESSES } from '../../../constants/chain-configs/addresses';
|
|
2
3
|
import { REBALANCER_ABI } from '../../../constants/abis/rebalancer/rebalancer-abi';
|
|
3
4
|
import { STRATEGY_ABI } from '../../../constants/abis/rebalancer/strategy-abi';
|
|
4
5
|
import { fetchMarket } from '../../market/apis';
|
|
5
6
|
import { PoolModel } from '../model';
|
|
6
7
|
import { toPoolKey } from '../utils/pool-key';
|
|
8
|
+
import { WRAPPED_6909_FACTORY_ABI } from '../../../constants/abis/rebalancer/wrapped-6909-factory-abi';
|
|
7
9
|
export async function fetchPool(publicClient, chainId, tokenAddresses, salt, useSubgraph, market) {
|
|
8
10
|
if (tokenAddresses.length !== 2) {
|
|
9
11
|
throw new Error('Invalid token pair');
|
|
@@ -12,7 +14,7 @@ export async function fetchPool(publicClient, chainId, tokenAddresses, salt, use
|
|
|
12
14
|
market = (await fetchMarket(publicClient, chainId, tokenAddresses, useSubgraph)).toJson();
|
|
13
15
|
}
|
|
14
16
|
const poolKey = toPoolKey(BigInt(market.bidBook.id), BigInt(market.askBook.id), salt);
|
|
15
|
-
const [{ bookIdA, bookIdB, reserveA, reserveB, orderListA, orderListB }, totalSupply, [totalLiquidityA, totalLiquidityB], paused,] = await publicClient.multicall({
|
|
17
|
+
const [{ bookIdA, bookIdB, reserveA, reserveB, orderListA, orderListB }, totalSupply, [totalLiquidityA, totalLiquidityB], paused, wrapped6909Address,] = await publicClient.multicall({
|
|
16
18
|
allowFailure: false,
|
|
17
19
|
contracts: [
|
|
18
20
|
{
|
|
@@ -39,6 +41,12 @@ export async function fetchPool(publicClient, chainId, tokenAddresses, salt, use
|
|
|
39
41
|
functionName: 'isPaused',
|
|
40
42
|
args: [poolKey],
|
|
41
43
|
},
|
|
44
|
+
{
|
|
45
|
+
address: CONTRACT_ADDRESSES[chainId].Wrapped6909Factory,
|
|
46
|
+
abi: WRAPPED_6909_FACTORY_ABI,
|
|
47
|
+
functionName: 'getWrapped6909Address',
|
|
48
|
+
args: [CONTRACT_ADDRESSES[chainId].Rebalancer, BigInt(poolKey)],
|
|
49
|
+
},
|
|
42
50
|
],
|
|
43
51
|
});
|
|
44
52
|
const liquidityA = totalLiquidityA.reserve +
|
|
@@ -54,6 +62,7 @@ export async function fetchPool(publicClient, chainId, tokenAddresses, salt, use
|
|
|
54
62
|
bookIdA,
|
|
55
63
|
bookIdB,
|
|
56
64
|
poolKey,
|
|
65
|
+
wrappedTokenAddress: getAddress(wrapped6909Address),
|
|
57
66
|
salt,
|
|
58
67
|
totalSupply: BigInt(totalSupply),
|
|
59
68
|
decimals: 18,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/entities/pool/apis/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/entities/pool/apis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,MAAM,MAAM,CAAA;AAG/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAA;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAA;AAElF,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAA;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,6DAA6D,CAAA;AAEtG,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,YAA0B,EAC1B,OAAkB,EAClB,cAA+B,EAC/B,IAAmB,EACnB,WAAoB,EACpB,MAAe;IAEf,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,CACP,MAAM,WAAW,CAAC,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,CAAC,CACtE,CAAC,MAAM,EAAE,CAAA;IACZ,CAAC;IACD,MAAM,OAAO,GAAG,SAAS,CACvB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EACzB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EACzB,IAAI,CACL,CAAA;IACD,MAAM,CACJ,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,EAChE,WAAW,EACX,CAAC,eAAe,EAAE,eAAe,CAAC,EAClC,MAAM,EACN,kBAAkB,EACnB,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC;QAC/B,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAE,CAAC,UAAU;gBAChD,GAAG,EAAE,cAAc;gBACnB,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,OAAO,CAAC;aAChB;YACD;gBACE,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAE,CAAC,UAAU;gBAChD,GAAG,EAAE,cAAc;gBACnB,YAAY,EAAE,aAAa;gBAC3B,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACxB;YACD;gBACE,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAE,CAAC,UAAU;gBAChD,GAAG,EAAE,cAAc;gBACnB,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE,CAAC,OAAO,CAAC;aAChB;YACD;gBACE,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAE,CAAC,QAAQ;gBAC9C,GAAG,EAAE,YAAY;gBACjB,YAAY,EAAE,UAAU;gBACxB,IAAI,EAAE,CAAC,OAAO,CAAC;aAChB;YACD;gBACE,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAE,CAAC,kBAAkB;gBACxD,GAAG,EAAE,wBAAwB;gBAC7B,YAAY,EAAE,uBAAuB;gBACrC,IAAI,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAE,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;aACjE;SACF;KACF,CAAC,CAAA;IACF,MAAM,UAAU,GACd,eAAe,CAAC,OAAO;QACvB,eAAe,CAAC,UAAU;QAC1B,eAAe,CAAC,SAAS,CAAA;IAC3B,MAAM,UAAU,GACd,eAAe,CAAC,OAAO;QACvB,eAAe,CAAC,UAAU;QAC1B,eAAe,CAAC,SAAS,CAAA;IAC3B,OAAO,IAAI,SAAS,CAAC;QACnB,OAAO;QACP,MAAM;QACN,QAAQ,EAAE,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC;QACpC,OAAO;QACP,OAAO;QACP,OAAO;QACP,mBAAmB,EAAE,UAAU,CAAC,kBAAkB,CAAC;QACnD,IAAI;QACJ,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;QAChC,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;QAC9B,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;QAC9B,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC;QAC/C,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC;QAC/C,UAAU,EAAE,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC;QAC7C,UAAU,EAAE,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC;QAC7C,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;QAC1B,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;QAC1B,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtD,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtD,MAAM;KACP,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -20,7 +20,7 @@ export const fetchPoolSnapshotFromSubgraph = async (chainId, poolKey) => {
|
|
|
20
20
|
symbol: pool.tokenB.symbol,
|
|
21
21
|
decimals: Number(pool.tokenB.decimals),
|
|
22
22
|
};
|
|
23
|
-
const
|
|
23
|
+
const lpCurrency = {
|
|
24
24
|
id: pool.id,
|
|
25
25
|
address: getContractAddresses({ chainId }).Rebalancer,
|
|
26
26
|
name: pool.tokenA.name + '/' + pool.tokenB.name,
|
|
@@ -41,7 +41,7 @@ export const fetchPoolSnapshotFromSubgraph = async (chainId, poolKey) => {
|
|
|
41
41
|
value: formatUnits(BigInt(pool.initialTokenBAmount), Number(pool.tokenB.decimals)),
|
|
42
42
|
},
|
|
43
43
|
lpToken: {
|
|
44
|
-
currency:
|
|
44
|
+
currency: lpCurrency,
|
|
45
45
|
value: formatUnits(BigInt(pool.initialTotalSupply), 18),
|
|
46
46
|
},
|
|
47
47
|
lpPriceUSD: pool.initialLPPriceUSD,
|
|
@@ -50,7 +50,7 @@ export const fetchPoolSnapshotFromSubgraph = async (chainId, poolKey) => {
|
|
|
50
50
|
},
|
|
51
51
|
currencyA,
|
|
52
52
|
currencyB,
|
|
53
|
-
|
|
53
|
+
lpCurrency,
|
|
54
54
|
volumeUSD24h: poolDayDatas.sort((a, b) => b.date - a.date)?.[0]?.volumeUSD ?? '0',
|
|
55
55
|
lpPriceUSD: pool.lpPriceUSD,
|
|
56
56
|
totalTvlUSD: pool.totalValueLockedUSD,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { formatUnits } from 'viem';
|
|
2
2
|
import { CONTRACT_ADDRESSES } from '../../constants/chain-configs/addresses';
|
|
3
3
|
export class PoolModel {
|
|
4
|
-
constructor({ chainId, market, isOpened, bookIdA, bookIdB, poolKey, totalSupply, decimals, reserveA, reserveB, liquidityA, liquidityB, cancelableA, cancelableB, claimableA, claimableB, orderListA, orderListB, paused, salt, }) {
|
|
4
|
+
constructor({ chainId, market, isOpened, bookIdA, bookIdB, poolKey, wrappedTokenAddress, totalSupply, decimals, reserveA, reserveB, liquidityA, liquidityB, cancelableA, cancelableB, claimableA, claimableB, orderListA, orderListB, paused, salt, }) {
|
|
5
5
|
Object.defineProperty(this, "chainId", {
|
|
6
6
|
enumerable: true,
|
|
7
7
|
configurable: true,
|
|
@@ -50,7 +50,7 @@ export class PoolModel {
|
|
|
50
50
|
writable: true,
|
|
51
51
|
value: void 0
|
|
52
52
|
});
|
|
53
|
-
Object.defineProperty(this, "
|
|
53
|
+
Object.defineProperty(this, "lpCurrency", {
|
|
54
54
|
enumerable: true,
|
|
55
55
|
configurable: true,
|
|
56
56
|
writable: true,
|
|
@@ -62,6 +62,12 @@ export class PoolModel {
|
|
|
62
62
|
writable: true,
|
|
63
63
|
value: void 0
|
|
64
64
|
});
|
|
65
|
+
Object.defineProperty(this, "wrappedLpCurrency", {
|
|
66
|
+
enumerable: true,
|
|
67
|
+
configurable: true,
|
|
68
|
+
writable: true,
|
|
69
|
+
value: void 0
|
|
70
|
+
});
|
|
65
71
|
Object.defineProperty(this, "decimals", {
|
|
66
72
|
enumerable: true,
|
|
67
73
|
configurable: true,
|
|
@@ -148,7 +154,8 @@ export class PoolModel {
|
|
|
148
154
|
strategy: this.strategy,
|
|
149
155
|
currencyA: this.currencyA,
|
|
150
156
|
currencyB: this.currencyB,
|
|
151
|
-
|
|
157
|
+
lpCurrency: this.lpCurrency,
|
|
158
|
+
wrappedLpCurrency: this.wrappedLpCurrency,
|
|
152
159
|
liquidityA: {
|
|
153
160
|
total: {
|
|
154
161
|
currency: this.currencyA,
|
|
@@ -186,7 +193,7 @@ export class PoolModel {
|
|
|
186
193
|
},
|
|
187
194
|
},
|
|
188
195
|
totalSupply: {
|
|
189
|
-
currency: this.
|
|
196
|
+
currency: this.lpCurrency,
|
|
190
197
|
value: formatUnits(this.totalSupply, this.decimals),
|
|
191
198
|
},
|
|
192
199
|
orderListA: this.orderListA.map((order) => order.toString()),
|
|
@@ -218,13 +225,19 @@ export class PoolModel {
|
|
|
218
225
|
else {
|
|
219
226
|
throw new Error('Invalid book id');
|
|
220
227
|
}
|
|
221
|
-
this.
|
|
228
|
+
this.lpCurrency = {
|
|
222
229
|
address: CONTRACT_ADDRESSES[chainId].Rebalancer,
|
|
223
230
|
id: poolKey,
|
|
224
231
|
name: `${this.currencyA.symbol}-${this.currencyB.symbol} LP Token`,
|
|
225
232
|
symbol: `${this.currencyA.symbol}-${this.currencyB.symbol}`,
|
|
226
233
|
decimals: decimals,
|
|
227
234
|
};
|
|
235
|
+
this.wrappedLpCurrency = {
|
|
236
|
+
address: wrappedTokenAddress,
|
|
237
|
+
name: `Wrapped ${this.currencyA.symbol}-${this.currencyB.symbol} LP Token`,
|
|
238
|
+
symbol: `w${this.currencyA.symbol}-${this.currencyB.symbol}`,
|
|
239
|
+
decimals: decimals,
|
|
240
|
+
};
|
|
228
241
|
this.totalSupply = totalSupply;
|
|
229
242
|
this.decimals = decimals;
|
|
230
243
|
this.liquidityA = liquidityA;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/entities/pool/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAGlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAG5E,MAAM,OAAO,SAAS;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/entities/pool/model.ts"],"names":[],"mappings":"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"}
|