@moonwell-fi/moonwell-sdk 0.5.12 → 0.5.13
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/CHANGELOG.md +6 -0
- package/_cjs/actions/core/markets/getMarketSnapshots.js +20 -4
- package/_cjs/actions/core/markets/getMarketSnapshots.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_esm/actions/core/markets/getMarketSnapshots.js +20 -4
- package/_esm/actions/core/markets/getMarketSnapshots.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/types/market.d.ts +2 -0
- package/_types/types/market.d.ts.map +1 -1
- package/actions/core/markets/getMarketSnapshots.ts +27 -5
- package/errors/version.ts +1 -1
- package/package.json +1 -1
- package/types/market.ts +2 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @moonwell-fi/moonwell-sdk
|
|
2
2
|
|
|
3
|
+
## 0.5.13
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#53](https://github.com/moonwell-fi/moonwell-sdk/pull/53) [`09604ff8f13f7e326e47914d7e337d1fe76161ab`](https://github.com/moonwell-fi/moonwell-sdk/commit/09604ff8f13f7e326e47914d7e337d1fe76161ab) Thanks [@x0s0l](https://github.com/x0s0l)! - Add borrow apy and supply apy to markets snapshots
|
|
8
|
+
|
|
3
9
|
## 0.5.12
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -42,6 +42,10 @@ async function fetchCoreMarketSnapshots(marketAddress, environment) {
|
|
|
42
42
|
totalBorrowsUSD
|
|
43
43
|
totalSupplies
|
|
44
44
|
totalSuppliesUSD
|
|
45
|
+
totalLiquidity
|
|
46
|
+
totalLiquidityUSD
|
|
47
|
+
baseSupplyApy
|
|
48
|
+
baseBorrowApy
|
|
45
49
|
timestamp
|
|
46
50
|
}
|
|
47
51
|
pageInfo {
|
|
@@ -62,10 +66,8 @@ async function fetchCoreMarketSnapshots(marketAddress, environment) {
|
|
|
62
66
|
const borrow = Number(point.totalBorrows);
|
|
63
67
|
const borrowUsd = Number(point.totalBorrowsUSD);
|
|
64
68
|
const suppliedUsd = Number(point.totalSuppliesUSD);
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
liquidity = Math.max(liquidity, 0);
|
|
68
|
-
liquidityUsd = Math.max(liquidityUsd, 0);
|
|
69
|
+
const liquidity = Math.max(point.totalLiquidity, 0);
|
|
70
|
+
const liquidityUsd = Math.max(point.totalLiquidityUSD, 0);
|
|
69
71
|
const result = {
|
|
70
72
|
marketId: marketAddress.toLowerCase(),
|
|
71
73
|
chainId: environment.chainId,
|
|
@@ -76,6 +78,8 @@ async function fetchCoreMarketSnapshots(marketAddress, environment) {
|
|
|
76
78
|
totalBorrowsUsd: borrowUsd,
|
|
77
79
|
totalLiquidity: liquidity,
|
|
78
80
|
totalLiquidityUsd: liquidityUsd,
|
|
81
|
+
baseSupplyApy: point.baseSupplyApy,
|
|
82
|
+
baseBorrowApy: point.baseBorrowApy,
|
|
79
83
|
};
|
|
80
84
|
return result;
|
|
81
85
|
});
|
|
@@ -122,6 +126,14 @@ async function fetchIsolatedMarketSnapshots(marketAddress, environment) {
|
|
|
122
126
|
decimals
|
|
123
127
|
}
|
|
124
128
|
historicalState {
|
|
129
|
+
supplyApy(options: $options) {
|
|
130
|
+
x
|
|
131
|
+
y
|
|
132
|
+
}
|
|
133
|
+
borrowApy(options: $options) {
|
|
134
|
+
x
|
|
135
|
+
y
|
|
136
|
+
}
|
|
125
137
|
borrowAssets(options: $options) {
|
|
126
138
|
x
|
|
127
139
|
y
|
|
@@ -161,6 +173,8 @@ async function fetchIsolatedMarketSnapshots(marketAddress, environment) {
|
|
|
161
173
|
const supplyAssetsUsd = result.marketTotalTimeseries.historicalState.supplyAssetsUsd[index];
|
|
162
174
|
const liquidityAssets = result.marketTotalTimeseries.historicalState.liquidityAssets[index];
|
|
163
175
|
const liquidityAssetsUsd = result.marketTotalTimeseries.historicalState.liquidityAssetsUsd[index];
|
|
176
|
+
const supplyApy = result.marketTotalTimeseries.historicalState.supplyApy[index];
|
|
177
|
+
const borrowApy = result.marketTotalTimeseries.historicalState.borrowApy[index];
|
|
164
178
|
return {
|
|
165
179
|
chainId: environment.chainId,
|
|
166
180
|
timestamp: borrowAssets.x * 1000,
|
|
@@ -177,6 +191,8 @@ async function fetchIsolatedMarketSnapshots(marketAddress, environment) {
|
|
|
177
191
|
loanPrice) /
|
|
178
192
|
collateralPrice,
|
|
179
193
|
totalLiquidityUsd: Number(liquidityAssetsUsd.y),
|
|
194
|
+
baseSupplyApy: supplyApy.y,
|
|
195
|
+
baseBorrowApy: borrowApy.y,
|
|
180
196
|
};
|
|
181
197
|
});
|
|
182
198
|
return markets;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getMarketSnapshots.js","sourceRoot":"","sources":["../../../../actions/core/markets/getMarketSnapshots.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,kDAA0B;AAC1B,iEAAsC;AAEtC,uDAIkC;AAKlC,eAAK,CAAC,MAAM,CAAC,gBAAG,CAAC,CAAC;AAYX,KAAK,UAAU,kBAAkB,CAItC,MAAsB,EACtB,IAAyD;IAEzD,MAAM,WAAW,GAAG,IAAA,iCAAsB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,IAAI,EAAE,IAAI,KAAK,MAAM,EAAE;QACzB,OAAO,wBAAwB,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KAC7D;SAAM;QACL,OAAO,4BAA4B,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KACjE;AACH,CAAC;AAlBD,gDAkBC;AAED,KAAK,UAAU,wBAAwB,CACrC,aAAqB,EACrB,WAAwB;IAExB,MAAM,SAAS,GAAsB,EAAE,CAAC;IACxC,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,SAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"getMarketSnapshots.js","sourceRoot":"","sources":["../../../../actions/core/markets/getMarketSnapshots.ts"],"names":[],"mappings":"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"}
|
package/_cjs/errors/version.js
CHANGED
|
@@ -35,6 +35,10 @@ async function fetchCoreMarketSnapshots(marketAddress, environment) {
|
|
|
35
35
|
totalBorrowsUSD
|
|
36
36
|
totalSupplies
|
|
37
37
|
totalSuppliesUSD
|
|
38
|
+
totalLiquidity
|
|
39
|
+
totalLiquidityUSD
|
|
40
|
+
baseSupplyApy
|
|
41
|
+
baseBorrowApy
|
|
38
42
|
timestamp
|
|
39
43
|
}
|
|
40
44
|
pageInfo {
|
|
@@ -55,10 +59,8 @@ async function fetchCoreMarketSnapshots(marketAddress, environment) {
|
|
|
55
59
|
const borrow = Number(point.totalBorrows);
|
|
56
60
|
const borrowUsd = Number(point.totalBorrowsUSD);
|
|
57
61
|
const suppliedUsd = Number(point.totalSuppliesUSD);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
liquidity = Math.max(liquidity, 0);
|
|
61
|
-
liquidityUsd = Math.max(liquidityUsd, 0);
|
|
62
|
+
const liquidity = Math.max(point.totalLiquidity, 0);
|
|
63
|
+
const liquidityUsd = Math.max(point.totalLiquidityUSD, 0);
|
|
62
64
|
const result = {
|
|
63
65
|
marketId: marketAddress.toLowerCase(),
|
|
64
66
|
chainId: environment.chainId,
|
|
@@ -69,6 +71,8 @@ async function fetchCoreMarketSnapshots(marketAddress, environment) {
|
|
|
69
71
|
totalBorrowsUsd: borrowUsd,
|
|
70
72
|
totalLiquidity: liquidity,
|
|
71
73
|
totalLiquidityUsd: liquidityUsd,
|
|
74
|
+
baseSupplyApy: point.baseSupplyApy,
|
|
75
|
+
baseBorrowApy: point.baseBorrowApy,
|
|
72
76
|
};
|
|
73
77
|
return result;
|
|
74
78
|
});
|
|
@@ -115,6 +119,14 @@ async function fetchIsolatedMarketSnapshots(marketAddress, environment) {
|
|
|
115
119
|
decimals
|
|
116
120
|
}
|
|
117
121
|
historicalState {
|
|
122
|
+
supplyApy(options: $options) {
|
|
123
|
+
x
|
|
124
|
+
y
|
|
125
|
+
}
|
|
126
|
+
borrowApy(options: $options) {
|
|
127
|
+
x
|
|
128
|
+
y
|
|
129
|
+
}
|
|
118
130
|
borrowAssets(options: $options) {
|
|
119
131
|
x
|
|
120
132
|
y
|
|
@@ -154,6 +166,8 @@ async function fetchIsolatedMarketSnapshots(marketAddress, environment) {
|
|
|
154
166
|
const supplyAssetsUsd = result.marketTotalTimeseries.historicalState.supplyAssetsUsd[index];
|
|
155
167
|
const liquidityAssets = result.marketTotalTimeseries.historicalState.liquidityAssets[index];
|
|
156
168
|
const liquidityAssetsUsd = result.marketTotalTimeseries.historicalState.liquidityAssetsUsd[index];
|
|
169
|
+
const supplyApy = result.marketTotalTimeseries.historicalState.supplyApy[index];
|
|
170
|
+
const borrowApy = result.marketTotalTimeseries.historicalState.borrowApy[index];
|
|
157
171
|
return {
|
|
158
172
|
chainId: environment.chainId,
|
|
159
173
|
timestamp: borrowAssets.x * 1000,
|
|
@@ -170,6 +184,8 @@ async function fetchIsolatedMarketSnapshots(marketAddress, environment) {
|
|
|
170
184
|
loanPrice) /
|
|
171
185
|
collateralPrice,
|
|
172
186
|
totalLiquidityUsd: Number(liquidityAssetsUsd.y),
|
|
187
|
+
baseSupplyApy: supplyApy.y,
|
|
188
|
+
baseBorrowApy: borrowApy.y,
|
|
173
189
|
};
|
|
174
190
|
});
|
|
175
191
|
return markets;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getMarketSnapshots.js","sourceRoot":"","sources":["../../../../actions/core/markets/getMarketSnapshots.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAEtC,OAAO,EACL,MAAM,EACN,sBAAsB,EACtB,YAAY,GACb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAYlB,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAItC,MAAsB,EACtB,IAAyD;IAEzD,MAAM,WAAW,GAAG,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,IAAI,EAAE,IAAI,KAAK,MAAM,EAAE;QACzB,OAAO,wBAAwB,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KAC7D;SAAM;QACL,OAAO,4BAA4B,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KACjE;AACH,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,aAAqB,EACrB,WAAwB;IAExB,MAAM,SAAS,GAAsB,EAAE,CAAC;IACxC,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,SAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"getMarketSnapshots.js","sourceRoot":"","sources":["../../../../actions/core/markets/getMarketSnapshots.ts"],"names":[],"mappings":"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"}
|
package/_esm/errors/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '0.5.
|
|
1
|
+
export const version = '0.5.13';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "0.5.
|
|
1
|
+
export declare const version = "0.5.13";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/_types/types/market.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"market.d.ts","sourceRoot":"","sources":["../../types/market.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,MAAM,GAAG;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,WAAW,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}
|
|
1
|
+
{"version":3,"file":"market.d.ts","sourceRoot":"","sources":["../../types/market.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,MAAM,GAAG;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,WAAW,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}
|
|
@@ -56,6 +56,10 @@ async function fetchCoreMarketSnapshots(
|
|
|
56
56
|
totalBorrowsUSD: number;
|
|
57
57
|
totalSupplies: number;
|
|
58
58
|
totalSuppliesUSD: number;
|
|
59
|
+
totalLiquidity: number;
|
|
60
|
+
totalLiquidityUSD: number;
|
|
61
|
+
baseSupplyApy: number;
|
|
62
|
+
baseBorrowApy: number;
|
|
59
63
|
timestamp: number;
|
|
60
64
|
}
|
|
61
65
|
|
|
@@ -85,6 +89,10 @@ async function fetchCoreMarketSnapshots(
|
|
|
85
89
|
totalBorrowsUSD
|
|
86
90
|
totalSupplies
|
|
87
91
|
totalSuppliesUSD
|
|
92
|
+
totalLiquidity
|
|
93
|
+
totalLiquidityUSD
|
|
94
|
+
baseSupplyApy
|
|
95
|
+
baseBorrowApy
|
|
88
96
|
timestamp
|
|
89
97
|
}
|
|
90
98
|
pageInfo {
|
|
@@ -112,11 +120,8 @@ async function fetchCoreMarketSnapshots(
|
|
|
112
120
|
|
|
113
121
|
const borrowUsd = Number(point.totalBorrowsUSD);
|
|
114
122
|
const suppliedUsd = Number(point.totalSuppliesUSD);
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
let liquidityUsd = supplied - borrow > 0 ? suppliedUsd - borrowUsd : 0;
|
|
118
|
-
liquidity = Math.max(liquidity, 0);
|
|
119
|
-
liquidityUsd = Math.max(liquidityUsd, 0);
|
|
123
|
+
const liquidity = Math.max(point.totalLiquidity, 0);
|
|
124
|
+
const liquidityUsd = Math.max(point.totalLiquidityUSD, 0);
|
|
120
125
|
|
|
121
126
|
const result: MarketSnapshot = {
|
|
122
127
|
marketId: marketAddress.toLowerCase(),
|
|
@@ -128,6 +133,8 @@ async function fetchCoreMarketSnapshots(
|
|
|
128
133
|
totalBorrowsUsd: borrowUsd,
|
|
129
134
|
totalLiquidity: liquidity,
|
|
130
135
|
totalLiquidityUsd: liquidityUsd,
|
|
136
|
+
baseSupplyApy: point.baseSupplyApy,
|
|
137
|
+
baseBorrowApy: point.baseBorrowApy,
|
|
131
138
|
};
|
|
132
139
|
|
|
133
140
|
return result;
|
|
@@ -192,6 +199,14 @@ async function fetchIsolatedMarketSnapshots(
|
|
|
192
199
|
decimals
|
|
193
200
|
}
|
|
194
201
|
historicalState {
|
|
202
|
+
supplyApy(options: $options) {
|
|
203
|
+
x
|
|
204
|
+
y
|
|
205
|
+
}
|
|
206
|
+
borrowApy(options: $options) {
|
|
207
|
+
x
|
|
208
|
+
y
|
|
209
|
+
}
|
|
195
210
|
borrowAssets(options: $options) {
|
|
196
211
|
x
|
|
197
212
|
y
|
|
@@ -258,6 +273,11 @@ async function fetchIsolatedMarketSnapshots(
|
|
|
258
273
|
index
|
|
259
274
|
];
|
|
260
275
|
|
|
276
|
+
const supplyApy =
|
|
277
|
+
result.marketTotalTimeseries.historicalState.supplyApy[index];
|
|
278
|
+
const borrowApy =
|
|
279
|
+
result.marketTotalTimeseries.historicalState.borrowApy[index];
|
|
280
|
+
|
|
261
281
|
return {
|
|
262
282
|
chainId: environment.chainId,
|
|
263
283
|
timestamp: borrowAssets.x * 1000,
|
|
@@ -279,6 +299,8 @@ async function fetchIsolatedMarketSnapshots(
|
|
|
279
299
|
loanPrice) /
|
|
280
300
|
collateralPrice,
|
|
281
301
|
totalLiquidityUsd: Number(liquidityAssetsUsd.y),
|
|
302
|
+
baseSupplyApy: supplyApy.y,
|
|
303
|
+
baseBorrowApy: borrowApy.y,
|
|
282
304
|
};
|
|
283
305
|
},
|
|
284
306
|
);
|
package/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '0.5.
|
|
1
|
+
export const version = '0.5.13'
|
package/package.json
CHANGED