@sonarwatch/portfolio-plugins 0.14.151 → 0.14.153

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.14.153](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.152...plugins-0.14.153) (2025-03-25)
+
+
+
+## [0.14.152](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.151...plugins-0.14.152) (2025-03-24)
+
+
+
 ## [0.14.151](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.150...plugins-0.14.151) (2025-03-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.14.151",
+  "version": "0.14.153",
   "type": "commonjs",
   "types": "./src/index.d.ts",
   "peerDependencies": {

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

@@ -1,13 +1,7 @@
-/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
-/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
-import { PublicKey } from '@solana/web3.js';
-import { IdlItem } from '@solanafm/explorer-kit-idls';
 export declare const platformId = "allbridge";
 export declare const platform: Platform;
 export declare const apiPoolInfoUrl = "https://core.api.allbridgecoreapi.net/token-info";
 export declare const poolsCacheKey = "allbridge-pools";
 export declare const cachePrefix = "allbridge";
-export declare const allbridgeProgram: PublicKey;
 export declare const SYSTEM_PRECISION = 3;
-export declare const allbridgeIdlItem: IdlItem;

package/src/plugins/allbridge/constants.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allbridgeIdlItem = exports.SYSTEM_PRECISION = exports.allbridgeProgram = exports.cachePrefix = exports.poolsCacheKey = exports.apiPoolInfoUrl = exports.platform = exports.platformId = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const idl_1 = require("./idl");
+exports.SYSTEM_PRECISION = exports.cachePrefix = exports.poolsCacheKey = exports.apiPoolInfoUrl = exports.platform = exports.platformId = void 0;
 exports.platformId = 'allbridge';
 exports.platform = {
     id: exports.platformId,
@@ -21,11 +19,5 @@ exports.platform = {
 exports.apiPoolInfoUrl = `https://core.api.allbridgecoreapi.net/token-info`;
 exports.poolsCacheKey = `${exports.platformId}-pools`;
 exports.cachePrefix = `${exports.platformId}`;
-exports.allbridgeProgram = new web3_js_1.PublicKey('BrdgN2RPzEMWF96ZbnnJaUtQDQx7VRXYaHHbYCBvceWB');
 exports.SYSTEM_PRECISION = 3;
-exports.allbridgeIdlItem = {
-    programId: exports.allbridgeProgram.toString(),
-    idl: idl_1.AllbridgeIDL,
-    idlType: 'anchor',
-};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/allbridge/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAE5C,+BAAqC;AAExB,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EACH,+EAA+E;IACjF,OAAO,EAAE,iCAAiC;IAC1C,OAAO,EAAE,kCAAkC;IAC3C,WAAW,EAAE,gBAAgB,EAAE,sCAAsC;IACrE,OAAO,EAAE,uCAAuC;IAChD,WAAW,EACT,wGAAwG;IAC1G,aAAa,EAAE,iCAAiC;IAChD,MAAM,EAAE,iCAAiC;IACzC,MAAM,EAAE,+BAA+B;IACvC,QAAQ,EAAE,iCAAiC;CAC5C,CAAC;AAEW,QAAA,cAAc,GAAG,kDAAkD,CAAC;AAEpE,QAAA,aAAa,GAAG,GAAG,kBAAU,QAAQ,CAAC;AACtC,QAAA,WAAW,GAAG,GAAG,kBAAU,EAAE,CAAC;AAE9B,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAErB,QAAA,gBAAgB,GAAG;IAC9B,SAAS,EAAE,wBAAgB,CAAC,QAAQ,EAAE;IACtC,GAAG,EAAE,kBAAY;IACjB,OAAO,EAAE,QAAQ;CACP,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/allbridge/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EACH,+EAA+E;IACjF,OAAO,EAAE,iCAAiC;IAC1C,OAAO,EAAE,kCAAkC;IAC3C,WAAW,EAAE,gBAAgB,EAAE,sCAAsC;IACrE,OAAO,EAAE,uCAAuC;IAChD,WAAW,EACT,wGAAwG;IAC1G,aAAa,EAAE,iCAAiC;IAChD,MAAM,EAAE,iCAAiC;IACzC,MAAM,EAAE,+BAA+B;IACvC,QAAQ,EAAE,iCAAiC;CAC5C,CAAC;AAEW,QAAA,cAAc,GAAG,kDAAkD,CAAC;AAEpE,QAAA,aAAa,GAAG,GAAG,kBAAU,QAAQ,CAAC;AACtC,QAAA,WAAW,GAAG,GAAG,kBAAU,EAAE,CAAC;AAE9B,QAAA,gBAAgB,GAAG,CAAC,CAAC"}

package/src/plugins/allbridge/helpers.d.ts

@@ -3,5 +3,5 @@
 import BigNumber from 'bignumber.js';
 import { PublicKey } from '@solana/web3.js';
 import { Pools } from './types';
-export declare const getEarned: (userLpAmount: string, userRewardDebt: string, accRewardPerShareP: string, p: number) => BigNumber;
+export declare const getEarned: (userLpAmountBN: BigNumber, userRewardDebtBN: BigNumber, accRewardPerShareP: string, p: number) => BigNumber;
 export declare const getUserDepositPublicKeys: (poolInfo: Pools, owner: string) => PublicKey[];

package/src/plugins/allbridge/helpers.js

@@ -6,10 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserDepositPublicKeys = exports.getEarned = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const web3_js_1 = require("@solana/web3.js");
-const getEarned = (userLpAmount, userRewardDebt, accRewardPerShareP, p) => {
-    const userLpAmountBN = new bignumber_js_1.default(userLpAmount);
+const getEarned = (userLpAmountBN, userRewardDebtBN, accRewardPerShareP, p) => {
     const accRewardPerSharePBN = new bignumber_js_1.default(accRewardPerShareP);
-    const userRewardDebtBN = new bignumber_js_1.default(userRewardDebt);
     const rewards = userLpAmountBN
         .multipliedBy(accRewardPerSharePBN)
         .dividedBy(Math.pow(10, p));

package/src/plugins/allbridge/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/allbridge/helpers.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,6CAA4C;AAGrC,MAAM,SAAS,GAAG,CACvB,YAAoB,EACpB,cAAsB,EACtB,kBAA0B,EAC1B,CAAS,EACE,EAAE;IACb,MAAM,cAAc,GAAG,IAAI,sBAAS,CAAC,YAAY,CAAC,CAAC;IACnD,MAAM,oBAAoB,GAAG,IAAI,sBAAS,CAAC,kBAAkB,CAAC,CAAC;IAC/D,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,cAAc;SAC3B,YAAY,CAAC,oBAAoB,CAAC;SAClC,SAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC;IAEtB,OAAO,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;AACzC,CAAC,CAAC;AAdW,QAAA,SAAS,aAcpB;AAEK,MAAM,wBAAwB,GAAG,CAAC,QAAe,EAAE,KAAa,EAAE,EAAE,CACzE,QAAQ,CAAC,MAAM,CAAC,GAAG,CACjB,CAAC,EAAE,EAAE,EAAE,CACL,mBAAS,CAAC,sBAAsB,CAC9B;IACE,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC;IACpC,IAAI,mBAAS,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE;IACzC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;CAChC,EACD,IAAI,mBAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CACpC,CAAC,CAAC,CAAC,CACP,CAAC;AAXS,QAAA,wBAAwB,4BAWjC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/allbridge/helpers.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,6CAA4C;AAGrC,MAAM,SAAS,GAAG,CACvB,cAAyB,EACzB,gBAA2B,EAC3B,kBAA0B,EAC1B,CAAS,EACE,EAAE;IACb,MAAM,oBAAoB,GAAG,IAAI,sBAAS,CAAC,kBAAkB,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,cAAc;SAC3B,YAAY,CAAC,oBAAoB,CAAC;SAClC,SAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC;IAEtB,OAAO,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;AACzC,CAAC,CAAC;AAZW,QAAA,SAAS,aAYpB;AAEK,MAAM,wBAAwB,GAAG,CAAC,QAAe,EAAE,KAAa,EAAE,EAAE,CACzE,QAAQ,CAAC,MAAM,CAAC,GAAG,CACjB,CAAC,EAAE,EAAE,EAAE,CACL,mBAAS,CAAC,sBAAsB,CAC9B;IACE,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC;IACpC,IAAI,mBAAS,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE;IACzC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;CAChC,EACD,IAAI,mBAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CACpC,CAAC,CAAC,CAAC,CACP,CAAC;AAXS,QAAA,wBAAwB,4BAWjC"}

package/src/plugins/allbridge/positionsFetcher.js

@@ -20,6 +20,7 @@ const solana_1 = require("../../utils/solana");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const helpers_1 = require("./helpers");
 const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
+const structs_1 = require("./structs");
 const poolInfoMemo = new MemoizedCache_1.MemoizedCache(constants_1.poolsCacheKey, {
     prefix: constants_1.cachePrefix,
     networkId: portfolio_core_1.NetworkId.solana,
@@ -30,7 +31,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     if (!poolInfo)
         throw new Error('Pool info not cached');
     const userDepositPublicKeys = (0, helpers_1.getUserDepositPublicKeys)(poolInfo, owner);
-    const userDeposits = (yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.allbridgeIdlItem, userDepositPublicKeys)).filter((userDeposit) => userDeposit !== null && (userDeposit === null || userDeposit === void 0 ? void 0 : userDeposit.lpAmount) !== '0');
+    const userDeposits = (yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.userDepositStruct, userDepositPublicKeys)).filter((userDeposit) => userDeposit !== null && !(userDeposit === null || userDeposit === void 0 ? void 0 : userDeposit.lpAmount.isZero()));
     if (userDeposits.length === 0)
         return [];
     const tokenPrices = yield cache.getTokenPricesAsMap(poolInfo.tokens.map((pi) => pi.tokenAddress), portfolio_core_1.NetworkId.solana);

package/src/plugins/allbridge/positionsFetcher.js.map

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

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

@@ -0,0 +1,13 @@
+/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
+import { PublicKey } from '@solana/web3.js';
+import { FixableBeetStruct } from '@metaplex-foundation/beet';
+import BigNumber from 'bignumber.js';
+export type UserDeposit = {
+    accountDiscriminator: number[];
+    userAddress: PublicKey;
+    mint: PublicKey;
+    lpAmount: BigNumber;
+    rewardDebt: BigNumber;
+};
+export declare const userDepositStruct: FixableBeetStruct<UserDeposit, Partial<UserDeposit>>;

package/src/plugins/allbridge/structs.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.userDepositStruct = void 0;
+const beet_1 = require("@metaplex-foundation/beet");
+const beet_solana_1 = require("@metaplex-foundation/beet-solana");
+const solana_1 = require("../../utils/solana");
+exports.userDepositStruct = new beet_1.FixableBeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['userAddress', beet_solana_1.publicKey],
+    ['mint', beet_solana_1.publicKey],
+    ['lpAmount', solana_1.u64],
+    ['rewardDebt', solana_1.u64],
+], (args) => args);
+//# sourceMappingURL=structs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/allbridge/structs.ts"],"names":[],"mappings":";;;AACA,oDAImC;AACnC,kEAA6D;AAE7D,+CAAyC;AAU5B,QAAA,iBAAiB,GAAG,IAAI,wBAAiB,CACpD;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,aAAa,EAAE,uBAAS,CAAC;IAC1B,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,YAAY,EAAE,YAAG,CAAC;CACpB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,CAC9B,CAAC"}

package/src/plugins/allbridge/types.d.ts

@@ -1,9 +1,3 @@
-export type UserDeposit = {
-    userAddress: string;
-    mint: string;
-    lpAmount: string;
-    rewardDebt: string;
-};
 export type Pools = {
     bridgeAddress: string;
     swapAddress: string;

package/src/plugins/bonfida/constants.js

@@ -6,7 +6,7 @@ exports.platformId = 'bonfida';
 exports.fidaMint = 'EchesyfXePKdLtoiZSL8pBe8Myagyy8ZRqsACNCFGnvp';
 exports.platform = {
     id: exports.platformId,
-    name: 'Bonfida (SNS)',
+    name: 'SNS',
     image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/bonfida.webp',
     website: 'https://www.sns.id/',
     twitter: 'https://twitter.com/bonfida',

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,eAAe;IACrB,KAAK,EACH,6EAA6E;IAC/E,OAAO,EAAE,qBAAqB;IAC9B,OAAO,EAAE,6BAA6B;IACtC,WAAW,EAAE,qBAAqB,EAAE,sCAAsC;IAC1E,WAAW,EAAE,4BAA4B;IACzC,MAAM,EAAE,4BAA4B;IACpC,OAAO,EAAE,uDAAuD;IAChE,aAAa,EAAE,gCAAgC;IAC/C,QAAQ,EAAE,wBAAwB;IAClC,MAAM,EAAE,CAAC,gBAAQ,CAAC;CACnB,CAAC;AAEW,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,yFAAyF,CAAC;AAC/E,QAAA,YAAY,GAAG,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,KAAK;IACX,KAAK,EACH,6EAA6E;IAC/E,OAAO,EAAE,qBAAqB;IAC9B,OAAO,EAAE,6BAA6B;IACtC,WAAW,EAAE,qBAAqB,EAAE,sCAAsC;IAC1E,WAAW,EAAE,4BAA4B;IACzC,MAAM,EAAE,4BAA4B;IACpC,OAAO,EAAE,uDAAuD;IAChE,aAAa,EAAE,gCAAgC;IAC/C,QAAQ,EAAE,wBAAwB;IAClC,MAAM,EAAE,CAAC,gBAAQ,CAAC;CACnB,CAAC;AAEW,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,yFAAyF,CAAC;AAC/E,QAAA,YAAY,GAAG,CAAC,CAAC"}

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

@@ -1,11 +1,9 @@
 /// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
-import { IdlItem } from '@solanafm/explorer-kit-idls';
 import { PublicKey } from '@solana/web3.js';
 export declare const platformId = "divvy";
 export declare const dvyMint = "8fdi18UQNGg8mFEzjf79GUkzTg9YHSeojzCcarVxCX2y";
 export declare const platform: Platform;
 export declare const divvyProgram: PublicKey;
-export declare const divvyIdlItem: IdlItem;
 export declare const houseCacheKey = "houses";

package/src/plugins/divvy/constants.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.houseCacheKey = exports.divvyIdlItem = exports.divvyProgram = exports.platform = exports.dvyMint = exports.platformId = void 0;
+exports.houseCacheKey = exports.divvyProgram = exports.platform = exports.dvyMint = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const idl_1 = require("./idl");
 exports.platformId = 'divvy';
 exports.dvyMint = '8fdi18UQNGg8mFEzjf79GUkzTg9YHSeojzCcarVxCX2y';
 exports.platform = {
@@ -18,10 +17,5 @@ exports.platform = {
     description: 'Frictionless betting experience powered by Solana with no signups or deposits',
 };
 exports.divvyProgram = new web3_js_1.PublicKey('dvyFwAPniptQNb1ey4eM12L8iLHrzdiDsPPDndd6xAR');
-exports.divvyIdlItem = {
-    programId: exports.divvyProgram.toString(),
-    idl: idl_1.DivvyIdl,
-    idlType: 'anchor',
-};
 exports.houseCacheKey = 'houses';
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/constants.ts"],"names":[],"mappings":";;;AAEA,6CAA4C;AAC5C,+BAAiC;AAEpB,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,OAAO,GAAG,8CAA8C,CAAC;AACzD,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,OAAO;IACb,KAAK,EACH,2EAA2E;IAC7E,WAAW,EAAE,WAAW;IACxB,OAAO,EAAE,wBAAwB;IACjC,OAAO,EAAE,qCAAqC;IAC9C,aAAa,EACX,yEAAyE;IAC3E,OAAO,EAAE,8BAA8B;IACvC,MAAM,EAAE,CAAC,eAAO,CAAC;IACjB,WAAW,EACT,+EAA+E;CAClF,CAAC;AAEW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,SAAS,EAAE,oBAAY,CAAC,QAAQ,EAAE;IAClC,GAAG,EAAE,cAAQ;IACb,OAAO,EAAE,QAAQ;CACP,CAAC;AAEA,QAAA,aAAa,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,OAAO,GAAG,8CAA8C,CAAC;AACzD,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,OAAO;IACb,KAAK,EACH,2EAA2E;IAC7E,WAAW,EAAE,WAAW;IACxB,OAAO,EAAE,wBAAwB;IACjC,OAAO,EAAE,qCAAqC;IAC9C,aAAa,EACX,yEAAyE;IAC3E,OAAO,EAAE,8BAA8B;IACvC,MAAM,EAAE,CAAC,eAAO,CAAC;IACjB,WAAW,EACT,+EAA+E;CAClF,CAAC;AAEW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,aAAa,GAAG,QAAQ,CAAC"}

package/src/plugins/divvy/houseJob.js

@@ -15,12 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
-const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
+const structs_1 = require("./structs");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const houses = yield (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.divvyIdlItem, [{ memcmp: { offset: 0, bytes: '4cEdzVs6LUe' } }]);
-    const tokenPrices = yield cache.getTokenPricesAsMap(houses.map((h) => h.currency), portfolio_core_1.NetworkId.solana);
+    const houses = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.houseStruct, constants_1.divvyProgram)
+        .addFilter('accountDiscriminator', [21, 145, 94, 109, 254, 199, 210, 151])
+        .run();
+    const tokenPrices = yield cache.getTokenPricesAsMap(houses.map((h) => h.currency.toString()), portfolio_core_1.NetworkId.solana);
     const tokenPriceSources = [];
     houses.forEach((house) => {
         const tokenPrice = tokenPrices.get(house.currency.toString());

package/src/plugins/divvy/houseJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"houseJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/houseJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAyE;AACzE,gEAAqC;AAGrC,2CAAsE;AACtE,+CAAkE;AAClE,iDAAsD;AAGtD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,IAAA,qCAA4B,EAC/C,UAAU,EACV,wBAAY,EACZ,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,CAAC,CAClD,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAC7B,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IAEjD,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,KAAK,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,SAAS,CACpD,KAAK,CAAC,gBAAgB,CACvB,CAAC;QAEF,iBAAiB,CAAC,IAAI,CAAC;YACrB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YACnC,QAAQ,EAAE,KAAK,CAAC,gBAAgB;YAChC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;YAC/C,WAAW,EAAE;gBACX;oBACE,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE;oBAClC,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE;oBAC7B,QAAQ,EAAE,KAAK,CAAC,gBAAgB;oBAChC,SAAS,EAAE,UAAU,CAAC,SAAS;oBAC/B,KAAK,EAAE,UAAU,CAAC,KAAK;iBACxB;aACF;YACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM,EAAE,CAAC;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC;QAC7C,KAAK,CAAC,OAAO,CAAC,yBAAa,EAAE,MAAM,EAAE;YACnC,MAAM,EAAE,sBAAU;YAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC;KACH,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AAEF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"houseJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/houseJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAyE;AACzE,gEAAqC;AAGrC,2CAAsE;AACtE,iDAAsD;AACtD,uCAAwC;AACxC,kEAA+D;AAE/D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAW,EAAE,wBAAY,CAAC;SACxE,SAAS,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SACzE,GAAG,EAAE,CAAC;IAET,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EACxC,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IAEjD,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,KAAK,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,SAAS,CACpD,KAAK,CAAC,gBAAgB,CACvB,CAAC;QAEF,iBAAiB,CAAC,IAAI,CAAC;YACrB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YACnC,QAAQ,EAAE,KAAK,CAAC,gBAAgB;YAChC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;YAC/C,WAAW,EAAE;gBACX;oBACE,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE;oBAClC,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE;oBAC7B,QAAQ,EAAE,KAAK,CAAC,gBAAgB;oBAChC,SAAS,EAAE,UAAU,CAAC,SAAS;oBAC/B,KAAK,EAAE,UAAU,CAAC,KAAK;iBACxB;aACF;YACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM,EAAE,CAAC;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC;QAC7C,KAAK,CAAC,OAAO,CAAC,yBAAa,EAAE,MAAM,EAAE;YACnC,MAAM,EAAE,sBAAU;YAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC;KACH,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AAEF,kBAAe,GAAG,CAAC"}

package/src/plugins/divvy/housePoolFetcher.js

@@ -10,27 +10,25 @@ 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 web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
-const solana_1 = require("../../utils/solana");
 const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
 const arrayToMap_1 = require("../../utils/misc/arrayToMap");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const structs_1 = require("./structs");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
 const housesMemo = new MemoizedCache_1.MemoizedCache(constants_1.houseCacheKey, {
     prefix: constants_1.platformId,
     networkId: portfolio_core_1.NetworkId.solana,
 }, (arr) => (0, arrayToMap_1.arrayToMap)(arr || [], 'pubkey'));
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const accounts = yield (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.divvyIdlItem, [
-        { memcmp: { offset: 0, bytes: 'VZMoMoKgZQb' } },
-        {
-            memcmp: {
-                bytes: owner,
-                offset: 40,
-            },
-        },
-    ]);
+    const accounts = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.positionStruct, constants_1.divvyProgram)
+        .addFilter('accountDiscriminator', [170, 188, 143, 228, 122, 64, 247, 208])
+        .addFilter('user', new web3_js_1.PublicKey(owner))
+        .debug()
+        .run();
     if (accounts.length === 0)
         return [];
     const houses = yield housesMemo.getItem(cache);
@@ -43,7 +41,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         link: 'https://app.divvy.bet/housepool/?house=SOL',
     });
     accounts.forEach((account) => {
-        const house = houses.get(account.house);
+        const house = houses.get(account.house.toString());
         if (!house)
             return;
         element.addAsset({

package/src/plugins/divvy/housePoolFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"housePoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/housePoolFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAEvD,2CAAsE;AAEtE,iDAAsD;AAEtD,+CAAkE;AAClE,kEAA+D;AAC/D,4DAAyD;AACzD,gFAA6E;AAE7E,MAAM,UAAU,GAAG,IAAI,6BAAa,CAClC,yBAAa,EACb;IACE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,GAAG,IAAI,EAAE,EAAE,QAAQ,CAAC,CACzC,CAAC;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAA4B,EACjD,UAAU,EACV,wBAAY,EACZ;QACE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE;QAC/C;YACE,MAAM,EAAE;gBACN,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,EAAE;aACX;SACF;KACF,CACF,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAElD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,4CAA4C;KACnD,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,KAAK,CAAC,QAAQ;YACvB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,MAAM;YACnB,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;SACjE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"housePoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/housePoolFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAE5C,2CAAsE;AAEtE,iDAAsD;AAEtD,kEAA+D;AAC/D,4DAAyD;AACzD,gFAA6E;AAC7E,uCAAkD;AAClD,kEAA+D;AAE/D,MAAM,UAAU,GAAG,IAAI,6BAAa,CAIlC,yBAAa,EACb;IACE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,GAAG,IAAI,EAAE,EAAE,QAAQ,CAAC,CACzC,CAAC;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CACpC,UAAU,EACV,wBAAc,EACd,wBAAY,CACb;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SAC1E,SAAS,CAAC,MAAM,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SACvC,KAAK,EAAE;SACP,GAAG,EAAE,CAAC;IAET,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAElD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,4CAA4C;KACnD,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,KAAK,CAAC,QAAQ;YACvB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,MAAM;YACnB,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;SACjE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/divvy/stakingFetcher.js

@@ -10,23 +10,18 @@ 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 web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
-const solana_1 = require("../../utils/solana");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const accounts = yield (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.divvyIdlItem, [
-        {
-            dataSize: 96,
-        },
-        {
-            memcmp: {
-                bytes: owner,
-                offset: 41,
-            },
-        },
-    ]);
+    const accounts = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.minerStruct, constants_1.divvyProgram)
+        .addFilter('accountDiscriminator', [223, 113, 15, 54, 123, 122, 140, 100])
+        .addFilter('authority', new web3_js_1.PublicKey(owner))
+        .run();
     if (accounts.length === 0)
         return [];
     const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);

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

@@ -1 +1 @@
-{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAEvD,2CAAgE;AAEhE,iDAAsD;AAEtD,+CAAkE;AAClE,gFAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAA4B,EACjD,UAAU,EACV,wBAAY,EACZ;QACE;YACE,QAAQ,EAAE,EAAE;SACb;QACD;YACE,MAAM,EAAE;gBACN,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,EAAE;aACX;SACF;KACF,CACF,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,0CAA0C;KACjD,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,mBAAO;YAChB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,MAAM;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,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"}
+{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAE5C,2CAAgE;AAEhE,iDAAsD;AACtD,gFAA6E;AAC7E,kEAA+D;AAC/D,uCAAwC;AAExC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAW,EAAE,wBAAY,CAAC;SAC1E,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SACzE,SAAS,CAAC,WAAW,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC5C,GAAG,EAAE,CAAC;IAET,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,0CAA0C;KACjD,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,mBAAO;YAChB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,MAAM;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,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/divvy/structs.d.ts

@@ -0,0 +1,57 @@
+/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
+import { FixableBeetStruct } from '@metaplex-foundation/beet';
+import { PublicKey } from '@solana/web3.js';
+import BigNumber from 'bignumber.js';
+export type House = {
+    accountDiscriminator: number[];
+    admin: PublicKey;
+    foreman: PublicKey;
+    beneficiary: PublicKey;
+    houseMint: PublicKey;
+    currency: PublicKey;
+    currencyDecimals: number;
+    beneficiaryFeeBps: number;
+    dvypassFeeBps: number;
+    maxUtilizationBps: number;
+    houseTokenSupply: BigNumber;
+    liquidity: BigNumber;
+    maxPayoutAmount: BigNumber;
+    betAmount: BigNumber;
+    activeSlips: BigNumber;
+    authorityBump: number;
+    paused: boolean;
+    beneficiaryLiquidity: BigNumber;
+    dvypassLiquidity: BigNumber;
+    dvypassRewardRemaining: BigNumber;
+    dvypassRewardPerStake: BigNumber;
+    dvypassTotalStake: number;
+    dvypassNextTotalStake: number;
+    dvypassCollection: PublicKey | null;
+    utilizedAmount: BigNumber;
+};
+export declare const houseStruct: FixableBeetStruct<House, Partial<House>>;
+export declare enum PositionStatus {
+    Deposit = 0,
+    Withdraw = 1
+}
+export type Position = {
+    accountDiscriminator: number[];
+    house: PublicKey;
+    user: PublicKey;
+    amount: BigNumber;
+    minAmountOut: BigNumber;
+    createdTs: number;
+    status: PositionStatus;
+};
+export declare const positionStruct: FixableBeetStruct<Position, Partial<Position>>;
+export type Miner = {
+    accountDiscriminator: number[];
+    isBoosted: boolean;
+    rewarder: PublicKey;
+    authority: PublicKey;
+    amount: BigNumber;
+    rewards: BigNumber;
+    revshares: number;
+};
+export declare const minerStruct: FixableBeetStruct<Miner, Partial<Miner>>;

package/src/plugins/divvy/structs.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.minerStruct = exports.positionStruct = exports.PositionStatus = exports.houseStruct = void 0;
+const beet_1 = require("@metaplex-foundation/beet");
+const beet_solana_1 = require("@metaplex-foundation/beet-solana");
+const solana_1 = require("../../utils/solana");
+exports.houseStruct = new beet_1.FixableBeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['admin', beet_solana_1.publicKey],
+    ['foreman', beet_solana_1.publicKey],
+    ['beneficiary', beet_solana_1.publicKey],
+    ['houseMint', beet_solana_1.publicKey],
+    ['currency', beet_solana_1.publicKey],
+    ['currencyDecimals', beet_1.u8],
+    ['beneficiaryFeeBps', beet_1.u16],
+    ['dvypassFeeBps', beet_1.u16],
+    ['maxUtilizationBps', beet_1.u16],
+    ['houseTokenSupply', solana_1.u64],
+    ['liquidity', solana_1.u64],
+    ['maxPayoutAmount', solana_1.u64],
+    ['betAmount', solana_1.u64],
+    ['activeSlips', solana_1.u64],
+    ['authorityBump', beet_1.u8],
+    ['paused', beet_1.bool],
+    ['beneficiaryLiquidity', solana_1.u64],
+    ['dvypassLiquidity', solana_1.u64],
+    ['dvypassRewardRemaining', solana_1.u64],
+    ['dvypassRewardPerStake', solana_1.u64],
+    ['dvypassTotalStake', beet_1.u16],
+    ['dvypassNextTotalStake', beet_1.u16],
+    ['dvypassCollection', beet_solana_1.publicKey],
+    ['utilizedAmount', solana_1.u64],
+], (args) => args);
+var PositionStatus;
+(function (PositionStatus) {
+    PositionStatus[PositionStatus["Deposit"] = 0] = "Deposit";
+    PositionStatus[PositionStatus["Withdraw"] = 1] = "Withdraw";
+})(PositionStatus || (exports.PositionStatus = PositionStatus = {}));
+exports.positionStruct = new beet_1.FixableBeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['house', beet_solana_1.publicKey],
+    ['user', beet_solana_1.publicKey],
+    ['amount', solana_1.u64],
+    ['minAmountOut', solana_1.u64],
+    ['createdTs', beet_1.u32],
+    ['status', beet_1.u8],
+], (args) => args);
+exports.minerStruct = new beet_1.FixableBeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['isBoosted', beet_1.bool],
+    ['rewarder', beet_solana_1.publicKey],
+    ['authority', beet_solana_1.publicKey],
+    ['amount', solana_1.u64],
+    ['rewards', solana_1.u64],
+    ['revshares', beet_1.u8],
+], (args) => args);
+//# sourceMappingURL=structs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/divvy/structs.ts"],"names":[],"mappings":";;;AAAA,oDAOmC;AACnC,kEAA6D;AAG7D,+CAAyC;AA8B5B,QAAA,WAAW,GAAG,IAAI,wBAAiB,CAC9C;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,SAAS,EAAE,uBAAS,CAAC;IACtB,CAAC,aAAa,EAAE,uBAAS,CAAC;IAC1B,CAAC,WAAW,EAAE,uBAAS,CAAC;IACxB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,kBAAkB,EAAE,SAAE,CAAC;IACxB,CAAC,mBAAmB,EAAE,UAAG,CAAC;IAC1B,CAAC,eAAe,EAAE,UAAG,CAAC;IACtB,CAAC,mBAAmB,EAAE,UAAG,CAAC;IAC1B,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,eAAe,EAAE,SAAE,CAAC;IACrB,CAAC,QAAQ,EAAE,WAAI,CAAC;IAChB,CAAC,sBAAsB,EAAE,YAAG,CAAC;IAC7B,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,wBAAwB,EAAE,YAAG,CAAC;IAC/B,CAAC,uBAAuB,EAAE,YAAG,CAAC;IAC9B,CAAC,mBAAmB,EAAE,UAAG,CAAC;IAC1B,CAAC,uBAAuB,EAAE,UAAG,CAAC;IAC9B,CAAC,mBAAmB,EAAE,uBAAS,CAAC;IAChC,CAAC,gBAAgB,EAAE,YAAG,CAAC;CACxB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAa,CACxB,CAAC;AAEF,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,yDAAW,CAAA;IACX,2DAAY,CAAA;AACd,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAYY,QAAA,cAAc,GAAG,IAAI,wBAAiB,CACjD;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,WAAW,EAAE,UAAG,CAAC;IAClB,CAAC,QAAQ,EAAE,SAAE,CAAC;CACf,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAgB,CAC3B,CAAC;AAYW,QAAA,WAAW,GAAG,IAAI,wBAAiB,CAC9C;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,WAAW,EAAE,WAAI,CAAC;IACnB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,WAAW,EAAE,uBAAS,CAAC;IACxB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,WAAW,EAAE,SAAE,CAAC;CAClB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAa,CACxB,CAAC"}

package/src/plugins/drift/spotMarketsJob.js

@@ -65,7 +65,6 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             },
             depositedAmount,
             platformId: constants_1.platformId,
-            poolName: 'Main',
         };
         yield cache.setItem(`${spotMarketAccount.vault.toString()}-${tokenAddress}`, rate, {
             prefix: portfolio_core_1.borrowLendRatesPrefix,

package/src/plugins/drift/spotMarketsJob.js.map

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

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

@@ -1,6 +1,8 @@
+/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
-import { IdlItem } from '@solanafm/explorer-kit-idls';
+import { PublicKey } from '@solana/web3.js';
 export declare const platformId = "elemental";
 export declare const platform: Platform;
 export declare const poolsCacheKey = "pools";
-export declare const elementalIdlItem: IdlItem;
+export declare const programId: PublicKey;

package/src/plugins/elemental/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.elementalIdlItem = exports.poolsCacheKey = exports.platform = exports.platformId = void 0;
-const elementalVaultIDL_1 = require("./elementalVaultIDL");
+exports.programId = exports.poolsCacheKey = exports.platform = exports.platformId = void 0;
+const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'elemental';
 exports.platform = {
     id: exports.platformId,
@@ -16,9 +16,5 @@ exports.platform = {
     github: 'https://github.com/elementalfund',
 };
 exports.poolsCacheKey = `pools`;
-exports.elementalIdlItem = {
-    programId: elementalVaultIDL_1.elementalIDLs.address,
-    idl: elementalVaultIDL_1.elementalIDLs,
-    idlType: 'anchor',
-};
+exports.programId = new web3_js_1.PublicKey('ELE5vYY81W7UCpTPs7SyD6Bwm5FwZBntTW8PiGqM5d4A');
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/elemental/constants.ts"],"names":[],"mappings":";;;AAEA,2DAAoD;AAEvC,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EACH,+EAA+E;IACjF,OAAO,EAAE,yBAAyB;IAClC,OAAO,EAAE,mCAAmC;IAC5C,qEAAqE;IACrE,aAAa,EAAE,8BAA8B;IAC7C,QAAQ,EAAE,2BAA2B;IACrC,WAAW,EACT,oEAAoE;IACtE,MAAM,EAAE,kCAAkC;CAC3C,CAAC;AACW,QAAA,aAAa,GAAG,OAAO,CAAC;AAExB,QAAA,gBAAgB,GAAG;IAC9B,SAAS,EAAE,iCAAa,CAAC,OAAO;IAChC,GAAG,EAAE,iCAAa;IAClB,OAAO,EAAE,QAAQ;CACP,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/elemental/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EACH,+EAA+E;IACjF,OAAO,EAAE,yBAAyB;IAClC,OAAO,EAAE,mCAAmC;IAC5C,qEAAqE;IACrE,aAAa,EAAE,8BAA8B;IAC7C,QAAQ,EAAE,2BAA2B;IACrC,WAAW,EACT,oEAAoE;IACtE,MAAM,EAAE,kCAAkC;CAC3C,CAAC;AACW,QAAA,aAAa,GAAG,OAAO,CAAC;AAExB,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC"}

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

@@ -2,4 +2,3 @@
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const positionFilter: (owner: string) => GetProgramAccountsFilter[];
-export declare const poolFilter: GetProgramAccountsFilter[];

package/src/plugins/elemental/filters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.poolFilter = exports.positionFilter = void 0;
+exports.positionFilter = void 0;
 const positionFilter = (owner) => [
     {
         memcmp: {
@@ -13,9 +13,4 @@ const positionFilter = (owner) => [
     },
 ];
 exports.positionFilter = positionFilter;
-exports.poolFilter = [
-    {
-        dataSize: 254,
-    },
-];
 //# sourceMappingURL=filters.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/elemental/filters.ts"],"names":[],"mappings":";;;AAEO,MAAM,cAAc,GAAG,CAAC,KAAa,EAA8B,EAAE,CAAC;IAC3E;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAVW,QAAA,cAAc,kBAUzB;AAEW,QAAA,UAAU,GAA+B;IACpD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/elemental/filters.ts"],"names":[],"mappings":";;;AAEO,MAAM,cAAc,GAAG,CAAC,KAAa,EAA8B,EAAE,CAAC;IAC3E;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAVW,QAAA,cAAc,kBAUzB"}

package/src/plugins/elemental/helpers.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStatus = exports.getPositionAddress = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const elementalVaultIDL_1 = require("./elementalVaultIDL");
+const constants_1 = require("./constants");
 function getPositionAddress(poolAddress, ownerAddress) {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from('position'),
         new web3_js_1.PublicKey(ownerAddress).toBuffer(),
         new web3_js_1.PublicKey(poolAddress).toBuffer(),
-    ], new web3_js_1.PublicKey(elementalVaultIDL_1.elementalIDLs.address))[0];
+    ], constants_1.programId)[0];
 }
 exports.getPositionAddress = getPositionAddress;
 function getStatus(position, pool) {