@sonarwatch/portfolio-plugins 0.14.164 → 0.14.165

package/src/plugins/nirvana/depositFetcher.d.ts

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

package/src/plugins/nirvana/depositFetcher.js

@@ -0,0 +1,64 @@
+"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());
+    });
+};
+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 ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const structs_1 = require("./structs");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const connection = (0, clients_1.getClientSolana)();
+    const personalAccounts = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.personalAccountStruct, constants_1.pid)
+        .addFilter('owner', new web3_js_1.PublicKey(owner))
+        .addDataSizeFilter(272)
+        .run();
+    if (personalAccounts.length === 0)
+        return [];
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    personalAccounts.forEach((acc) => {
+        const lendingElement = elementRegistry.addElementBorrowlend({
+            label: 'Lending',
+            ref: acc.pubkey,
+            link: 'https://app.nirvana.finance/borrow',
+        });
+        lendingElement.addBorrowedAsset({
+            address: constants_1.nirvMint,
+            amount: acc.nirvBorrowed.dividedBy(Math.pow(10, constants_1.nirvDecimals)),
+            alreadyShifted: true,
+        });
+        lendingElement.addSuppliedAsset({
+            address: constants_1.anaMint,
+            amount: acc.anaDeposited.dividedBy(Math.pow(10, constants_1.anaDecimals)),
+            alreadyShifted: true,
+        });
+        const daoElement = elementRegistry.addElementMultiple({
+            label: 'Deposit',
+            name: 'Nirvana DAO',
+            ref: acc.pubkey,
+            link: 'https://app.nirvana.finance/govern',
+        });
+        daoElement.addAsset({
+            address: constants_1.prAnaMint,
+            amount: acc.stagedPrana.dividedBy(Math.pow(10, constants_1.prAnaDecimals)),
+            alreadyShifted: true,
+        });
+    });
+    return elementRegistry.getElements(cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-deposits`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=depositFetcher.js.map

package/src/plugins/nirvana/depositFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"depositFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nirvana/depositFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAE5C,2CASqB;AAErB,iDAAsD;AACtD,gFAA6E;AAC7E,uCAAkD;AAClD,kEAA+D;AAE/D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,gBAAgB,GAAG,MAAM,qBAAS,CAAC,KAAK,CAC5C,UAAU,EACV,+BAAqB,EACrB,eAAG,CACJ;SACE,SAAS,CAAC,OAAO,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SACxC,iBAAiB,CAAC,GAAG,CAAC;SACtB,GAAG,EAAE,CAAC;IACT,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE7C,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,MAAM,cAAc,GAAG,eAAe,CAAC,oBAAoB,CAAC;YAC1D,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,GAAG,CAAC,MAAM;YACf,IAAI,EAAE,oCAAoC;SAC3C,CAAC,CAAC;QACH,cAAc,CAAC,gBAAgB,CAAC;YAC9B,OAAO,EAAE,oBAAQ;YACjB,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,wBAAY,CAAA,CAAC;YACtD,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,cAAc,CAAC,gBAAgB,CAAC;YAC9B,OAAO,EAAE,mBAAO;YAChB,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,uBAAW,CAAA,CAAC;YACrD,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,CAAC;YACpD,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,aAAa;YACnB,GAAG,EAAE,GAAG,CAAC,MAAM;YACf,IAAI,EAAE,oCAAoC;SAC3C,CAAC,CAAC;QACH,UAAU,CAAC,QAAQ,CAAC;YAClB,OAAO,EAAE,qBAAS;YAClB,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC;YACtD,cAAc,EAAE,IAAI;SACrB,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,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/nirvana/index.d.ts

@@ -0,0 +1,4 @@
+import { Fetcher } from '../../Fetcher';
+import { Job } from '../../Job';
+export declare const jobs: Job[];
+export declare const fetchers: Fetcher[];

package/src/plugins/nirvana/index.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchers = exports.jobs = void 0;
+const depositFetcher_1 = __importDefault(require("./depositFetcher"));
+exports.jobs = [];
+exports.fetchers = [depositFetcher_1.default];
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nirvana/index.ts"],"names":[],"mappings":";;;;;;AAEA,sEAA8C;AAEjC,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,wBAAc,CAAC,CAAC"}

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

@@ -0,0 +1,47 @@
+/// <reference types="node" />
+/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
+import { BeetStruct, FixableBeetStruct } from '@metaplex-foundation/beet';
+import { PublicKey } from '@solana/web3.js';
+import BigNumber from 'bignumber.js';
+export type CustomNumber = {
+    val: BigNumber[];
+};
+export declare const customNumberStruct: FixableBeetStruct<CustomNumber, Partial<CustomNumber>>;
+export type Revenue = {
+    lastSeenIndex: CustomNumber;
+    staged: BigNumber;
+};
+export declare const revenueStruct: FixableBeetStruct<Revenue, Partial<Revenue>>;
+export type RevenueIndexes = {
+    ana: Revenue;
+    nirv: Revenue;
+};
+export declare const revenueIndexesStruct: FixableBeetStruct<RevenueIndexes, Partial<RevenueIndexes>>;
+export type PersonalBallot = {
+    floorRaise: BigNumber;
+    buyAnaFeeMbps: BigNumber;
+    sellAnaFeeMbps: BigNumber;
+    withdrawAnaFeeMbps: BigNumber;
+    pranaAprMbps: BigNumber;
+    nirvBorrowMbps: BigNumber;
+    pranaRealizeFeeMbps: BigNumber;
+};
+export declare const personalBallotStruct: BeetStruct<PersonalBallot, Partial<PersonalBallot>>;
+export type RevenueManager = {
+    sharesDeposited: BigNumber;
+    revenueIndexes: RevenueIndexes;
+};
+export declare const revenueManagerStruct: FixableBeetStruct<RevenueManager, Partial<RevenueManager>>;
+export type PersonalAccount = {
+    buffer: Buffer;
+    owner: PublicKey;
+    tenant: PublicKey;
+    nirvBorrowed: BigNumber;
+    anaDeposited: BigNumber;
+    lastSeenPranaIndex: CustomNumber;
+    stagedPrana: BigNumber;
+    personalBallot: PersonalBallot;
+    pranaRevManager: RevenueManager;
+};
+export declare const personalAccountStruct: FixableBeetStruct<PersonalAccount, Partial<PersonalAccount>>;

package/src/plugins/nirvana/structs.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.personalAccountStruct = exports.revenueManagerStruct = exports.personalBallotStruct = exports.revenueIndexesStruct = exports.revenueStruct = exports.customNumberStruct = 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.customNumberStruct = new beet_1.FixableBeetStruct([['val', (0, beet_1.uniformFixedSizeArray)(solana_1.u64, 4)]], (args) => args);
+exports.revenueStruct = new beet_1.FixableBeetStruct([
+    ['lastSeenIndex', exports.customNumberStruct],
+    ['staged', solana_1.u64],
+], (args) => args);
+exports.revenueIndexesStruct = new beet_1.FixableBeetStruct([
+    ['ana', exports.revenueStruct],
+    ['nirv', exports.revenueStruct],
+], (args) => args);
+exports.personalBallotStruct = new beet_1.BeetStruct([
+    ['floorRaise', solana_1.i64],
+    ['buyAnaFeeMbps', solana_1.i64],
+    ['sellAnaFeeMbps', solana_1.i64],
+    ['withdrawAnaFeeMbps', solana_1.i64],
+    ['pranaAprMbps', solana_1.i64],
+    ['nirvBorrowMbps', solana_1.i64],
+    ['pranaRealizeFeeMbps', solana_1.i64],
+], (args) => args);
+exports.revenueManagerStruct = new beet_1.FixableBeetStruct([
+    ['sharesDeposited', solana_1.u64],
+    ['revenueIndexes', exports.revenueIndexesStruct],
+], (args) => args);
+exports.personalAccountStruct = new beet_1.FixableBeetStruct([
+    ['buffer', (0, solana_1.blob)(8)],
+    ['owner', beet_solana_1.publicKey],
+    ['tenant', beet_solana_1.publicKey],
+    ['nirvBorrowed', solana_1.u64],
+    ['anaDeposited', solana_1.u64],
+    ['lastSeenPranaIndex', exports.customNumberStruct],
+    ['stagedPrana', solana_1.u64],
+    ['personalBallot', exports.personalBallotStruct],
+    ['pranaRevManager', exports.revenueManagerStruct],
+], (args) => args);
+//# sourceMappingURL=structs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nirvana/structs.ts"],"names":[],"mappings":";;;AAAA,oDAImC;AAGnC,kEAA6D;AAC7D,+CAAoD;AAMvC,QAAA,kBAAkB,GAAG,IAAI,wBAAiB,CACrD,CAAC,CAAC,KAAK,EAAE,IAAA,4BAAqB,EAAC,YAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EACxC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC;AAOW,QAAA,aAAa,GAAG,IAAI,wBAAiB,CAChD;IACE,CAAC,eAAe,EAAE,0BAAkB,CAAC;IACrC,CAAC,QAAQ,EAAE,YAAG,CAAC;CAChB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAe,CAC1B,CAAC;AAQW,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,KAAK,EAAE,qBAAa,CAAC;IACtB,CAAC,MAAM,EAAE,qBAAa,CAAC;CACxB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC;AAaW,QAAA,oBAAoB,GAAG,IAAI,iBAAU,CAChD;IACE,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,qBAAqB,EAAE,YAAG,CAAC;CAC7B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC;AAQW,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,gBAAgB,EAAE,4BAAoB,CAAC;CACzC,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC;AAeW,QAAA,qBAAqB,GAAG,IAAI,wBAAiB,CACxD;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,oBAAoB,EAAE,0BAAkB,CAAC;IAC1C,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,gBAAgB,EAAE,4BAAoB,CAAC;IACxC,CAAC,iBAAiB,EAAE,4BAAoB,CAAC;CAC1C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAuB,CAClC,CAAC"}

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

@@ -1,18 +1,14 @@
 /// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
-import { IdlItem } from '@solanafm/explorer-kit-idls';
 import { PublicKey } from '@solana/web3.js';
 export declare const platformId = "nxfinance";
 export declare const ID: PublicKey;
 export declare const leverageFiProgramID: PublicKey;
 export declare const leverageVaultsMints: string[];
-export declare const nxfinanceLeverageIdlItem: IdlItem;
 export declare const lendProgramId: PublicKey;
-export declare const nxfinanceLendIdlItem: IdlItem;
 export declare const lendingPoolKey = "lending-pools";
 export declare const stakingPoolKey = "staking-pool";
 export declare const solayerPoolKey = "solayer-pools";
 export declare const lendingPools: PublicKey[];
 export declare const stakePool = "2P1eeegdbEhN3bnCroJJPXiH13i4rw1XYk8ftdh9meRY";
 export declare const stakingProgramId = "9un1MopS4NRhgVDLXB1DqoQDTmq1un48YKJuPiMLpSc9";
-export declare const nxfinanceStakingIdlItem: IdlItem;

package/src/plugins/nxfinance/constants.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxfinanceStakingIdlItem = exports.stakingProgramId = exports.stakePool = exports.lendingPools = exports.solayerPoolKey = exports.stakingPoolKey = exports.lendingPoolKey = exports.nxfinanceLendIdlItem = exports.lendProgramId = exports.nxfinanceLeverageIdlItem = exports.leverageVaultsMints = exports.leverageFiProgramID = exports.ID = exports.platformId = void 0;
+exports.stakingProgramId = exports.stakePool = exports.lendingPools = exports.solayerPoolKey = exports.stakingPoolKey = exports.lendingPoolKey = exports.lendProgramId = exports.leverageVaultsMints = exports.leverageFiProgramID = exports.ID = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const leverageIdl_1 = require("./leverageIdl");
-const lendIdl_1 = require("./lendIdl");
-const stakingIdl_1 = require("./stakingIdl");
 exports.platformId = 'nxfinance';
 // https://nxfinance.io/nx-data/doc
 exports.ID = new web3_js_1.PublicKey('RaXcyfW8jK295UAU1XN2uLMTHnTWEaeCcNWLeDB4iD6');
@@ -16,17 +13,7 @@ exports.leverageVaultsMints = [
     'sSo14endRuUbvQaJS3dq36Q829a3A6BEfoeeRGJywEh', // sSOL
     'HUBsveNpjo5pWqNkH57QzxjQASdTVXcSK7bVKTSZtcSX', // hubSOL
 ];
-exports.nxfinanceLeverageIdlItem = {
-    programId: exports.leverageFiProgramID.toString(),
-    idl: leverageIdl_1.NxfinanceLeverageIDL,
-    idlType: 'anchor',
-};
 exports.lendProgramId = new web3_js_1.PublicKey('NXFiKimQN3QSL3CDhCXddyVmLfrai8HK36bHKaAzK7g');
-exports.nxfinanceLendIdlItem = {
-    programId: exports.lendProgramId.toString(),
-    idl: lendIdl_1.NxfinanceLendIdl,
-    idlType: 'anchor',
-};
 exports.lendingPoolKey = 'lending-pools';
 exports.stakingPoolKey = 'staking-pool';
 exports.solayerPoolKey = 'solayer-pools';
@@ -35,9 +22,4 @@ exports.lendingPools = [
 ];
 exports.stakePool = '2P1eeegdbEhN3bnCroJJPXiH13i4rw1XYk8ftdh9meRY';
 exports.stakingProgramId = '9un1MopS4NRhgVDLXB1DqoQDTmq1un48YKJuPiMLpSc9';
-exports.nxfinanceStakingIdlItem = {
-    programId: new web3_js_1.PublicKey(exports.stakingProgramId).toString(),
-    idl: stakingIdl_1.NxfinanceStakingIdl,
-    idlType: 'anchor',
-};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAC5C,+CAAqD;AACrD,uCAA6C;AAC7C,6CAAmD;AAEtC,QAAA,UAAU,GAAG,WAAW,CAAC;AACtC,mCAAmC;AAEtB,QAAA,EAAE,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AAElE,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAC9C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG;IACjC,8CAA8C,EAAE,MAAM;IACtD,6CAA6C,EAAE,SAAS;IACxD,6CAA6C,EAAE,OAAO;IACtD,6CAA6C,EAAE,OAAO;IACtD,8CAA8C,EAAE,SAAS;CAC1D,CAAC;AAEW,QAAA,wBAAwB,GAAG;IACtC,SAAS,EAAE,2BAAmB,CAAC,QAAQ,EAAE;IACzC,GAAG,EAAE,kCAAoB;IACzB,OAAO,EAAE,QAAQ;CACP,CAAC;AAEA,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,oBAAoB,GAAG;IAClC,SAAS,EAAE,qBAAa,CAAC,QAAQ,EAAE;IACnC,GAAG,EAAE,0BAAgB;IACrB,OAAO,EAAE,QAAQ;CACP,CAAC;AAEA,QAAA,cAAc,GAAG,eAAe,CAAC;AACjC,QAAA,cAAc,GAAG,cAAc,CAAC;AAChC,QAAA,cAAc,GAAG,eAAe,CAAC;AAEjC,QAAA,YAAY,GAAG;IAC1B,IAAI,mBAAS,CAAC,8CAA8C,CAAC;CAC9D,CAAC;AAEW,QAAA,SAAS,GAAG,8CAA8C,CAAC;AAC3D,QAAA,gBAAgB,GAAG,8CAA8C,CAAC;AAElE,QAAA,uBAAuB,GAAG;IACrC,SAAS,EAAE,IAAI,mBAAS,CAAC,wBAAgB,CAAC,CAAC,QAAQ,EAAE;IACrD,GAAG,EAAE,gCAAmB;IACxB,OAAO,EAAE,QAAQ;CACP,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,WAAW,CAAC;AACtC,mCAAmC;AAEtB,QAAA,EAAE,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AAElE,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAC9C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG;IACjC,8CAA8C,EAAE,MAAM;IACtD,6CAA6C,EAAE,SAAS;IACxD,6CAA6C,EAAE,OAAO;IACtD,6CAA6C,EAAE,OAAO;IACtD,8CAA8C,EAAE,SAAS;CAC1D,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,cAAc,GAAG,eAAe,CAAC;AACjC,QAAA,cAAc,GAAG,cAAc,CAAC;AAChC,QAAA,cAAc,GAAG,eAAe,CAAC;AAEjC,QAAA,YAAY,GAAG;IAC1B,IAAI,mBAAS,CAAC,8CAA8C,CAAC;CAC9D,CAAC;AAEW,QAAA,SAAS,GAAG,8CAA8C,CAAC;AAC3D,QAAA,gBAAgB,GAAG,8CAA8C,CAAC"}

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

@@ -1,11 +1,12 @@
 import BigNumber from 'bignumber.js';
-import { FormattedLendingPool, LendingAccount, LendingPool, MarginAccount, MarginPool, SolayerPool, SolayerUser, VSolPositionAccount } from './types';
+import { FormattedLendingPool } from './types';
 import { ParsedAccount } from '../../utils/solana';
+import { LendingPool, SolayerPool, MarginPool } from './structs';
 export declare const getSupplyNoteRate: (marginPool: MarginPool) => BigNumber;
 export declare const getBorrowNoteRate: (marginPool: MarginPool) => BigNumber;
 export declare const formatLendingPool: (t: LendingPool, decimals: number) => FormattedLendingPool;
-export declare const getLendingAccounts: (lendingPools: ParsedAccount<LendingPool>[], owner: string) => Promise<(ParsedAccount<LendingAccount> | null)[]>;
-export declare const getVSolPositionAccounts: (lendingPools: ParsedAccount<LendingPool>[], owner: string) => Promise<(ParsedAccount<VSolPositionAccount> | null)[]>;
-export declare const getSolayerUserAccounts: (solayerPools: ParsedAccount<SolayerPool>[], owner: string) => Promise<(ParsedAccount<SolayerUser> | null)[]>;
-export declare const getMarginAccount: (owner: string) => Promise<ParsedAccount<MarginAccount> | null>;
+export declare const getLendingAccounts: (lendingPools: ParsedAccount<LendingPool>[], owner: string) => Promise<(ParsedAccount<import("./structs").LendingAccount> | null)[]>;
+export declare const getVSolPositionAccounts: (lendingPools: ParsedAccount<LendingPool>[], owner: string) => Promise<(ParsedAccount<import("./structs").VSolPosition> | null)[]>;
+export declare const getSolayerUserAccounts: (solayerPools: ParsedAccount<SolayerPool>[], owner: string) => Promise<(ParsedAccount<import("./structs").SolayerUser> | null)[]>;
+export declare const getMarginAccount: (owner: string) => Promise<ParsedAccount<import("./structs").MarginAccount> | null>;
 export declare const getMarginPools: (mints: Set<string>) => Promise<(ParsedAccount<MarginPool> | null)[]>;

package/src/plugins/nxfinance/helpers.js

@@ -18,6 +18,7 @@ const web3_js_1 = require("@solana/web3.js");
 const solana_1 = require("../../utils/solana");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
+const structs_1 = require("./structs");
 const getBorrowApr = (utilization) => {
     if (utilization.isLessThanOrEqualTo(0.8)) {
         return parseFloat(utilization.times(0.125).plus(0.1).toFixed(4, bignumber_js_1.default.ROUND_DOWN));
@@ -141,7 +142,7 @@ const getLendingAccounts = (lendingPools, owner) => {
             new web3_js_1.PublicKey(owner).toBuffer(),
         ], constants_1.lendProgramId)[0];
     });
-    return (0, solana_1.getAutoParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), constants_1.nxfinanceLendIdlItem, pdas);
+    return (0, solana_1.getParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), structs_1.lendingAccountStruct, pdas);
 };
 exports.getLendingAccounts = getLendingAccounts;
 const getVSolPositionAccounts = (lendingPools, owner) => {
@@ -150,7 +151,7 @@ const getVSolPositionAccounts = (lendingPools, owner) => {
         new web3_js_1.PublicKey(lendingPool.nxMarket).toBuffer(),
         new web3_js_1.PublicKey(owner).toBuffer(),
     ], constants_1.lendProgramId)[0]);
-    return (0, solana_1.getAutoParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), constants_1.nxfinanceLendIdlItem, pdas);
+    return (0, solana_1.getParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), structs_1.vSolPositionStruct, pdas);
 };
 exports.getVSolPositionAccounts = getVSolPositionAccounts;
 const getSolayerUserAccounts = (solayerPools, owner) => {
@@ -160,7 +161,7 @@ const getSolayerUserAccounts = (solayerPools, owner) => {
         new web3_js_1.PublicKey(solayerPool.lrtMint).toBuffer(),
         new web3_js_1.PublicKey(owner).toBuffer(),
     ], constants_1.lendProgramId)[0]);
-    return (0, solana_1.getAutoParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), constants_1.nxfinanceLendIdlItem, pdas);
+    return (0, solana_1.getParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), structs_1.solayerUserStruct, pdas);
 };
 exports.getSolayerUserAccounts = getSolayerUserAccounts;
 const getMarginAccount = (owner) => __awaiter(void 0, void 0, void 0, function* () {
@@ -169,7 +170,7 @@ const getMarginAccount = (owner) => __awaiter(void 0, void 0, void 0, function*
         new web3_js_1.PublicKey(owner).toBuffer(),
         Buffer.from('account'),
     ], constants_1.leverageFiProgramID)[0];
-    return (yield (0, solana_1.getAutoParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), constants_1.nxfinanceLeverageIdlItem, [pdas]))[0];
+    return (yield (0, solana_1.getParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), structs_1.marginAccountStruct, [pdas]))[0];
 });
 exports.getMarginAccount = getMarginAccount;
 const getMarginPools = (mints) => __awaiter(void 0, void 0, void 0, function* () {
@@ -177,7 +178,7 @@ const getMarginPools = (mints) => __awaiter(void 0, void 0, void 0, function* ()
         web3_js_1.PublicKey.findProgramAddressSync([constants_1.ID.toBuffer()], constants_1.leverageFiProgramID)[0].toBuffer(),
         new web3_js_1.PublicKey(mint).toBuffer(),
     ], constants_1.leverageFiProgramID)[0]);
-    return (0, solana_1.getAutoParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), constants_1.nxfinanceLeverageIdlItem, marginPoolsPublicKeys);
+    return (0, solana_1.getParsedMultipleAccountsInfo)((0, clients_1.getClientSolana)(), structs_1.marginPoolStruct, marginPoolsPublicKeys);
 });
 exports.getMarginPools = getMarginPools;
 //# sourceMappingURL=helpers.js.map

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

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

package/src/plugins/nxfinance/lendingPoolsJob.js

@@ -13,9 +13,10 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const solana_1 = require("../../utils/solana");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
+const structs_1 = require("./structs");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const lendingPoolAccounts = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.nxfinanceLendIdlItem, constants_1.lendingPools);
+    const lendingPoolAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.lendingPoolStruct, constants_1.lendingPools);
     yield cache.setItem(constants_1.lendingPoolKey, lendingPoolAccounts, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/nxfinance/lendingPoolsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"lendingPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/lendingPoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,+CAAuE;AACvE,2CAKqB;AACrB,iDAAsD;AAGtD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,mBAAmB,GACvB,MAAM,IAAA,0CAAiC,EACrC,UAAU,EACV,gCAAoB,EACpB,wBAAY,CACb,CAAC;IAEJ,MAAM,KAAK,CAAC,OAAO,CAAC,0BAAc,EAAE,mBAAmB,EAAE;QACvD,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,gBAAgB;IACjC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"lendingPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/lendingPoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,+CAAmE;AACnE,2CAAuE;AACvE,iDAAsD;AACtD,uCAA8C;AAE9C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,mBAAmB,GAAG,MAAM,IAAA,sCAA6B,EAC7D,UAAU,EACV,2BAAiB,EACjB,wBAAY,CACb,CAAC;IAEF,MAAM,KAAK,CAAC,OAAO,CAAC,0BAAc,EAAE,mBAAmB,EAAE;QACvD,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,gBAAgB;IACjC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/nxfinance/positionsFetcher.js

@@ -48,17 +48,17 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         return [];
     const mints = new Set();
     if (marginAccount) {
-        marginAccount.deposits.forEach((d) => mints.add(d.tokenMint));
-        marginAccount.loans.forEach((l) => mints.add(l.tokenMint));
+        marginAccount.deposits.forEach((d) => mints.add(d.tokenMint.toString()));
+        marginAccount.loans.forEach((l) => mints.add(l.tokenMint.toString()));
     }
     vSolPositionsAccounts.forEach((vSolPositionsAccount) => {
         vSolPositionsAccount === null || vSolPositionsAccount === void 0 ? void 0 : vSolPositionsAccount.positions.forEach((position) => {
-            mints.add(position.borrowMint);
-            mints.add(position.collateralMint);
-            mints.add(position.leverageMint);
+            mints.add(position.borrowMint.toString());
+            mints.add(position.collateralMint.toString());
+            mints.add(position.leverageMint.toString());
         });
     });
-    lendingPools.forEach((l) => mints.add(l.tokenMint));
+    lendingPools.forEach((l) => mints.add(l.tokenMint.toString()));
     const [marginPools, tokenPrices] = yield Promise.all([
         (0, helpers_1.getMarginPools)(mints),
         cache.getTokenPricesAsMap(mints, portfolio_core_1.NetworkId.solana),
@@ -67,12 +67,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     lendingAccounts.forEach((lendingAccount) => {
         if (!lendingAccount)
             return;
-        if (lendingAccount.depositNotes === '0')
+        if (lendingAccount.depositNotes.isZero())
             return;
-        const lendingPool = lendingPools.find((lp) => lp.nxMarket === lendingAccount.nxMarket);
+        const lendingPool = lendingPools.find((lp) => lp.nxMarket.toString() === lendingAccount.nxMarket.toString());
         if (!lendingPool)
             return;
-        const tokenPrice = tokenPrices.get(lendingPool.tokenMint);
+        const tokenPrice = tokenPrices.get(lendingPool.tokenMint.toString());
         if (!tokenPrice)
             return;
         const element = elementRegistry.addElementLiquidity({
@@ -102,16 +102,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         vSolPositionsAccount.positions.forEach((position) => {
             if (!position)
                 return;
-            const lendingPool = lendingPools.find((lp) => lp.nxMarket === vSolPositionsAccount.nxMarket);
+            const lendingPool = lendingPools.find((lp) => lp.nxMarket.toString() === vSolPositionsAccount.nxMarket.toString());
             if (!lendingPool)
                 return;
-            const tokenPrice = tokenPrices.get(lendingPool.tokenMint);
+            const tokenPrice = tokenPrices.get(lendingPool.tokenMint.toString());
             if (!tokenPrice)
                 return;
             const formattedLendingPool = (0, helpers_1.formatLendingPool)(lendingPools[0], tokenPrice.decimals);
-            const collateralTokenPrice = tokenPrices.get(position.collateralMint);
-            const loanTokenPrice = tokenPrices.get(position.borrowMint);
-            const leverageTokenPrice = tokenPrices.get(position.leverageMint);
+            const collateralTokenPrice = tokenPrices.get(position.collateralMint.toString());
+            const loanTokenPrice = tokenPrices.get(position.borrowMint.toString());
+            const leverageTokenPrice = tokenPrices.get(position.leverageMint.toString());
             if (!collateralTokenPrice || !loanTokenPrice || !leverageTokenPrice)
                 return;
             const element = elementRegistry.addElementMultiple({
@@ -156,7 +156,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             ref: marginAccount.pubkey,
         });
         marginAccount.deposits.forEach((deposit) => {
-            const marginPool = marginPools.find((mp) => (mp === null || mp === void 0 ? void 0 : mp.tokenMint) === deposit.tokenMint);
+            const marginPool = marginPools.find((mp) => (mp === null || mp === void 0 ? void 0 : mp.tokenMint.toString()) === deposit.tokenMint.toString());
             if (!marginPool)
                 return;
             const supplyNoteRate = (0, helpers_1.getSupplyNoteRate)(marginPool);
@@ -165,7 +165,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 address: deposit.tokenMint,
                 amount,
             };
-            if (constants_1.leverageVaultsMints.includes(deposit.tokenMint)) {
+            if (constants_1.leverageVaultsMints.includes(deposit.tokenMint.toString())) {
                 asset.amount = asset.amount
                     .multipliedBy(marginAccount.leverage)
                     .dividedBy(100);
@@ -176,10 +176,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             }
         });
         marginAccount.loans.forEach((loan) => {
-            const marginPool = marginPools.find((mp) => (mp === null || mp === void 0 ? void 0 : mp.tokenMint) === loan.tokenMint);
+            const marginPool = marginPools.find((mp) => (mp === null || mp === void 0 ? void 0 : mp.tokenMint.toString()) === loan.tokenMint.toString());
             if (!marginPool)
                 return;
-            if (loan.loanNote === '0')
+            if (loan.loanNote.isZero())
                 return;
             const borrowNoteRate = (0, helpers_1.getBorrowNoteRate)(marginPool);
             elementBorrowlend.addBorrowedAsset({

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

@@ -1 +1 @@
-{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/positionsFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,gEAAqC;AAErC,2CAKqB;AAIrB,kEAA+D;AAC/D,uCASmB;AACnB,gFAA6E;AAE7E,MAAM,gBAAgB,GAAG,IAAI,6BAAa,CACxC,0BAAc,EACd;IACE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CACF,CAAC;AACF,MAAM,gBAAgB,GAAG,IAAI,6BAAa,CACxC,0BAAc,EACd;IACE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CACF,CAAC;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrD,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/B,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;KAChC,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACtE,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAEtE,MAAM,CACJ,eAAe,EACf,qBAAqB,EACrB,aAAa,EACb,mBAAmB,EACpB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpB,IAAA,4BAAkB,EAAC,YAAY,EAAE,KAAK,CAAC,EAAE,MAAM;QAC/C,IAAA,iCAAuB,EAAC,YAAY,EAAE,KAAK,CAAC,EAAE,OAAO;QACrD,IAAA,0BAAgB,EAAC,KAAK,CAAC,EAAE,uBAAuB;QAChD,IAAA,gCAAsB,EAAC,YAAY,EAAE,KAAK,CAAC,EAAE,UAAU;KACxD,CAAC,CAAC;IAEH,IACE,eAAe,CAAC,MAAM,KAAK,CAAC;QAC5B,qBAAqB,CAAC,MAAM,KAAK,CAAC;QAClC,CAAC,aAAa;QACd,mBAAmB,CAAC,MAAM,KAAK,CAAC;QAEhC,OAAO,EAAE,CAAC;IAEZ,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,IAAI,aAAa,EAAE,CAAC;QAClB,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACzE,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IACD,qBAAqB,CAAC,OAAO,CAAC,CAAC,oBAAoB,EAAE,EAAE;QACrD,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnD,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1C,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9C,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAE/D,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,IAAA,wBAAc,EAAC,KAAK,CAAC;QACrB,KAAK,CAAC,mBAAmB,CAAC,KAAK,EAAE,0BAAS,CAAC,MAAM,CAAC;KACnD,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;QACzC,IAAI,CAAC,cAAc;YAAE,OAAO;QAC5B,IAAI,cAAc,CAAC,YAAY,CAAC,MAAM,EAAE;YAAE,OAAO;QAEjD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CACnC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,cAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,CACtE,CAAC;QACF,IAAI,CAAC,WAAW;YAAE,OAAO;QAEzB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAErE,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,OAAO,GAAG,eAAe,CAAC,mBAAmB,CAAC;YAClD,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,2BAA2B;SAClC,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,IAAA,2BAAiB,EAC5C,YAAY,CAAC,CAAC,CAAC,EACf,UAAU,CAAC,QAAQ,CACpB,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;YACrC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE;YACrC,UAAU,EAAE;gBACV,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;aACnE;SACF,CAAC,CAAC;QACH,SAAS,CAAC,QAAQ,CAAC;YACjB,OAAO,EAAE,WAAW,CAAC,SAAS;YAC9B,MAAM,EAAE,IAAI,sBAAS,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,YAAY,CAC7D,oBAAoB,CAAC,eAAe,CACrC;SACF,CAAC,CAAC;QACH,SAAS,CAAC,QAAQ,CAAC;YACjB,GAAG,EAAE,oBAAoB,CAAC,GAAG;YAC7B,GAAG,EAAE,IAAA,yBAAQ,EAAC,oBAAoB,CAAC,GAAG,CAAC;SACxC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,qBAAqB,CAAC,OAAO,CAAC,CAAC,oBAAoB,EAAE,EAAE;QACrD,IAAI,CAAC,oBAAoB;YAAE,OAAO;QAElC,oBAAoB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAClD,IAAI,CAAC,QAAQ;gBAAE,OAAO;YACtB,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CACnC,CAAC,EAAE,EAAE,EAAE,CACL,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,EAAE,CACtE,CAAC;YACF,IAAI,CAAC,WAAW;gBAAE,OAAO;YAEzB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YAErE,IAAI,CAAC,UAAU;gBAAE,OAAO;YAExB,MAAM,oBAAoB,GAAG,IAAA,2BAAiB,EAC5C,YAAY,CAAC,CAAC,CAAC,EACf,UAAU,CAAC,QAAQ,CACpB,CAAC;YAEF,MAAM,oBAAoB,GAAG,WAAW,CAAC,GAAG,CAC1C,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,CACnC,CAAC;YACF,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvE,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,CACxC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,CACjC,CAAC;YAEF,IAAI,CAAC,oBAAoB,IAAI,CAAC,cAAc,IAAI,CAAC,kBAAkB;gBACjE,OAAO;YAET,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;gBACjD,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE,kBAAkB,IAAI,sBAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC;qBAC9D,SAAS,CAAC,OAAO,CAAC;qBAClB,aAAa,CAAC,CAAC,CAAC,EAAE;gBACrB,IAAI,EAAE,+BAA+B;gBACrC,GAAG,EAAE,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAC3C,UAAU,EAAE;oBACV,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;iBACnE;aACF,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,IAAI,sBAAS,CAC1B,IAAI,sBAAS,CAAC,QAAQ,CAAC,YAAY,CAAC;iBACjC,SAAS,CAAC,SAAA,EAAE,EAAI,kBAAkB,CAAC,QAAQ,CAAA,CAAC;iBAC5C,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CACnC;iBACE,KAAK,CACJ,IAAI,sBAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;iBAC/B,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC;iBACjD,SAAS,CAAC,SAAA,EAAE,EAAI,cAAc,CAAC,QAAQ,CAAA,CAAC;iBACxC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAC/B;iBACA,GAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAEnC,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,QAAQ,CAAC,cAAc;gBAChC,MAAM;gBACN,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC;YACzD,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,sBAAsB;YAC5B,IAAI,EAAE,2BAA2B;YACjC,GAAG,EAAE,aAAa,CAAC,MAAM;SAC1B,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAG,eAAe,CAAC,oBAAoB,CAAC;YAC7D,KAAK,EAAE,UAAU;YACjB,IAAI,EAAE,QAAQ,IAAI,sBAAS,CAAC,aAAa,CAAC,QAAQ,CAAC;iBAChD,SAAS,CAAC,GAAG,CAAC;iBACd,aAAa,CAAC,CAAC,CAAC,EAAE;YACrB,IAAI,EAAE,+BAA+B;YACrC,GAAG,EAAE,aAAa,CAAC,MAAM;SAC1B,CAAC,CAAC;QAEH,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACzC,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CACjC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,SAAS,CAAC,QAAQ,EAAE,MAAK,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAClE,CAAC;YACF,IAAI,CAAC,UAAU;gBAAE,OAAO;YAExB,MAAM,cAAc,GAAG,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;YAErD,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,YAAY,CAC5D,cAAc,CACf,CAAC;YAEF,MAAM,KAAK,GAAG;gBACZ,OAAO,EAAE,OAAO,CAAC,SAAS;gBAC1B,MAAM;aACP,CAAC;YAEF,IAAI,+BAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;gBAC/D,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM;qBACxB,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC;qBACpC,SAAS,CAAC,GAAG,CAAC,CAAC;gBAClB,iBAAiB,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CACjC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,SAAS,CAAC,QAAQ,EAAE,MAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAC/D,CAAC;YACF,IAAI,CAAC,UAAU;gBAAE,OAAO;YACxB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;gBAAE,OAAO;YAEnC,MAAM,cAAc,GAAG,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;YAErD,iBAAiB,CAAC,gBAAgB,CAAC;gBACjC,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,MAAM,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC;aAClE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB,CAAC,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE;QACjD,IAAI,CAAC,kBAAkB;YAAE,OAAO;QAChC,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;YACjD,KAAK,EAAE,UAAU;YACjB,IAAI,EAAE,+BAA+B;YACrC,GAAG,EAAE,kBAAkB,CAAC,MAAM;SAC/B,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,kBAAkB,CAAC,OAAO;YACnC,MAAM,EAAE,kBAAkB,CAAC,MAAM;SAClC,CAAC,CAAC;QACH,kBAAkB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACpD,IAAI,UAAU,CAAC,CAAC,CAAC;gBACf,OAAO,CAAC,QAAQ,CAAC;oBACf,OAAO,EAAE,2CAA0B;oBACnC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;iBAChC,CAAC,CAAC;QACP,CAAC,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,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/nxfinance/solayerPoolsJob.js

@@ -10,22 +10,16 @@ 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 solana_1 = require("../../utils/solana");
 const constants_1 = require("./constants");
 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 solayerPoolAccounts = yield (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.nxfinanceLendIdlItem, [
-        {
-            memcmp: {
-                offset: 0,
-                bytes: 'J27HTcn2xq3',
-            },
-        },
-        {
-            dataSize: 184,
-        },
-    ]);
+    const solayerPoolAccounts = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.solayerPoolStruct, constants_1.lendProgramId)
+        .addRawFilter(0, 'J27HTcn2xq3')
+        .addDataSizeFilter(184)
+        .run();
     yield cache.setItem(constants_1.solayerPoolKey, solayerPoolAccounts, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/nxfinance/solayerPoolsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"solayerPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/solayerPoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,+CAAkE;AAClE,2CAA+E;AAC/E,iDAAsD;AAGtD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,mBAAmB,GAAG,MAAM,IAAA,qCAA4B,EAC5D,UAAU,EACV,gCAAoB,EACpB;QACE;YACE,MAAM,EAAE;gBACN,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,aAAa;aACrB;SACF;QACD;YACE,QAAQ,EAAE,GAAG;SACd;KACF,CACF,CAAC;IAEF,MAAM,KAAK,CAAC,OAAO,CAAC,0BAAc,EAAE,mBAAmB,EAAE;QACvD,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,gBAAgB;IACjC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"solayerPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/solayerPoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAwE;AACxE,iDAAsD;AACtD,uCAA8C;AAC9C,kEAA+D;AAE/D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,mBAAmB,GAAG,MAAM,qBAAS,CAAC,KAAK,CAC/C,UAAU,EACV,2BAAiB,EACjB,yBAAa,CACd;SACE,YAAY,CAAC,CAAC,EAAE,aAAa,CAAC;SAC9B,iBAAiB,CAAC,GAAG,CAAC;SACtB,GAAG,EAAE,CAAC;IAET,MAAM,KAAK,CAAC,OAAO,CAAC,0BAAc,EAAE,mBAAmB,EAAE;QACvD,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,gBAAgB;IACjC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/nxfinance/stakingFetcher.js

@@ -19,9 +19,10 @@ 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 structs_1 = require("./structs");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const stakingAccount = (yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.nxfinanceStakingIdlItem, [
+    const stakingAccount = (yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.stakeAccountStruct, [
         web3_js_1.PublicKey.findProgramAddressSync([
             new web3_js_1.PublicKey(constants_1.stakePool).toBuffer(),
             Buffer.from('nx_account', 'utf8'),
@@ -41,7 +42,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         label: 'Staked',
         link: 'https://nxfinance.io/stake',
         ref: stakingAccount.pubkey.toString(),
-        sourceRefs: [{ name: 'Pool', address: stakePoolAccount.pubkey }],
+        sourceRefs: [{ name: 'Pool', address: stakePoolAccount.pubkey.toString() }],
     });
     element.addAsset({
         address: stakePoolAccount.stakeTokenMint,

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

@@ -1 +1 @@
-{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA4E;AAC5E,6CAA4C;AAC5C,gEAAqC;AAErC,2CAMqB;AAErB,iDAAsD;AACtD,+CAAuE;AAEvE,gFAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,cAAc,GAAG,CACrB,MAAM,IAAA,0CAAiC,EACrC,UAAU,EACV,mCAAuB,EACvB;QACE,mBAAS,CAAC,sBAAsB,CAC9B;YACE,IAAI,mBAAS,CAAC,qBAAS,CAAC,CAAC,QAAQ,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC;YACjC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;SAChC,EACD,IAAI,mBAAS,CAAC,4BAAgB,CAAC,CAChC,CAAC,CAAC,CAAC;KACL,CACF,CACF,CAAC,CAAC,CAAC,CAAC;IACL,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,OAAO,CAC1C,0BAAc,EACd;QACE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CACF,CAAC;IACF,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAEzE,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,4BAA4B;QAClC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE;QACrC,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,MAAM,EAAE,CAAC;KACjE,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,gBAAgB,CAAC,cAAc;QACxC,MAAM,EAAE,cAAc,CAAC,YAAY;KACpC,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,oCAAmB;QAC5B,MAAM,EAAE,cAAc,CAAC,eAAe;QACtC,UAAU,EAAE;YACV,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,gBAAgB,CAAC,cAAc;QACxC,MAAM,EAAE,cAAc,CAAC,iBAAiB;QACxC,UAAU,EAAE;YACV,WAAW,EAAE,IAAI,sBAAS,CAAC,cAAc,CAAC,mBAAmB,CAAC;iBAC3D,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,UAAU;iBAClC,YAAY,CAAC,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;iBAChC,QAAQ,EAAE;SACd;KACF,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/nxfinance/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA4E;AAC5E,6CAA4C;AAC5C,gEAAqC;AAErC,2CAKqB;AAErB,iDAAsD;AACtD,+CAG4B;AAC5B,gFAA6E;AAC7E,uCAA0D;AAE1D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,cAAc,GAAG,CACrB,MAAM,IAAA,sCAA6B,EAAC,UAAU,EAAE,4BAAkB,EAAE;QAClE,mBAAS,CAAC,sBAAsB,CAC9B;YACE,IAAI,mBAAS,CAAC,qBAAS,CAAC,CAAC,QAAQ,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC;YACjC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;SAChC,EACD,IAAI,mBAAS,CAAC,4BAAgB,CAAC,CAChC,CAAC,CAAC,CAAC;KACL,CAAC,CACH,CAAC,CAAC,CAAC,CAAC;IACL,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,OAAO,CAC1C,0BAAc,EACd;QACE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CACF,CAAC;IACF,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAEzE,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,4BAA4B;QAClC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE;QACrC,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;KAC5E,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,gBAAgB,CAAC,cAAc;QACxC,MAAM,EAAE,cAAc,CAAC,YAAY;KACpC,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,oCAAmB;QAC5B,MAAM,EAAE,cAAc,CAAC,eAAe;QACtC,UAAU,EAAE;YACV,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,gBAAgB,CAAC,cAAc;QACxC,MAAM,EAAE,cAAc,CAAC,iBAAiB;QACxC,UAAU,EAAE;YACV,WAAW,EAAE,IAAI,sBAAS,CAAC,cAAc,CAAC,mBAAmB,CAAC;iBAC3D,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,UAAU;iBAClC,YAAY,CAAC,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;iBAChC,QAAQ,EAAE;SACd;KACF,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/nxfinance/stakingPoolJob.js

@@ -14,9 +14,12 @@ const web3_js_1 = require("@solana/web3.js");
 const solana_1 = require("../../utils/solana");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
+const structs_1 = require("./structs");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const stakePoolAccount = (yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.nxfinanceStakingIdlItem, [new web3_js_1.PublicKey('2P1eeegdbEhN3bnCroJJPXiH13i4rw1XYk8ftdh9meRY')]))[0];
+    const stakePoolAccount = (yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.stakePoolStruct, [
+        new web3_js_1.PublicKey('2P1eeegdbEhN3bnCroJJPXiH13i4rw1XYk8ftdh9meRY'),
+    ]))[0];
     yield cache.setItem(constants_1.stakingPoolKey, stakePoolAccount, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,