@sonarwatch/portfolio-plugins 0.11.2 → 0.11.4

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 CHANGED
@@ -2,86 +2,94 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
- ## [0.11.2](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.1...plugins-0.11.2) (2023-12-12)
6
-
7
-
8
-
9
- ## [0.11.1](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.0...plugins-0.11.1) (2023-12-12)
10
-
11
-
12
-
13
- # [0.11.0](https://github.com/sonarwatch/portfolio/compare/plugins-0.10.0...plugins-0.11.0) (2023-12-12)
14
-
15
-
16
-
17
- # [0.10.0](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.11...plugins-0.10.0) (2023-12-12)
18
-
19
-
20
-
21
- ## [0.9.11](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.10...plugins-0.9.11) (2023-12-12)
22
-
23
-
24
-
25
- ## [0.9.10](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.9...plugins-0.9.10) (2023-12-11)
26
-
27
-
28
-
29
- ## [0.9.9](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.8...plugins-0.9.9) (2023-12-11)
30
-
31
-
32
-
33
- ## [0.9.8](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.7...plugins-0.9.8) (2023-12-11)
34
-
35
-
36
-
37
- ## [0.9.7](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.6...plugins-0.9.7) (2023-12-11)
38
-
39
-
40
-
41
- ## [0.9.6](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.5...plugins-0.9.6) (2023-12-11)
42
-
43
-
44
-
45
- ## [0.9.5](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.4...plugins-0.9.5) (2023-12-10)
46
-
47
-
48
-
49
- ## [0.9.4](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.3...plugins-0.9.4) (2023-12-10)
50
-
51
-
52
-
53
- ## [0.9.3](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.2...plugins-0.9.3) (2023-12-10)
54
-
55
-
56
-
57
- ## [0.9.2](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.1...plugins-0.9.2) (2023-12-10)
58
-
59
-
60
-
61
- ## [0.9.1](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.0...plugins-0.9.1) (2023-12-09)
62
-
63
-
64
-
65
- # [0.9.0](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.126...plugins-0.9.0) (2023-12-09)
66
-
67
-
68
-
69
- ## [0.8.126](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.125...plugins-0.8.126) (2023-12-09)
70
-
71
-
72
-
73
- ## [0.8.125](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.124...plugins-0.8.125) (2023-12-09)
74
-
75
-
76
-
77
- ## [0.8.124](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.123...plugins-0.8.124) (2023-12-08)
78
-
79
-
80
-
81
- ## [0.8.123](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.122...plugins-0.8.123) (2023-12-07)
5
+ ## [0.11.4](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.3...plugins-0.11.4) (2023-12-12)
82
6
 
83
7
 
84
8
 
9
+ ## [0.11.3](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.2...plugins-0.11.3) (2023-12-12)
10
+
11
+
12
+
13
+ ## [0.11.2](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.1...plugins-0.11.2) (2023-12-12)
14
+
15
+
16
+
17
+ ## [0.11.1](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.0...plugins-0.11.1) (2023-12-12)
18
+
19
+
20
+
21
+ # [0.11.0](https://github.com/sonarwatch/portfolio/compare/plugins-0.10.0...plugins-0.11.0) (2023-12-12)
22
+
23
+
24
+
25
+ # [0.10.0](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.11...plugins-0.10.0) (2023-12-12)
26
+
27
+
28
+
29
+ ## [0.9.11](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.10...plugins-0.9.11) (2023-12-12)
30
+
31
+
32
+
33
+ ## [0.9.10](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.9...plugins-0.9.10) (2023-12-11)
34
+
35
+
36
+
37
+ ## [0.9.9](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.8...plugins-0.9.9) (2023-12-11)
38
+
39
+
40
+
41
+ ## [0.9.8](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.7...plugins-0.9.8) (2023-12-11)
42
+
43
+
44
+
45
+ ## [0.9.7](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.6...plugins-0.9.7) (2023-12-11)
46
+
47
+
48
+
49
+ ## [0.9.6](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.5...plugins-0.9.6) (2023-12-11)
50
+
51
+
52
+
53
+ ## [0.9.5](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.4...plugins-0.9.5) (2023-12-10)
54
+
55
+
56
+
57
+ ## [0.9.4](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.3...plugins-0.9.4) (2023-12-10)
58
+
59
+
60
+
61
+ ## [0.9.3](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.2...plugins-0.9.3) (2023-12-10)
62
+
63
+
64
+
65
+ ## [0.9.2](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.1...plugins-0.9.2) (2023-12-10)
66
+
67
+
68
+
69
+ ## [0.9.1](https://github.com/sonarwatch/portfolio/compare/plugins-0.9.0...plugins-0.9.1) (2023-12-09)
70
+
71
+
72
+
73
+ # [0.9.0](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.126...plugins-0.9.0) (2023-12-09)
74
+
75
+
76
+
77
+ ## [0.8.126](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.125...plugins-0.8.126) (2023-12-09)
78
+
79
+
80
+
81
+ ## [0.8.125](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.124...plugins-0.8.125) (2023-12-09)
82
+
83
+
84
+
85
+ ## [0.8.124](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.123...plugins-0.8.124) (2023-12-08)
86
+
87
+
88
+
89
+ ## [0.8.123](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.122...plugins-0.8.123) (2023-12-07)
90
+
91
+
92
+
85
93
  ## [0.8.122](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.121...plugins-0.8.122) (2023-12-07)
86
94
 
87
95
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.11.2",
3
+ "version": "0.11.4",
4
4
  "type": "commonjs",
5
5
  "generators": "./generators.json",
6
6
  "dependencies": {
@@ -41,7 +41,7 @@
41
41
  "web3-v1": "npm:web3@^1.5.0"
42
42
  },
43
43
  "peerDependencies": {
44
- "@sonarwatch/portfolio-core": "0.11.2"
44
+ "@sonarwatch/portfolio-core": "0.11.4"
45
45
  },
46
46
  "main": "./src/index.js",
47
47
  "types": "./src/index.d.ts"
@@ -32,13 +32,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
32
32
  const { decimals } = gofxTokenPrice;
33
33
  const assets = [];
34
34
  for (const ticket of stakingAccount.unstakingTickets) {
35
+ if (ticket.totalUnstaked.isZero())
36
+ continue;
35
37
  const unlockStartedAt = new Date(ticket.createdAt.times(1000).toNumber());
36
38
  const unlockingAt = new Date(unlockStartedAt.getTime() + sevenDays);
37
- if (Date.now() < unlockingAt.getTime()) {
38
- assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.gofxMint, ticket.totalUnstaked.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, gofxTokenPrice)), { attributes: {
39
- lockedUntil: unlockingAt.getTime(),
40
- } }));
41
- }
39
+ assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.gofxMint, ticket.totalUnstaked.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, gofxTokenPrice)), { attributes: {
40
+ lockedUntil: unlockingAt.getTime(),
41
+ } }));
42
42
  }
43
43
  if (stakingAccount.totalStaked.isGreaterThan(0)) {
44
44
  const amount = stakingAccount.totalStaked
@@ -1 +1 @@
1
- {"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/stakingFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAGpC,2CAAoE;AACpE,iDAAsD;AACtD,+CAA8D;AAC9D,uCAA+C;AAC/C,uCAAiD;AACjD,qGAA6E;AAE7E,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE1C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,4BAAkB,EAClB,2BAAe,EACf,IAAA,8BAAoB,EAAC,KAAK,CAAC,CAC5B,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAC5D,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC7E,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACrD,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE;YAAE,SAAS;QAC5C,MAAM,eAAe,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAC;QACpE,MAAM,CAAC,IAAI,iCACN,IAAA,gCAAsB,EACvB,oBAAQ,EACR,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,EACzD,0BAAS,CAAC,MAAM,EAChB,cAAc,CACf,KACD,UAAU,EAAE;gBACV,WAAW,EAAE,WAAW,CAAC,OAAO,EAAE;aACnC,IACD,CAAC;IACL,CAAC;IACD,IAAI,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW;aACtC,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;aACzB,QAAQ,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EAAC,oBAAQ,EAAE,MAAM,EAAE,0BAAS,CAAC,MAAM,EAAE,cAAc,CAAC,CAC3E,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,QAAQ;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1D;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
@@ -36,7 +36,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
36
36
  const name = escrowEndsAt.isZero() ? yearsText : undefined;
37
37
  const asset = (0, tokenPriceToAssetToken_1.default)(constants_1.lfntyMint, amount.dividedBy(Math.pow(10, constants_1.lfntyDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, lfntyTokenPrice);
38
38
  if (escrowEndsAt.isGreaterThan(0)) {
39
- asset.attributes.lockedUntil = escrowEndsAt.toNumber();
39
+ asset.attributes.lockedUntil = escrowEndsAt.times(1000).toNumber();
40
40
  }
41
41
  return [
42
42
  {
@@ -1 +1 @@
1
- {"version":3,"file":"lockerFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/lifinity/lockerFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAG7E,2CAKqB;AACrB,iDAAsD;AACtD,+CAA8D;AAC9D,uCAAyC;AACzC,uCAAyC;AACzC,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,sBAAY,EACZ,mCAAuB,EACvB,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5D,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAElC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IAEzD,IAAI,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,aAAa,CAC/C,qBAAS,EACT,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,WAAW,WAAW,QAAQ;QAChC,CAAC,CAAC,WAAW,WAAW,SAAS,CAAC;IACpC,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAE3D,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,qBAAS,EACT,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE,EAChD,0BAAS,CAAC,MAAM,EAChB,eAAe,CAChB,CAAC;IAEF,IAAI,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,KAAK,CAAC,UAAU,CAAC,WAAW,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;IACzD,CAAC;IAED,OAAO;QACL;YACE,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,qCAAoB,CAAC,MAAM;YACjC,IAAI,EAAE,EAAE,KAAK,EAAE;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI;SACL;KACF,CAAC;AACJ,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":"lockerFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/lifinity/lockerFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAG7E,2CAKqB;AACrB,iDAAsD;AACtD,+CAA8D;AAC9D,uCAAyC;AACzC,uCAAyC;AACzC,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,sBAAY,EACZ,mCAAuB,EACvB,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5D,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAElC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IAEzD,IAAI,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,aAAa,CAC/C,qBAAS,EACT,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,WAAW,WAAW,QAAQ;QAChC,CAAC,CAAC,WAAW,WAAW,SAAS,CAAC;IACpC,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAE3D,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,qBAAS,EACT,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE,EAChD,0BAAS,CAAC,MAAM,EAChB,eAAe,CAChB,CAAC;IAEF,IAAI,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,KAAK,CAAC,UAAU,CAAC,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrE,CAAC;IAED,OAAO;QACL;YACE,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,qCAAoB,CAAC,MAAM;YACjC,IAAI,EAAE,EAAE,KAAK,EAAE;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI;SACL;KACF,CAAC;AACJ,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"}
@@ -41,11 +41,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
41
41
  const nativeAssets = [];
42
42
  for (let i = 0; i < stakeAccounts.length; i += 1) {
43
43
  const stakeAccount = stakeAccounts[i];
44
- if (stakeAccount.stake.isZero())
45
- continue;
46
- const amount = new bignumber_js_1.default(stakeAccount.stake)
44
+ const amount = new bignumber_js_1.default(stakeAccount.lamports)
45
+ .minus(stakeAccount.rentExemptReserve)
47
46
  .dividedBy(new bignumber_js_1.default(Math.pow(10, 9)))
48
47
  .toNumber();
48
+ if (amount <= 0)
49
+ continue;
49
50
  const isMarinade = constants_3.marinadeManagerAddresses.includes(stakeAccount.staker.toString());
50
51
  if (isMarinade) {
51
52
  marinadeNativeAmount += amount;
@@ -63,7 +64,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
63
64
  else if (epoch && activationEpoch.isGreaterThanOrEqualTo(epoch)) {
64
65
  tags.push('Activating');
65
66
  }
66
- else if (epoch && deactivationEpoch.isLessThanOrEqualTo(epoch)) {
67
+ else if (epoch && deactivationEpoch.isLessThan(epoch)) {
68
+ tags.push('Unstaked');
69
+ }
70
+ else if (epoch && deactivationEpoch.isEqualTo(epoch)) {
67
71
  tags.push('Unstaking');
68
72
  }
69
73
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"solanaFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/native-stake/solana/solanaFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"solanaFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/native-stake/solana/solanaFetcher.ts"],"names":[],"mappings":"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"}