@sonarwatch/portfolio-plugins 0.14.145 → 0.14.151

package/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.14.151](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.150...plugins-0.14.151) (2025-03-20)
+
+
+
+## [0.14.150](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.149...plugins-0.14.150) (2025-03-20)
+
+
+
+## [0.14.149](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.148...plugins-0.14.149) (2025-03-20)
+
+
+
+## [0.14.148](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.147...plugins-0.14.148) (2025-03-20)
+
+
+
+## [0.14.147](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.146...plugins-0.14.147) (2025-03-20)
+
+
+
+## [0.14.146](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.145...plugins-0.14.146) (2025-03-20)
+
+
+
 ## [0.14.145](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.144...plugins-0.14.145) (2025-03-18)
 
 

package/package.json

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

package/src/plugins/ratex/getPool.d.ts

@@ -1,7 +1,6 @@
 /// <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';
 import { Cache } from '../../Cache';
 import { YieldMarketWithOracle } from './types';
-export declare const getPool: (poolId: PublicKey, idlItem: IdlItem, cache: Cache) => Promise<YieldMarketWithOracle | undefined>;
+export declare const getPool: (poolId: PublicKey, cache: Cache) => Promise<YieldMarketWithOracle | undefined>;

package/src/plugins/ratex/getPool.js

@@ -15,7 +15,8 @@ const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
-const getPool = (poolId, idlItem, cache) => __awaiter(void 0, void 0, void 0, function* () {
+const structs_1 = require("./structs");
+const getPool = (poolId, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const cacheOpts = {
         prefix: constants_1.poolPrefix,
         networkId: portfolio_core_1.NetworkId.solana,
@@ -24,10 +25,10 @@ const getPool = (poolId, idlItem, cache) => __awaiter(void 0, void 0, void 0, fu
     if (cachedPool)
         return cachedPool;
     const connection = (0, clients_1.getClientSolana)();
-    const pools = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, idlItem, [poolId]);
+    const pools = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.yieldMarketStruct, [poolId]);
     if (!pools[0])
         return undefined;
-    const oracles = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, idlItem, [new web3_js_1.PublicKey(pools[0].oracle)]);
+    const oracles = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.oracleStruct, [new web3_js_1.PublicKey(pools[0].oracle)]);
     if (!oracles[0])
         return undefined;
     const poolWithOracle = Object.assign(Object.assign({}, pools[0]), { rate: oracles[0].rate });

package/src/plugins/ratex/getPool.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPool.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ratex/getPool.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AAEvD,6CAA4C;AAE5C,2CAAyC;AAEzC,+CAAuE;AACvE,iDAAsD;AAE/C,MAAM,OAAO,GAAG,CACrB,MAAiB,EACjB,OAAgB,EAChB,KAAY,EACgC,EAAE;IAC9C,MAAM,SAAS,GAAG;QAChB,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,OAAO,CACpC,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,CACV,CAAC;IACF,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC;IAElC,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,KAAK,GAAG,MAAM,IAAA,0CAAiC,EACnD,UAAU,EACV,OAAO,EACP,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAEhC,MAAM,OAAO,GAAG,MAAM,IAAA,0CAAiC,EACrD,UAAU,EACV,OAAO,EACP,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CACjC,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAElC,MAAM,cAAc,mCACf,KAAK,CAAC,CAAC,CAAC,KACX,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,GACtB,CAAC;IAEF,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;IAElE,OAAO,cAAc,CAAC;AACxB,CAAC,CAAA,CAAC;AAzCW,QAAA,OAAO,WAyClB"}
+{"version":3,"file":"getPool.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ratex/getPool.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAE5C,2CAAyC;AACzC,+CAAmE;AACnE,iDAAsD;AACtD,uCAA4D;AAGrD,MAAM,OAAO,GAAG,CACrB,MAAiB,EACjB,KAAY,EACgC,EAAE;IAC9C,MAAM,SAAS,GAAG;QAChB,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,OAAO,CACpC,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,CACV,CAAC;IACF,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC;IAElC,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,KAAK,GAAG,MAAM,IAAA,sCAA6B,EAC/C,UAAU,EACV,2BAAiB,EACjB,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAEhC,MAAM,OAAO,GAAG,MAAM,IAAA,sCAA6B,EACjD,UAAU,EACV,sBAAY,EACZ,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CACjC,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAElC,MAAM,cAAc,mCACf,KAAK,CAAC,CAAC,CAAC,KACX,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,GACtB,CAAC;IAEF,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;IAElE,OAAO,cAAc,CAAC;AACxB,CAAC,CAAA,CAAC;AAxCW,QAAA,OAAO,WAwClB"}

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

@@ -1,10 +1,13 @@
-import { IdlItem } from '@solanafm/explorer-kit-idls';
+/// <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 { ParsedAccount } from '../../utils/solana';
-import { LP, Program, User, UserStats, YieldMarketWithOracle } from './types';
+import { Program, YieldMarketWithOracle } from './types';
 import { Cache } from '../../Cache';
+import { LP, User, UserStats } from './structs';
 export declare const getUserStatsByProgram: (programs: Program[], owner: string) => Promise<Map<string, UserStats>>;
 export declare const getUsersByProgram: (programs: Program[], userStatsByProgram: Map<string, UserStats>, owner: string) => Promise<Map<string, ParsedAccount<User>[]>>;
 export declare const getLpDatasByProgram: (programs: Program[], userStatsByProgram: Map<string, UserStats>, owner: string) => Promise<Map<string, ParsedAccount<LP>[]>>;
 export declare const getPools: (programs: Program[], lpDatasByProgram: Map<string, ParsedAccount<LP>[]>, cache: Cache) => Promise<Map<string, YieldMarketWithOracle>>;
-export declare const getUsers: (owner: string, numberOfSubAccountsCreated: number, idlItem: IdlItem) => Promise<(ParsedAccount<User> | null)[]>;
-export declare const getLpDatas: (owner: string, numberOfSubAccountsCreated: number, idlItem: IdlItem) => Promise<(ParsedAccount<LP> | null)[]>;
+export declare const getUsers: (owner: string, numberOfSubAccountsCreated: number, program: PublicKey) => Promise<(ParsedAccount<User> | null)[]>;
+export declare const getLpDatas: (owner: string, numberOfSubAccountsCreated: number, programId: PublicKey) => Promise<(ParsedAccount<LP> | null)[]>;

package/src/plugins/ratex/helpers.js

@@ -17,19 +17,15 @@ const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
-const idl_json_1 = __importDefault(require("./idl.json"));
 const getPool_1 = require("./getPool");
+const structs_1 = require("./structs");
 const getUserStatsByProgram = (programs, owner) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
     const userStatsPdas = programs.map((program) => {
         const [userStatsPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user_stats'), new web3_js_1.PublicKey(owner).toBuffer()], new web3_js_1.PublicKey(program.programId));
         return userStatsPda;
     });
-    const userStatss = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, {
-        programId: programs[0].programId,
-        idl: idl_json_1.default,
-        idlType: 'anchor',
-    }, userStatsPdas);
+    const userStatss = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.userStatsStruct, userStatsPdas);
     const userStatsByProgram = new Map();
     programs.forEach((program, i) => {
         const userStats = userStatss[i];
@@ -45,12 +41,7 @@ const getUsersByProgram = (programs, userStatsByProgram, owner) => __awaiter(voi
         const userStats = userStatsByProgram.get(program.programId);
         if (!userStats || userStats.numberOfSubAccountsCreated === 0)
             return null;
-        const idlItem = {
-            programId: program.programId,
-            idl: idl_json_1.default,
-            idlType: 'anchor',
-        };
-        return (0, exports.getUsers)(owner, userStats.numberOfSubAccountsCreated, idlItem);
+        return (0, exports.getUsers)(owner, userStats.numberOfSubAccountsCreated, new web3_js_1.PublicKey(program.programId));
     }));
     const usersByProgram = new Map();
     programs.forEach((program, i) => {
@@ -67,12 +58,7 @@ const getLpDatasByProgram = (programs, userStatsByProgram, owner) => __awaiter(v
         const userStats = userStatsByProgram.get(program.programId);
         if (!userStats || userStats.numberOfSubAccountsCreated === 0)
             return null;
-        const idlItem = {
-            programId: program.programId,
-            idl: idl_json_1.default,
-            idlType: 'anchor',
-        };
-        return (0, exports.getLpDatas)(owner, userStats.numberOfSubAccountsCreated, idlItem);
+        return (0, exports.getLpDatas)(owner, userStats.numberOfSubAccountsCreated, new web3_js_1.PublicKey(program.programId));
     }));
     const lpDatasByProgram = new Map();
     programs.forEach((program, i) => {
@@ -90,13 +76,7 @@ const getPools = (programs, lpDatasByProgram, cache) => __awaiter(void 0, void 0
         const lpDatas = lpDatasByProgram.get(program.programId);
         if (!lpDatas)
             return null;
-        const idlItem = {
-            programId: program.programId,
-            idl: idl_json_1.default,
-            idlType: 'anchor',
-        };
-        return Promise.all(lpDatas.map((lpData) => lpData &&
-            (0, getPool_1.getPool)(new web3_js_1.PublicKey(lpData.ammPosition.ammpool), idlItem, cache))).then((lpDatasPools) => {
+        return Promise.all(lpDatas.map((lpData) => lpData && (0, getPool_1.getPool)(new web3_js_1.PublicKey(lpData.ammPosition.ammpool), cache))).then((lpDatasPools) => {
             lpDatasPools.forEach((p) => {
                 if (p) {
                     pools.set(p.pubkey.toString(), p);
@@ -107,32 +87,32 @@ const getPools = (programs, lpDatasByProgram, cache) => __awaiter(void 0, void 0
     return pools;
 });
 exports.getPools = getPools;
-const getUsers = (owner, numberOfSubAccountsCreated, idlItem) => {
+const getUsers = (owner, numberOfSubAccountsCreated, program) => {
     const userPdas = [];
     for (let subaccountId = 0; subaccountId < numberOfSubAccountsCreated; subaccountId++) {
         const [userPda] = web3_js_1.PublicKey.findProgramAddressSync([
             Buffer.from('user'),
             new web3_js_1.PublicKey(owner).toBuffer(),
             new bn_js_1.default(subaccountId).toArrayLike(Buffer, 'le', 2),
-        ], new web3_js_1.PublicKey(idlItem.programId));
+        ], program);
         userPdas.push(userPda);
     }
     const connection = (0, clients_1.getClientSolana)();
-    return (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, idlItem, userPdas);
+    return (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.userStruct, userPdas);
 };
 exports.getUsers = getUsers;
-const getLpDatas = (owner, numberOfSubAccountsCreated, idlItem) => {
+const getLpDatas = (owner, numberOfSubAccountsCreated, programId) => {
     const lpPdas = [];
     for (let subaccountId = 0; subaccountId < numberOfSubAccountsCreated; subaccountId++) {
         const [lpPda] = web3_js_1.PublicKey.findProgramAddressSync([
             Buffer.from('lp'),
             new web3_js_1.PublicKey(owner).toBuffer(),
             new bn_js_1.default(subaccountId).toArrayLike(Buffer, 'le', 2),
-        ], new web3_js_1.PublicKey(idlItem.programId));
+        ], programId);
         lpPdas.push(lpPda);
     }
     const connection = (0, clients_1.getClientSolana)();
-    return (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, idlItem, lpPdas);
+    return (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.lpStruct, lpPdas);
 };
 exports.getLpDatas = getLpDatas;
 //# sourceMappingURL=helpers.js.map

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

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

package/src/plugins/ratex/marketsJob.js

@@ -17,8 +17,8 @@ const bn_js_1 = __importDefault(require("bn.js"));
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
-const idl_json_1 = __importDefault(require("./idl.json"));
 const solana_1 = require("../../utils/solana");
+const structs_1 = require("./structs");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
     const addressLookupTable = (yield connection.getAddressLookupTable(constants_1.programIdLookupTable)).value;
@@ -27,12 +27,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const programs = [];
     for (const programId of addressLookupTable.state.addresses) {
         const [statePda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('ratex_state')], programId);
-        const idlItem = {
-            programId: programId.toString(),
-            idl: idl_json_1.default,
-            idlType: 'anchor',
-        };
-        const states = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, idlItem, [statePda]);
+        const states = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.stateStruct, [statePda]);
         if (!states[0])
             continue;
         const marketIndexStart = states[0]['marketIndexStart'];
@@ -40,12 +35,12 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             Buffer.from('margin_market'),
             new bn_js_1.default(marketIndexStart).toArrayLike(Buffer, 'le', 4),
         ], programId);
-        const marginMarkets = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, idlItem, [marginMarketPda]);
+        const marginMarkets = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.marginMarketStruct, [marginMarketPda]);
         if (!marginMarkets[0])
             continue;
         programs.push({
             programId: programId.toString(),
-            mint: marginMarkets[0].mint,
+            mint: marginMarkets[0].mint.toString(),
         });
     }
     yield cache.setItem(constants_1.programsCacheKey, programs, {

package/src/plugins/ratex/marketsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ratex/marketsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6CAA4C;AAE5C,kDAAuB;AACvB,+DAAuD;AAGvD,2CAIqB;AACrB,iDAAsD;AACtD,0DAA6B;AAC7B,+CAAuE;AAGvE,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,kBAAkB,GAAG,CACzB,MAAM,UAAU,CAAC,qBAAqB,CAAC,gCAAoB,CAAC,CAC7D,CAAC,KAAK,CAAC;IAER,IAAI,CAAC,kBAAkB;QAAE,OAAO;IAEhC,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,KAAK,MAAM,SAAS,IAAI,kBAAkB,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAC3D,MAAM,CAAC,QAAQ,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACjD,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAC5B,SAAS,CACV,CAAC;QAEF,MAAM,OAAO,GAAG;YACd,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;YAC/B,GAAG,EAAH,kBAAG;YACH,OAAO,EAAE,QAAQ;SACP,CAAC;QAEb,MAAM,MAAM,GAAG,MAAM,IAAA,0CAAiC,EACpD,UAAU,EACV,OAAO,EACP,CAAC,QAAQ,CAAC,CACX,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,SAAS;QAEzB,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAW,CAAC;QAEjE,MAAM,CAAC,eAAe,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACxD;YACE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;YAC5B,IAAI,eAAE,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;SACtD,EACD,SAAS,CACV,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAA,0CAAiC,EAC3D,UAAU,EACV,OAAO,EACP,CAAC,eAAe,CAAC,CAClB,CAAC;QAEF,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;YAAE,SAAS;QAEhC,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;YAC/B,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,CAAC,OAAO,CAAC,4BAAgB,EAAE,QAAQ,EAAE;QAC9C,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,UAAU;IAC3B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"marketsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ratex/marketsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,kDAAuB;AACvB,+DAAuD;AAGvD,2CAIqB;AACrB,iDAAsD;AACtD,+CAAmE;AACnE,uCAKmB;AAEnB,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,kBAAkB,GAAG,CACzB,MAAM,UAAU,CAAC,qBAAqB,CAAC,gCAAoB,CAAC,CAC7D,CAAC,KAAK,CAAC;IAER,IAAI,CAAC,kBAAkB;QAAE,OAAO;IAEhC,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,KAAK,MAAM,SAAS,IAAI,kBAAkB,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAC3D,MAAM,CAAC,QAAQ,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACjD,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAC5B,SAAS,CACV,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAA,sCAA6B,EAChD,UAAU,EACV,qBAAW,EACX,CAAC,QAAQ,CAAC,CACX,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,SAAS;QAEzB,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAW,CAAC;QAEjE,MAAM,CAAC,eAAe,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACxD;YACE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;YAC5B,IAAI,eAAE,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;SACtD,EACD,SAAS,CACV,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,UAAU,EACV,4BAAkB,EAClB,CAAC,eAAe,CAAC,CAClB,CAAC;QAEF,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;YAAE,SAAS;QAEhC,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;YAC/B,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE;SACvC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,CAAC,OAAO,CAAC,4BAAgB,EAAE,QAAQ,EAAE;QAC9C,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,UAAU;IAC3B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/ratex/positionsFetcher.js

@@ -42,7 +42,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 if (!user)
                     return;
                 user.marginPositions.forEach((marginPosition) => {
-                    if (marginPosition.balance !== 0) {
+                    if (!marginPosition.balance.isZero()) {
                         const element = elementRegistry.addElementMultiple({
                             label: 'Margin',
                             link: 'https://app.rate-x.io/trade',
@@ -61,7 +61,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             lpDatas.forEach((lpData) => {
                 if (!lpData)
                     return;
-                const ammpool = pools.get(lpData.ammPosition.ammpool);
+                const ammpool = pools.get(lpData.ammPosition.ammpool.toString());
                 if (!ammpool)
                     return;
                 const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(new bignumber_js_1.default(lpData.ammPosition.liquidity), ammpool.pool.tickCurrentIndex, lpData.ammPosition.tickLowerIndex, lpData.ammPosition.tickUpperIndex, true);

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

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

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

@@ -0,0 +1,211 @@
+/// <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 BigNumber from 'bignumber.js';
+import { BeetStruct, FixableBeetStruct } from '@metaplex-foundation/beet';
+export type State = {
+    accountDiscriminator: number[];
+    admin: PublicKey;
+    signer: PublicKey;
+    numberOfAuthorities: BigNumber;
+    numberOfSubAccounts: BigNumber;
+    collateralRatioInitial: BigNumber;
+    collateralRatioMaintenance: BigNumber;
+    collateralRatioInitialPreExpiry: BigNumber;
+    numberOfYieldMarkets: number;
+    numberOfMarginMarkets: number;
+    signerNonce: number;
+    twapDuration: number;
+    marginIndexStart: number;
+    marketIndexStart: number;
+    keepers: PublicKey[];
+    keeperFeePerTx: BigNumber[];
+    keeperFee: BigNumber[];
+};
+export declare const stateStruct: FixableBeetStruct<State, Partial<State>>;
+export type MarginMarket = {
+    accountDiscriminator: number[];
+    pubkey: PublicKey;
+    mint: PublicKey;
+};
+export declare const marginMarketStruct: FixableBeetStruct<MarginMarket, Partial<MarginMarket>>;
+export type AmmpoolRewardInfo = {
+    mint: PublicKey;
+    vault: PublicKey;
+    authority: PublicKey;
+    emissionsPerSecondX64: BigNumber;
+    growthGlobalX64: BigNumber;
+};
+export declare const ammPoolRewardInfoStruct: BeetStruct<AmmpoolRewardInfo, Partial<AmmpoolRewardInfo>>;
+export type Ammpool = {
+    ammpoolsConfig: PublicKey;
+    liquidity: BigNumber;
+    sqrtPrice: BigNumber;
+    protocolFeeOwedA: BigNumber;
+    protocolFeeOwedB: BigNumber;
+    tokenMintBase: PublicKey;
+    tokenVaultBase: PublicKey;
+    feeGrowthGlobalA: BigNumber;
+    tokenMintQuote: PublicKey;
+    tokenVaultQuote: PublicKey;
+    feeGrowthGlobalB: BigNumber;
+    rewardLastUpdatedTimestamp: BigNumber;
+    rewardInfos: AmmpoolRewardInfo[];
+    oracle: PublicKey;
+    tickCurrentIndex: number;
+    observationIndex: number;
+    observationUpdateDuration: number;
+    tickSpacing: number;
+    tickSpacingSeed: number[];
+    feeRate: number;
+    protocolFeeRate: number;
+};
+export declare const ammpoolStruct: BeetStruct<Ammpool, Partial<Ammpool>>;
+export declare enum MarginType {
+    NonYieldBearing = 0,
+    YieldBearing = 1
+}
+export type YieldMarket = {
+    accountDiscriminator: number[];
+    pubkey: PublicKey;
+    oracle: PublicKey;
+    name: number[];
+    quoteAssetVault: PublicKey;
+    baseAssetVault: PublicKey;
+    pool: Ammpool;
+    startTs: BigNumber;
+    expireTs: BigNumber;
+    orderStepSize: BigNumber;
+    minOrderSize: BigNumber;
+    minLpAmount: BigNumber;
+    minLiquidationSize: BigNumber;
+    marketIndex: number;
+    marginIndex: number;
+    lpMarginIndex: number;
+    marginType: MarginType;
+    lpMarginType: MarginType;
+    marginDecimals: number;
+    lpMarginDecimals: number;
+};
+export declare const yieldMarketStruct: FixableBeetStruct<YieldMarket, Partial<YieldMarket>>;
+export type Oracle = {
+    accountDiscriminator: number[];
+    admin: PublicKey;
+    name: number[];
+    lastRate: BigNumber;
+    rate: BigNumber;
+    marketRate: BigNumber;
+    ts: BigNumber;
+    decimals: number;
+    padding: number[];
+    epochStartTimestamp: BigNumber;
+    lastEpochStartTimestamp: BigNumber;
+    padding1: number[];
+};
+export declare const oracleStruct: FixableBeetStruct<Oracle, Partial<Oracle>>;
+export type YieldPosition = {
+    baseAssetAmount: BigNumber;
+    quoteAssetAmount: BigNumber;
+    lastRate: BigNumber;
+    marketIndex: number;
+    padding1: number[];
+    padding2: number[];
+};
+export declare const yieldPositionStruct: BeetStruct<YieldPosition, Partial<YieldPosition>>;
+export declare enum OrderStatus {
+    Init = 0,
+    Open = 1,
+    Filled = 2,
+    Canceled = 3
+}
+export declare enum OrderType {
+    Market = 0,
+    Limit = 1
+}
+export type Order = {
+    slot: BigNumber;
+    priceLimit: BigNumber;
+    baseAssetAmount: BigNumber;
+    baseAssetAmountFilled: BigNumber;
+    quoteAssetAmountFilled: BigNumber;
+    expireTs: BigNumber;
+    orderIndex: number;
+    orderId: number;
+    isolatedMarginAmount: BigNumber;
+    marketIndex: number;
+    status: OrderStatus;
+    orderType: OrderType;
+    isClose: boolean;
+    padding1: number[];
+    padding2: number[];
+};
+export declare const orderStruct: BeetStruct<Order, Partial<Order>>;
+export type MarginPosition = {
+    balance: BigNumber;
+    marketIndex: number;
+    decimals: number;
+    padding2: number[];
+};
+export declare const marginPositionStruct: BeetStruct<MarginPosition, Partial<MarginPosition>>;
+export type User = {
+    accountDiscriminator: number[];
+    authority: PublicKey;
+    marginPositions: MarginPosition[];
+    orders: Order[];
+    yieldPositions: YieldPosition[];
+    lastActiveSlot: BigNumber;
+    lastOrderId: number;
+    subAccountId: number;
+    idle: boolean;
+    padding2: boolean;
+    isIsolated: boolean;
+    isExpiryOn: boolean;
+    padding1: number[];
+};
+export declare const userStruct: FixableBeetStruct<User, Partial<User>>;
+export type UserStats = {
+    accountDiscriminator: number[];
+    authority: PublicKey;
+    referrer: PublicKey;
+    numberOfSubAccounts: number;
+    numberOfSubAccountsCreated: number;
+    padding: number[];
+};
+export declare const userStatsStruct: BeetStruct<UserStats, Partial<UserStats>>;
+export type PositionRewardInfo = {
+    growthInsideCheckpoint: BigNumber;
+    amountOwed: BigNumber;
+};
+export declare const positionrewardinfoStruct: BeetStruct<PositionRewardInfo, Partial<PositionRewardInfo>>;
+export type AmmPosition = {
+    ammpool: PublicKey;
+    liquidity: BigNumber;
+    tickLowerIndex: number;
+    tickUpperIndex: number;
+    lowerRate: BigNumber;
+    upperRate: BigNumber;
+    feeGrowthCheckpointA: BigNumber;
+    feeOwedA: BigNumber;
+    feeGrowthCheckpointB: BigNumber;
+    feeOwedB: BigNumber;
+    rewardInfos: PositionRewardInfo[];
+};
+export declare const positionStruct: BeetStruct<AmmPosition, Partial<AmmPosition>>;
+export declare enum LpStatus {
+    Active = 0,
+    Updating = 1
+}
+export type LP = {
+    accountDiscriminator: number[];
+    authority: PublicKey;
+    ammPosition: AmmPosition;
+    reserveQuoteAmount: BigNumber;
+    reserveBaseAmount: BigNumber;
+    lastActiveSlot: BigNumber;
+    subAccountId: BigNumber;
+    idle: boolean;
+    state: LpStatus;
+    padding1: number[];
+    padding2: number[];
+};
+export declare const lpStruct: BeetStruct<LP, Partial<LP>>;