@sonarwatch/portfolio-core 0.16.66 → 0.16.68

package/README.md

@@ -1,3 +1,3 @@
-# @sonarwatch/portfolio-core
-
-This library is @sonarwatch/portfolio-core
+# @sonarwatch/portfolio-core
+
+This library is @sonarwatch/portfolio-core

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-core",
-  "version": "0.16.66",
+  "version": "0.16.68",
   "type": "commonjs",
   "types": "./src/index.d.ts",
   "repository": {

package/src/Portfolio.d.ts

@@ -81,6 +81,12 @@ export type PortfolioAssetTokenData = {
     address: string;
     amount: number;
     price: UsdValue;
+    yields?: Yield[];
+};
+/**
+ * @deprecated will soon be replaced by PortfolioAssetTokenDataSupport (search YIELD_COMPAT)
+ */
+export type PortfolioAssetTokenDataSupport = PortfolioAssetTokenData & {
     yield?: Yield;
 };
 /**
@@ -88,7 +94,7 @@ export type PortfolioAssetTokenData = {
  */
 export type PortfolioAssetToken = PortfolioAssetCommon & {
     type: 'token';
-    data: PortfolioAssetTokenData;
+    data: PortfolioAssetTokenDataSupport;
 };
 /**
  * Represents the data of a collectible portfolio asset.
@@ -132,7 +138,7 @@ export type ProxyInfo = {
     id: string;
     address: string;
 };
-export type SourceRefName = 'Pool' | 'Farm' | 'Market' | 'Vault' | 'Lending Market' | 'Strategy' | 'NFT Mint' | 'Reserve' | 'Proposal' | 'Distributor' | 'Locker' | 'Custody' | 'Pair' | 'Borrow Token' | 'Collateral Token';
+export type SourceRefName = 'Pool' | 'Farm' | 'Market' | 'Vault' | 'Lending Market' | 'Strategy' | 'NFT Mint' | 'Reserve' | 'Proposal' | 'Distributor' | 'Locker' | 'Custody' | 'Pair' | 'Borrow Token' | 'Collateral Token' | 'Elevation Group';
 /**
  * Represents references to on-chain accounts.
  */

package/src/Portfolio.js.map

@@ -1 +1 @@
-{"version":3,"file":"Portfolio.js","sourceRoot":"","sources":["../../../../packages/core/src/Portfolio.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACU,QAAA,kBAAkB,GAAG;IAChC,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;CAClB,CAAC;AA6CX;;GAEG;AACU,QAAA,oBAAoB,GAAG;IAClC,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;CACN,CAAC;AAoPX,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,+BAAe,CAAA;AACjB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB"}
+{"version":3,"file":"Portfolio.js","sourceRoot":"","sources":["../../../../packages/core/src/Portfolio.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACU,QAAA,kBAAkB,GAAG;IAChC,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;CAClB,CAAC;AA6CX;;GAEG;AACU,QAAA,oBAAoB,GAAG;IAClC,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;CACN,CAAC;AA4PX,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,+BAAe,CAAA;AACjB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB"}

package/src/TokenYield.d.ts

@@ -4,6 +4,12 @@ export declare const tokenYieldTtl: number;
 export type TokenYield = {
     address: string;
     networkId: NetworkIdType;
-    yield: Yield;
+    yields: Yield[];
     timestamp: number;
 };
+/**
+ * @deprecated will soon be replaced by TokenYield (search YIELD_COMPAT)
+ */
+export type TokenYieldSupport = TokenYield & {
+    yield: Yield;
+};

package/src/utils/getAddressesFromAssets.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAddressesFromAssets = void 0;
+const Portfolio_1 = require("../Portfolio");
 const getAddressFromAsset_1 = require("./getAddressFromAsset");
 function getAddressesFromAssets(assets, tokenOnly = false) {
     const addresses = new Set();
@@ -8,6 +9,9 @@ function getAddressesFromAssets(assets, tokenOnly = false) {
         const address = (0, getAddressFromAsset_1.getAddressFromAsset)(a, tokenOnly);
         if (address)
             addresses.add(address);
+        if (a.type === Portfolio_1.PortfolioAssetType.token && a.data.yields) {
+            a.data.yields.forEach((y) => y.address && addresses.add(y.address));
+        }
     });
     return [...addresses];
 }

package/src/utils/getAddressesFromAssets.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAddressesFromAssets.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/getAddressesFromAssets.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAE5D,SAAgB,sBAAsB,CACpC,MAAwB,EACxB,SAAS,GAAG,KAAK;IAEjB,MAAM,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAC;IACzC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnB,MAAM,OAAO,GAAG,IAAA,yCAAmB,EAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAClD,IAAI,OAAO;YAAE,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;AACxB,CAAC;AAVD,wDAUC"}
+{"version":3,"file":"getAddressesFromAssets.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/getAddressesFromAssets.ts"],"names":[],"mappings":";;;AAAA,4CAAkE;AAClE,+DAA4D;AAE5D,SAAgB,sBAAsB,CACpC,MAAwB,EACxB,SAAS,GAAG,KAAK;IAEjB,MAAM,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAC;IACzC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnB,MAAM,OAAO,GAAG,IAAA,yCAAmB,EAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAClD,IAAI,OAAO;YAAE,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI,CAAC,CAAC,IAAI,KAAK,8BAAkB,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACzD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;AACxB,CAAC;AAbD,wDAaC"}

package/src/utils/getAddressesFromElement.js

@@ -13,7 +13,17 @@ function getAddressesFromElement(element, tokenOnly = true) {
         ];
     }
     const assets = (0, getAssetsFromElement_1.getAssetsFromElement)(element);
-    return (0, getAddressesFromAssets_1.getAddressesFromAssets)(assets, tokenOnly);
+    const addressesFromAssets = (0, getAddressesFromAssets_1.getAddressesFromAssets)(assets, tokenOnly);
+    const addressesFromYields = [];
+    if (element.type === Portfolio_1.PortfolioElementType.borrowlend) {
+        element.data.suppliedYields.forEach((yields) => {
+            yields.forEach((y) => y.address && addressesFromYields.push(y.address));
+        });
+        element.data.borrowedYields.forEach((yields) => {
+            yields.forEach((y) => y.address && addressesFromYields.push(y.address));
+        });
+    }
+    return [...addressesFromAssets, ...addressesFromYields];
 }
 exports.getAddressesFromElement = getAddressesFromElement;
 //# sourceMappingURL=getAddressesFromElement.js.map

package/src/utils/getAddressesFromElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAddressesFromElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/getAddressesFromElement.ts"],"names":[],"mappings":";;;AAAA,4CAAsE;AACtE,iEAA8D;AAC9D,qEAAkE;AAElE,SAAgB,uBAAuB,CACrC,OAAyB,EACzB,SAAS,GAAG,IAAI;;IAEhB,IAAI,OAAO,CAAC,IAAI,KAAK,gCAAoB,CAAC,QAAQ,EAAE,CAAC;QACnD,OAAO;YACL,GAAI,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,0CAAE,SAAS,CAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,KAAI,EAAE,CAAc;YACrD,GAAI,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,KAAK,0CAAE,SAAS,CAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,KAAI,EAAE,CAAc;SACtD,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,IAAA,2CAAoB,EAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,IAAA,+CAAsB,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACnD,CAAC;AAhBD,0DAgBC"}
+{"version":3,"file":"getAddressesFromElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/getAddressesFromElement.ts"],"names":[],"mappings":";;;AAAA,4CAAsE;AACtE,iEAA8D;AAC9D,qEAAkE;AAElE,SAAgB,uBAAuB,CACrC,OAAyB,EACzB,SAAS,GAAG,IAAI;;IAEhB,IAAI,OAAO,CAAC,IAAI,KAAK,gCAAoB,CAAC,QAAQ,EAAE,CAAC;QACnD,OAAO;YACL,GAAI,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,0CAAE,SAAS,CAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,KAAI,EAAE,CAAc;YACrD,GAAI,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,KAAK,0CAAE,SAAS,CAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,KAAI,EAAE,CAAc;SACtD,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,IAAA,2CAAoB,EAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,mBAAmB,GAAG,IAAA,+CAAsB,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAEtE,MAAM,mBAAmB,GAAa,EAAE,CAAC;IACzC,IAAI,OAAO,CAAC,IAAI,KAAK,gCAAoB,CAAC,UAAU,EAAE,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,GAAG,mBAAmB,EAAE,GAAG,mBAAmB,CAAC,CAAC;AAC1D,CAAC;AA5BD,0DA4BC"}