@clober/v2-sdk 0.0.105 → 0.0.107
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/apis/market.js +7 -3
- package/dist/cjs/apis/market.js.map +1 -1
- package/dist/cjs/apis/open-order.js +12 -12
- package/dist/cjs/apis/open-order.js.map +1 -1
- package/dist/cjs/utils/currency.js +7 -4
- package/dist/cjs/utils/currency.js.map +1 -1
- package/dist/esm/apis/market.js +8 -4
- package/dist/esm/apis/market.js.map +1 -1
- package/dist/esm/apis/open-order.js +13 -13
- package/dist/esm/apis/open-order.js.map +1 -1
- package/dist/esm/utils/currency.js +7 -4
- package/dist/esm/utils/currency.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/types/apis/market.d.ts.map +1 -1
- package/dist/types/apis/open-order.d.ts.map +1 -1
- package/dist/types/utils/currency.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/cjs/apis/market.js
CHANGED
|
@@ -66,10 +66,14 @@ async function fetchMarket(publicClient, chainId, tokenAddresses, useSubgraph, n
|
|
|
66
66
|
tokenAddresses[0],
|
|
67
67
|
tokenAddresses[1],
|
|
68
68
|
]);
|
|
69
|
-
const
|
|
70
|
-
|
|
71
|
-
|
|
69
|
+
const currencyMap = await (0, currency_1.fetchCurrencyMap)(publicClient, chainId, [
|
|
70
|
+
quoteTokenAddress,
|
|
71
|
+
baseTokenAddress,
|
|
72
72
|
]);
|
|
73
|
+
const [quoteCurrency, baseCurrency] = [
|
|
74
|
+
currencyMap[quoteTokenAddress],
|
|
75
|
+
currencyMap[baseTokenAddress],
|
|
76
|
+
];
|
|
73
77
|
const [bidBook, askBook] = await Promise.all([
|
|
74
78
|
getBook(publicClient, chainId, quoteCurrency, baseCurrency, useSubgraph, n),
|
|
75
79
|
getBook(publicClient, chainId, baseCurrency, quoteCurrency, useSubgraph, n),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"market.js","sourceRoot":"","sources":["../../../src/apis/market.ts"],"names":[],"mappings":";;;AAGA,4CAAwC;AACxC,wCAAoC;AACpC,4CAA6C;AAC7C,8CAA2C;AAC3C,kDAAsD;AAEtD,sDAA2D;AAC3D,kEAA8D;AAC9D,wCAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"market.js","sourceRoot":"","sources":["../../../src/apis/market.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,15 +27,15 @@ const getOpenOrdersByUserAddressFromSubgraph = async (chainId, userAddress) => {
|
|
|
27
27
|
};
|
|
28
28
|
async function fetchOpenOrdersByUserAddress(publicClient, chainId, userAddress) {
|
|
29
29
|
const { data: { openOrders }, } = await getOpenOrdersByUserAddressFromSubgraph(chainId, userAddress);
|
|
30
|
-
const
|
|
30
|
+
const addresses = openOrders
|
|
31
31
|
.map((openOrder) => [
|
|
32
32
|
(0, viem_1.getAddress)(openOrder.book.base.id),
|
|
33
33
|
(0, viem_1.getAddress)(openOrder.book.quote.id),
|
|
34
34
|
])
|
|
35
35
|
.flat()
|
|
36
|
-
.filter((address, index, self) => self.findIndex((c) => (0, viem_1.isAddressEqual)(c, address)) === index)
|
|
37
|
-
|
|
38
|
-
return openOrders.map((openOrder) => toOpenOrder(chainId,
|
|
36
|
+
.filter((address, index, self) => self.findIndex((c) => (0, viem_1.isAddressEqual)(c, address)) === index);
|
|
37
|
+
const currencyMap = await (0, currency_1.fetchCurrencyMap)(publicClient, chainId, addresses);
|
|
38
|
+
return openOrders.map((openOrder) => toOpenOrder(chainId, Object.values(currencyMap), openOrder));
|
|
39
39
|
}
|
|
40
40
|
exports.fetchOpenOrdersByUserAddress = fetchOpenOrdersByUserAddress;
|
|
41
41
|
async function fetchOpenOrder(publicClient, chainId, id) {
|
|
@@ -43,24 +43,24 @@ async function fetchOpenOrder(publicClient, chainId, id) {
|
|
|
43
43
|
if (!openOrder) {
|
|
44
44
|
throw new Error(`Open order not found: ${id}`);
|
|
45
45
|
}
|
|
46
|
-
const
|
|
47
|
-
(0,
|
|
48
|
-
(0,
|
|
46
|
+
const currencyMap = await (0, currency_1.fetchCurrencyMap)(publicClient, chainId, [
|
|
47
|
+
(0, viem_1.getAddress)(openOrder.book.base.id),
|
|
48
|
+
(0, viem_1.getAddress)(openOrder.book.quote.id),
|
|
49
49
|
]);
|
|
50
|
-
return toOpenOrder(chainId,
|
|
50
|
+
return toOpenOrder(chainId, Object.values(currencyMap), openOrder);
|
|
51
51
|
}
|
|
52
52
|
exports.fetchOpenOrder = fetchOpenOrder;
|
|
53
53
|
async function fetchOpenOrders(publicClient, chainId, ids) {
|
|
54
54
|
const { data: { openOrders }, } = await getOpenOrdersFromSubgraph(chainId, ids);
|
|
55
|
-
const
|
|
55
|
+
const addresses = openOrders
|
|
56
56
|
.map((openOrder) => [
|
|
57
57
|
(0, viem_1.getAddress)(openOrder.book.base.id),
|
|
58
58
|
(0, viem_1.getAddress)(openOrder.book.quote.id),
|
|
59
59
|
])
|
|
60
60
|
.flat()
|
|
61
|
-
.filter((address, index, self) => self.findIndex((c) => (0, viem_1.isAddressEqual)(c, address)) === index)
|
|
62
|
-
|
|
63
|
-
return openOrders.map((openOrder) => toOpenOrder(chainId,
|
|
61
|
+
.filter((address, index, self) => self.findIndex((c) => (0, viem_1.isAddressEqual)(c, address)) === index);
|
|
62
|
+
const currencyMap = await (0, currency_1.fetchCurrencyMap)(publicClient, chainId, addresses);
|
|
63
|
+
return openOrders.map((openOrder) => toOpenOrder(chainId, Object.values(currencyMap), openOrder));
|
|
64
64
|
}
|
|
65
65
|
exports.fetchOpenOrders = fetchOpenOrders;
|
|
66
66
|
const toOpenOrder = (chainId, currencies, openOrder) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-order.js","sourceRoot":"","sources":["../../../src/apis/open-order.ts"],"names":[],"mappings":";;;AAAA,+BAA4E;AAG5E,4CAA6C;AAE7C,gDAA4D;AAC5D,4CAA6C;AAC7C,wCAAmD;AAEnD,
|
|
1
|
+
{"version":3,"file":"open-order.js","sourceRoot":"","sources":["../../../src/apis/open-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ const fetchCurrencyMap = async (publicClient, chainId, addresses) => {
|
|
|
65
65
|
const cachedCurrencies = addresses
|
|
66
66
|
.map((address) => getCurrencyFromCache(chainId, address))
|
|
67
67
|
.filter((currency) => currency !== undefined);
|
|
68
|
-
const uncachedAddresses = addresses.filter((address) => !cachedCurrencies.some((currency) => currency.address
|
|
68
|
+
const uncachedAddresses = addresses.filter((address) => !cachedCurrencies.some((currency) => (0, viem_1.isAddressEqual)(currency.address, address)));
|
|
69
69
|
const uncachedCurrencies = await fetchCurrencyMapInner(publicClient, uncachedAddresses);
|
|
70
70
|
for (const currency of Object.values(uncachedCurrencies)) {
|
|
71
71
|
setCurrencyToCache(chainId, currency.address, currency);
|
|
@@ -147,11 +147,14 @@ const fetchCurrencyMapInner = async (publicClient, addresses) => {
|
|
|
147
147
|
const name = result[index].result;
|
|
148
148
|
const symbol = result[index + addresses.length].result;
|
|
149
149
|
const decimals = result[index + addresses.length * 2].result;
|
|
150
|
+
if (!name || !symbol || !decimals) {
|
|
151
|
+
throw new Error(`Failed to fetch currency: ${address}`);
|
|
152
|
+
}
|
|
150
153
|
return {
|
|
151
154
|
address,
|
|
152
|
-
name
|
|
153
|
-
symbol
|
|
154
|
-
decimals
|
|
155
|
+
name,
|
|
156
|
+
symbol,
|
|
157
|
+
decimals,
|
|
155
158
|
};
|
|
156
159
|
})
|
|
157
160
|
.reduce((acc, currency) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currency.js","sourceRoot":"","sources":["../../../src/utils/currency.ts"],"names":[],"mappings":";;;AAAA,+BAA4E;AAI5E,oDAA4D;AAE5D,MAAM,IAAI,GAAG;IACX;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,QAAQ;gBACtB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,QAAQ;aACf;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,QAAQ;gBACtB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,QAAQ;aACf;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,OAAO;aACd;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAA;AAEV,MAAM,qBAAqB,GAAG,CAAC,OAAkB,EAAE,OAAsB,EAAE,EAAE,CAC3E,GAAG,OAAO,IAAI,OAAO,EAAE,CAAA;AACzB,MAAM,aAAa,GAAG,IAAI,GAAG,EAAoB,CAAA;AACjD,MAAM,oBAAoB,GAAG,CAC3B,OAAkB,EAClB,OAAsB,EACA,EAAE,CACxB,aAAa,CAAC,GAAG,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;AAC5D,MAAM,kBAAkB,GAAG,CACzB,OAAkB,EAClB,OAAsB,EACtB,QAAkB,EAClB,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAA;AAElE,MAAM,aAAa,GAAG,KAAK,EAChC,YAA0B,EAC1B,OAAkB,EAClB,OAAsB,EACH,EAAE;IACrB,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7D,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAChE,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC9C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAbY,QAAA,aAAa,iBAazB;AAEM,MAAM,gBAAgB,GAAG,KAAK,EACnC,YAA0B,EAC1B,OAAkB,EAClB,SAA0B,EAGzB,EAAE;IACH,SAAS,GAAG,SAAS;SAClB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAA,qBAAc,EAAC,OAAO,EAAE,kBAAW,CAAC,CAAC;SAC1D,MAAM,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,CAAA;IACpE,MAAM,gBAAgB,GAAG,SAAS;SAC/B,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACxD,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,SAAS,CAAe,CAAA;IAC7D,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CACxC,CAAC,OAAO,EAAE,EAAE,CACV,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"currency.js","sourceRoot":"","sources":["../../../src/utils/currency.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/apis/market.js
CHANGED
|
@@ -6,7 +6,7 @@ import { calculateUnitSize } from '../utils/unit-size';
|
|
|
6
6
|
import { CONTRACT_ADDRESSES } from '../constants/addresses';
|
|
7
7
|
import { BOOK_VIEWER_ABI } from '../abis/core/book-viewer-abi';
|
|
8
8
|
import { fetchIsMarketOpened } from '../utils/open';
|
|
9
|
-
import {
|
|
9
|
+
import { fetchCurrencyMap } from '../utils/currency';
|
|
10
10
|
import { Subgraph } from '../constants/subgraph';
|
|
11
11
|
const fetchBookFromSubgraph = async (chainId, bookId) => {
|
|
12
12
|
return Subgraph.get(chainId, 'getBook', 'query getBook($bookId: ID!) { book(id: $bookId){ depths { tick unitAmount } } }', {
|
|
@@ -63,10 +63,14 @@ export async function fetchMarket(publicClient, chainId, tokenAddresses, useSubg
|
|
|
63
63
|
tokenAddresses[0],
|
|
64
64
|
tokenAddresses[1],
|
|
65
65
|
]);
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
66
|
+
const currencyMap = await fetchCurrencyMap(publicClient, chainId, [
|
|
67
|
+
quoteTokenAddress,
|
|
68
|
+
baseTokenAddress,
|
|
69
69
|
]);
|
|
70
|
+
const [quoteCurrency, baseCurrency] = [
|
|
71
|
+
currencyMap[quoteTokenAddress],
|
|
72
|
+
currencyMap[baseTokenAddress],
|
|
73
|
+
];
|
|
70
74
|
const [bidBook, askBook] = await Promise.all([
|
|
71
75
|
getBook(publicClient, chainId, quoteCurrency, baseCurrency, useSubgraph, n),
|
|
72
76
|
getBook(publicClient, chainId, baseCurrency, quoteCurrency, useSubgraph, n),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"market.js","sourceRoot":"","sources":["../../../src/apis/market.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"market.js","sourceRoot":"","sources":["../../../src/apis/market.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { getMarketId } from '../utils/market';
|
|
|
3
3
|
import { baseToQuote, quoteToBase } from '../utils/decimals';
|
|
4
4
|
import { formatPrice } from '../utils/prices';
|
|
5
5
|
import { invertTick, toPrice } from '../utils/tick';
|
|
6
|
-
import {
|
|
6
|
+
import { fetchCurrencyMap } from '../utils/currency';
|
|
7
7
|
import { applyPercent } from '../utils/bigint';
|
|
8
8
|
import { MAKER_DEFAULT_POLICY } from '../constants/fee';
|
|
9
9
|
import { Subgraph } from '../constants/subgraph';
|
|
@@ -24,38 +24,38 @@ const getOpenOrdersByUserAddressFromSubgraph = async (chainId, userAddress) => {
|
|
|
24
24
|
};
|
|
25
25
|
export async function fetchOpenOrdersByUserAddress(publicClient, chainId, userAddress) {
|
|
26
26
|
const { data: { openOrders }, } = await getOpenOrdersByUserAddressFromSubgraph(chainId, userAddress);
|
|
27
|
-
const
|
|
27
|
+
const addresses = openOrders
|
|
28
28
|
.map((openOrder) => [
|
|
29
29
|
getAddress(openOrder.book.base.id),
|
|
30
30
|
getAddress(openOrder.book.quote.id),
|
|
31
31
|
])
|
|
32
32
|
.flat()
|
|
33
|
-
.filter((address, index, self) => self.findIndex((c) => isAddressEqual(c, address)) === index)
|
|
34
|
-
|
|
35
|
-
return openOrders.map((openOrder) => toOpenOrder(chainId,
|
|
33
|
+
.filter((address, index, self) => self.findIndex((c) => isAddressEqual(c, address)) === index);
|
|
34
|
+
const currencyMap = await fetchCurrencyMap(publicClient, chainId, addresses);
|
|
35
|
+
return openOrders.map((openOrder) => toOpenOrder(chainId, Object.values(currencyMap), openOrder));
|
|
36
36
|
}
|
|
37
37
|
export async function fetchOpenOrder(publicClient, chainId, id) {
|
|
38
38
|
const { data: { openOrder }, } = await getOpenOrderFromSubgraph(chainId, id);
|
|
39
39
|
if (!openOrder) {
|
|
40
40
|
throw new Error(`Open order not found: ${id}`);
|
|
41
41
|
}
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
const currencyMap = await fetchCurrencyMap(publicClient, chainId, [
|
|
43
|
+
getAddress(openOrder.book.base.id),
|
|
44
|
+
getAddress(openOrder.book.quote.id),
|
|
45
45
|
]);
|
|
46
|
-
return toOpenOrder(chainId,
|
|
46
|
+
return toOpenOrder(chainId, Object.values(currencyMap), openOrder);
|
|
47
47
|
}
|
|
48
48
|
export async function fetchOpenOrders(publicClient, chainId, ids) {
|
|
49
49
|
const { data: { openOrders }, } = await getOpenOrdersFromSubgraph(chainId, ids);
|
|
50
|
-
const
|
|
50
|
+
const addresses = openOrders
|
|
51
51
|
.map((openOrder) => [
|
|
52
52
|
getAddress(openOrder.book.base.id),
|
|
53
53
|
getAddress(openOrder.book.quote.id),
|
|
54
54
|
])
|
|
55
55
|
.flat()
|
|
56
|
-
.filter((address, index, self) => self.findIndex((c) => isAddressEqual(c, address)) === index)
|
|
57
|
-
|
|
58
|
-
return openOrders.map((openOrder) => toOpenOrder(chainId,
|
|
56
|
+
.filter((address, index, self) => self.findIndex((c) => isAddressEqual(c, address)) === index);
|
|
57
|
+
const currencyMap = await fetchCurrencyMap(publicClient, chainId, addresses);
|
|
58
|
+
return openOrders.map((openOrder) => toOpenOrder(chainId, Object.values(currencyMap), openOrder));
|
|
59
59
|
}
|
|
60
60
|
const toOpenOrder = (chainId, currencies, openOrder) => {
|
|
61
61
|
const inputCurrency = currencies.find((c) => isAddressEqual(c.address, getAddress(openOrder.book.quote.id)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-order.js","sourceRoot":"","sources":["../../../src/apis/open-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,cAAc,EAAgB,MAAM,MAAM,CAAA;AAG5E,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"open-order.js","sourceRoot":"","sources":["../../../src/apis/open-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ export const fetchCurrencyMap = async (publicClient, chainId, addresses) => {
|
|
|
61
61
|
const cachedCurrencies = addresses
|
|
62
62
|
.map((address) => getCurrencyFromCache(chainId, address))
|
|
63
63
|
.filter((currency) => currency !== undefined);
|
|
64
|
-
const uncachedAddresses = addresses.filter((address) => !cachedCurrencies.some((currency) => currency.address
|
|
64
|
+
const uncachedAddresses = addresses.filter((address) => !cachedCurrencies.some((currency) => isAddressEqual(currency.address, address)));
|
|
65
65
|
const uncachedCurrencies = await fetchCurrencyMapInner(publicClient, uncachedAddresses);
|
|
66
66
|
for (const currency of Object.values(uncachedCurrencies)) {
|
|
67
67
|
setCurrencyToCache(chainId, currency.address, currency);
|
|
@@ -142,11 +142,14 @@ const fetchCurrencyMapInner = async (publicClient, addresses) => {
|
|
|
142
142
|
const name = result[index].result;
|
|
143
143
|
const symbol = result[index + addresses.length].result;
|
|
144
144
|
const decimals = result[index + addresses.length * 2].result;
|
|
145
|
+
if (!name || !symbol || !decimals) {
|
|
146
|
+
throw new Error(`Failed to fetch currency: ${address}`);
|
|
147
|
+
}
|
|
145
148
|
return {
|
|
146
149
|
address,
|
|
147
|
-
name
|
|
148
|
-
symbol
|
|
149
|
-
decimals
|
|
150
|
+
name,
|
|
151
|
+
symbol,
|
|
152
|
+
decimals,
|
|
150
153
|
};
|
|
151
154
|
})
|
|
152
155
|
.reduce((acc, currency) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currency.js","sourceRoot":"","sources":["../../../src/utils/currency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAgB,WAAW,EAAE,MAAM,MAAM,CAAA;AAI5E,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,MAAM,IAAI,GAAG;IACX;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,QAAQ;gBACtB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,QAAQ;aACf;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,QAAQ;gBACtB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,QAAQ;aACf;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,OAAO;aACd;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAA;AAEV,MAAM,qBAAqB,GAAG,CAAC,OAAkB,EAAE,OAAsB,EAAE,EAAE,CAC3E,GAAG,OAAO,IAAI,OAAO,EAAE,CAAA;AACzB,MAAM,aAAa,GAAG,IAAI,GAAG,EAAoB,CAAA;AACjD,MAAM,oBAAoB,GAAG,CAC3B,OAAkB,EAClB,OAAsB,EACA,EAAE,CACxB,aAAa,CAAC,GAAG,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;AAC5D,MAAM,kBAAkB,GAAG,CACzB,OAAkB,EAClB,OAAsB,EACtB,QAAkB,EAClB,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEzE,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,YAA0B,EAC1B,OAAkB,EAClB,OAAsB,EACH,EAAE;IACrB,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7D,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAChE,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC9C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,YAA0B,EAC1B,OAAkB,EAClB,SAA0B,EAGzB,EAAE;IACH,SAAS,GAAG,SAAS;SAClB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;SAC1D,MAAM,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,CAAA;IACpE,MAAM,gBAAgB,GAAG,SAAS;SAC/B,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACxD,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,SAAS,CAAe,CAAA;IAC7D,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CACxC,CAAC,OAAO,EAAE,EAAE,CACV,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"currency.js","sourceRoot":"","sources":["../../../src/utils/currency.ts"],"names":[],"mappings":"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"}
|