@defisaver/positions-sdk 0.0.8 → 0.0.10

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.
Files changed (5) hide show
  1. package/cjs/compoundV3/index.js +8 -1
  2. package/esm/compoundV3/index.js +8 -1
  3. package/package.json +1 -1
  4. package/src/compoundV3/index.ts +9 -1
  5. package/yarn-error.log +64 -0
package/cjs/compoundV3/index.js CHANGED
@@ -177,7 +177,14 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
177
177
  if (loanData.borrowAmount.toString() !== '0') {
178
178
  usedAssets[baseAssetSymbol].isBorrowed = true;
179
179
  usedAssets[baseAssetSymbol].borrowed = (0, tokens_1.assetAmountInEth)(loanData.borrowAmount, baseAssetInfo.symbol);
180
- usedAssets[baseAssetSymbol].borrowedUsd = (0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol);
180
+ if (selectedMarket.value === (0, compound_2.COMPOUND_V3_ETH)(network).value) {
181
+ usedAssets[baseAssetSymbol].borrowedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol))
182
+ .mul(assetsData[baseAssetSymbol].price)
183
+ .toString();
184
+ }
185
+ else {
186
+ usedAssets[baseAssetSymbol].borrowedUsd = (0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol);
187
+ }
181
188
  }
182
189
  loanData.collAddr.forEach((coll, i) => {
183
190
  const assetInfo = (0, tokens_1.getAssetInfoByAddress)(coll, network);
package/esm/compoundV3/index.js CHANGED
@@ -169,7 +169,14 @@ export const getCompoundV3AccountData = (web3, network, address, proxyAddress, e
169
169
  if (loanData.borrowAmount.toString() !== '0') {
170
170
  usedAssets[baseAssetSymbol].isBorrowed = true;
171
171
  usedAssets[baseAssetSymbol].borrowed = assetAmountInEth(loanData.borrowAmount, baseAssetInfo.symbol);
172
- usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
172
+ if (selectedMarket.value === COMPOUND_V3_ETH(network).value) {
173
+ usedAssets[baseAssetSymbol].borrowedUsd = new Dec(assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol))
174
+ .mul(assetsData[baseAssetSymbol].price)
175
+ .toString();
176
+ }
177
+ else {
178
+ usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
179
+ }
173
180
  }
174
181
  loanData.collAddr.forEach((coll, i) => {
175
182
  const assetInfo = getAssetInfoByAddress(coll, network);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.8",
3
+ "version": "0.0.10",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/compoundV3/index.ts CHANGED
@@ -213,7 +213,15 @@ export const getCompoundV3AccountData = async (
213
213
  if (loanData.borrowAmount.toString() !== '0') {
214
214
  usedAssets[baseAssetSymbol].isBorrowed = true;
215
215
  usedAssets[baseAssetSymbol].borrowed = assetAmountInEth(loanData.borrowAmount, baseAssetInfo.symbol);
216
- usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
216
+ if (selectedMarket.value === COMPOUND_V3_ETH(network).value) {
217
+ usedAssets[baseAssetSymbol].borrowedUsd = new Dec(
218
+ assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol),
219
+ )
220
+ .mul(assetsData[baseAssetSymbol].price)
221
+ .toString();
222
+ } else {
223
+ usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
224
+ }
217
225
  }
218
226
  loanData.collAddr.forEach((coll: string, i: number): void => {
219
227
  const assetInfo = getAssetInfoByAddress(coll, network);
package/yarn-error.log ADDED
@@ -0,0 +1,64 @@
1
+ Arguments:
2
+ /Users/stefan/.nvm/versions/node/v14.19.0/bin/node /usr/local/Cellar/yarn/1.22.19/libexec/bin/yarn.js
3
+
4
+ PATH:
5
+ /Users/stefan/.nvm/versions/node/v14.19.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Applications/VMware Fusion.app/Contents/Public:/usr/local/go/bin:/Users/stefan/WebstormProjects/defisaver-positions-sdk/node_modules/.bin:/usr/local/go
6
+
7
+ Yarn version:
8
+ 1.22.19
9
+
10
+ Node version:
11
+ 14.19.0
12
+
13
+ Platform:
14
+ darwin x64
15
+
16
+ Trace:
17
+ Error: incorrect data check
18
+ at Zlib.zlibOnError [as onerror] (zlib.js:187:17)
19
+
20
+ npm manifest:
21
+ {
22
+ "name": "defisaver-positions-sdk",
23
+ "version": "0.0.1",
24
+ "description": "",
25
+ "main": "./cjs/index.js",
26
+ "module": "./esm/src/index.js",
27
+ "types": "./esm/src/index.d.ts",
28
+ "scripts": {
29
+ "build:esm": "rm -rf esm && tsc -p tsconfig.json",
30
+ "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
31
+ "build": "npm run build:cjs && npm run build:esm",
32
+ "dev": "tsc -p tsconfig.cjs.json --watch",
33
+ "lint": "eslint src/ --fix",
34
+ "generate-contracts": "node scripts/generateContracts.js",
35
+ "test": "mocha tests/*",
36
+ "build-test": "npm run build && mocha tests/*"
37
+ },
38
+ "keywords": [],
39
+ "author": "",
40
+ "license": "ISC",
41
+ "dependencies": {
42
+ "@defisaver/tokens": "^1.4.56",
43
+ "decimal.js": "^10.4.3"
44
+ },
45
+ "devDependencies": {
46
+ "@defisaver/eslint-config": "^1.0.1",
47
+ "chai": "^4.3.8",
48
+ "dotenv": "^16.3.1",
49
+ "eslint": "^8.49.0",
50
+ "mocha": "^10.2.0",
51
+ "typechain": "^8.3.1",
52
+ "typechain-target-web3-v1-3mihai3": "^6.0.2",
53
+ "typescript": "^5.2.2"
54
+ },
55
+ "peerDependencies": {
56
+ "web3": "^1.10.2"
57
+ }
58
+ }
59
+
60
+ yarn manifest:
61
+ No manifest
62
+
63
+ Lockfile:
64
+ No lockfile