npm - @sonarwatch/portfolio-plugins - Versions diffs - 0.8.112 → 0.8.114 - Mend

@sonarwatch/portfolio-plugins 0.8.112 → 0.8.114

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 (48) hide show

package/CHANGELOG.md +9 -1
package/package.json +2 -2
package/src/plugins/01/depostisFetcher.js +2 -1
package/src/plugins/01/depostisFetcher.js.map +1 -1
package/src/plugins/bucket/collateralFetcher.js +2 -1
package/src/plugins/bucket/collateralFetcher.js.map +1 -1
package/src/plugins/compound/getPositionsV2Fetcher.js +2 -1
package/src/plugins/compound/getPositionsV2Fetcher.js.map +1 -1
package/src/plugins/compound/getPositionsV3Fetcher.js +2 -1
package/src/plugins/compound/getPositionsV3Fetcher.js.map +1 -1
package/src/plugins/drift/deposits.js +2 -1
package/src/plugins/drift/deposits.js.map +1 -1
package/src/plugins/jupiter/perpetualFetcher.js +36 -30
package/src/plugins/jupiter/perpetualFetcher.js.map +1 -1
package/src/plugins/kamino/depositsFetcher.js +2 -2
package/src/plugins/kamino/depositsFetcher.js.map +1 -1
package/src/plugins/maker/vaultsFetcher.js +2 -1
package/src/plugins/maker/vaultsFetcher.js.map +1 -1
package/src/plugins/mango/collateralFetcher.js +2 -1
package/src/plugins/mango/collateralFetcher.js.map +1 -1
package/src/plugins/mango/redeemFetcher.js +2 -1
package/src/plugins/mango/redeemFetcher.js.map +1 -1
package/src/plugins/maple/ethereumFetcher.js +2 -1
package/src/plugins/maple/ethereumFetcher.js.map +1 -1
package/src/plugins/morpho/aaveV3CollateralFetcher.js +2 -1
package/src/plugins/morpho/aaveV3CollateralFetcher.js.map +1 -1
package/src/plugins/navi/collateralFetcher.js +2 -1
package/src/plugins/navi/collateralFetcher.js.map +1 -1
package/src/plugins/port/constants.js +1 -1
package/src/plugins/port/constants.js.map +1 -1
package/src/plugins/port/helpers.d.ts +7 -0
package/src/plugins/port/helpers.js +18 -1
package/src/plugins/port/helpers.js.map +1 -1
package/src/plugins/port/obligationsFetcher.js +6 -6
package/src/plugins/port/obligationsFetcher.js.map +1 -1
package/src/plugins/port/structs.d.ts +13 -0
package/src/plugins/port/structs.js +12 -1
package/src/plugins/port/structs.js.map +1 -1
package/src/plugins/scallop/lendingsFetcher.js +2 -1
package/src/plugins/scallop/lendingsFetcher.js.map +1 -1
package/src/plugins/scallop/obligationsFetcher.js +2 -1
package/src/plugins/scallop/obligationsFetcher.js.map +1 -1
package/src/plugins/sushiswap/constants.js +1 -1
package/src/plugins/sushiswap/constants.js.map +1 -1
package/src/plugins/thala/vaultsFetcher.js +2 -1
package/src/plugins/thala/vaultsFetcher.js.map +1 -1
package/src/plugins/venus/constants.js +1 -1
package/src/plugins/venus/constants.js.map +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -2,10 +2,18 @@
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
-## [0.8.112](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.111...plugins-0.8.112) (2023-11-29)
+## [0.8.114](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.113...plugins-0.8.114) (2023-11-30)
+## [0.8.113](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.112...plugins-0.8.113) (2023-11-29)
+## [0.8.112](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.111...plugins-0.8.112) (2023-11-29)
 ## [0.8.111](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.110...plugins-0.8.111) (2023-11-28)

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.8.112",
+  "version": "0.8.114",
   "type": "commonjs",
   "generators": "./generators.json",
   "dependencies": {
@@ -41,7 +41,7 @@
     "web3-v1": "npm:web3@^1.5.0"
   },
   "peerDependencies": {
-    "@sonarwatch/portfolio-core": "0.8.112"
+    "@sonarwatch/portfolio-core": "0.8.114"
   },
   "main": "./src/index.js",
   "types": "./src/index.d.ts"

package/src/plugins/01/depostisFetcher.js CHANGED Viewed

@@ -53,7 +53,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const elements = [];
     if (suppliedAssets.length === 0)
         return [];
-    const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+    const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
     elements.push();
     return [
         {
@@ -71,6 +71,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedYields,
                 collateralRatio,
                 rewardAssets,
+                healthRatio,
                 value,
             },
         },

package/src/plugins/01/depostisFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"depostisFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/01/depostisFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,6CAA4C;AAG5C,2CAAgD;AAChD,uCAAmC;AACnC,kFAA+E;AAC/E,qCAAwC;AACxC,iDAAsD;AACtD,iDAA+D;AAC/D,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,GAAG,GAAG,IAAA,gBAAM,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,EAAE,qBAAY,EAAE,GAAG,CAAC,CAAC;IAEtE,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAA,kCAAwB,EAAC,UAAU,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAAE,SAAS;QAE/C,MAAM,IAAI,GAAG,iBAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,6CAA6C;YAAE,SAAS;QAErE,MAAM,MAAM,GACV,IAAI;YACJ,CAAC,6CAA6C;gBAC5C,6CAA6C,CAAC;YAC9C,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;YAC3B,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE1C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;QAErE,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,EACJ,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;KACH;IACD,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE3C,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,EAAE,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACxE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChB,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"depostisFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/01/depostisFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,6CAA4C;AAG5C,2CAAgD;AAChD,uCAAmC;AACnC,kFAA+E;AAC/E,qCAAwC;AACxC,iDAAsD;AACtD,iDAA+D;AAC/D,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,GAAG,GAAG,IAAA,gBAAM,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,EAAE,qBAAY,EAAE,GAAG,CAAC,CAAC;IAEtE,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAA,kCAAwB,EAAC,UAAU,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAAE,SAAS;QAE/C,MAAM,IAAI,GAAG,iBAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,6CAA6C;YAAE,SAAS;QAErE,MAAM,MAAM,GACV,IAAI;YACJ,CAAC,6CAA6C;gBAC5C,6CAA6C,CAAC;YAC9C,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;YAC3B,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE1C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;QAErE,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,EACJ,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;KACH;IACD,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE3C,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,GACzE,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACxE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChB,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,WAAW;gBACX,KAAK;aACN;SACF;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/bucket/collateralFetcher.js CHANGED Viewed

@@ -60,7 +60,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             .toNumber();
         borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(constants_1.buckId, borrowedQuantity, portfolio_core_1.NetworkId.sui, buckPrice));
         suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(collateral.tokenId, suppliedQuantity, portfolio_core_1.NetworkId.sui, tokenPrice));
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, healthRatio, suppliedValue, value, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         const element = {
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.sui,
@@ -75,6 +75,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedValue,
                 suppliedYields,
                 collateralRatio,
+                healthRatio,
                 rewardAssets,
                 value,
             },

package/src/plugins/bucket/collateralFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bucket/collateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,2CAAiD;AACjD,gEAAqC;AAGrC,2CAA8D;AAC9D,iDAAmD;AAEnD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,kBAAM,EAAE,0BAAS,CAAC,GAAG,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,KAAK,MAAM,UAAU,IAAI,uBAAW,EAAE;QACpC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG;YACZ,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,KAAK;aACb;SACF,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,CAAC,IAAI;YAAE,SAAS;QAEjC,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAC1C,UAAU,CAAC,OAAO,EAClB,0BAAS,CAAC,GAAG,CACd,CAAC;QACF,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,gBAAgB,GAAG,IAAA,wBAAe,EAAC,YAAY,CAAqB,CAAC;QAC3E,IACE,CAAC,gBAAgB,CAAC,KAAK;YACvB,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM;YAC9B,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;YACpC,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM;YAE3C,SAAS;QAEX,MAAM,cAAc,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAClE,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,iBAAiB,CAAC;aACrE,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aACpC,QAAQ,EAAE,CAAC;QACd,IAAI,gBAAgB,KAAK,CAAC;YAAE,SAAS;QACrC,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,WAAW,CAAC;aAC/D,SAAS,CAAC,SAAA,EAAE,EAAI,SAAS,CAAC,QAAQ,CAAA,CAAC;aACnC,QAAQ,EAAE,CAAC;QAEd,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EAAC,kBAAM,EAAE,gBAAgB,EAAE,0BAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAC3E,CAAC;QAEF,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,gBAAgB,EAChB,0BAAS,CAAC,GAAG,EACb,UAAU,CACX,CACF,CAAC;QAEF,MAAM,~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QAExE~~,MAAM,OAAO,GAAqB;YAChC,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,GAAG;YACxB,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACxB;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bucket/collateralFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/compound/getPositionsV2Fetcher.js CHANGED Viewed

@@ -85,7 +85,7 @@ function getPositionsV2Fetcher(networkId, platformId) {
         }
         if (borrowedAssets.length === 0 && suppliedAssets.length === 0)
             return [];
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         return [
             {
                 type: portfolio_core_1.PortfolioElementType.borrowlend,
@@ -101,6 +101,7 @@ function getPositionsV2Fetcher(networkId, platformId) {
                     suppliedValue,
                     suppliedYields,
                     collateralRatio,
+                    healthRatio,
                     rewardAssets,
                     value,
                 },

package/src/plugins/compound/getPositionsV2Fetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getPositionsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV2Fetcher.ts"],"names":[],"mappings":"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~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QACxE~~,OAAO;YACL;gBACE,IAAI,EAAE,qCAAoB,CAAC,UAAU;gBACrC,SAAS;gBACT,UAAU;gBACV,KAAK,EAAE,SAAS;gBAChB,KAAK;gBACL,IAAI,EAAE;oBACJ,cAAc;oBACd,aAAa;oBACb,cAAc;oBACd,cAAc;oBACd,aAAa;oBACb,cAAc;oBACd,eAAe;oBACf,YAAY;oBACZ,KAAK;iBACN;aACF;SACF,CAAC;IACJ,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,GAAG,UAAU,IAAI,SAAS,eAAe;QAC7C,SAAS;QACT,QAAQ;KACT,CAAC;AACJ,CAAC;~~AAvID~~,~~wCAuIC~~"}
1	+ {"version":3,"file":"getPositionsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV2Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,gEAAqC;AAIrC,iCAAuC;AACvC,uDAA6D;AAC7D,iDAAmD;AACnD,qGAA6E;AAC7E,2CAA+C;AAC/C,uCAAwC;AAExC,SAAwB,qBAAqB,CAC3C,SAA2B,EAC3B,UAAkB;IAElB,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,SAAS,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,KAAsB,CAAC;QAEvC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,CAAmB,4BAAgB,EAAE;YACtE,MAAM,EAAE,UAAU;YAClB,SAAS;SACV,CAAC,CAAC;QACH,IAAI,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC;QAExB,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QAC3E,MAAM,cAAc,GAA4B,IAAI,GAAG,EAAE,CAAC;QAC1D,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1B,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAC7C,CAAC;QAEF,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACxD,MAAM,CAAC,SAAS,CAAC;gBACf,SAAS,EAAE,OAAO,CAAC,GAAG,CACpB,CAAC,MAAM,EAAE,EAAE,CACT,CAAC;oBACC,GAAG,EAAE,4BAAiB;oBACtB,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,YAAY,EAAE,WAAW;oBACzB,IAAI,EAAE,CAAC,OAAO,CAAC;iBACN,CAAA,CACd;aACF,CAAC;YACF,MAAM,CAAC,SAAS,CAAC;gBACf,SAAS,EAAE,OAAO,CAAC,GAAG,CACpB,CAAC,MAAM,EAAE,EAAE,CACT,CAAC;oBACC,GAAG,EAAE,CAAC,oBAAa,CAAC,mBAAmB,CAAC;oBACxC,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,YAAY,EAAE,oBAAa,CAAC,mBAAmB,CAAC,IAAI;oBACpD,IAAI,EAAE,CAAC,OAAO,CAAC;iBACN,CAAA,CACd;aACF,CAAC;SACH,CAAC,CAAC;QACH,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,UAAU;gBAAE,SAAS;YAE1B,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAEpC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;YAC/B,IACE,cAAc,CAAC,MAAM,KAAK,SAAS;gBACnC,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,EACjC;gBACA,MAAM,oBAAoB,GAAG,IAAI,sBAAS,CAAC,YAAY,CAAC,CAAC,SAAS,CAChE,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAC1B,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;qBACjE,SAAS,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC;qBACnB,YAAY,CAAC,oBAAoB,CAAC,CAAC;gBAEtC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CACjC,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,EACV,YAAY,CAAC,QAAQ,EAAE,EACvB,SAAS,EACT,UAAU,CACX,CACF,CACF,CAAC;aACH;YAED,MAAM,SAAS,GAAG,IAAA,qBAAW,EAAC,SAAS,CAAC,CAAC;YACzC,IACE,aAAa,CAAC,MAAM,KAAK,SAAS;gBAClC,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;gBAChC,SAAS,EACT;gBACA,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CACjC,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,EACV,IAAI,sBAAS,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;qBAC3C,SAAS,CAAC,SAAA,EAAE,EAAI,SAAS,CAAA,CAAC;qBAC1B,QAAQ,EAAE,EACb,SAAS,EACT,UAAU,CACX,CACF,CACF,CAAC;aACH;SACF;QAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAE1E,MAAM,EACJ,aAAa,EACb,eAAe,EACf,aAAa,EACb,KAAK,EACL,WAAW,GACZ,GAAG,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QAC1E,OAAO;YACL;gBACE,IAAI,EAAE,qCAAoB,CAAC,UAAU;gBACrC,SAAS;gBACT,UAAU;gBACV,KAAK,EAAE,SAAS;gBAChB,KAAK;gBACL,IAAI,EAAE;oBACJ,cAAc;oBACd,aAAa;oBACb,cAAc;oBACd,cAAc;oBACd,aAAa;oBACb,cAAc;oBACd,eAAe;oBACf,WAAW;oBACX,YAAY;oBACZ,KAAK;iBACN;aACF;SACF,CAAC;IACJ,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,GAAG,UAAU,IAAI,SAAS,eAAe;QAC7C,SAAS;QACT,QAAQ;KACT,CAAC;AACJ,CAAC;AA7ID,wCA6IC"}

package/src/plugins/compound/getPositionsV3Fetcher.js CHANGED Viewed

@@ -120,7 +120,7 @@ function getPositionsV3Fetcher(networkId) {
                 suppliedAssets.length === 0 &&
                 rewardAssets.length === 0)
                 continue;
-            const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+            const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
             elements.push({
                 type: portfolio_core_1.PortfolioElementType.borrowlend,
                 networkId,
@@ -136,6 +136,7 @@ function getPositionsV3Fetcher(networkId) {
                     suppliedValue,
                     suppliedYields,
                     collateralRatio,
+                    healthRatio,
                     rewardAssets,
                     value,
                 },

package/src/plugins/compound/getPositionsV3Fetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getPositionsV3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV3Fetcher.ts"],"names":[],"mappings":"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~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~YACxE~~,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;gBACrC,SAAS;gBACT,UAAU,EAAV,sBAAU;gBACV,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,aAAa;gBACnB,KAAK;gBACL,IAAI,EAAE;oBACJ,cAAc;oBACd,aAAa;oBACb,cAAc;oBACd,cAAc;oBACd,aAAa;oBACb,cAAc;oBACd,eAAe;oBACf,YAAY;oBACZ,KAAK;iBACN;aACF,CAAC,CAAC;SACJ;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,GAAG,sBAAU,IAAI,SAAS,eAAe;QAC7C,SAAS;QACT,QAAQ;KACT,CAAC;AACJ,CAAC;~~AAvLD~~,~~wCAuLC~~"}
1	+ {"version":3,"file":"getPositionsV3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV3Fetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/drift/deposits.js CHANGED Viewed

@@ -141,7 +141,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
             continue;
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,
@@ -157,6 +157,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedYields,
                 collateralRatio,
                 rewardAssets,
+                healthRatio,
                 value,
             },
             name: (0, helpers_1.decodeName)(userAccount.name),

package/src/plugins/drift/deposits.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deposits.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/deposits.ts"],"names":[],"mappings":"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~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QACxE~~,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;YACD,IAAI,EAAE,IAAA,oBAAU,EAAC,WAAW,CAAC,IAAI,CAAC;SACnC,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"deposits.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/deposits.ts"],"names":[],"mappings":"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"}

package/src/plugins/jupiter/perpetualFetcher.js CHANGED Viewed

@@ -48,17 +48,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     tokensDetails.forEach((tD) => tD ? tokensDetailsById.set(tD.address, tD) : undefined);
     const elements = [];
     for (const position of perpetualsPositions) {
+        if (position.side === structs_1.Side.None)
+            continue;
+        const isLong = position.side === structs_1.Side.Long;
         const custody = custodyById.get(position.custody.toString());
         const collateralCustody = custodyById.get(position.collateralCustody.toString());
         if (!custody || !collateralCustody)
             continue;
-        const custodyPriceData = pythPricesByAccount.get(custody.oracle.oracleAccount);
-        const collateralCustodyPriceData = pythPricesByAccount.get(collateralCustody.oracle.oracleAccount);
-        if (!custodyPriceData ||
-            !custodyPriceData.price ||
-            !collateralCustodyPriceData ||
-            !collateralCustodyPriceData.price)
-            continue;
         const borrowedAssets = [];
         const borrowedYields = [];
         const suppliedAssets = [];
@@ -66,46 +62,54 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const rewardAssets = [];
         const { collateralUsd, sizeUsd, price, cumulativeInterestSnapshot } = position;
         const openingPrice = price.dividedBy(usdFactor);
+        const custodyPriceData = pythPricesByAccount.get(custody.oracle.oracleAccount);
+        const collateralCustodyPriceData = pythPricesByAccount.get(collateralCustody.oracle.oracleAccount);
+        if (!custodyPriceData ||
+            !custodyPriceData.price ||
+            !collateralCustodyPriceData ||
+            !collateralCustodyPriceData.price)
+            continue;
         const currentPrice = new bignumber_js_1.default(custodyPriceData.price);
         const leverage = sizeUsd.dividedBy(collateralUsd);
         const custodyDetails = tokensDetailsById.get(custody.mint);
         const custodyName = custodyDetails ? custodyDetails.symbol : '';
-        const amountDeposited = collateralUsd
+        const collatAmount = collateralUsd
             .dividedBy(collateralCustodyPriceData.price)
             .dividedBy(usdFactor);
-        const depositValue = collateralUsd.dividedBy(usdFactor).toNumber();
+        const collatValue = collateralUsd.dividedBy(usdFactor).toNumber();
+        const custodyAmount = collatAmount.times(leverage);
+        const custodyValue = sizeUsd.dividedBy(usdFactor).toNumber();
+        const borrowFee = sizeUsd
+            .times(new bignumber_js_1.default(collateralCustody.fundingRateState.cumulativeInterestRate).minus(cumulativeInterestSnapshot))
+            .dividedBy(Math.pow(10, 15))
+            .absoluteValue();
+        const openAndCloseFees = sizeUsd.times(0.001).times(2).dividedBy(usdFactor);
+        const fees = borrowFee.plus(openAndCloseFees).negated().toNumber();
+        const priceDelta = isLong
+            ? currentPrice.minus(openingPrice)
+            : openingPrice.minus(currentPrice);
+        const priceVar = priceDelta.dividedBy(openingPrice);
+        const pnl = priceVar.times(collatValue).times(leverage).toNumber();
         suppliedAssets.push({
             type: 'token',
             networkId: portfolio_core_1.NetworkId.solana,
-            value: collateralUsd.dividedBy(usdFactor).toNumber(),
+            value: collatValue,
             data: {
-                amount: amountDeposited.toNumber(),
+                amount: collatAmount.toNumber(),
                 address: collateralCustody.mint,
                 price: collateralCustodyPriceData.price,
             },
         });
-        const amountBorrowed = amountDeposited.times(leverage);
-        const borrowedValue = sizeUsd.dividedBy(usdFactor).toNumber();
         borrowedAssets.push({
             type: 'token',
             networkId: portfolio_core_1.NetworkId.solana,
-            value: borrowedValue,
+            value: custodyValue,
             data: {
-                amount: amountBorrowed.toNumber(),
-                address: collateralCustody.mint,
-                price: collateralCustodyPriceData.price,
+                amount: custodyAmount.toNumber(),
+                address: custody.mint,
+                price: custodyPriceData.price,
             },
         });
-        const borrowFee = sizeUsd
-            .times(new bignumber_js_1.default(collateralCustody.fundingRateState.cumulativeInterestRate).minus(cumulativeInterestSnapshot))
-            .dividedBy(Math.pow(10, 15))
-            .absoluteValue();
-        const openAndCloseFees = sizeUsd.times(0.001).times(2).dividedBy(usdFactor);
-        const fees = borrowFee.plus(openAndCloseFees).negated().toNumber();
-        const priceChange = position.side === structs_1.Side.Long
-            ? currentPrice.minus(openingPrice).dividedBy(openingPrice)
-            : openingPrice.minus(currentPrice).dividedBy(openingPrice);
-        const pnl = priceChange.times(leverage).times(depositValue).toNumber();
         rewardAssets.push({
             type: 'generic',
             networkId: portfolio_core_1.NetworkId.solana,
@@ -120,8 +124,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         });
         if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
             continue;
+        const { borrowedValue, collateralRatio, suppliedValue, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         const value = collateralUsd.dividedBy(usdFactor).plus(pnl).toNumber();
-        const side = position.side === structs_1.Side.Long ? 'Long' : 'Short';
+        const side = isLong ? 'Long' : 'Short';
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,
@@ -134,10 +139,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 borrowedValue,
                 borrowedYields,
                 suppliedAssets,
-                suppliedValue: depositValue,
+                suppliedValue,
                 suppliedYields,
-                collateralRatio: null,
+                collateralRatio,
                 rewardAssets,
+                healthRatio,
                 value,
             },
         });

package/src/plugins/jupiter/perpetualFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/perpetualFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+~~DAOoC~~;AACpC,gEAAqC;AACrC,6CAA4C;AAG5C,2CAAuE;AACvE,iDAAsD;AACtD,+CAA8D;AAC9D,uCAAiD;AACjD,uCAAsD;AAEtD,gGAA6F;AAC7F,6DAAwE;AACxE,mDAA8D;AAE9D,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC;AACzC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,mBAAmB,GAAG,MAAM,IAAA,iCAAwB,EACxD,MAAM,EACN,wBAAc,EACd,0BAAc,EACd,IAAA,mCAAyB,EAAC,KAAK,CAAC,CACjC,CAAC;IACF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEhD,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,OAAO,CAAgB,wBAAY,EAAE;QACzE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,cAAc,GAAgB,EAAE,CAAC;IACvC,MAAM,WAAW,GAA6B,IAAI,GAAG,EAAE,CAAC;IACxD,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,cAAc,CAAC,IAAI,CAAC,IAAI,mBAAS,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7D,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,MAAM,IAAA,yDAA2B,EACtD,MAAM,EACN,cAAc,CACf,CAAC;IACF,MAAM,mBAAmB,GAAG,IAAA,+BAAqB,EAC/C,cAAc,EACd,cAAc,CACf,CAAC;IAEF,MAAM,iBAAiB,GAA8B,IAAI,GAAG,EAAE,CAAC;IAC/D,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,QAAQ,CACxC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EACxC,EAAE,MAAM,EAAE,mCAAuB,EAAE,SAAS,EAAE,0BAAS,CAAC,MAAM,EAAE,CACjE,CAAC;IACF,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC3B,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CACvD,CAAC;IAEF,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,MAAM,QAAQ,IAAI,mBAAmB,EAAE;QAC1C,~~MAAM~~,~~OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,~~QAAQ,CAAC,~~OAAO~~,~~CAAC~~,~~QAAQ~~,~~EAAE,~~CAAC,~~CAAC~~;~~QAC7D~~,MAAM,~~iBAAiB~~,GAAG,~~WAAW,CAAC,GAAG,CACvC,~~QAAQ,CAAC,~~iBAAiB~~,~~CAAC~~,~~QAAQ~~,~~EAAE,CACtC,~~CAAC~~;QACF~~,IAAI,CAAC~~,OAAO,IAAI,CAAC,iBAAiB~~;~~YAAE~~,~~SAAS;QAE7C,~~MAAM,~~gBAAgB~~,GAAG,~~mBAAmB~~,CAAC,GAAG,~~CAC9C~~,~~OAAO~~,CAAC,~~MAAM~~,CAAC,~~aAAa~~,~~CAC7B~~,CAAC;~~QACF~~,MAAM,~~0BAA0B~~,GAAG,~~mBAAmB~~,CAAC,GAAG,~~CACxD~~,~~iBAAiB~~,CAAC,~~MAAM~~,CAAC,~~aAAa~~,~~CACvC~~,CAAC;QACF,~~IACE~~,CAAC,~~gBAAgB;YACjB~~,~~CAAC~~,~~gBAAgB,~~CAAC,~~KAAK~~;~~YACvB~~,~~CAAC,0BAA0B;YAC3B,CAAC,0BAA0B,CAAC,KAAK;YAEjC,~~SAAS;~~QAEX~~,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;~~QAE1C~~,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,0BAA0B,EAAE,GACjE,QAAQ,CAAC;~~QAEX~~,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;~~QAChD~~,MAAM,~~YAAY~~,GAAG,~~IAAI~~,~~sBAAS,~~CAAC,~~gBAAgB~~,~~CAAC~~,~~KAAK~~,CAAC,~~CAAC;QAE3D,~~MAAM,~~QAAQ,GAAG,OAAO,~~CAAC,~~SAAS,CAAC,~~aAAa,~~CAAC~~,CAAC;~~QAElD~~,MAAM,~~cAAc~~,GAAG,~~iBAAiB~~,CAAC,GAAG,~~CAAC~~,~~OAAO~~,CAAC,~~IAAI~~,CAAC,CAAC;~~QAC3D~~,~~MAAM~~,~~WAAW~~,~~GAAG~~,~~cAAc,~~CAAC,~~CAAC~~,CAAC,~~cAAc~~,CAAC,~~MAAM~~,CAAC,~~CAAC~~,CAAC,~~EAAE~~,~~CAAC~~;~~QAEhE~~,MAAM,~~eAAe~~,GAAG,~~aAAa;aAClC~~,~~SAAS~~,CAAC,~~0BAA0B~~,CAAC,KAAK,CAAC~~;aAC3C~~,~~SAAS,~~CAAC~~,SAAS,CAAC,CAAC~~;~~QACxB~~,MAAM,~~YAAY~~,GAAG,~~aAAa~~,CAAC,SAAS,CAAC,~~SAAS~~,CAAC,CAAC,~~QAAQ~~,~~EAAE~~,~~CAAC;QACnE~~,~~cAAc~~,CAAC,~~IAAI~~,CAAC~~;YAClB~~,~~IAAI,EAAE,~~OAAO~~;YACb~~,~~SAAS~~,~~EAAE~~,~~0BAAS~~,CAAC,MAAM~~;YAC3B~~,~~KAAK~~,~~EAAE~~,~~aAAa~~,CAAC,~~SAAS~~,CAAC,~~SAAS~~,CAAC,CAAC,~~QAAQ~~,~~EAAE;YACpD~~,~~IAAI,~~EAAE~~;gBACJ~~,~~MAAM,EAAE,eAAe,~~CAAC~~,QAAQ,EAAE~~;~~gBAClC~~,~~OAAO~~,~~EAAE~~,~~iBAAiB~~,~~CAAC,IAAI~~;~~gBAC~~/B,~~KAAK~~,~~EAAE~~,0BAA0B,CAAC,KAAK~~;aACxC;SACF~~,CAAC~~,CAAC~~;~~QAEH~~,~~MAAM~~,~~cAAc,GAAG,eAAe,~~CAAC,~~KAAK~~,CAAC,~~QAAQ,~~CAAC~~,CAAC~~;~~QACvD~~,MAAM,~~aAAa~~,GAAG,~~OAAO~~,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;~~QAC9D~~,~~cAAc~~,~~CAAC~~,~~IAAI~~,~~CAAC;YAClB~~,~~IAAI,EAAE,OAAO;YACb,SAAS,EAAE,0BAAS,~~CAAC,~~MAAM;YAC3B,~~KAAK,~~EAAE~~,~~aAAa;YACpB~~,~~IAAI~~,~~EAAE~~;~~gBACJ~~,MAAM,~~EAAE~~,~~cAAc~~,~~CAAC,QAAQ,EAAE;gBACjC,~~OAAO,~~EAAE~~,~~iBAAiB~~,CAAC,~~IAAI;gBAC/B~~,~~KAAK~~,~~EAAE,0BAA0B,~~CAAC,~~KAAK;aACxC;SACF~~,~~CAAC~~,CAAC;~~QAEH~~,MAAM,SAAS,GAAG,OAAO;aACtB,KAAK,CACJ,IAAI,sBAAS,CACX,iBAAiB,CAAC,gBAAgB,CAAC,sBAAsB,CAC1D,CAAC,KAAK,CAAC,0BAA0B,CAAC,CACpC;aACA,SAAS,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC;aACnB,aAAa,EAAE,CAAC;QAEnB,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;QAEnE,MAAM,~~WAAW~~,~~GACf~~,~~QAAQ~~,CAAC,~~IAAI~~,KAAK,~~cAAI~~,CAAC~~,IAAI~~;~~YACzB~~,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC;~~YAC1D~~,CAAC,CAAC,~~YAAY~~,CAAC,KAAK,CAAC,~~YAAY~~,CAAC,CAAC,~~SAAS~~,CAAC,~~YAAY~~,CAAC,CAAC;~~QAE/D~~,~~MAAM~~,~~GAAG~~,~~GAAG~~,~~WAAW~~,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,~~YAAY~~,CAAC,CAAC,QAAQ,EAAE,CAAC;~~QAEvE~~,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE;SACvC,CAAC,CAAC;QACH,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE;SAC7C,CAAC,CAAC;QAEH,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAEzE,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtE,MAAM,IAAI,GAAG,~~QAAQ~~,CAAC,~~IAAI,KAAK,cAAI,~~CAAC,~~IAAI,~~CAAC,~~CAAC,CAAC,~~MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;~~QAE5D~~,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,UAAU;YACjB,KAAK;YACL,IAAI,EAAE,GAAG,WAAW,IAAI,IAAI,IAAI,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG;YAC5D,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa~~,EAAE,YAAY~~;~~gBAC3B~~,cAAc;gBACd,eAAe~~,EAAE,IAAI~~;~~gBACrB~~,YAAY;gBACZ,KAAK;aACN;SACF,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/perpetualFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,gEAAqC;AACrC,6CAA4C;AAG5C,2CAAuE;AACvE,iDAAsD;AACtD,+CAA8D;AAC9D,uCAAiD;AACjD,uCAAsD;AAEtD,gGAA6F;AAC7F,6DAAwE;AACxE,mDAA8D;AAE9D,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC;AACzC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,mBAAmB,GAAG,MAAM,IAAA,iCAAwB,EACxD,MAAM,EACN,wBAAc,EACd,0BAAc,EACd,IAAA,mCAAyB,EAAC,KAAK,CAAC,CACjC,CAAC;IACF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEhD,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,OAAO,CAAgB,wBAAY,EAAE;QACzE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,cAAc,GAAgB,EAAE,CAAC;IACvC,MAAM,WAAW,GAA6B,IAAI,GAAG,EAAE,CAAC;IACxD,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,cAAc,CAAC,IAAI,CAAC,IAAI,mBAAS,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7D,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,MAAM,IAAA,yDAA2B,EACtD,MAAM,EACN,cAAc,CACf,CAAC;IACF,MAAM,mBAAmB,GAAG,IAAA,+BAAqB,EAC/C,cAAc,EACd,cAAc,CACf,CAAC;IAEF,MAAM,iBAAiB,GAA8B,IAAI,GAAG,EAAE,CAAC;IAC/D,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,QAAQ,CACxC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EACxC,EAAE,MAAM,EAAE,mCAAuB,EAAE,SAAS,EAAE,0BAAS,CAAC,MAAM,EAAE,CACjE,CAAC;IACF,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC3B,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CACvD,CAAC;IAEF,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,MAAM,QAAQ,IAAI,mBAAmB,EAAE;QAC1C,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAI,CAAC,IAAI;YAAE,SAAS;QAC1C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,KAAK,cAAI,CAAC,IAAI,CAAC;QAE3C,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7D,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CACvC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CACtC,CAAC;QACF,IAAI,CAAC,OAAO,IAAI,CAAC,iBAAiB;YAAE,SAAS;QAE7C,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAC1C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,0BAA0B,EAAE,GACjE,QAAQ,CAAC;QACX,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEhD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,GAAG,CAC9C,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;QACF,MAAM,0BAA0B,GAAG,mBAAmB,CAAC,GAAG,CACxD,iBAAiB,CAAC,MAAM,CAAC,aAAa,CACvC,CAAC;QACF,IACE,CAAC,gBAAgB;YACjB,CAAC,gBAAgB,CAAC,KAAK;YACvB,CAAC,0BAA0B;YAC3B,CAAC,0BAA0B,CAAC,KAAK;YAEjC,SAAS;QACX,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAElD,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAEhE,MAAM,YAAY,GAAG,aAAa;aAC/B,SAAS,CAAC,0BAA0B,CAAC,KAAK,CAAC;aAC3C,SAAS,CAAC,SAAS,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;QAElE,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE7D,MAAM,SAAS,GAAG,OAAO;aACtB,KAAK,CACJ,IAAI,sBAAS,CACX,iBAAiB,CAAC,gBAAgB,CAAC,sBAAsB,CAC1D,CAAC,KAAK,CAAC,0BAA0B,CAAC,CACpC;aACA,SAAS,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC;aACnB,aAAa,EAAE,CAAC;QAEnB,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;QAEnE,MAAM,UAAU,GAAG,MAAM;YACvB,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC;YAClC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAEpD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEnE,cAAc,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE;gBACJ,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;gBAC/B,OAAO,EAAE,iBAAiB,CAAC,IAAI;gBAC/B,KAAK,EAAE,0BAA0B,CAAC,KAAK;aACxC;SACF,CAAC,CAAC;QACH,cAAc,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE;gBACJ,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,KAAK,EAAE,gBAAgB,CAAC,KAAK;aAC9B;SACF,CAAC,CAAC;QACH,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE;SACvC,CAAC,CAAC;QACH,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE;SAC7C,CAAC,CAAC;QAEH,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAEzE,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,WAAW,EAAE,GAClE,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QAExE,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtE,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAEvC,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,UAAU;YACjB,KAAK;YACL,IAAI,EAAE,GAAG,WAAW,IAAI,IAAI,IAAI,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG;YAC5D,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,WAAW;gBACX,KAAK;aACN;SACF,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/kamino/depositsFetcher.js CHANGED Viewed

@@ -184,7 +184,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                     suppliedValue,
                     suppliedYields,
                     collateralRatio,
-                    healthRatio: -healthRatio / 0.9,
+                    healthRatio: healthRatio ? -healthRatio / 0.9 : null,
                     rewardAssets,
                     value,
                 },
@@ -261,7 +261,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                     suppliedValue,
                     suppliedYields,
                     collateralRatio,
-                    healthRatio: healthRatio / 0.9,
+                    healthRatio: healthRatio ? healthRatio / 0.9 : null,
                     rewardAssets,
                     value,
                 },

package/src/plugins/kamino/depositsFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/depositsFetcher.ts"],"names":[],"mappings":"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~~oBAC/B~~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~~oBAC9B~~,YAAY;oBACZ,KAAK;iBACN;aACF,CAAC,CAAC;SACJ;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/depositsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/maker/vaultsFetcher.js CHANGED Viewed

@@ -146,7 +146,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             suppliedAssets.length === 0 &&
             rewardAssets.length === 0)
             continue;
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.ethereum,
@@ -161,6 +161,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedValue,
                 suppliedYields,
                 collateralRatio,
+                healthRatio,
                 rewardAssets,
                 value,
             },

package/src/plugins/maker/vaultsFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/maker/vaultsFetcher.ts"],"names":[],"mappings":"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~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QACxE~~,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,QAAQ;YAC7B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/maker/vaultsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/mango/collateralFetcher.js CHANGED Viewed

@@ -116,7 +116,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
             continue;
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,
@@ -131,6 +131,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedValue,
                 suppliedYields,
                 collateralRatio,
+                healthRatio,
                 rewardAssets,
                 value,
             },

package/src/plugins/mango/collateralFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mango/collateralFetcher.ts"],"names":[],"mappings":"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~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QACxE~~,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;YACD,IAAI,EAAE,IAAA,oBAAU,EAAC,WAAW,CAAC,IAAI,CAAC;SACnC,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mango/collateralFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/mango/redeemFetcher.js CHANGED Viewed

@@ -94,7 +94,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     if (suppliedAssets.length === 0)
         return [];
     const elements = [];
-    const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+    const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
     elements.push({
         type: portfolio_core_1.PortfolioElementType.borrowlend,
         networkId: portfolio_core_1.NetworkId.solana,
@@ -109,6 +109,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             suppliedValue,
             suppliedYields,
             collateralRatio,
+            healthRatio,
             rewardAssets,
             value,
         },

package/src/plugins/mango/redeemFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"redeemFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mango/redeemFetcher.ts"],"names":[],"mappings":"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~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IAExE,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;QACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,UAAU,EAAV,sBAAU;QACV,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,IAAI,EAAE;YACJ,cAAc;YACd,aAAa;YACb,cAAc;YACd,cAAc;YACd,aAAa;YACb,cAAc;YACd,eAAe;YACf,YAAY;YACZ,KAAK;SACN;QACD,IAAI,EAAE,WAAW;KAClB,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"redeemFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mango/redeemFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/maple/ethereumFetcher.js CHANGED Viewed

@@ -61,7 +61,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(asset, balance.toNumber(), portfolio_core_1.NetworkId.ethereum, tokenPrice));
         if (suppliedAssets.length === 0)
             continue;
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.ethereum,
@@ -77,6 +77,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedValue,
                 suppliedYields,
                 collateralRatio,
+                healthRatio,
                 rewardAssets,
                 value,
             },

package/src/plugins/maple/ethereumFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ethereumFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/maple/ethereumFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,gEAAqC;AAGrC,2CAAuD;AACvD,iDAAmD;AACnD,uDAA6D;AAC7D,qDAAiD;AAEjD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,0BAAS,CAAC,QAAQ,CAAC,CAAC;IAEhD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,OAAO,CAAkB,oBAAQ,EAAE;QAC/D,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,QAAQ;KAC9B,CAAC,CAAC;IAEH,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAE1B,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,cAAc,CAC7C,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAC7B,0BAAS,CAAC,QAAQ,CACnB,CAAC;IAEF,MAAM,cAAc,GAA4B,IAAI,GAAG,EAAE,CAAC;IAC1D,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7E,MAAM,YAAY,GAAG;QACnB,GAAG,EAAE,4BAAiB;QACtB,YAAY,EAAE,WAAW;QACzB,IAAI,EAAE,CAAC,KAAsB,CAAC;KACtB,CAAC;IAEX,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAC9B,KAAK,MAAM,QAAQ,IAAI,wBAAY,EAAE;QACnC,kBAAkB,CAAC,IAAI,CAAC,gCACnB,YAAY,KACf,OAAO,EAAE,QAAyB,GAC1B,CAAC,CAAC;KACb;IAED,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS;YAAE,SAAS;QAC9C,IAAI,UAAU,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC;YAAE,SAAS;QAE9C,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;QAC1C,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAE1C,MAAM,OAAO,GAAG,IAAI,sBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CACnE,SAAA,EAAE,EAAI,OAAO,CAAA,CACd,CAAC;QACF,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,KAAK,EACL,OAAO,CAAC,QAAQ,EAAE,EAClB,0BAAS,CAAC,QAAQ,EAClB,UAAU,CACX,CACF,CAAC;QACF,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAE1C,MAAM,~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QAExE~~,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,QAAQ;YAC7B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI;YACJ,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"ethereumFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/maple/ethereumFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/morpho/aaveV3CollateralFetcher.js CHANGED Viewed

@@ -68,7 +68,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         borrowedYields.push([]);
         borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, amount, portfolio_core_1.NetworkId.ethereum, tokenPrice));
     });
-    const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+    const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
     if (borrowedValue === 0 && suppliedValue === 0)
         return [];
     const element = {
@@ -86,6 +86,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             suppliedValue,
             suppliedYields,
             collateralRatio,
+            healthRatio,
             rewardAssets,
             value,
         },

package/src/plugins/morpho/aaveV3CollateralFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aaveV3CollateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/morpho/aaveV3CollateralFetcher.ts"],"names":[],"mappings":"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~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACxE,IAAI,aAAa,KAAK,CAAC,IAAI,aAAa,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE1D,MAAM,OAAO,GAA+B;QAC1C,IAAI,EAAE,qCAAoB,CAAC,UAAU;QACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,UAAU,EAAV,sBAAU;QACV,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,cAAc;YACd,aAAa;YACb,cAAc;YACd,cAAc;YACd,aAAa;YACb,cAAc;YACd,eAAe;YACf,YAAY;YACZ,KAAK;SACN;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,qBAAqB;IACtC,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"aaveV3CollateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/morpho/aaveV3CollateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,gEAAqC;AACrC,2CAAqD;AAGrD,uCAGmB;AACnB,qGAA6E;AAE7E,MAAM,qBAAqB,GAAG;IAC5B,sBAAU,CAAC,MAAM;IACjB,sBAAU,CAAC,GAAG;IACd,sBAAU,CAAC,IAAI;IACf,sBAAU,CAAC,IAAI;IACf,sBAAU,CAAC,IAAI;IACf,sBAAU,CAAC,KAAK;IAChB,sBAAU,CAAC,IAAI;CAChB,CAAC;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACzD,IAAA,yCAA+B,EAAC,CAAC,EAAE,KAAK,CAAC,CAC1C,CAAC;IACF,MAAM,cAAc,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACrD,IAAA,qCAA2B,EAAC,CAAC,EAAE,KAAK,CAAC,CACtC,CAAC;IAEF,MAAM,kBAAkB,GAAG,KAAK,CAAC,cAAc,CAC7C,qBAAqB,EACrB,0BAAS,CAAC,QAAQ,CACnB,CAAC;IAEF,MAAM,QAAQ,GAAG;QACf,kBAAkB;QAClB,GAAG,kBAAkB;QACrB,GAAG,cAAc;KAClB,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5B,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC;IAE7C,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAE1C,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACjE,kBAAkB,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;aACvD,GAAG,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aAC9B,QAAQ,EAAE,CAAC;QACd,IAAI,MAAM,KAAK,CAAC;YAAE,OAAO;QACzB,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxB,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,MAAM,EACN,0BAAS,CAAC,QAAQ,EAClB,UAAU,CACX,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACzD,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;aACnD,GAAG,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aAC9B,QAAQ,EAAE,CAAC;QACd,IAAI,MAAM,KAAK,CAAC;YAAE,OAAO;QACzB,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxB,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,MAAM,EACN,0BAAS,CAAC,QAAQ,EAClB,UAAU,CACX,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,GACzE,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACxE,IAAI,aAAa,KAAK,CAAC,IAAI,aAAa,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE1D,MAAM,OAAO,GAA+B;QAC1C,IAAI,EAAE,qCAAoB,CAAC,UAAU;QACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,UAAU,EAAV,sBAAU;QACV,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,cAAc;YACd,aAAa;YACb,cAAc;YACd,cAAc;YACd,aAAa;YACb,cAAc;YACd,eAAe;YACf,WAAW;YACX,YAAY;YACZ,KAAK;SACN;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,qBAAqB;IACtC,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/navi/collateralFetcher.js CHANGED Viewed

@@ -90,7 +90,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     }
     if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
         return [];
-    const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+    const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
     const element = {
         type: portfolio_core_1.PortfolioElementType.borrowlend,
         networkId: portfolio_core_1.NetworkId.sui,
@@ -105,6 +105,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             suppliedValue,
             suppliedYields,
             collateralRatio,
+            healthRatio,
             rewardAssets,
             value,
         },

package/src/plugins/navi/collateralFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/collateralFetcher.ts"],"names":[],"mappings":"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~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACxE,MAAM,OAAO,GAAqB;QAChC,IAAI,EAAE,qCAAoB,CAAC,UAAU;QACrC,SAAS,EAAE,0BAAS,CAAC,GAAG;QACxB,UAAU,EAAV,sBAAU;QACV,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,IAAI,EAAE;YACJ,cAAc;YACd,aAAa;YACb,cAAc;YACd,cAAc;YACd,aAAa;YACb,cAAc;YACd,eAAe;YACf,YAAY;YACZ,KAAK;SACN;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/collateralFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/port/constants.js CHANGED Viewed

@@ -7,7 +7,7 @@ exports.platform = {
     id: exports.platformId,
     name: 'Port',
     image: 'https://sonar.watch/img/platforms/port.png',
-    defiLlamaId: 'foo-finance',
+    defiLlamaId: 'port-finance',
     website: 'https://mainnet.port.finance/lending',
     // twitter: 'https://twitter.com/myplatform',
 };

package/src/plugins/port/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/port/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,4CAA4C;IACnD,WAAW,EAAE,~~aAAa~~;~~IAC1B~~,OAAO,EAAE,sCAAsC;IAC/C,6CAA6C;CAC9C,CAAC;AAEW,QAAA,OAAO,GAAG,6BAA6B,CAAC;AACxC,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/port/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,4CAA4C;IACnD,WAAW,EAAE,cAAc;IAC3B,OAAO,EAAE,sCAAsC;IAC/C,6CAA6C;CAC9C,CAAC;AAEW,QAAA,OAAO,GAAG,6BAA6B,CAAC;AACxC,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC"}

package/src/plugins/port/helpers.d.ts CHANGED Viewed

@@ -1 +1,8 @@
+/// <reference types="node" />
 export declare function parseApy(apy: string | undefined): number;
+export declare const parseDataflat: (dataFlat: Buffer, depositsLen: number, borrowsLen: number) => {
+    deposits: import("./structs").ObligationCollateral[];
+    depositsMap: Map<string, import("./structs").ObligationCollateral>;
+    borrows: import("./structs").ObligationLiquidity[];
+    borrowsMap: Map<string, import("./structs").ObligationLiquidity>;
+};

package/src/plugins/port/helpers.js CHANGED Viewed

@@ -1,10 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseApy = void 0;
+exports.parseDataflat = exports.parseApy = void 0;
+const beet_1 = require("@metaplex-foundation/beet");
+const structs_1 = require("./structs");
 function parseApy(apy) {
     if (!apy)
         return 0;
     return Number(apy.replace('%', '')) / 100;
 }
 exports.parseApy = parseApy;
+const parseDataflat = (dataFlat, depositsLen, borrowsLen) => {
+    const obligationCollateralArray = (0, beet_1.uniformFixedSizeArray)(structs_1.obligationCollateralStruct, depositsLen);
+    const deposits = obligationCollateralArray.read(dataFlat, 0);
+    const depositsMap = new Map(deposits.map((i) => [i.depositReserve.toString(), i]));
+    const obligationLiquidityArray = (0, beet_1.uniformFixedSizeArray)(structs_1.obligationLiquidityStruct, borrowsLen);
+    const borrows = obligationLiquidityArray.read(dataFlat, obligationCollateralArray.byteSize);
+    const borrowsMap = new Map(borrows.map((i) => [i.borrowReserve.toString(), i]));
+    return {
+        deposits,
+        depositsMap,
+        borrows,
+        borrowsMap,
+    };
+};
+exports.parseDataflat = parseDataflat;
 //# sourceMappingURL=helpers.js.map

package/src/plugins/port/helpers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/port/helpers.ts"],"names":[],"mappings":";;;AAAA,SAAgB,QAAQ,CAAC,GAAuB;IAC9C,IAAI,CAAC,GAAG;QAAE,OAAO,CAAC,CAAC;IACnB,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;AAC5C,CAAC;AAHD,4BAGC"}
1	+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/port/helpers.ts"],"names":[],"mappings":";;;AAAA,oDAAkE;AAClE,uCAGmB;AAEnB,SAAgB,QAAQ,CAAC,GAAuB;IAC9C,IAAI,CAAC,GAAG;QAAE,OAAO,CAAC,CAAC;IACnB,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;AAC5C,CAAC;AAHD,4BAGC;AAEM,MAAM,aAAa,GAAG,CAC3B,QAAgB,EAChB,WAAmB,EACnB,UAAkB,EAClB,EAAE;IACF,MAAM,yBAAyB,GAAG,IAAA,4BAAqB,EACrD,oCAA0B,EAC1B,WAAW,CACZ,CAAC;IACF,MAAM,QAAQ,GAAG,yBAAyB,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CACtD,CAAC;IAEF,MAAM,wBAAwB,GAAG,IAAA,4BAAqB,EACpD,mCAAyB,EACzB,UAAU,CACX,CAAC;IACF,MAAM,OAAO,GAAG,wBAAwB,CAAC,IAAI,CAC3C,QAAQ,EACR,yBAAyB,CAAC,QAAQ,CACnC,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CACpD,CAAC;IACF,OAAO;QACL,QAAQ;QACR,WAAW;QACX,OAAO;QACP,UAAU;KACX,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,aAAa,iBA+BxB"}

package/src/plugins/port/obligationsFetcher.js CHANGED Viewed

@@ -19,11 +19,10 @@ const solana_1 = require("../../utils/solana");
 const structs_1 = require("./structs");
 const clients_1 = require("../../utils/clients");
 const filters_1 = require("./filters");
-const helpers_1 = require("../solend/helpers");
+const helpers_1 = require("./helpers");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
 const constants_2 = require("../solend/constants");
-const helpers_2 = require("./helpers");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const obligations = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.obligationStruct, constants_1.programId, (0, filters_1.obligationsFilter)(owner));
@@ -41,7 +40,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             reservesByMarket.set(obli.lendingMarket.toString(), reserves);
     });
     const reserveByAddress = new Map();
-    for (const market of Object.keys(reservesByMarket)) {
+    for (const market of reservesByMarket.keys()) {
         const reserves = reservesByMarket.get(market);
         if (!reserves)
             continue;
@@ -92,7 +91,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                         .div(Math.pow(10, decimals))
                         .times(reserveDepositAmount / collateralSupply)
                         .toNumber();
-                    const apy = (0, helpers_2.parseApy)(reserve.depositApy);
+                    const apy = (0, helpers_1.parseApy)(reserve.depositApy);
                     const cSuppliedYields = [
                         {
                             apr: (0, portfolio_core_1.apyToApr)(apy),
@@ -112,7 +111,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                         .div(borrow.cumulativeBorrowRateWads)
                         .dividedBy(new bignumber_js_1.default(Math.pow(10, (constants_2.wadsDecimal + decimals))))
                         .toNumber();
-                    const apy = (0, helpers_2.parseApy)(reserve.borrowApy);
+                    const apy = (0, helpers_1.parseApy)(reserve.borrowApy);
                     const cBorrowedYields = [
                         {
                             apr: (0, portfolio_core_1.apyToApr)(apy),
@@ -126,7 +125,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
             continue;
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,
@@ -141,6 +140,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedValue,
                 suppliedYields,
                 collateralRatio,
+                healthRatio,
                 rewardAssets,
                 value,
             },

package/src/plugins/port/obligationsFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"obligationsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/port/obligationsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,gEAAqC;AAGrC,2CAAoD;AAEpD,+CAA8D;AAC9D,uCAA6C;AAC7C,iDAAsD;AACtD,uCAA8C;AAC9C~~,+CAAkD~~;~~AAClD~~,qGAA6E;AAC7E,6FAAoE;AACpE,mDAAkD;~~AAClD~~,~~uCAAqC;AAErC,~~MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAwB,EAChD,MAAM,EACN,0BAAgB,EAChB,qBAAS,EACT,IAAA,2BAAiB,EAAC,KAAK,CAAC,CACzB,CAAC;IACF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAExC,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,QAAQ,CACvC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,EAClD;QACE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CACF,CAAC;IAEF,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;IACxC,MAAM,gBAAgB,GAAmC,IAAI,GAAG,EAAE,CAAC;IACnE,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAClC,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,QAAQ;YAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAiC,IAAI,GAAG,EAAE,CAAC;IACjE,KAAK,MAAM,MAAM,IAAI,~~MAAM~~,CAAC,IAAI,~~CAAC~~,~~gBAAgB,CAAC,~~EAAE;~~QAClD~~,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;KAClE;IAED,MAAM,cAAc,GAAG,MAAM,IAAA,4BAAiB,EAC5C,WAAW;SACR,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAClE,IAAI,EAAE,EACT,0BAAS,CAAC,MAAM,EAChB,KAAK,CACN,CAAC;IACF,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,QAAQ;YAAE,SAAS;QAExB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAA,uBAAa,EAC/C,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,UAAU,CACtB,CAAC;QACF,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC;YAAE,SAAS;QAC9D,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAE1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC3C,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACrD,IAAI,CAAC,OAAO;gBAAE,SAAS;YAEvB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;YAC1C,MAAM,KAAK,GAAG,SAAS,CAAC,UAAU,CAAC;YACnC,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC9C,IAAI,CAAC,WAAW;gBAAE,SAAS;YAE3B,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,CAAC;YACxC,MAAM,mBAAmB,GAAG,IAAI,sBAAS,CAAC,SAAS,CAAC,kBAAkB,CAAC;iBACpE,SAAS,CAAC,SAAA,EAAE,EAAI,CAAC,uBAAW,GAAG,QAAQ,CAAC,CAAA,CAAC;iBACzC,QAAQ,EAAE,CAAC;YACd,MAAM,sBAAsB,GAAG,IAAI,sBAAS,CAAC,SAAS,CAAC,eAAe,CAAC;iBACpE,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;iBACzB,QAAQ,EAAE,CAAC;YACd,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,UAAU,CAAC,eAAe,CAAC;iBAC/D,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;iBACzB,QAAQ,EAAE,CAAC;YACd,MAAM,oBAAoB,GAAG,mBAAmB,GAAG,sBAAsB,CAAC;YAE1E,UAAU;YACV,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAChD,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE;oBACrC,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe;yBAC3C,GAAG,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;yBACnB,KAAK,CAAC,oBAAoB,GAAG,gBAAgB,CAAC;yBAC9C,QAAQ,EAAE,CAAC;oBAEd,MAAM,GAAG,GAAG,IAAA,kBAAQ,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;oBACzC,MAAM,eAAe,GAAY;wBAC/B;4BACE,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;4BAClB,GAAG;yBACJ;qBACF,CAAC;oBACF,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;oBACrC,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,KAAK,EACL,cAAc,EACd,0BAAS,CAAC,MAAM,EAChB,WAAW,CACZ,CACF,CAAC;iBACH;aACF;YAED,SAAS;YACT,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC9C,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE;oBACvC,MAAM,cAAc,GAAG,MAAM,CAAC,kBAAkB;yBAC7C,KAAK,CAAC,IAAI,sBAAS,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;yBACxD,GAAG,CAAC,MAAM,CAAC,wBAAwB,CAAC;yBACpC,SAAS,CAAC,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,CAAC,uBAAW,GAAG,QAAQ,CAAC,CAAA,CAAC,CAAC;yBACxD,QAAQ,EAAE,CAAC;oBAEd,MAAM,GAAG,GAAG,IAAA,kBAAQ,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBACxC,MAAM,eAAe,GAAY;wBAC/B;4BACE,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;4BAClB,GAAG;yBACJ;qBACF,CAAC;oBACF,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;oBACrC,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,KAAK,EACL,cAAc,EACd,0BAAS,CAAC,MAAM,EAChB,WAAW,CACZ,CACF,CAAC;iBACH;aACF;SACF;QACD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAEzE,MAAM,~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QAExE~~,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"obligationsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/port/obligationsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/port/structs.d.ts CHANGED Viewed

@@ -67,3 +67,16 @@ export type Obligation = {
     dataFlat: Buffer;
 };
 export declare const obligationStruct: BeetStruct<Obligation, Partial<Obligation>>;
+export type ObligationCollateral = {
+    depositReserve: PublicKey;
+    depositedAmount: BigNumber;
+    marketValue: BigNumber;
+};
+export declare const obligationCollateralStruct: BeetStruct<ObligationCollateral, Partial<ObligationCollateral>>;
+export type ObligationLiquidity = {
+    borrowReserve: PublicKey;
+    cumulativeBorrowRateWads: BigNumber;
+    borrowedAmountWads: BigNumber;
+    marketValue: BigNumber;
+};
+export declare const obligationLiquidityStruct: BeetStruct<ObligationLiquidity, Partial<ObligationLiquidity>>;

package/src/plugins/port/structs.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.obligationStruct = exports.reserveStruct = exports.lastUpdateStruct = exports.liquidityStruct = exports.collateralStruct = exports.reserveConfigStruct = exports.feesStruct = void 0;
+exports.obligationLiquidityStruct = exports.obligationCollateralStruct = exports.obligationStruct = exports.reserveStruct = exports.lastUpdateStruct = exports.liquidityStruct = exports.collateralStruct = exports.reserveConfigStruct = exports.feesStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
@@ -61,4 +61,15 @@ exports.obligationStruct = new beet_1.BeetStruct([
     ['borrowsLen', beet_1.u8],
     ['dataFlat', (0, solana_1.blob)(776)],
 ], (args) => args);
+exports.obligationCollateralStruct = new beet_1.BeetStruct([
+    ['depositReserve', beet_solana_1.publicKey],
+    ['depositedAmount', solana_1.u64],
+    ['marketValue', solana_1.u128],
+], (args) => args);
+exports.obligationLiquidityStruct = new beet_1.BeetStruct([
+    ['borrowReserve', beet_solana_1.publicKey],
+    ['cumulativeBorrowRateWads', solana_1.u128],
+    ['borrowedAmountWads', solana_1.u128],
+    ['marketValue', solana_1.u128],
+], (args) => args);
 //# sourceMappingURL=structs.js.map

package/src/plugins/port/structs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/port/structs.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/port/structs.ts"],"names":[],"mappings":"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"}

package/src/plugins/scallop/lendingsFetcher.js CHANGED Viewed

@@ -156,7 +156,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         borrowedAssets.length === 0 &&
         rewardAssets.length === 0)
         return [];
-    const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+    const { borrowedValue, collateralRatio, healthRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
     elements.push({
         type: portfolio_core_1.PortfolioElementType.borrowlend,
         networkId: portfolio_core_1.NetworkId.sui,
@@ -171,6 +171,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             suppliedValue,
             suppliedYields,
             collateralRatio,
+            healthRatio,
             rewardAssets,
             value,
         },

package/src/plugins/scallop/lendingsFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"lendingsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/lendingsFetcher.ts"],"names":[],"mappings":"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~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACxE,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;QACrC,SAAS,EAAE,0BAAS,CAAC,GAAG;QACxB,UAAU,EAAV,sBAAU;QACV,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,IAAI,EAAE;YACJ,cAAc;YACd,aAAa;YACb,cAAc;YACd,cAAc;YACd,aAAa;YACb,cAAc;YACd,eAAe;YACf,YAAY;YACZ,KAAK;SACN;KACF,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"lendingsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/lendingsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/scallop/obligationsFetcher.js CHANGED Viewed

@@ -169,7 +169,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             borrowedAssets.length === 0 &&
             rewardAssets.length === 0)
             continue;
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, healthRatio, suppliedValue, value, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.sui,
@@ -185,6 +185,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedValue,
                 suppliedYields,
                 collateralRatio,
+                healthRatio,
                 rewardAssets,
                 value,
             },

package/src/plugins/scallop/obligationsFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"obligationsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/obligationsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAUoC;AACpC,2CAIwB;AACxB,gEAAqC;AAGrC,2CAOqB;AAQrB,uCAA2D;AAC3D,iDAAmD;AACnD,qGAA6E;AAC7E,6EAAqD;AAGrD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAE1C,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,OAAO,CAAQ,oBAAQ,EAAE;QAC5D,MAAM,EAAE,uBAAW;QACnB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;IACH,IAAI,CAAC,gBAAgB;QAAE,OAAO,EAAE,CAAC;IAEjC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAClD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEtC,MAAM,iBAAiB,GAAwB;QAC7C,QAAQ,EAAE;YACR;gBACE,UAAU,EAAE,kCAAsB;aACnC;SACF;KACF,CAAC;IAEF,MAAM,CAAC,mBAAmB,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1D,IAAA,wBAAc,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;QACpD,KAAK,CAAC,OAAO,CAAkB,qBAAS,EAAE;YACxC,MAAM,EAAN,wBAAM;YACN,SAAS,EAAE,0BAAS,CAAC,GAAG;SACzB,CAAC;KACH,CAAC,CAAC;IACH,IAAI,CAAC,UAAU,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE/D,MAAM,eAAe,GAAoB,EAAE,CAAC;IAE5C,MAAM,qCAAqC,GAAG,mBAAmB,CAAC,GAAG,CACnE,CAAC,aAAa,EAAE,EAAE,CAAC,GAAS,EAAE;QAC5B,MAAM,mBAAmB,GAAG,IAAA,wBAAe,EACzC,aAAa,CACS,CAAC;QACzB,IAAI,CAAC,mBAAmB;YAAE,OAAO;QACjC,MAAM,YAAY,GAAG,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7D,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE;YAClC,eAAe,CAAC,YAAY,CAAC,GAAG;gBAC9B,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE,EAAE;aACV,CAAC;SACH;QACD,MAAM,OAAO,GAAG,IAAA,wBAAe,EAC7B,MAAM,MAAM,CAAC,SAAS,CAAC;YACrB,EAAE,EAAE,YAAY;YAChB,OAAO,EAAE;gBACP,WAAW,EAAE,IAAI;aAClB;SACF,CAAC,CACkB,CAAC;QACvB,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,oBAAoB,GACxB,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;QAC/D,MAAM,wBAAwB,GAC5B,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QAClD,MAAM,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QAErE,sBAAsB;QACtB,MAAM,gCAAgC,GAAG,wBAAwB,CAAC,GAAG,CACnE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACb,GAAS,EAAE;;YACT,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC3D,eAAe,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC;oBACpD,IAAA,sBAAS,EAAC,CAAC,CAAC,CAAC;aAChB;YACD,MAAM,KAAK,GAAG,IAAA,wBAAe,EAC3B,MAAM,MAAM,CAAC,qBAAqB,CAAC;gBACjC,QAAQ,EAAE,oBAAoB;gBAC9B,IAAI,EAAE;oBACJ,IAAI,EAAE,0BAA0B;oBAChC,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM,CAAC,IAAI;qBAClB;iBACF;aACF,CAAC,CAC4B,CAAC;YACjC,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,eAAe,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC;gBACpD,eAAe,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CACzD,IAAA,sBAAS,EAAC,MAAA,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,mCAAI,CAAC,CAAC,CAC1C,CAAC;QACN,CAAC,CAAA,CACJ,CAAC;QAEF,gBAAgB;QAChB,MAAM,0BAA0B,GAAG,kBAAkB,CAAC,GAAG,CACvD,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACb,GAAS,EAAE;;YACT,MAAM,QAAQ,GAAG,MAAA,MAAA,SAAS;iBACvB,IAAI,CACH,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,CAAC,CAC9D,0CACC,QAAQ,0CAAE,MAAM,CAAC,WAAW,EAAE,CAAC;YACnC,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAEtB,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM;gBAAE,OAAO;YAEpB,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBACrD,eAAe,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAS,EAAC,CAAC,CAAC,CAAC;aACjE;YACD,MAAM,KAAK,GAAG,IAAA,wBAAe,EAC3B,MAAM,MAAM,CAAC,qBAAqB,CAAC;gBACjC,QAAQ,EAAE,cAAc;gBACxB,IAAI,EAAE;oBACJ,IAAI,EAAE,0BAA0B;oBAChC,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM,CAAC,IAAI;qBAClB;iBACF;aACF,CAAC,CACsB,CAAC;YAC3B,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,eAAe,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAChE,YAAY,CACb,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CACvB,IAAA,sBAAS,EAAC,MAAA,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,mCAAI,CAAC,CAAC,CAAC,YAAY,CACpD,MAAM,CAAC,cAAc,GAAG,CAAC,CAC1B,CACF,CAAC;QACJ,CAAC,CAAA,CACJ,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAA,oBAAU,EAAC,gCAAgC,EAAE,CAAC,CAAC;YAC/C,IAAA,oBAAU,EAAC,0BAA0B,EAAE,CAAC,CAAC;SAC1C,CAAC,CAAC,CAAC,+DAA+D;IACrE,CAAC,CAAA,CACF,CAAC;IAEF,MAAM,IAAA,oBAAU,EAAC,qCAAqC,EAAE,CAAC,CAAC,CAAC,CAAC,mEAAmE;IAE/H,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChE,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,cAAc,CACjD,cAAc,EACd,0BAAS,CAAC,GAAG,CACd,CAAC;IACF,MAAM,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IACvD,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,IAAI,CAAC,CAAC;YAAE,OAAO;QACf,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QAClD,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QAErC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAExD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAC7B,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,IAAA,2BAAkB,EAAC,QAAQ,CAAC,CAC3D,CAAC;YACF,MAAM,OAAO,GAAG,IAAA,uCAAsB,EAAC,KAAK,QAAQ,EAAE,CAAC,CAAC;YACxD,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,OAAO,EACP,WAAW,CAAC,QAAQ,CAAC;iBAClB,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,QAAQ,mCAAI,CAAC,CAAC,CAAC;iBACnD,QAAQ,EAAE,EACb,0BAAS,CAAC,GAAG,EACb,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CACzB,CACF,CAAC;SACH;QACD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAC7B,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,IAAA,2BAAkB,EAAC,QAAQ,CAAC,CAC3D,CAAC;YACF,MAAM,QAAQ,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,CAAC,WAAW,EAAE,mCAAI,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM;gBAAE,SAAS;YACtB,MAAM,OAAO,GAAG,IAAA,uCAAsB,EAAC,KAAK,QAAQ,EAAE,CAAC,CAAC;YACxD,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,OAAO,EACP,KAAK,CAAC,QAAQ,CAAC;iBACZ,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,QAAQ,mCAAI,CAAC,CAAC,CAAC;iBACnD,QAAQ,EAAE,EACb,0BAAS,CAAC,GAAG,EACb,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CACzB,CACF,CAAC;YACF,cAAc,CAAC,IAAI,CAAC;gBAClB;oBACE,GAAG,EAAE,MAAM,CAAC,kBAAkB;oBAC9B,GAAG,EAAE,IAAA,yBAAQ,EAAC,MAAM,CAAC,kBAAkB,CAAC;iBACzC;aACF,CAAC,CAAC;SACJ;QACD,IACE,cAAc,CAAC,MAAM,KAAK,CAAC;YAC3B,cAAc,CAAC,MAAM,KAAK,CAAC;YAC3B,YAAY,CAAC,MAAM,KAAK,CAAC;YAEzB,SAAS;QACX,MAAM,~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QACxE~~,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,GAAG;YACxB,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,cAAc;YACpD,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"obligationsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/obligationsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/sushiswap/constants.js CHANGED Viewed

@@ -6,7 +6,7 @@ exports.platform = {
     id: exports.platformId,
     name: 'Sushiswap',
     image: 'https://sonar.watch/img/platforms/sushiswap.png',
-    defiLlamaId: 'sushi',
+    defiLlamaId: 'sushiswap',
     website: 'https://www.sushi.com/',
     twitter: 'https://twitter.com/SushiSwap',
 };

package/src/plugins/sushiswap/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sushiswap/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EAAE,iDAAiD;IACxD,WAAW,EAAE,~~OAAO~~;~~IACpB~~,OAAO,EAAE,wBAAwB;IACjC,OAAO,EAAE,+BAA+B;CACzC,CAAC;AAEW,QAAA,UAAU,GACrB,8DAA8D,CAAC;AACpD,QAAA,kBAAkB,GAC7B,4DAA4D,CAAC;AAClD,QAAA,mBAAmB,GAC9B,sEAAsE,CAAC;AAC5D,QAAA,iBAAiB,GAC5B,kEAAkE,CAAC;AACxD,QAAA,aAAa,GACxB,gEAAgE,CAAC"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sushiswap/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EAAE,iDAAiD;IACxD,WAAW,EAAE,WAAW;IACxB,OAAO,EAAE,wBAAwB;IACjC,OAAO,EAAE,+BAA+B;CACzC,CAAC;AAEW,QAAA,UAAU,GACrB,8DAA8D,CAAC;AACpD,QAAA,kBAAkB,GAC7B,4DAA4D,CAAC;AAClD,QAAA,mBAAmB,GAC9B,sEAAsE,CAAC;AAC5D,QAAA,iBAAiB,GAC5B,kEAAkE,CAAC;AACxD,QAAA,aAAa,GACxB,gEAAgE,CAAC"}

package/src/plugins/thala/vaultsFetcher.js CHANGED Viewed

@@ -48,7 +48,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(suppliedAsset, suppliedAmount, portfolio_core_1.NetworkId.aptos, suppliedTokenPrice));
         const borrowedAmount = vaultData.debt / Math.pow(10, borrowedTokenPrice.decimals);
         borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(borrowedAsset, borrowedAmount, portfolio_core_1.NetworkId.aptos, borrowedTokenPrice));
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.aptos,
@@ -63,6 +63,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedValue,
                 suppliedYields,
                 collateralRatio,
+                healthRatio,
                 rewardAssets,
                 value,
             },

package/src/plugins/thala/vaultsFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/vaultsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AAGpC,2CAA+D;AAC/D,iDAAqD;AACrD,6CAAuE;AAEvE,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,wBAAc,GAAE,CAAC;IAEpC,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAmB,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC/D,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAE1B,MAAM,aAAa,GAAG,mBAAO,CAAC;IAC9B,MAAM,kBAAkB,GAAG,MAAM,KAAK,CAAC,aAAa,CAClD,aAAa,EACb,0BAAS,CAAC,KAAK,CAChB,CAAC;IACF,IAAI,CAAC,kBAAkB;QAAE,OAAO,EAAE,CAAC;IAEnC,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAW,CAAC;YAAE,SAAS;QAErD,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAE1C,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAsB,CAAC;QAClD,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI;YAAE,SAAS;QAEjE,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC;QAEhC,MAAM,aAAa,GAAG,IAAA,qBAAa,EAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,kBAAkB,GAAG,MAAM,KAAK,CAAC,aAAa,CAClD,aAAa,EACb,0BAAS,CAAC,KAAK,CAChB,CAAC;QACF,IAAI,CAAC,kBAAkB;YAAE,SAAS;QAElC,MAAM,cAAc,GAClB,SAAS,CAAC,UAAU,CAAC,KAAK,GAAG,SAAA,EAAE,EAAI,kBAAkB,CAAC,QAAQ,CAAA,CAAC;QAEjE,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,aAAa,EACb,cAAc,EACd,0BAAS,CAAC,KAAK,EACf,kBAAkB,CACnB,CACF,CAAC;QACF,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,GAAG,SAAA,EAAE,EAAI,kBAAkB,CAAC,QAAQ,CAAA,CAAC;QAE1E,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,aAAa,EACb,cAAc,EACd,0BAAS,CAAC,KAAK,EACf,kBAAkB,CACnB,CACF,CAAC;QACF,MAAM,~~EAAE~~,aAAa,~~EAAE~~,eAAe,~~EAAE~~,aAAa,~~EAAE~~,KAAK,~~EAAE~~,~~GAC5D~~,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;~~QAExE~~,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,KAAK;YAC1B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,OAAO,CAAS,aAAa,EAAE;YACnE,MAAM,EAAE,sBAAU;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,KAAK,CAAC;YAAE,SAAS;QAE5D,MAAM,oBAAoB,GAAY;YACpC;gBACE,GAAG,EAAE,IAAA,yBAAQ,EAAC,iBAAiB,CAAC;gBAChC,GAAG,EAAE,iBAAiB;aACvB;SACF,CAAC;QACF,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;KAC3C;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,KAAK;IAC1B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/vaultsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/venus/constants.js CHANGED Viewed

@@ -10,7 +10,7 @@ exports.venusPlatform = {
     id: exports.platformId,
     name: (0, upperCaseFirstLetter_1.default)(exports.platformId),
     image: 'https://sonar.watch/img/platforms/venus.png',
-    defiLlamaId: 'venus',
+    defiLlamaId: 'venus-core-pool',
     website: 'https://app.venus.io/',
 };
 exports.comptrollerVenus = '0xfD36E2c2a6789Db23113685031d7F16329158384';

package/src/plugins/venus/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/venus/constants.ts"],"names":[],"mappings":";;;;;;AACA,iGAAyE;AAE5D,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,aAAa,GAAa;IACrC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,IAAA,8BAAoB,EAAC,kBAAU,CAAC;IACtC,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,~~OAAO~~;~~IACpB~~,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAEW,QAAA,gBAAgB,GAAG,4CAA4C,CAAC"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/venus/constants.ts"],"names":[],"mappings":";;;;;;AACA,iGAAyE;AAE5D,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,aAAa,GAAa;IACrC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,IAAA,8BAAoB,EAAC,kBAAU,CAAC;IACtC,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAEW,QAAA,gBAAgB,GAAG,4CAA4C,CAAC"}