@clober/v2-sdk 1.0.0-rc.62 → 1.0.0-rc.63
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/entities/pool/apis/index.js +6 -4
- package/dist/cjs/entities/pool/apis/index.js.map +1 -1
- package/dist/esm/entities/pool/apis/index.js +7 -5
- package/dist/esm/entities/pool/apis/index.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/types/entities/pool/apis/index.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -17,8 +17,8 @@ async function fetchPool(publicClient, chainId, tokenAddresses, salt, useSubgrap
|
|
|
17
17
|
market = (await (0, apis_1.fetchMarket)(publicClient, chainId, tokenAddresses, useSubgraph)).toJson();
|
|
18
18
|
}
|
|
19
19
|
const poolKey = (0, pool_key_1.toPoolKey)(BigInt(market.bidBook.id), BigInt(market.askBook.id), salt);
|
|
20
|
-
const [{ bookIdA, bookIdB, reserveA, reserveB, orderListA, orderListB }, totalSupply, [totalLiquidityA, totalLiquidityB], paused, wrapped6909Address,] = await publicClient.multicall({
|
|
21
|
-
allowFailure:
|
|
20
|
+
const [{ result: { bookIdA, bookIdB, reserveA, reserveB, orderListA, orderListB }, }, { result: totalSupply }, { result: [totalLiquidityA, totalLiquidityB], }, { result: paused }, { result: wrapped6909Address },] = (await publicClient.multicall({
|
|
21
|
+
allowFailure: true,
|
|
22
22
|
contracts: [
|
|
23
23
|
{
|
|
24
24
|
address: addresses_1.CONTRACT_ADDRESSES[chainId].Rebalancer,
|
|
@@ -51,7 +51,7 @@ async function fetchPool(publicClient, chainId, tokenAddresses, salt, useSubgrap
|
|
|
51
51
|
args: [addresses_1.CONTRACT_ADDRESSES[chainId].Rebalancer, BigInt(poolKey)],
|
|
52
52
|
},
|
|
53
53
|
],
|
|
54
|
-
});
|
|
54
|
+
}));
|
|
55
55
|
const liquidityA = totalLiquidityA.reserve +
|
|
56
56
|
totalLiquidityA.cancelable +
|
|
57
57
|
totalLiquidityA.claimable;
|
|
@@ -65,7 +65,9 @@ async function fetchPool(publicClient, chainId, tokenAddresses, salt, useSubgrap
|
|
|
65
65
|
bookIdA,
|
|
66
66
|
bookIdB,
|
|
67
67
|
poolKey,
|
|
68
|
-
wrappedTokenAddress:
|
|
68
|
+
wrappedTokenAddress: wrapped6909Address
|
|
69
|
+
? (0, viem_1.getAddress)(wrapped6909Address)
|
|
70
|
+
: viem_1.zeroAddress,
|
|
69
71
|
salt,
|
|
70
72
|
totalSupply: BigInt(totalSupply),
|
|
71
73
|
decimals: 18,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/entities/pool/apis/index.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/entities/pool/apis/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getAddress } from 'viem';
|
|
1
|
+
import { getAddress, zeroAddress } from 'viem';
|
|
2
2
|
import { CONTRACT_ADDRESSES } from '../../../constants/chain-configs/addresses';
|
|
3
3
|
import { REBALANCER_ABI } from '../../../constants/abis/rebalancer/rebalancer-abi';
|
|
4
4
|
import { STRATEGY_ABI } from '../../../constants/abis/rebalancer/strategy-abi';
|
|
@@ -14,8 +14,8 @@ export async function fetchPool(publicClient, chainId, tokenAddresses, salt, use
|
|
|
14
14
|
market = (await fetchMarket(publicClient, chainId, tokenAddresses, useSubgraph)).toJson();
|
|
15
15
|
}
|
|
16
16
|
const poolKey = toPoolKey(BigInt(market.bidBook.id), BigInt(market.askBook.id), salt);
|
|
17
|
-
const [{ bookIdA, bookIdB, reserveA, reserveB, orderListA, orderListB }, totalSupply, [totalLiquidityA, totalLiquidityB], paused, wrapped6909Address,] = await publicClient.multicall({
|
|
18
|
-
allowFailure:
|
|
17
|
+
const [{ result: { bookIdA, bookIdB, reserveA, reserveB, orderListA, orderListB }, }, { result: totalSupply }, { result: [totalLiquidityA, totalLiquidityB], }, { result: paused }, { result: wrapped6909Address },] = (await publicClient.multicall({
|
|
18
|
+
allowFailure: true,
|
|
19
19
|
contracts: [
|
|
20
20
|
{
|
|
21
21
|
address: CONTRACT_ADDRESSES[chainId].Rebalancer,
|
|
@@ -48,7 +48,7 @@ export async function fetchPool(publicClient, chainId, tokenAddresses, salt, use
|
|
|
48
48
|
args: [CONTRACT_ADDRESSES[chainId].Rebalancer, BigInt(poolKey)],
|
|
49
49
|
},
|
|
50
50
|
],
|
|
51
|
-
});
|
|
51
|
+
}));
|
|
52
52
|
const liquidityA = totalLiquidityA.reserve +
|
|
53
53
|
totalLiquidityA.cancelable +
|
|
54
54
|
totalLiquidityA.claimable;
|
|
@@ -62,7 +62,9 @@ export async function fetchPool(publicClient, chainId, tokenAddresses, salt, use
|
|
|
62
62
|
bookIdA,
|
|
63
63
|
bookIdB,
|
|
64
64
|
poolKey,
|
|
65
|
-
wrappedTokenAddress:
|
|
65
|
+
wrappedTokenAddress: wrapped6909Address
|
|
66
|
+
? getAddress(wrapped6909Address)
|
|
67
|
+
: zeroAddress,
|
|
66
68
|
salt,
|
|
67
69
|
totalSupply: BigInt(totalSupply),
|
|
68
70
|
decimals: 18,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/entities/pool/apis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/entities/pool/apis/index.ts"],"names":[],"mappings":"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"}
|