@sonarwatch/portfolio-plugins 0.14.16 → 0.14.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (23) hide show
  1. package/CHANGELOG.md +1660 -1652
  2. package/README.md +3 -3
  3. package/package.json +1 -1
  4. package/src/plugins/aave/index.js +21 -17
  5. package/src/plugins/aave/index.js.map +1 -1
  6. package/src/plugins/balancer/helpers/pools.js +21 -21
  7. package/src/plugins/jupiter/exchange/lockFetcher.js +31 -11
  8. package/src/plugins/jupiter/exchange/lockFetcher.js.map +1 -1
  9. package/src/plugins/maker/vaultsFetcher.js +5 -4
  10. package/src/plugins/maker/vaultsFetcher.js.map +1 -1
  11. package/src/plugins/orca/getWhirlpoolPositions.js +39 -84
  12. package/src/plugins/orca/getWhirlpoolPositions.js.map +1 -1
  13. package/src/plugins/orca/helpers_fees.d.ts +1 -1
  14. package/src/plugins/orca/helpers_fees.js +13 -9
  15. package/src/plugins/orca/helpers_fees.js.map +1 -1
  16. package/src/plugins/staratlas/stakingFetcher.js +5 -6
  17. package/src/plugins/staratlas/stakingFetcher.js.map +1 -1
  18. package/src/plugins/sushiswap/helpers.js +24 -24
  19. package/src/plugins/uniswap-v2/helpers.js +22 -22
  20. package/src/plugins/vaultka/strategyFetcher.js +5 -5
  21. package/src/plugins/zeta/airdropFetcher.js +14 -14
  22. package/src/utils/sei/constants.js +8 -8
  23. package/src/utils/sei/getQueryBalanceByOwner.js +4 -4
package/README.md CHANGED
@@ -1,3 +1,3 @@
1
- # @sonarwatch/portfolio-plugins
2
-
3
- This library is @sonarwatch/portfolio-plugins
1
+ # @sonarwatch/portfolio-plugins
2
+
3
+ This library is @sonarwatch/portfolio-plugins
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.14.16",
3
+ "version": "0.14.18",
4
4
  "type": "commonjs",
5
5
  "types": "./src/index.d.ts",
6
6
  "peerDependencies": {
package/src/plugins/aave/index.js CHANGED
@@ -4,9 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.fetchers = exports.jobs = exports.services = exports.platforms = void 0;
7
- const portfolio_core_1 = require("@sonarwatch/portfolio-core");
8
7
  // import lendingPoolsJob from './lendingPoolsJob';
9
- const getLendingFetcherExecutor_1 = __importDefault(require("./getLendingFetcherExecutor"));
10
8
  const stakingFetcher_1 = __importDefault(require("./stakingFetcher"));
11
9
  const constants_1 = require("./constants");
12
10
  const services_1 = require("./services");
@@ -16,21 +14,27 @@ exports.jobs = [
16
14
  // lendingPoolsJob,
17
15
  ];
18
16
  exports.fetchers = [
19
- {
20
- id: `${constants_1.platformId}-${portfolio_core_1.NetworkId.ethereum}-lending`,
21
- networkId: portfolio_core_1.NetworkId.ethereum,
22
- executor: (0, getLendingFetcherExecutor_1.default)(portfolio_core_1.NetworkId.ethereum),
23
- },
24
- {
25
- id: `${constants_1.platformId}-${portfolio_core_1.NetworkId.polygon}-lending`,
26
- networkId: portfolio_core_1.NetworkId.polygon,
27
- executor: (0, getLendingFetcherExecutor_1.default)(portfolio_core_1.NetworkId.polygon),
28
- },
29
- {
30
- id: `${constants_1.platformId}-${portfolio_core_1.NetworkId.avalanche}-lending`,
31
- networkId: portfolio_core_1.NetworkId.avalanche,
32
- executor: (0, getLendingFetcherExecutor_1.default)(portfolio_core_1.NetworkId.avalanche),
33
- },
17
+ // WARNING !!!!
18
+ // These fetchers use an old version of web3 wich cause process to exit
19
+ // WARNING !!!!
20
+ // {
21
+ // id: `${platformId}-${NetworkId.ethereum}-lending`,
22
+ // networkId: NetworkId.ethereum,
23
+ // executor: getLendingFetcherExecutor(NetworkId.ethereum),
24
+ // },
25
+ // {
26
+ // id: `${platformId}-${NetworkId.polygon}-lending`,
27
+ // networkId: NetworkId.polygon,
28
+ // executor: getLendingFetcherExecutor(NetworkId.polygon),
29
+ // },
30
+ // {
31
+ // id: `${platformId}-${NetworkId.avalanche}-lending`,
32
+ // networkId: NetworkId.avalanche,
33
+ // executor: getLendingFetcherExecutor(NetworkId.avalanche),
34
+ // },
35
+ // WARNING !!!!
36
+ // These fetchers use an old version of web3 wich cause process to exit
37
+ // WARNING !!!!
34
38
  stakingFetcher_1.default,
35
39
  ];
36
40
  //# sourceMappingURL=index.js.map
package/src/plugins/aave/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAA0E;AAG1E,mDAAmD;AACnD,4FAAoE;AACpE,sEAA8C;AAC9C,2CAAmD;AACnD,yCAAkD;AAErC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,QAAQ,GAAc,CAAC,oBAAS,EAAE,oBAAS,CAAC,CAAC;AAC7C,QAAA,IAAI,GAAU;AACzB,mBAAmB;CACpB,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC;QACE,EAAE,EAAE,GAAG,sBAAU,IAAI,0BAAS,CAAC,QAAQ,UAAU;QACjD,SAAS,EAAE,0BAAS,CAAC,QAAQ;QAC7B,QAAQ,EAAE,IAAA,mCAAyB,EAAC,0BAAS,CAAC,QAAQ,CAAC;KACxD;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,IAAI,0BAAS,CAAC,OAAO,UAAU;QAChD,SAAS,EAAE,0BAAS,CAAC,OAAO;QAC5B,QAAQ,EAAE,IAAA,mCAAyB,EAAC,0BAAS,CAAC,OAAO,CAAC;KACvD;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,IAAI,0BAAS,CAAC,SAAS,UAAU;QAClD,SAAS,EAAE,0BAAS,CAAC,SAAS;QAC9B,QAAQ,EAAE,IAAA,mCAAyB,EAAC,0BAAS,CAAC,SAAS,CAAC;KACzD;IACD,wBAAc;CACf,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/index.ts"],"names":[],"mappings":";;;;;;AAGA,mDAAmD;AACnD,sEAA8C;AAC9C,2CAAuC;AACvC,yCAAkD;AAErC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,QAAQ,GAAc,CAAC,oBAAS,EAAE,oBAAS,CAAC,CAAC;AAC7C,QAAA,IAAI,GAAU;AACzB,mBAAmB;CACpB,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,eAAe;IACf,uEAAuE;IACvE,eAAe;IACf,IAAI;IACJ,uDAAuD;IACvD,mCAAmC;IACnC,6DAA6D;IAC7D,KAAK;IACL,IAAI;IACJ,sDAAsD;IACtD,kCAAkC;IAClC,4DAA4D;IAC5D,KAAK;IACL,IAAI;IACJ,wDAAwD;IACxD,oCAAoC;IACpC,8DAA8D;IAC9D,KAAK;IACL,eAAe;IACf,uEAAuE;IACvE,eAAe;IACf,wBAAc;CACf,CAAC"}
package/src/plugins/balancer/helpers/pools.js CHANGED
@@ -36,27 +36,27 @@ exports.getBalancerPoolsV2 = void 0;
36
36
  const graphql_request_1 = __importStar(require("graphql-request"));
37
37
  function getBalancerPoolsV2(url) {
38
38
  return __awaiter(this, void 0, void 0, function* () {
39
- const query = (0, graphql_request_1.gql) `
40
- query pools {
41
- pools(
42
- first: 1000
43
- orderBy: totalLiquidity
44
- orderDirection: desc
45
- where: { totalLiquidity_gt: "500" }
46
- ) {
47
- id
48
- address
49
- symbol
50
- totalLiquidity
51
- totalShares
52
- tokens {
53
- balance
54
- decimals
55
- symbol
56
- address
57
- }
58
- }
59
- }
39
+ const query = (0, graphql_request_1.gql) `
40
+ query pools {
41
+ pools(
42
+ first: 1000
43
+ orderBy: totalLiquidity
44
+ orderDirection: desc
45
+ where: { totalLiquidity_gt: "500" }
46
+ ) {
47
+ id
48
+ address
49
+ symbol
50
+ totalLiquidity
51
+ totalShares
52
+ tokens {
53
+ balance
54
+ decimals
55
+ symbol
56
+ address
57
+ }
58
+ }
59
+ }
60
60
  `;
61
61
  const res = yield (0, graphql_request_1.default)(url, query);
62
62
  const pools = res.pools;
package/src/plugins/jupiter/exchange/lockFetcher.js CHANGED
@@ -22,19 +22,39 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
22
22
  if (vestingEscrowAccounts.length === 0)
23
23
  return [];
24
24
  const registry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
25
- const element = registry.addElementMultiple({
26
- label: 'Vesting',
27
- name: 'lock',
28
- });
29
25
  for (const lock of vestingEscrowAccounts) {
30
- const endTime = lock.vestingStartTime.plus(lock.numberOfPeriod.times(lock.frequency));
31
- element.addAsset({
32
- address: lock.tokenMint,
33
- amount: lock.amountPerPeriod
34
- .times(lock.numberOfPeriod)
35
- .minus(lock.totalClaimedAmount),
36
- attributes: { lockedUntil: endTime.toNumber() },
26
+ const element = registry.addElementMultiple({
27
+ label: 'Vesting',
28
+ name: 'Lock',
37
29
  });
30
+ const endTime = lock.cliffTime
31
+ .plus(lock.numberOfPeriod.times(lock.frequency))
32
+ .times(1000);
33
+ if (lock.totalClaimedAmount.isZero()) {
34
+ // Unlock at cliff time
35
+ element.addAsset({
36
+ address: lock.tokenMint,
37
+ amount: lock.cliffUnlockAmount,
38
+ attributes: { lockedUntil: lock.cliffTime.times(1000).toNumber() },
39
+ });
40
+ // Remaining vesting with end date
41
+ element.addAsset({
42
+ address: lock.tokenMint,
43
+ amount: lock.amountPerPeriod.times(lock.numberOfPeriod),
44
+ attributes: { lockedUntil: endTime.toNumber() },
45
+ });
46
+ }
47
+ else {
48
+ // Remaining vesting with end date, minus already claimed
49
+ element.addAsset({
50
+ address: lock.tokenMint,
51
+ amount: lock.amountPerPeriod
52
+ .times(lock.numberOfPeriod)
53
+ .plus(lock.cliffUnlockAmount)
54
+ .minus(lock.totalClaimedAmount),
55
+ attributes: { lockedUntil: endTime.toNumber() },
56
+ });
57
+ }
38
58
  }
39
59
  return registry.getElements(cache);
40
60
  });
package/src/plugins/jupiter/exchange/lockFetcher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lockFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/lockFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAwD;AACxD,oDAAyD;AACzD,kDAAiE;AACjE,uCAAgD;AAChD,uCAAwC;AACxC,mFAAgF;AAEhF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,qBAAqB,GAAG,MAAM,IAAA,iCAAwB,EAC1D,MAAM,EACN,6BAAmB,EACnB,yBAAa,EACb,IAAA,qBAAW,EAAC,KAAK,CAAC,CACnB,CAAC;IACF,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAElD,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;QAC1C,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,MAAM;KACb,CAAC,CAAC;IAEH,KAAK,MAAM,IAAI,IAAI,qBAAqB,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CACxC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAC1C,CAAC;QAEF,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,IAAI,CAAC,SAAS;YACvB,MAAM,EAAE,IAAI,CAAC,eAAe;iBACzB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;iBAC1B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;YACjC,UAAU,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE;SAChD,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"lockFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/lockFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAwD;AACxD,oDAAyD;AACzD,kDAAiE;AACjE,uCAAgD;AAChD,uCAAwC;AACxC,mFAAgF;AAEhF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,qBAAqB,GAAG,MAAM,IAAA,iCAAwB,EAC1D,MAAM,EACN,6BAAmB,EACnB,yBAAa,EACb,IAAA,qBAAW,EAAC,KAAK,CAAC,CACnB,CAAC;IACF,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAElD,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAEnE,KAAK,MAAM,IAAI,IAAI,qBAAqB,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS;aAC3B,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC/C,KAAK,CAAC,IAAI,CAAC,CAAC;QAEf,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,uBAAuB;YACvB,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,MAAM,EAAE,IAAI,CAAC,iBAAiB;gBAC9B,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;aACnE,CAAC,CAAC;YAEH,kCAAkC;YAClC,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;gBACvD,UAAU,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE;aAChD,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,yDAAyD;YACzD,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,MAAM,EAAE,IAAI,CAAC,eAAe;qBACzB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;qBAC1B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;qBAC5B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;gBACjC,UAAU,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE;aAChD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
package/src/plugins/maker/vaultsFetcher.js CHANGED
@@ -17,21 +17,22 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
17
17
  const constants_1 = require("./constants");
18
18
  const clients_1 = require("../../utils/clients");
19
19
  const abis_1 = require("./abis");
20
- const getDSA_1 = require("../../utils/evm/getDSA");
21
20
  const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
22
21
  const constants_2 = require("../../utils/misc/constants");
23
22
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
24
23
  // Get the user's proxy address
25
24
  const client = (0, clients_1.getEvmClient)(portfolio_core_1.NetworkId.ethereum);
26
- const instadappDSA = (0, getDSA_1.getDSA)(portfolio_core_1.NetworkId.ethereum);
27
- const instadappAccounts = yield instadappDSA.getAccounts(owner);
25
+ // WARNING: intadapp removed because it use an old version of web3 that cause process.exit
26
+ // const instadappDSA = getDSA(NetworkId.ethereum);
27
+ // const instadappAccounts = await instadappDSA.getAccounts(owner);
28
28
  const ownerProxyRes = yield client.readContract({
29
29
  abi: abis_1.proxyRegAbi,
30
30
  address: constants_1.proxyRegAddress,
31
31
  functionName: 'proxies',
32
32
  args: [owner],
33
33
  });
34
- const proxyAddresses = [owner, ...instadappAccounts.map((a) => a.address)];
34
+ // const proxyAddresses = [owner, ...instadappAccounts.map((a) => a.address)];
35
+ const proxyAddresses = [owner];
35
36
  if (ownerProxyRes !== portfolio_core_1.zeroAddressEvm)
36
37
  proxyAddresses.push(ownerProxyRes);
37
38
  if (proxyAddresses.length === 0)
package/src/plugins/maker/vaultsFetcher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/maker/vaultsFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/maker/vaultsFetcher.ts"],"names":[],"mappings":"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"}
package/src/plugins/orca/getWhirlpoolPositions.js CHANGED
@@ -99,100 +99,55 @@ function getOrcaNftFetcher(platformId, programId) {
99
99
  const tags = [];
100
100
  if (tokenAmountA.isZero() || tokenAmountB.isZero())
101
101
  tags.push('Out Of Range');
102
- /* const feesAndRewards = calcFeesAndRewards(
103
- whirlpoolInfo,
104
- positionInfo,
105
- tickArrays
106
- );
107
-
102
+ const feesAndRewards = (0, helpers_fees_1.calcFeesAndRewards)(whirlpoolInfo, positionInfo, tickArrays);
108
103
  if (feesAndRewards) {
109
- if (feesAndRewards.feeOwedA.isGreaterThan(0)) {
110
- rewardAssets.push(
111
- tokenPriceToAssetToken(
112
- tokenPriceA.address,
113
- feesAndRewards.feeOwedA
114
- .dividedBy(10 ** tokenPriceA.decimals)
115
- .toNumber(),
116
- NetworkId.solana,
117
- tokenPriceA
118
- )
119
- );
120
- }
121
-
122
- if (feesAndRewards.feeOwedB.isGreaterThan(0)) {
123
- rewardAssets.push(
124
- tokenPriceToAssetToken(
125
- tokenPriceB.address,
126
- feesAndRewards.feeOwedB
127
- .dividedBy(10 ** tokenPriceB.decimals)
128
- .toNumber(),
129
- NetworkId.solana,
130
- tokenPriceB
131
- )
132
- );
133
- }
134
-
135
- if (feesAndRewards.rewardOwedA.isGreaterThan(0)) {
136
- const tokenPriceRewardA = tokenPrices.get(
137
- whirlpoolInfo.rewardInfos[0].mint.toString()
138
- );
139
- if (tokenPriceRewardA) {
140
- rewardAssets.push(
141
- tokenPriceToAssetToken(
142
- tokenPriceRewardA.address,
143
- feesAndRewards.rewardOwedA
144
- .dividedBy(10 ** tokenPriceRewardA.decimals)
145
- .toNumber(),
146
- NetworkId.solana,
147
- tokenPriceRewardA
148
- )
149
- );
104
+ if (feesAndRewards.feeOwedA.isGreaterThan(0)) {
105
+ rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceA.address, feesAndRewards.feeOwedA
106
+ .dividedBy(Math.pow(10, tokenPriceA.decimals))
107
+ .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceA));
150
108
  }
151
- }
152
-
153
- if (feesAndRewards.rewardOwedB.isGreaterThan(0)) {
154
- const tokenPriceRewardB = tokenPrices.get(
155
- whirlpoolInfo.rewardInfos[1].mint.toString()
156
- );
157
- if (tokenPriceRewardB) {
158
- rewardAssets.push(
159
- tokenPriceToAssetToken(
160
- tokenPriceRewardB.address,
161
- feesAndRewards.rewardOwedB
162
- .dividedBy(10 ** tokenPriceRewardB.decimals)
163
- .toNumber(),
164
- NetworkId.solana,
165
- tokenPriceRewardB
166
- )
167
- );
109
+ if (feesAndRewards.feeOwedB.isGreaterThan(0)) {
110
+ rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceB.address, feesAndRewards.feeOwedB
111
+ .dividedBy(Math.pow(10, tokenPriceB.decimals))
112
+ .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceB));
168
113
  }
169
- }
170
-
171
- if (feesAndRewards.rewardOwedC.isGreaterThan(0)) {
172
- const tokenPriceRewardC = tokenPrices.get(
173
- whirlpoolInfo.rewardInfos[2].mint.toString()
174
- );
175
- if (tokenPriceRewardC) {
176
- rewardAssets.push(
177
- tokenPriceToAssetToken(
178
- tokenPriceRewardC.address,
179
- feesAndRewards.rewardOwedC
180
- .dividedBy(10 ** tokenPriceRewardC.decimals)
181
- .toNumber(),
182
- NetworkId.solana,
183
- tokenPriceRewardC
184
- )
185
- );
114
+ if (feesAndRewards.rewardOwedA.isGreaterThan(0)) {
115
+ const tokenPriceRewardA = tokenPrices.get(whirlpoolInfo.rewardInfos[0].mint.toString());
116
+ if (tokenPriceRewardA) {
117
+ rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceRewardA.address, feesAndRewards.rewardOwedA
118
+ .dividedBy(Math.pow(10, tokenPriceRewardA.decimals))
119
+ .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceRewardA));
120
+ }
186
121
  }
187
- }
188
- } */
122
+ if (feesAndRewards.rewardOwedB.isGreaterThan(0)) {
123
+ const tokenPriceRewardB = tokenPrices.get(whirlpoolInfo.rewardInfos[1].mint.toString());
124
+ if (tokenPriceRewardB) {
125
+ rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceRewardB.address, feesAndRewards.rewardOwedB
126
+ .dividedBy(Math.pow(10, tokenPriceRewardB.decimals))
127
+ .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceRewardB));
128
+ }
129
+ }
130
+ if (feesAndRewards.rewardOwedC.isGreaterThan(0)) {
131
+ const tokenPriceRewardC = tokenPrices.get(whirlpoolInfo.rewardInfos[2].mint.toString());
132
+ if (tokenPriceRewardC) {
133
+ rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceRewardC.address, feesAndRewards.rewardOwedC
134
+ .dividedBy(Math.pow(10, tokenPriceRewardC.decimals))
135
+ .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceRewardC));
136
+ }
137
+ }
138
+ }
189
139
  if (!assetTokenA ||
190
140
  !assetTokenB ||
191
141
  assetTokenA.value === null ||
192
142
  assetTokenB.value === null)
193
143
  continue;
144
+ const assets = !tokenAmountA.isZero() && !tokenAmountB.isZero()
145
+ ? [assetTokenA, assetTokenB]
146
+ : [];
194
147
  const value = assetTokenA.value + assetTokenB.value;
195
148
  const rewardAssetsValue = (0, portfolio_core_1.getUsdValueSum)(rewardAssets.map((a) => a.value));
149
+ if (assets.length === 0 && rewardAssets.length === 0)
150
+ continue;
196
151
  elements.push({
197
152
  type: portfolio_core_1.PortfolioElementType.liquidity,
198
153
  networkId: portfolio_core_1.NetworkId.solana,
@@ -203,7 +158,7 @@ function getOrcaNftFetcher(platformId, programId) {
203
158
  data: {
204
159
  liquidities: [
205
160
  {
206
- assets: [assetTokenA, assetTokenB],
161
+ assets,
207
162
  assetsValue: value,
208
163
  rewardAssets,
209
164
  rewardAssetsValue,
package/src/plugins/orca/getWhirlpoolPositions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getWhirlpoolPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getWhirlpoolPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts"],"names":[],"mappings":"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"}
package/src/plugins/orca/helpers_fees.d.ts CHANGED
@@ -1,6 +1,6 @@
1
+ import BigNumber from 'bignumber.js';
1
2
  import { Position, Tick, TickArray, Whirlpool, WhirlpoolRewardInfo } from './structs/whirlpool';
2
3
  import { ParsedAccount } from '../../utils/solana';
3
- import BigNumber from 'bignumber.js';
4
4
  export declare const getTickArraysAsMap: (positionsInfo: (ParsedAccount<Position> | null)[], whirlpoolMap: Map<string, Whirlpool>) => Promise<Map<string, TickArray>>;
5
5
  export declare const calcFeesAndRewards: (whirlpool: Whirlpool, position: ParsedAccount<Position>, tickArrays: Map<string, TickArray>) => {
6
6
  feeOwedA: BigNumber;
package/src/plugins/orca/helpers_fees.js CHANGED
@@ -13,14 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.getCollectRewardsQuoteInternal = exports.isRewardInitialized = exports.calcFeesAndRewards = exports.getTickArraysAsMap = void 0;
16
+ const web3_js_1 = require("@solana/web3.js");
17
+ const bn_js_1 = __importDefault(require("bn.js"));
18
+ const bignumber_js_1 = __importDefault(require("bignumber.js"));
16
19
  const whirlpool_1 = require("./structs/whirlpool");
17
20
  const solana_1 = require("../../utils/solana");
18
21
  const constants_1 = require("./constants");
19
22
  const clients_1 = require("../../utils/clients");
20
- const web3_js_1 = require("@solana/web3.js");
21
- const bn_js_1 = __importDefault(require("bn.js"));
22
23
  const toBN_1 = require("../../utils/misc/toBN");
23
- const bignumber_js_1 = __importDefault(require("bignumber.js"));
24
24
  const TWO = new bn_js_1.default(2);
25
25
  const U128 = TWO.pow(new bn_js_1.default(128));
26
26
  const TICK_ARRAY_SIZE = 88;
@@ -67,8 +67,8 @@ const calcFeesAndRewards = (whirlpool, position, tickArrays) => {
67
67
  const fees = getCollectFeesQuoteInternal({
68
68
  whirlpool,
69
69
  position,
70
- tickUpper,
71
70
  tickLower,
71
+ tickUpper,
72
72
  });
73
73
  return Object.assign(Object.assign({}, rewards), fees);
74
74
  };
@@ -140,8 +140,12 @@ function getCollectFeesQuoteInternal(param) {
140
140
  const updatedFeeOwedA = feeOwedA.plus(feeOwedADelta.toString());
141
141
  const updatedFeeOwedB = feeOwedB.plus(feeOwedBDelta.toString());
142
142
  return {
143
- feeOwedA: updatedFeeOwedA,
144
- feeOwedB: updatedFeeOwedB,
143
+ feeOwedA: updatedFeeOwedA.isGreaterThan(Math.pow(10, 18))
144
+ ? (0, bignumber_js_1.default)(0)
145
+ : updatedFeeOwedA,
146
+ feeOwedB: updatedFeeOwedB.isGreaterThan(Math.pow(10, 18))
147
+ ? (0, bignumber_js_1.default)(0)
148
+ : updatedFeeOwedB,
145
149
  };
146
150
  }
147
151
  function getTick(tickArray, tickIndex, tickSpacing) {
@@ -180,7 +184,7 @@ function getCollectRewardsQuoteInternal(param) {
180
184
  for (const i of range) {
181
185
  const rewardInfo = whirlpoolRewardsInfos[i];
182
186
  invariant(!!rewardInfo, 'whirlpoolRewardsInfos cannot be undefined');
183
- const growthGlobalX64 = rewardInfo.growthGlobalX64;
187
+ const { growthGlobalX64 } = rewardInfo;
184
188
  const lowerRewardGrowthsOutside = tickLowerRewardGrowthsOutside[i];
185
189
  const upperRewardGrowthsOutside = tickUpperRewardGrowthsOutside[i];
186
190
  invariant(!!lowerRewardGrowthsOutside, 'lowerRewardGrowthsOutside cannot be undefined');
@@ -220,8 +224,8 @@ function getCollectRewardsQuoteInternal(param) {
220
224
  for (const i of range) {
221
225
  const growthInsideX64 = rewardGrowthsInsideX64[i];
222
226
  invariant(!!growthInsideX64, 'growthInsideX64 cannot be undefined');
223
- const [rewardGrowthInsideX64, isRewardInitialized] = growthInsideX64;
224
- if (isRewardInitialized) {
227
+ const [rewardGrowthInsideX64, isRewardAlreadyInitialized] = growthInsideX64;
228
+ if (isRewardAlreadyInitialized) {
225
229
  const rewardInfo = rewardInfos[i];
226
230
  invariant(!!rewardInfo, 'rewardInfo cannot be undefined');
227
231
  const amountOwedX64 = (0, toBN_1.toBN)(rewardInfo.amountOwed).shln(64);
package/src/plugins/orca/helpers_fees.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helpers_fees.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/helpers_fees.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers_fees.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/helpers_fees.ts"],"names":[],"mappings":"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"}
package/src/plugins/staratlas/stakingFetcher.js CHANGED
@@ -31,14 +31,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
31
31
  const atlasTokenPrice = yield cache.getTokenPrice(constants_1.atlasMint, portfolio_core_1.NetworkId.solana);
32
32
  const assets = [];
33
33
  accounts.forEach((account) => {
34
- if (!account.totalStake.isZero()) {
35
- assets.push((0, tokenPriceToAssetToken_1.default)(constants_1.atlasMint, account.totalStake.div(Math.pow(10, constants_1.atlasDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, atlasTokenPrice, atlasTokenPrice === null || atlasTokenPrice === void 0 ? void 0 : atlasTokenPrice.price, {}));
36
- }
34
+ if (account.totalStake.isZero())
35
+ return;
36
+ const asset = (0, tokenPriceToAssetToken_1.default)(constants_1.atlasMint, account.totalStake.div(Math.pow(10, constants_1.atlasDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, atlasTokenPrice);
37
37
  if (!account.pendingRewards.isZero()) {
38
- assets.push((0, tokenPriceToAssetToken_1.default)(constants_1.atlasMint, account.totalStake.div(Math.pow(10, constants_1.atlasDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, atlasTokenPrice, atlasTokenPrice === null || atlasTokenPrice === void 0 ? void 0 : atlasTokenPrice.price, {
39
- isClaimable: true,
40
- }));
38
+ asset.attributes = { isClaimable: true };
41
39
  }
40
+ assets.push(asset);
42
41
  });
43
42
  if (assets.length === 0)
44
43
  return [];
package/src/plugins/staratlas/stakingFetcher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/staratlas/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAEpC,2CAA+E;AAE/E,iDAAsD;AACtD,qGAA6E;AAC7E,+CAA8D;AAC9D,uCAA0C;AAE1C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,UAAU,EACV,uBAAa,EACb,sBAAU,EACV;QACE,EAAE,QAAQ,EAAE,uBAAa,CAAC,QAAQ,EAAE;QACpC;YACE,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE;SACpC;KACF,CACF,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,aAAa,CAC/C,qBAAS,EACT,0BAAS,CAAC,MAAM,CACjB,CAAC;IACF,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EACpB,qBAAS,EACT,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE,EACtD,0BAAS,CAAC,MAAM,EAChB,eAAe,EACf,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,EACtB,EAAE,CACH,CACF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EACpB,qBAAS,EACT,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE,EACtD,0BAAS,CAAC,MAAM,EAChB,eAAe,EACf,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,EACtB;gBACE,WAAW,EAAE,IAAI;aAClB,CACF,CACF,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,QAAQ;YACf,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE;gBACJ,MAAM;aACP;YACD,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAClD;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"}
1
+ {"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/staratlas/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAEpC,2CAA+E;AAE/E,iDAAsD;AACtD,qGAA6E;AAC7E,+CAA8D;AAC9D,uCAA0C;AAE1C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,UAAU,EACV,uBAAa,EACb,sBAAU,EACV;QACE,EAAE,QAAQ,EAAE,uBAAa,CAAC,QAAQ,EAAE;QACpC;YACE,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE;SACpC;KACF,CACF,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,aAAa,CAC/C,qBAAS,EACT,0BAAS,CAAC,MAAM,CACjB,CAAC;IACF,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;YAAE,OAAO;QAExC,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,qBAAS,EACT,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE,EACtD,0BAAS,CAAC,MAAM,EAChB,eAAe,CAChB,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,KAAK,CAAC,UAAU,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QAC3C,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,QAAQ;YACf,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE;gBACJ,MAAM;aACP;YACD,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAClD;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"}