@sonarwatch/portfolio-core 0.16.70 → 0.16.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/package.json +1 -1
- package/src/Portfolio.d.ts +5 -7
- package/src/Portfolio.js.map +1 -1
- package/src/TokenYield.d.ts +3 -6
- package/src/utils/sortAssets.js +3 -2
- package/src/utils/sortAssets.js.map +1 -1
- package/src/utils/sortPortfolioElement.js +3 -1
- package/src/utils/sortPortfolioElement.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,26 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [0.16.72](https://github.com/sonarwatch/portfolio/compare/core-0.16.71...core-0.16.72) (2025-09-26)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* **plugins:** sort multiple assets with yields ([b98ab21](https://github.com/sonarwatch/portfolio/commit/b98ab2131e8de4df908ee0f4153d9accd2a6e507))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [0.16.71](https://github.com/sonarwatch/portfolio/compare/core-0.16.70...core-0.16.71) (2025-09-26)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Features
|
|
18
|
+
|
|
19
|
+
* **plugins:** remove TokenYieldSupport ([f4771a1](https://github.com/sonarwatch/portfolio/commit/f4771a1727f22965f433b2adbf8d55336d362f13))
|
|
20
|
+
* **plugins:** rename to assetsYield ([58310ec](https://github.com/sonarwatch/portfolio/commit/58310eca6206504558608a9d93b611a696a28adb))
|
|
21
|
+
* **plugins:** yields in multiple element, for native staking and drift mm ([772ae0d](https://github.com/sonarwatch/portfolio/commit/772ae0dbf0d9c139d7c3bc6726b185022780d4c0))
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
5
25
|
## [0.16.70](https://github.com/sonarwatch/portfolio/compare/core-0.16.69...core-0.16.70) (2025-09-24)
|
|
6
26
|
|
|
7
27
|
|
package/package.json
CHANGED
package/src/Portfolio.d.ts
CHANGED
|
@@ -92,18 +92,12 @@ export type PortfolioAssetTokenData = {
|
|
|
92
92
|
price: UsdValue;
|
|
93
93
|
yields?: Yield[];
|
|
94
94
|
};
|
|
95
|
-
/**
|
|
96
|
-
* @deprecated will soon be replaced by PortfolioAssetTokenDataSupport (search YIELD_COMPAT)
|
|
97
|
-
*/
|
|
98
|
-
export type PortfolioAssetTokenDataSupport = PortfolioAssetTokenData & {
|
|
99
|
-
yield?: Yield;
|
|
100
|
-
};
|
|
101
95
|
/**
|
|
102
96
|
* Represents a token portfolio asset.
|
|
103
97
|
*/
|
|
104
98
|
export type PortfolioAssetToken = PortfolioAssetCommon & {
|
|
105
99
|
type: 'token';
|
|
106
|
-
data:
|
|
100
|
+
data: PortfolioAssetTokenData;
|
|
107
101
|
};
|
|
108
102
|
/**
|
|
109
103
|
* Represents the data of a collectible portfolio asset.
|
|
@@ -180,6 +174,10 @@ export type PortfolioElementCommon = {
|
|
|
180
174
|
*/
|
|
181
175
|
export type PortfolioElementMultipleData = {
|
|
182
176
|
assets: PortfolioAsset[];
|
|
177
|
+
/**
|
|
178
|
+
* The yields generated by the assets.
|
|
179
|
+
*/
|
|
180
|
+
assetsYields?: Yield[][];
|
|
183
181
|
ref?: string;
|
|
184
182
|
sourceRefs?: SourceRef[];
|
|
185
183
|
link?: string;
|
package/src/Portfolio.js.map
CHANGED
|
@@ -1 +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;AAsDX;;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;
|
|
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;AAsDX;;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;AAyPX,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,+BAAe,CAAA;AACjB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB"}
|
package/src/TokenYield.d.ts
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
import { NetworkIdType } from './Network';
|
|
2
2
|
import { Yield } from './Yield';
|
|
3
3
|
export declare const tokenYieldTtl: number;
|
|
4
|
+
/**
|
|
5
|
+
* Represents the yield data for yield bearing assets.
|
|
6
|
+
*/
|
|
4
7
|
export type TokenYield = {
|
|
5
8
|
address: string;
|
|
6
9
|
networkId: NetworkIdType;
|
|
7
10
|
yields: Yield[];
|
|
8
11
|
timestamp: number;
|
|
9
12
|
};
|
|
10
|
-
/**
|
|
11
|
-
* @deprecated will soon be replaced by TokenYield (search YIELD_COMPAT)
|
|
12
|
-
*/
|
|
13
|
-
export type TokenYieldSupport = TokenYield & {
|
|
14
|
-
yield: Yield;
|
|
15
|
-
};
|
package/src/utils/sortAssets.js
CHANGED
|
@@ -11,8 +11,9 @@ function sortAssetsWithYields(assets, yields) {
|
|
|
11
11
|
}));
|
|
12
12
|
pairedArray.sort((a, b) => sortAssets(a.asset, b.asset));
|
|
13
13
|
const sortedAssets = pairedArray.map((pair) => pair.asset);
|
|
14
|
-
const sortedYields = pairedArray.map((pair) => pair.yield);
|
|
15
|
-
|
|
14
|
+
const sortedYields = pairedArray.map((pair) => pair.yield || []);
|
|
15
|
+
const allYieldsEmpty = sortedYields.every((yieldArray) => yieldArray.length === 0);
|
|
16
|
+
return { sortedAssets, sortedYields: allYieldsEmpty ? [] : sortedYields };
|
|
16
17
|
}
|
|
17
18
|
exports.sortAssetsWithYields = sortAssetsWithYields;
|
|
18
19
|
function sortMultipleAssets(assets) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortAssets.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortAssets.ts"],"names":[],"mappings":";;;AAAA,4CAMsB;AAEtB,+CAA4C;AAC5C,uDAAoD;AAEpD,SAAgB,oBAAoB,CAClC,MAAwB,EACxB,MAAiB;IAEjB,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAChD,KAAK;QACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;KACrB,CAAC,CAAC,CAAC;IAEJ,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAEzD,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sortAssets.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortAssets.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,9 @@ function sortPortfolioElement(element) {
|
|
|
23
23
|
exports.sortPortfolioElement = sortPortfolioElement;
|
|
24
24
|
function sortElementMultiple(element) {
|
|
25
25
|
const sortedElement = element;
|
|
26
|
-
|
|
26
|
+
const sortedAssetsAndYields = (0, sortAssets_1.sortAssetsWithYields)(sortedElement.data.assets, sortedElement.data.assetsYields || []);
|
|
27
|
+
sortedElement.data.assets = sortedAssetsAndYields.sortedAssets;
|
|
28
|
+
sortedElement.data.assetsYields = sortedAssetsAndYields.sortedYields;
|
|
27
29
|
return sortedElement;
|
|
28
30
|
}
|
|
29
31
|
exports.sortElementMultiple = sortElementMultiple;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortPortfolioElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortPortfolioElement.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,4CASsB;AACtB,6CAAwE;AAExE,SAAgB,oBAAoB,CAClC,OAAyB;IAEzB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACtC,KAAK,gCAAoB,CAAC,UAAU;YAClC,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACxC,KAAK,gCAAoB,CAAC,SAAS;YACjC,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACvC,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACtC,KAAK,gCAAoB,CAAC,KAAK;YAC7B,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACnC;YACE,OAAO,OAAO,CAAC;IACnB,CAAC;AACH,CAAC;AAjBD,oDAiBC;AAED,SAAgB,mBAAmB,CACjC,OAAiC;IAEjC,MAAM,aAAa,GAAG,OAAO,CAAC;IAC9B,aAAa,CAAC,IAAI,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"sortPortfolioElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortPortfolioElement.ts"],"names":[],"mappings":"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"}
|