@sonarwatch/portfolio-plugins 0.8.100 → 0.8.102

package/CHANGELOG.md

@@ -2,26 +2,34 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
-## [0.8.100](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.99...plugins-0.8.100) (2023-11-24)
-
-
-
-## [0.8.99](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.98...plugins-0.8.99) (2023-11-23)
-
-
-
-## [0.8.98](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.97...plugins-0.8.98) (2023-11-22)
-
-
-
-## [0.8.97](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.96...plugins-0.8.97) (2023-11-22)
-
-
-
-## [0.8.96](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.95...plugins-0.8.96) (2023-11-22)
+## [0.8.102](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.101...plugins-0.8.102) (2023-11-25)
 
 
 
+## [0.8.101](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.100...plugins-0.8.101) (2023-11-24)
+
+
+
+## [0.8.100](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.99...plugins-0.8.100) (2023-11-24)
+
+
+
+## [0.8.99](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.98...plugins-0.8.99) (2023-11-23)
+
+
+
+## [0.8.98](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.97...plugins-0.8.98) (2023-11-22)
+
+
+
+## [0.8.97](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.96...plugins-0.8.97) (2023-11-22)
+
+
+
+## [0.8.96](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.95...plugins-0.8.96) (2023-11-22)
+
+
+
 ## [0.8.95](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.94...plugins-0.8.95) (2023-11-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.8.100",
+  "version": "0.8.102",
   "type": "commonjs",
   "generators": "./generators.json",
   "dependencies": {
@@ -40,7 +40,7 @@
     "web3-v1": "npm:web3@^1.5.0"
   },
   "peerDependencies": {
-    "@sonarwatch/portfolio-core": "0.8.100"
+    "@sonarwatch/portfolio-core": "0.8.102"
   },
   "main": "./src/index.js",
   "types": "./src/index.d.ts"

package/src/plugins/01/depostisFetcher.js

@@ -51,6 +51,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(mint, amount.toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
     }
     const elements = [];
+    if (suppliedAssets.length === 0)
+        return [];
     const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
     elements.push();
     return [

package/src/plugins/01/depostisFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"depostisFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/01/depostisFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,6CAA4C;AAG5C,2CAAgD;AAChD,uCAAmC;AACnC,kFAA+E;AAC/E,qCAAwC;AACxC,iDAAsD;AACtD,iDAA+D;AAC/D,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,GAAG,GAAG,IAAA,gBAAM,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,EAAE,qBAAY,EAAE,GAAG,CAAC,CAAC;IAEtE,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAA,kCAAwB,EAAC,UAAU,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAAE,SAAS;QAE/C,MAAM,IAAI,GAAG,iBAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,6CAA6C;YAAE,SAAS;QACrE,MAAM,MAAM,GACV,IAAI;YACJ,CAAC,6CAA6C;gBAC5C,6CAA6C,CAAC;YAC9C,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE1C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;QAErE,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,EACJ,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;KACH;IACD,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,EAAE,GAC5D,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACxE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChB,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"depostisFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/01/depostisFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,6CAA4C;AAG5C,2CAAgD;AAChD,uCAAmC;AACnC,kFAA+E;AAC/E,qCAAwC;AACxC,iDAAsD;AACtD,iDAA+D;AAC/D,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,GAAG,GAAG,IAAA,gBAAM,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,EAAE,qBAAY,EAAE,GAAG,CAAC,CAAC;IAEtE,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAA,kCAAwB,EAAC,UAAU,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAAE,SAAS;QAE/C,MAAM,IAAI,GAAG,iBAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,6CAA6C;YAAE,SAAS;QAErE,MAAM,MAAM,GACV,IAAI;YACJ,CAAC,6CAA6C;gBAC5C,6CAA6C,CAAC;YAC9C,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE1C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;QAErE,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,EACJ,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;KACH;IACD,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE3C,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,EAAE,GAC5D,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACxE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChB,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe;gBACf,YAAY;gBACZ,KAAK;aACN;SACF;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/atrix/poolsV1Job.js

@@ -68,18 +68,18 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             continue;
         const { supply, decimals } = supplyAndDecimals;
         const poolUnderlyings = [
-            {
-                address: pool.pcMint.toString(),
-                reserveAmountRaw: pcAccount.amount.plus(baseTokenTotal),
-                price: pcTokenPrice.price,
-                decimals: pcTokenPrice.decimals,
-            },
             {
                 address: pool.coinMint.toString(),
-                reserveAmountRaw: coinAccount.amount.plus(quoteTokenTotal),
+                reserveAmountRaw: coinAccount.amount.plus(baseTokenTotal),
                 price: coinTokenPrice.price,
                 decimals: coinTokenPrice.decimals,
             },
+            {
+                address: pool.pcMint.toString(),
+                reserveAmountRaw: pcAccount.amount.plus(quoteTokenTotal),
+                price: pcTokenPrice.price,
+                decimals: pcTokenPrice.decimals,
+            },
         ];
         const lpDetailsRaw = {
             address: pool.lpMint.toString(),

package/src/plugins/atrix/poolsV1Job.js.map

@@ -1 +1 @@
-{"version":3,"file":"poolsV1Job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/atrix/poolsV1Job.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"poolsV1Job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/atrix/poolsV1Job.ts"],"names":[],"mappings":"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"}

package/src/plugins/balancer/helpers/pools.js

@@ -36,27 +36,27 @@ exports.getBalancerPoolsV2 = void 0;
 const graphql_request_1 = __importStar(require("graphql-request"));
 function getBalancerPoolsV2(url) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    query pools {
-      pools(
-        first: 1000
-        orderBy: totalLiquidity
-        orderDirection: desc
-        where: { totalLiquidity_gt: "500" }
-      ) {
-        id
-        address
-        symbol
-        totalLiquidity
-        totalShares
-        tokens {
-          balance
-          decimals
-          symbol
-          address
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    query pools {
+      pools(
+        first: 1000
+        orderBy: totalLiquidity
+        orderDirection: desc
+        where: { totalLiquidity_gt: "500" }
+      ) {
+        id
+        address
+        symbol
+        totalLiquidity
+        totalShares
+        tokens {
+          balance
+          decimals
+          symbol
+          address
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/goosefx/constants.d.ts

@@ -3,3 +3,5 @@ import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "goosefx";
 export declare const platform: Platform;
 export declare const programId: PublicKey;
+export declare const stakerProgramId: PublicKey;
+export declare const gofxMint = "GFX1ZjR2P15tmrSwow6FjyDYcEkoFb4p4gJCpLBjaxHD";

package/src/plugins/goosefx/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.programId = exports.platform = exports.platformId = void 0;
+exports.gofxMint = exports.stakerProgramId = exports.programId = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'goosefx';
 exports.platform = {
@@ -12,4 +12,6 @@ exports.platform = {
     // twitter: 'https://twitter.com/myplatform',
 };
 exports.programId = new web3_js_1.PublicKey('GFXsSL5sSaDfNFQUYsHekbWBW1TsFdjDYzACh62tEHxn');
+exports.stakerProgramId = new web3_js_1.PublicKey('STKRWxT4irmTthSJydggspWmkc3ovYHx62DHLPVv1f1');
+exports.gofxMint = 'GFX1ZjR2P15tmrSwow6FjyDYcEkoFb4p4gJCpLBjaxHD';
 //# sourceMappingURL=constants.js.map

package/src/plugins/goosefx/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,SAAS;IACtB,OAAO,EAAE,6BAA6B;IACtC,6CAA6C;CAC9C,CAAC;AAEW,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,SAAS;IACtB,OAAO,EAAE,6BAA6B;IACtC,6CAA6C;CAC9C,CAAC;AAEW,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,6CAA6C,CAC9C,CAAC;AAEW,QAAA,QAAQ,GAAG,8CAA8C,CAAC"}

package/src/plugins/goosefx/filters.d.ts

@@ -1,2 +1,3 @@
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const liquidityAccountFilter: (owner: string) => GetProgramAccountsFilter[];
+export declare const stakingAccountFilter: (owner: string) => GetProgramAccountsFilter[];

package/src/plugins/goosefx/filters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.liquidityAccountFilter = void 0;
+exports.stakingAccountFilter = exports.liquidityAccountFilter = void 0;
 const structs_1 = require("./structs");
 const liquidityAccountFilter = (owner) => [
     {
@@ -12,4 +12,14 @@ const liquidityAccountFilter = (owner) => [
     { dataSize: structs_1.liquidityStruct.byteSize },
 ];
 exports.liquidityAccountFilter = liquidityAccountFilter;
+const stakingAccountFilter = (owner) => [
+    {
+        memcmp: {
+            offset: 8,
+            bytes: owner,
+        },
+    },
+    { dataSize: structs_1.userMetadataStruct.byteSize },
+];
+exports.stakingAccountFilter = stakingAccountFilter;
 //# sourceMappingURL=filters.js.map

package/src/plugins/goosefx/filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/filters.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAErC,MAAM,sBAAsB,GAAG,CACpC,KAAa,EACe,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;IACD,EAAE,QAAQ,EAAE,yBAAe,CAAC,QAAQ,EAAE;CACvC,CAAC;AAVW,QAAA,sBAAsB,0BAUjC"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/filters.ts"],"names":[],"mappings":";;;AACA,uCAAgE;AAEzD,MAAM,sBAAsB,GAAG,CACpC,KAAa,EACe,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;IACD,EAAE,QAAQ,EAAE,yBAAe,CAAC,QAAQ,EAAE;CACvC,CAAC;AAVW,QAAA,sBAAsB,0BAUjC;AAEK,MAAM,oBAAoB,GAAG,CAClC,KAAa,EACe,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,KAAK;SACb;KACF;IACD,EAAE,QAAQ,EAAE,4BAAkB,CAAC,QAAQ,EAAE;CAC1C,CAAC;AAVW,QAAA,oBAAoB,wBAU/B"}

package/src/plugins/goosefx/index.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchers = exports.jobs = exports.platforms = void 0;
 const constants_1 = require("./constants");
 const poolsFetcher_1 = __importDefault(require("./poolsFetcher"));
+const stakingFetcher_1 = __importDefault(require("./stakingFetcher"));
 exports.platforms = [constants_1.platform];
 exports.jobs = [];
-exports.fetchers = [poolsFetcher_1.default];
+exports.fetchers = [poolsFetcher_1.default, stakingFetcher_1.default];
 //# sourceMappingURL=index.js.map

package/src/plugins/goosefx/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,kEAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,sBAAgB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,kEAA8C;AAC9C,sEAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,sBAAgB,EAAE,wBAAc,CAAC,CAAC"}

package/src/plugins/goosefx/stakingFetcher.d.ts

@@ -0,0 +1,3 @@
+import { Fetcher } from '../../Fetcher';
+declare const fetcher: Fetcher;
+export default fetcher;

package/src/plugins/goosefx/stakingFetcher.js

@@ -0,0 +1,63 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const constants_1 = require("./constants");
+const clients_1 = require("../../utils/clients");
+const solana_1 = require("../../utils/solana");
+const structs_1 = require("./structs");
+const filters_1 = require("./filters");
+const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
+const sevenDays = 7 * 1000 * 60 * 60 * 24;
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const accounts = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.userMetadataStruct, constants_1.stakerProgramId, (0, filters_1.stakingAccountFilter)(owner));
+    const gofxTokenPrice = yield cache.getTokenPrice(constants_1.gofxMint, portfolio_core_1.NetworkId.solana);
+    if (!gofxTokenPrice)
+        return [];
+    const assets = [];
+    for (const account of accounts) {
+        let totalAmount = account.totalStaked;
+        for (const ticket of account.unstakingTickets) {
+            const unlockStartedAt = new Date(ticket.createdAt.times(1000).toNumber());
+            const unlockingAt = new Date(unlockStartedAt.getTime() + sevenDays);
+            if (Date.now() < unlockingAt.getTime())
+                totalAmount = totalAmount.plus(ticket.totalUnstaked);
+        }
+        if (totalAmount.isZero())
+            continue;
+        const { decimals } = gofxTokenPrice;
+        const amount = totalAmount.dividedBy(Math.pow(10, decimals)).toNumber();
+        assets.push((0, tokenPriceToAssetToken_1.default)(constants_1.gofxMint, amount, portfolio_core_1.NetworkId.solana, gofxTokenPrice));
+    }
+    if (assets.length === 0)
+        return [];
+    return [
+        {
+            type: portfolio_core_1.PortfolioElementType.multiple,
+            label: 'Staked',
+            networkId: portfolio_core_1.NetworkId.solana,
+            platformId: constants_1.platformId,
+            data: { assets },
+            value: (0, portfolio_core_1.getUsdValueSum)(assets.map((asset) => asset.value)),
+        },
+    ];
+});
+const fetcher = {
+    id: `${constants_1.platformId}-staking`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=stakingFetcher.js.map

package/src/plugins/goosefx/stakingFetcher.js.map

@@ -0,0 +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,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC7E,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC7C,MAAM,eAAe,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1E,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAC;YACpE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE;gBACpC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;SACxD;QACD,IAAI,WAAW,CAAC,MAAM,EAAE;YAAE,SAAS;QAEnC,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QACpC,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEhE,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EAAC,oBAAQ,EAAE,MAAM,EAAE,0BAAS,CAAC,MAAM,EAAE,cAAc,CAAC,CAC3E,CAAC;KACH;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"}

package/src/plugins/goosefx/structs.d.ts

@@ -15,3 +15,19 @@ export type Liquidity = {
     space: number[];
 };
 export declare const liquidityStruct: BeetStruct<Liquidity, Partial<Liquidity>>;
+export type UnstakingTicket = {
+    totalUnstaked: BigNumber;
+    createdAt: BigNumber;
+};
+export declare const unstakingTicketStruct: BeetStruct<UnstakingTicket, Partial<UnstakingTicket>>;
+export type UserMetadata = {
+    buffer: Buffer;
+    owner: PublicKey;
+    accountOpenedAt: BigNumber;
+    totalStaked: BigNumber;
+    lastObservedTap: BigNumber;
+    lastClaimed: BigNumber;
+    totalEarned: BigNumber;
+    unstakingTickets: UnstakingTicket[];
+};
+export declare const userMetadataStruct: BeetStruct<UserMetadata, Partial<UserMetadata>>;

package/src/plugins/goosefx/structs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.liquidityStruct = void 0;
+exports.userMetadataStruct = exports.unstakingTicketStruct = exports.liquidityStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
@@ -16,4 +16,18 @@ exports.liquidityStruct = new beet_1.BeetStruct([
     ['createdAt', solana_1.i64],
     ['space', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 128)],
 ], (args) => args);
+exports.unstakingTicketStruct = new beet_1.BeetStruct([
+    ['totalUnstaked', solana_1.u64],
+    ['createdAt', solana_1.i64],
+], (args) => args);
+exports.userMetadataStruct = new beet_1.BeetStruct([
+    ['buffer', (0, solana_1.blob)(8)],
+    ['owner', beet_solana_1.publicKey],
+    ['accountOpenedAt', solana_1.i64],
+    ['totalStaked', solana_1.u64],
+    ['lastObservedTap', solana_1.u64],
+    ['lastClaimed', solana_1.i64],
+    ['totalEarned', solana_1.u64],
+    ['unstakingTickets', (0, beet_1.uniformFixedSizeArray)(exports.unstakingTicketStruct, 64)],
+], (args) => args);
 //# sourceMappingURL=structs.js.map

package/src/plugins/goosefx/structs.js.map

@@ -1 +1 @@
-{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/structs.ts"],"names":[],"mappings":";;;AAAA,oDAImC;AACnC,kEAA6D;AAG7D,+CAAoD;AAevC,QAAA,eAAe,GAAG,IAAI,iBAAU,CAC3C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,OAAO,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,GAAG,CAAC,CAAC;CAC1C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAiB,CAC5B,CAAC"}
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/structs.ts"],"names":[],"mappings":";;;AAAA,oDAImC;AACnC,kEAA6D;AAG7D,+CAAoD;AAevC,QAAA,eAAe,GAAG,IAAI,iBAAU,CAC3C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,OAAO,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,GAAG,CAAC,CAAC;CAC1C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAiB,CAC5B,CAAC;AAOW,QAAA,qBAAqB,GAAG,IAAI,iBAAU,CACjD;IACE,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,WAAW,EAAE,YAAG,CAAC;CACnB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAuB,CAClC,CAAC;AAaW,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,kBAAkB,EAAE,IAAA,4BAAqB,EAAC,6BAAqB,EAAE,EAAE,CAAC,CAAC;CACvE,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC"}

package/src/plugins/sushiswap/helpers.js

@@ -54,30 +54,30 @@ function sushiV3PairToUniV2(pair) {
 }
 function getV3PairsAddresses(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pools(
-        orderBy: totalValueLockedUSD
-        first: ${length}
-        orderDirection: desc
-        where: { volumeUSD_not: "0", liquidity_not: "0"  }
-      ) {
-        id
-        token0Price
-        token1Price
-        liquidity
-        token0 {
-          id
-          totalSupply
-          decimals
-        }
-        token1 {
-          id
-          totalSupply
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pools(
+        orderBy: totalValueLockedUSD
+        first: ${length}
+        orderDirection: desc
+        where: { volumeUSD_not: "0", liquidity_not: "0"  }
+      ) {
+        id
+        token0Price
+        token1Price
+        liquidity
+        token0 {
+          id
+          totalSupply
+          decimals
+        }
+        token1 {
+          id
+          totalSupply
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/tokens/fetchers/solana-cnfts.js

@@ -10,16 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const getAssetsByOwner_1 = require("../../../utils/solana/getAssetsByOwner");
+const getAssetsByOwnerDas_1 = require("../../../utils/solana/getAssetsByOwnerDas");
 const constants_1 = require("../constants");
 const constants_2 = require("../../../utils/clients/constants");
 const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const rpcEndpoint = (0, constants_2.getRpcEndpoint)(portfolio_core_1.NetworkId.solana);
-    const list = yield (0, getAssetsByOwner_1.getAssetsByOwner)(rpcEndpoint, owner);
-    const cNftsItems = list.items.filter((i) => i.compression.compressed);
-    const assets = cNftsItems.map((i) => {
+    const list = yield (0, getAssetsByOwnerDas_1.getAssetsByOwnerDas)(rpcEndpoint, owner);
+    const assets = [];
+    const items = list.items.filter((i) => {
+        const isCompressed = i.compression.compressed;
+        const isSplNft = i.spl20 === null && i.inscription !== null;
+        return isCompressed || isSplNft;
+    });
+    items.forEach((i) => {
         var _a;
-        return ({
+        assets.push({
             networkId: portfolio_core_1.NetworkId.solana,
             type: portfolio_core_1.PortfolioAssetType.collectible,
             value: null,

package/src/plugins/tokens/fetchers/solana-cnfts.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-cnfts.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-cnfts.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAMoC;AAEpC,6EAA0E;AAC1E,4CAAwE;AACxE,gEAAkE;AAElE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,EAAE;IACxD,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,0BAAS,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,IAAA,mCAAgB,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAExD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACtE,MAAM,MAAM,GAAgC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;QAAC,OAAA,CAAC;YACjE,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,IAAI,EAAE,mCAAkB,CAAC,WAAW;YACpC,KAAK,EAAE,IAAI;YACX,IAAI,EAAE;gBACJ,OAAO,EAAE,CAAC,CAAC,EAAE;gBACb,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAC7B,QAAQ,EAAE,MAAA,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WACnC,OAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA,EAAA,CAChD,0CAAE,GAAG;gBACN,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ;aAC5B;SACF,CAAC,CAAA;KAAA,CAAC,CAAC;IACJ,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,OAAO,GAA6B;QACxC,IAAI,EAAE,qCAAoB,CAAC,QAAQ;QACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,UAAU,EAAE,8BAAkB,CAAC,EAAE;QACjC,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,IAAI;QACX,IAAI,EAAE;YACJ,MAAM;SACP;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,gCAAoB,CAAC,EAAE,eAAe;IAC7C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"solana-cnfts.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-cnfts.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAMoC;AAEpC,mFAAgF;AAChF,4CAAwE;AACxE,gEAAkE;AAElE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,EAAE;IACxD,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,0BAAS,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,IAAA,yCAAmB,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAgC,EAAE,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC;QAC9C,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,WAAW,KAAK,IAAI,CAAC;QAC5D,OAAO,YAAY,IAAI,QAAQ,CAAC;IAClC,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;QAClB,MAAM,CAAC,IAAI,CAAC;YACV,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,IAAI,EAAE,mCAAkB,CAAC,WAAW;YACpC,KAAK,EAAE,IAAI;YACX,IAAI,EAAE;gBACJ,OAAO,EAAE,CAAC,CAAC,EAAE;gBACb,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAC7B,QAAQ,EAAE,MAAA,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WACnC,OAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA,EAAA,CAChD,0CAAE,GAAG;gBACN,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ;aAC5B;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,OAAO,GAA6B;QACxC,IAAI,EAAE,qCAAoB,CAAC,QAAQ;QACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,UAAU,EAAE,8BAAkB,CAAC,EAAE;QACjC,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,IAAI;QACX,IAAI,EAAE;YACJ,MAAM;SACP;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,gCAAoB,CAAC,EAAE,eAAe;IAC7C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/uniswap-v2/helpers.js

@@ -40,28 +40,28 @@ function getPairKey(version) {
 exports.getPairKey = getPairKey;
 function getPairsV2FromTheGraph(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pairs(
-        orderBy: reserveUSD
-        first: ${length}
-        orderDirection: desc
-        where: { trackedReserveETH_not: "0" }
-      ) {
-        id
-        reserve0
-        reserve1
-        totalSupply
-        token0 {
-          id
-          decimals
-        }
-        token1 {
-          id
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pairs(
+        orderBy: reserveUSD
+        first: ${length}
+        orderDirection: desc
+        where: { trackedReserveETH_not: "0" }
+      ) {
+        id
+        reserve0
+        reserve1
+        totalSupply
+        token0 {
+          id
+          decimals
+        }
+        token1 {
+          id
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pairs = res.pairs;

package/src/utils/solana/{getAssetsByOwner.d.ts → getAssetsByOwnerDas.d.ts}

@@ -1,5 +1,5 @@
 import { RpcEndpoint } from '@sonarwatch/portfolio-core';
-export declare function getAssetsByOwner(rpcEndpoint: RpcEndpoint, owner: string): Promise<HeliusAssetList>;
+export declare function getAssetsByOwnerDas(rpcEndpoint: RpcEndpoint, owner: string): Promise<HeliusAssetList>;
 export type GetAssetsByOwnerOutput = {
     jsonrpc: string;
     result: HeliusAssetList;
@@ -24,6 +24,24 @@ export type HeliusAsset = {
     supply: Supply | null;
     mutable: boolean;
     burnt: boolean;
+    inscription: Inscription | null;
+    spl20: Spl20 | null;
+};
+export type Inscription = {
+    order: number;
+    size: number;
+    contentType: string;
+    encoding: string;
+    validationHash: string;
+    inscriptionDataAccount: string;
+};
+export type Spl20 = {
+    p: string;
+    op: string;
+    tick: string;
+    max?: string;
+    lim?: string;
+    amt?: string;
 };
 export type Authority = {
     address: string;

package/src/utils/solana/{getAssetsByOwner.js → getAssetsByOwnerDas.js}

@@ -12,10 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAssetsByOwner = void 0;
+exports.getAssetsByOwnerDas = void 0;
 const axios_1 = __importDefault(require("axios"));
 const getBasicAuthHeaders_1 = require("../misc/getBasicAuthHeaders");
-function getAssetsByOwner(rpcEndpoint, owner) {
+function getAssetsByOwnerDas(rpcEndpoint, owner) {
     return __awaiter(this, void 0, void 0, function* () {
         const httpHeaders = rpcEndpoint.basicAuth
             ? (0, getBasicAuthHeaders_1.getBasicAuthHeaders)(rpcEndpoint.basicAuth.username, rpcEndpoint.basicAuth.password)
@@ -33,6 +33,11 @@ function getAssetsByOwner(rpcEndpoint, owner) {
                     sortBy: 'created',
                     sortDirection: 'asc',
                 },
+                displayOptions: {
+                    showFungible: false,
+                    showNativeBalance: false,
+                    showInscription: true,
+                },
             },
         }, {
             headers: Object.assign({ 'Content-Type': 'application/json' }, httpHeaders),
@@ -40,5 +45,5 @@ function getAssetsByOwner(rpcEndpoint, owner) {
             .then((res) => res.data.result);
     });
 }
-exports.getAssetsByOwner = getAssetsByOwner;
-//# sourceMappingURL=getAssetsByOwner.js.map
+exports.getAssetsByOwnerDas = getAssetsByOwnerDas;
+//# sourceMappingURL=getAssetsByOwnerDas.js.map

package/src/utils/solana/getAssetsByOwnerDas.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAssetsByOwnerDas.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/getAssetsByOwnerDas.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAA6C;AAC7C,qEAAkE;AAElE,SAAsB,mBAAmB,CACvC,WAAwB,EACxB,KAAa;;QAEb,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS;YACvC,CAAC,CAAC,IAAA,yCAAmB,EACjB,WAAW,CAAC,SAAS,CAAC,QAAQ,EAC9B,WAAW,CAAC,SAAS,CAAC,QAAQ,CAC/B;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO,eAAK;aACT,IAAI,CACH,WAAW,CAAC,GAAG,EACf;YACE,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE;gBACN,YAAY,EAAE,KAAK;gBACnB,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE;oBACN,MAAM,EAAE,SAAS;oBACjB,aAAa,EAAE,KAAK;iBACrB;gBACD,cAAc,EAAE;oBACd,YAAY,EAAE,KAAK;oBACnB,iBAAiB,EAAE,KAAK;oBACxB,eAAe,EAAE,IAAI;iBACtB;aACF;SACF,EACD;YACE,OAAO,kBACL,cAAc,EAAE,kBAAkB,IAC/B,WAAW,CACf;SACF,CACF;aACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CAAA;AAzCD,kDAyCC"}

package/src/utils/solana/getAssetsByOwner.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getAssetsByOwner.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/getAssetsByOwner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAA6C;AAC7C,qEAAkE;AAElE,SAAsB,gBAAgB,CACpC,WAAwB,EACxB,KAAa;;QAEb,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS;YACvC,CAAC,CAAC,IAAA,yCAAmB,EACjB,WAAW,CAAC,SAAS,CAAC,QAAQ,EAC9B,WAAW,CAAC,SAAS,CAAC,QAAQ,CAC/B;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO,eAAK;aACT,IAAI,CACH,WAAW,CAAC,GAAG,EACf;YACE,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE;gBACN,YAAY,EAAE,KAAK;gBACnB,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE;oBACN,MAAM,EAAE,SAAS;oBACjB,aAAa,EAAE,KAAK;iBACrB;aACF;SACF,EACD;YACE,OAAO,kBACL,cAAc,EAAE,kBAAkB,IAC/B,WAAW,CACf;SACF,CACF;aACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CAAA;AApCD,4CAoCC"}