add identifier for Orca positions

sonarwatch · Nov 7, 2024 · ad393b7 · ad393b7
1 parent b9f0cd3
commit ad393b7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/packages/plugins/src/plugins/orca/constants.ts b/packages/plugins/src/plugins/orca/constants.ts
@@ -25,7 +25,7 @@ export const aquafarmsProgram = new PublicKey(
   '82yxjeMsvaURa4MbZZ7WZZHfobirZYkH1zF8fmeGtyaQ'
 );
 
-export const positionsIdentifier = 'Orca Whirlpool Position';
+export const positionsIdentifiers = ['Orca Whirlpool Position', 'OWP'];
 export const whirlpoolPrefix = `${platformId}-whirlpool`;
 export const whirlpoolProgram = new PublicKey(
   'whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc'

diff --git a/packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts b/packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts
@@ -126,7 +126,6 @@ export function getOrcaNftFetcher(
         positionInfo.tickUpperIndex,
         false
       );
-
       const rewardAssets: PortfolioAsset[] = [];
 
       const tokenPriceA = tokenPrices.get(whirlpoolInfo.tokenMintA.toString());
@@ -240,12 +239,7 @@ export function getOrcaNftFetcher(
         }
       }
 
-      if (
-        !assetTokenA ||
-        !assetTokenB ||
-        (assetTokenA.value === null && assetTokenB.value === null)
-      )
-        continue;
+      if (!assetTokenA || !assetTokenB) continue;
 
       const assets = [assetTokenA, assetTokenB];
 
@@ -258,6 +252,8 @@ export function getOrcaNftFetcher(
       );
       const totalValue = getUsdValueSum([assetsValue, rewardAssetsValue]);
 
+      if (totalValue === 0 || totalValue === null) continue;
+
       elements.push({
         type: PortfolioElementType.liquidity,
         networkId: NetworkId.solana,

diff --git a/packages/plugins/src/plugins/orca/helpers.ts b/packages/plugins/src/plugins/orca/helpers.ts
@@ -4,10 +4,12 @@ import BN from 'bn.js';
 import Decimal from 'decimal.js';
 
 import { PortfolioAssetCollectible } from '@sonarwatch/portfolio-core';
-import { positionsIdentifier } from './constants';
+import { positionsIdentifiers } from './constants';
 
 export function isAnOrcaPosition(nft: PortfolioAssetCollectible): boolean {
-  return nft.name === positionsIdentifier;
+  return positionsIdentifiers.some((identifier) =>
+    nft.name?.includes(identifier)
+  );
 }
 
 export function signedShiftRight(n0: BN, shiftBy: number, bitWidth: number) {