@sonarwatch/portfolio-plugins 0.7.0 → 0.7.2

package/src/plugins/native-stake/constants.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.marinadeNativeMerger = exports.marinadeNativeManager = exports.validatorsPrefix = exports.validatorsKey = exports.platformId = void 0;
+exports.marinadeNativeMerger = exports.marinadeNativeManager = exports.validatorsPrefix = exports.validatorsKey = exports.nativeStakePlatform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'native-stake';
+exports.nativeStakePlatform = {
+    id: exports.platformId,
+    name: 'Native Stake',
+    image: 'https://alpha.sonar.watch/img/platforms/native-stake.png',
+};
 exports.validatorsKey = 'activeValidators';
 exports.validatorsPrefix = `${exports.platformId}-validators`;
 exports.marinadeNativeManager = new web3_js_1.PublicKey('noMa7dN4cHQLV4ZonXrC29HTKFpxrpFbDLK5Gub8W8t');

package/src/plugins/native-stake/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,cAAc,CAAC;AAC5B,QAAA,aAAa,GAAG,kBAAkB,CAAC;AACnC,QAAA,gBAAgB,GAAG,GAAG,kBAAU,aAAa,CAAC;AAC9C,QAAA,qBAAqB,GAAG,IAAI,mBAAS,CAChD,6CAA6C,CAC9C,CAAC;AAEW,QAAA,oBAAoB,GAAG,IAAI,mBAAS,CAC/C,6CAA6C,CAC9C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,cAAc,CAAC;AAC5B,QAAA,mBAAmB,GAAa;IAC3C,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,cAAc;IACpB,KAAK,EAAE,0DAA0D;CAClE,CAAC;AACW,QAAA,aAAa,GAAG,kBAAkB,CAAC;AACnC,QAAA,gBAAgB,GAAG,GAAG,kBAAU,aAAa,CAAC;AAC9C,QAAA,qBAAqB,GAAG,IAAI,mBAAS,CAChD,6CAA6C,CAC9C,CAAC;AAEW,QAAA,oBAAoB,GAAG,IAAI,mBAAS,CAC/C,6CAA6C,CAC9C,CAAC"}

package/src/plugins/native-stake/index.d.ts

@@ -1,4 +1,6 @@
+import { Platform } from '@sonarwatch/portfolio-core';
 import { Job } from '../../Job';
 import { Fetcher } from '../../Fetcher';
+export declare const platforms: Platform[];
 export declare const jobs: Job[];
 export declare const fetchers: Fetcher[];

package/src/plugins/native-stake/index.js

@@ -3,11 +3,13 @@ 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;
+exports.fetchers = exports.jobs = exports.platforms = void 0;
 const suiFetcher_1 = __importDefault(require("./suiFetcher"));
 const aptosFetcher_1 = __importDefault(require("./aptosFetcher"));
 const solanaFetcher_1 = __importDefault(require("./solanaFetcher"));
 const activeValidatorsJob_1 = __importDefault(require("./activeValidatorsJob"));
+const constants_1 = require("./constants");
+exports.platforms = [constants_1.nativeStakePlatform];
 exports.jobs = [activeValidatorsJob_1.default];
 exports.fetchers = [suiFetcher_1.default, aptosFetcher_1.default, solanaFetcher_1.default];
 //# sourceMappingURL=index.js.map

package/src/plugins/native-stake/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/index.ts"],"names":[],"mappings":";;;;;;AAEA,8DAAsC;AACtC,kEAA0C;AAC1C,oEAA4C;AAC5C,gFAAuD;AAE1C,QAAA,IAAI,GAAU,CAAC,6BAAkB,CAAC,CAAC;AACnC,QAAA,QAAQ,GAAc,CAAC,oBAAU,EAAE,sBAAY,EAAE,uBAAa,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/index.ts"],"names":[],"mappings":";;;;;;AAGA,8DAAsC;AACtC,kEAA0C;AAC1C,oEAA4C;AAC5C,gFAAuD;AACvD,2CAAkD;AAErC,QAAA,SAAS,GAAe,CAAC,+BAAmB,CAAC,CAAC;AAC9C,QAAA,IAAI,GAAU,CAAC,6BAAkB,CAAC,CAAC;AACnC,QAAA,QAAQ,GAAc,CAAC,oBAAU,EAAE,sBAAY,EAAE,uBAAa,CAAC,CAAC"}

package/src/plugins/native-stake/solanaFetcher.js

@@ -21,7 +21,6 @@ const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
 const structs_1 = require("./structs");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-const platforms_1 = require("../../platforms");
 const stakeProgramId = new web3_js_1.PublicKey('Stake11111111111111111111111111111111111111');
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
@@ -54,7 +53,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     if (nativeAssets.length !== 0) {
         elements.push({
             networkId: portfolio_core_1.NetworkId.solana,
-            platformId: platforms_1.nativeStakePlatform.id,
+            platformId: constants_1.nativeStakePlatform.id,
             type: 'multiple',
             label: 'Staked',
             value: (0, portfolio_core_1.getUsdValueSum)(nativeAssets.map((a) => a.value)),
@@ -66,7 +65,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     if (marinadeNativeAssets.length !== 0) {
         elements.push({
             networkId: portfolio_core_1.NetworkId.solana,
-            platformId: platforms_1.nativeStakePlatform.id,
+            platformId: constants_1.nativeStakePlatform.id,
             type: 'multiple',
             label: 'Staked',
             tags: ['Marinade Native'],

package/src/plugins/native-stake/solanaFetcher.js.map

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

package/src/plugins/native-stake/suiFetcher.js

@@ -17,7 +17,6 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-const platforms_1 = require("../../platforms");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSui)();
     const stakedValidators = yield client.getStakes({ owner });
@@ -44,7 +43,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         elements.push({
             networkId: portfolio_core_1.NetworkId.sui,
-            platformId: platforms_1.nativeStakePlatform.id,
+            platformId: constants_1.nativeStakePlatform.id,
             type: 'multiple',
             label: 'Staked',
             tags: ['Native Stake'],

package/src/plugins/native-stake/suiFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"suiFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/suiFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AACpC,gEAAqC;AAGrC,2CAAyC;AACzC,iDAAmD;AACnD,qGAA6E;AAC7E,+CAAsD;AAEtD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE7C,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAC7C,2BAAU,CAAC,MAAM,CAAC,OAAO,EACzB,0BAAS,CAAC,GAAG,CACd,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAE9B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAChD,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAElC,MAAM,MAAM,GAA0B,EAAE,CAAC;QACzC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,SAAS,CAAC,SAAS,CAAC;iBACpD,GAAG,CAAC,SAAA,EAAE,EAAI,2BAAU,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC;iBACrC,QAAQ,EAAE,CAAC;YACd,MAAM,WAAW,GAAG,IAAA,gCAAsB,EACxC,2BAAU,CAAC,MAAM,CAAC,OAAO,EACzB,YAAY,EACZ,0BAAS,CAAC,GAAG,EACb,aAAa,CACd,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzB,KAAK,IAAI,WAAW,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7D;QACD,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,0BAAS,CAAC,GAAG;YACxB,UAAU,EAAE,+BAAmB,CAAC,EAAE;YAClC,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,CAAC,cAAc,CAAC;YACtB,IAAI,EAAE,gBAAgB;YACtB,KAAK;YACL,IAAI,EAAE;gBACJ,MAAM;aACP;SACF,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,MAAM;IACvB,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"suiFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/suiFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AACpC,gEAAqC;AAGrC,2CAA8D;AAC9D,iDAAmD;AACnD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE7C,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAC7C,2BAAU,CAAC,MAAM,CAAC,OAAO,EACzB,0BAAS,CAAC,GAAG,CACd,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAE9B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAChD,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAElC,MAAM,MAAM,GAA0B,EAAE,CAAC;QACzC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,SAAS,CAAC,SAAS,CAAC;iBACpD,GAAG,CAAC,SAAA,EAAE,EAAI,2BAAU,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC;iBACrC,QAAQ,EAAE,CAAC;YACd,MAAM,WAAW,GAAG,IAAA,gCAAsB,EACxC,2BAAU,CAAC,MAAM,CAAC,OAAO,EACzB,YAAY,EACZ,0BAAS,CAAC,GAAG,EACb,aAAa,CACd,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzB,KAAK,IAAI,WAAW,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7D;QACD,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,0BAAS,CAAC,GAAG;YACxB,UAAU,EAAE,+BAAmB,CAAC,EAAE;YAClC,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,CAAC,cAAc,CAAC;YACtB,IAAI,EAAE,gBAAgB;YACtB,KAAK;YACL,IAAI,EAAE;gBACJ,MAAM;aACP;SACF,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,MAAM;IACvB,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -1,5 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
+import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "orca";
+export declare const orcaPlatform: Platform;
 export declare const poolsProgram: PublicKey;
 export declare const aquafarmsProgram: PublicKey;
 export declare const positionsIdentifier = "Orca Whirlpool Position";

package/src/plugins/orca/constants.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiWhirlpool = exports.whirlpoolConfig = exports.whirlpoolProgram = exports.whirlpoolPrefix = exports.positionsIdentifier = exports.aquafarmsProgram = exports.poolsProgram = exports.platformId = void 0;
+exports.apiWhirlpool = exports.whirlpoolConfig = exports.whirlpoolProgram = exports.whirlpoolPrefix = exports.positionsIdentifier = exports.aquafarmsProgram = exports.poolsProgram = exports.orcaPlatform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'orca';
+exports.orcaPlatform = {
+    id: exports.platformId,
+    name: 'Orca',
+    image: 'https://alpha.sonar.watch/img/platforms/orca.png',
+};
 exports.poolsProgram = new web3_js_1.PublicKey('9W959DqEETiGZocYWCQPaJ6sBmUzgfxXfqGeTEdp3aQP');
 exports.aquafarmsProgram = new web3_js_1.PublicKey('82yxjeMsvaURa4MbZZ7WZZHfobirZYkH1zF8fmeGtyaQ');
 exports.positionsIdentifier = 'Orca Whirlpool Position';

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,yBAAyB,CAAC;AAChD,QAAA,eAAe,GAAG,GAAG,kBAAU,YAAY,CAAC;AAC5C,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,8CAA8C,CAC/C,CAAC;AACW,QAAA,YAAY,GAAG,+CAA+C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,YAAY,GAAa;IACpC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,kDAAkD;CAC1D,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,yBAAyB,CAAC;AAChD,QAAA,eAAe,GAAG,GAAG,kBAAU,YAAY,CAAC;AAC5C,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,8CAA8C,CAC/C,CAAC;AACW,QAAA,YAAY,GAAG,+CAA+C,CAAC"}

package/src/plugins/orca/getWhirlpoolPositions.js

@@ -82,7 +82,7 @@ function getWhirlpoolPositions(cache, nfts) {
                 !whirlpoolInfo.tokenMintB ||
                 !whirlpoolInfo.tickCurrentIndex)
                 continue;
-            const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(positionInfo.liquidity, whirlpoolInfo.tickCurrentIndex, positionInfo.tickLowerIndex, positionInfo.tickUpperIndex, 0);
+            const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(positionInfo.liquidity, whirlpoolInfo.tickCurrentIndex, positionInfo.tickLowerIndex, positionInfo.tickUpperIndex, false);
             const tokenPriceA = tokenPrices.get(whirlpoolInfo.tokenMintA.toString());
             if (!tokenPriceA)
                 continue;

package/src/plugins/orca/getWhirlpoolPositions.js.map

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

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

@@ -1,2 +1,12 @@
+import BigNumber from 'bignumber.js';
+import BN from 'bn.js';
 import { Metadata, Nft, Sft } from '@metaplex-foundation/js';
 export declare function isAnOrcaPosition(nft: Metadata | Nft | Sft): boolean;
+export declare function signedShiftRight(n0: BN, shiftBy: number, bitWidth: number): BN;
+export declare function tickIndexToSqrtPricePositive(tick: number): BN;
+export declare function tickIndexToSqrtPriceNegative(tickIndex: number): BN;
+export declare function orcaTickToPriceX64(tickIndex: number): BigNumber;
+export declare function getOrcaTokenAmountsFromLiquidity(liquidity: number, currentSqrtPrice: BigNumber, lowerSqrtPrice: BigNumber, upperSqrtPrice: BigNumber, roundUp: boolean): {
+    tokenAmountA: BigNumber;
+    tokenAmountB: BigNumber;
+};

package/src/plugins/orca/helpers.js

@@ -1,9 +1,201 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAnOrcaPosition = void 0;
+exports.getOrcaTokenAmountsFromLiquidity = exports.orcaTickToPriceX64 = exports.tickIndexToSqrtPriceNegative = exports.tickIndexToSqrtPricePositive = exports.signedShiftRight = exports.isAnOrcaPosition = void 0;
+/* eslint-disable no-bitwise */
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const bn_js_1 = __importDefault(require("bn.js"));
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const constants_1 = require("./constants");
 function isAnOrcaPosition(nft) {
     return nft && nft.name === constants_1.positionsIdentifier;
 }
 exports.isAnOrcaPosition = isAnOrcaPosition;
+function signedShiftRight(n0, shiftBy, bitWidth) {
+    const twoN0 = n0.toTwos(bitWidth).shrn(shiftBy);
+    twoN0.imaskn(bitWidth - shiftBy + 1);
+    return twoN0.fromTwos(bitWidth - shiftBy);
+}
+exports.signedShiftRight = signedShiftRight;
+function tickIndexToSqrtPricePositive(tick) {
+    let ratio;
+    if ((tick & 1) !== 0) {
+        ratio = new bn_js_1.default('79232123823359799118286999567');
+    }
+    else {
+        ratio = new bn_js_1.default('79228162514264337593543950336');
+    }
+    if ((tick & 2) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('79236085330515764027303304731')), 96, 256);
+    }
+    if ((tick & 4) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('79244008939048815603706035061')), 96, 256);
+    }
+    if ((tick & 8) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('79259858533276714757314932305')), 96, 256);
+    }
+    if ((tick & 16) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('79291567232598584799939703904')), 96, 256);
+    }
+    if ((tick & 32) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('79355022692464371645785046466')), 96, 256);
+    }
+    if ((tick & 64) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('79482085999252804386437311141')), 96, 256);
+    }
+    if ((tick & 128) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('79736823300114093921829183326')), 96, 256);
+    }
+    if ((tick & 256) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('80248749790819932309965073892')), 96, 256);
+    }
+    if ((tick & 512) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('81282483887344747381513967011')), 96, 256);
+    }
+    if ((tick & 1024) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('83390072131320151908154831281')), 96, 256);
+    }
+    if ((tick & 2048) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('87770609709833776024991924138')), 96, 256);
+    }
+    if ((tick & 4096) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('97234110755111693312479820773')), 96, 256);
+    }
+    if ((tick & 8192) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('119332217159966728226237229890')), 96, 256);
+    }
+    if ((tick & 16384) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('179736315981702064433883588727')), 96, 256);
+    }
+    if ((tick & 32768) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('407748233172238350107850275304')), 96, 256);
+    }
+    if ((tick & 65536) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('2098478828474011932436660412517')), 96, 256);
+    }
+    if ((tick & 131072) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('55581415166113811149459800483533')), 96, 256);
+    }
+    if ((tick & 262144) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('38992368544603139932233054999993551')), 96, 256);
+    }
+    return signedShiftRight(ratio, 32, 256);
+}
+exports.tickIndexToSqrtPricePositive = tickIndexToSqrtPricePositive;
+function tickIndexToSqrtPriceNegative(tickIndex) {
+    const tick = Math.abs(tickIndex);
+    let ratio;
+    if ((tick & 1) !== 0) {
+        ratio = new bn_js_1.default('18445821805675392311');
+    }
+    else {
+        ratio = new bn_js_1.default('18446744073709551616');
+    }
+    if ((tick & 2) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('18444899583751176498')), 64, 256);
+    }
+    if ((tick & 4) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('18443055278223354162')), 64, 256);
+    }
+    if ((tick & 8) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('18439367220385604838')), 64, 256);
+    }
+    if ((tick & 16) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('18431993317065449817')), 64, 256);
+    }
+    if ((tick & 32) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('18417254355718160513')), 64, 256);
+    }
+    if ((tick & 64) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('18387811781193591352')), 64, 256);
+    }
+    if ((tick & 128) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('18329067761203520168')), 64, 256);
+    }
+    if ((tick & 256) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('18212142134806087854')), 64, 256);
+    }
+    if ((tick & 512) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('17980523815641551639')), 64, 256);
+    }
+    if ((tick & 1024) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('17526086738831147013')), 64, 256);
+    }
+    if ((tick & 2048) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('16651378430235024244')), 64, 256);
+    }
+    if ((tick & 4096) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('15030750278693429944')), 64, 256);
+    }
+    if ((tick & 8192) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('12247334978882834399')), 64, 256);
+    }
+    if ((tick & 16384) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('8131365268884726200')), 64, 256);
+    }
+    if ((tick & 32768) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('3584323654723342297')), 64, 256);
+    }
+    if ((tick & 65536) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('696457651847595233')), 64, 256);
+    }
+    if ((tick & 131072) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('26294789957452057')), 64, 256);
+    }
+    if ((tick & 262144) !== 0) {
+        ratio = signedShiftRight(ratio.mul(new bn_js_1.default('37481735321082')), 64, 256);
+    }
+    return ratio;
+}
+exports.tickIndexToSqrtPriceNegative = tickIndexToSqrtPriceNegative;
+function orcaTickToPriceX64(tickIndex) {
+    if (tickIndex > 0) {
+        return new bignumber_js_1.default(tickIndexToSqrtPricePositive(tickIndex).toString());
+    }
+    return new bignumber_js_1.default(tickIndexToSqrtPriceNegative(tickIndex).toString());
+}
+exports.orcaTickToPriceX64 = orcaTickToPriceX64;
+const fromX64Decimal = (num) => num.times(decimal_js_1.default.pow(2, -64));
+const toX64Decimal = (num) => num.times(decimal_js_1.default.pow(2, 64));
+function getOrcaTokenAmountsFromLiquidity(liquidity, currentSqrtPrice, lowerSqrtPrice, upperSqrtPrice, roundUp) {
+    const decLiquidity = new decimal_js_1.default(liquidity.toString());
+    const currentPrice = new decimal_js_1.default(currentSqrtPrice.toString());
+    const lowerPrice = new decimal_js_1.default(lowerSqrtPrice.toString());
+    const upperPrice = new decimal_js_1.default(upperSqrtPrice.toString());
+    let tokenA;
+    let tokenB;
+    if (currentSqrtPrice.lt(lowerSqrtPrice)) {
+        // x = L * (pb - pa) / (pa * pb)
+        tokenA = toX64Decimal(decLiquidity)
+            .times(upperPrice.sub(lowerPrice))
+            .div(lowerPrice.mul(upperPrice));
+        tokenB = new decimal_js_1.default(0);
+    }
+    else if (currentSqrtPrice.lt(upperSqrtPrice)) {
+        // x = L * (pb - p) / (p * pb)
+        // y = L * (p - pa)
+        tokenA = toX64Decimal(decLiquidity)
+            .times(upperPrice.sub(currentPrice))
+            .div(currentPrice.mul(upperPrice));
+        tokenB = fromX64Decimal(decLiquidity.mul(currentPrice.sub(lowerPrice)));
+    }
+    else {
+        // y = L * (pb - pa)
+        tokenA = new decimal_js_1.default(0);
+        tokenB = fromX64Decimal(decLiquidity.mul(upperPrice.sub(lowerPrice)));
+    }
+    if (roundUp) {
+        return {
+            tokenAmountA: new bignumber_js_1.default(tokenA.ceil().toString()),
+            tokenAmountB: new bignumber_js_1.default(tokenB.ceil().toString()),
+        };
+    }
+    return {
+        tokenAmountA: new bignumber_js_1.default(tokenA.floor().toString()),
+        tokenAmountB: new bignumber_js_1.default(tokenB.floor().toString()),
+    };
+}
+exports.getOrcaTokenAmountsFromLiquidity = getOrcaTokenAmountsFromLiquidity;
 //# sourceMappingURL=helpers.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/helpers.ts"],"names":[],"mappings":";;;AACA,2CAAkD;AAElD,SAAgB,gBAAgB,CAAC,GAAyB;IACxD,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,+BAAmB,CAAC;AACjD,CAAC;AAFD,4CAEC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/helpers.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA+B;AAC/B,gEAAqC;AACrC,kDAAuB;AACvB,4DAAiC;AAGjC,2CAAkD;AAElD,SAAgB,gBAAgB,CAAC,GAAyB;IACxD,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,+BAAmB,CAAC;AACjD,CAAC;AAFD,4CAEC;AAED,SAAgB,gBAAgB,CAAC,EAAM,EAAE,OAAe,EAAE,QAAgB;IACxE,MAAM,KAAK,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChD,KAAK,CAAC,MAAM,CAAC,QAAQ,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC;IACrC,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC;AAC5C,CAAC;AAJD,4CAIC;AAED,SAAgB,4BAA4B,CAAC,IAAY;IACvD,IAAI,KAAK,CAAC;IAEV,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC;KACjD;SAAM;QACL,KAAK,GAAG,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC;KACjD;IAED,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE;QACrB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE;QACrB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE;QACrB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE;QACtB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE;QACtB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE;QACtB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,+BAA+B,CAAC,CAAC,EAClD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,gCAAgC,CAAC,CAAC,EACnD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE;QACxB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,gCAAgC,CAAC,CAAC,EACnD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE;QACxB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,gCAAgC,CAAC,CAAC,EACnD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE;QACxB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,iCAAiC,CAAC,CAAC,EACpD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE;QACzB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,kCAAkC,CAAC,CAAC,EACrD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE;QACzB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,qCAAqC,CAAC,CAAC,EACxD,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IAED,OAAO,gBAAgB,CAAC,KAAK,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;AAC1C,CAAC;AAzID,oEAyIC;AAED,SAAgB,4BAA4B,CAAC,SAAiB;IAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACjC,IAAI,KAAK,CAAC;IAEV,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC;KACxC;SAAM;QACL,KAAK,GAAG,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC;KACxC;IAED,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE;QACrB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE;QACrB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE;QACrB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE;QACtB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE;QACtB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE;QACtB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,KAAK,GAAG,gBAAgB,CACtB,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,sBAAsB,CAAC,CAAC,EACzC,EAAE,EACF,GAAG,CACJ,CAAC;KACH;IACD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE;QACxB,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,qBAAqB,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;KAC7E;IACD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE;QACxB,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,qBAAqB,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;KAC7E;IACD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE;QACxB,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,oBAAoB,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;KAC5E;IACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE;QACzB,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;KAC3E;IACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE;QACzB,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;KACxE;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAtHD,oEAsHC;AAED,SAAgB,kBAAkB,CAAC,SAAiB;IAClD,IAAI,SAAS,GAAG,CAAC,EAAE;QACjB,OAAO,IAAI,sBAAS,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC1E;IACD,OAAO,IAAI,sBAAS,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC3E,CAAC;AALD,gDAKC;AAED,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACxE,MAAM,YAAY,GAAG,CAAC,GAAY,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAErE,SAAgB,gCAAgC,CAC9C,SAAiB,EACjB,gBAA2B,EAC3B,cAAyB,EACzB,cAAyB,EACzB,OAAgB;IAEhB,MAAM,YAAY,GAAG,IAAI,oBAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,IAAI,oBAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAG,IAAI,oBAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,IAAI,oBAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,IAAI,MAAM,CAAC;IACX,IAAI,MAAM,CAAC;IAEX,IAAI,gBAAgB,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE;QACvC,gCAAgC;QAChC,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC;aAChC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aACjC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QACnC,MAAM,GAAG,IAAI,oBAAO,CAAC,CAAC,CAAC,CAAC;KACzB;SAAM,IAAI,gBAAgB,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE;QAC9C,8BAA8B;QAC9B,mBAAmB;QACnB,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC;aAChC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aACnC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QACrC,MAAM,GAAG,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KACzE;SAAM;QACL,oBAAoB;QACpB,MAAM,GAAG,IAAI,oBAAO,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,GAAG,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KACvE;IAED,IAAI,OAAO,EAAE;QACX,OAAO;YACL,YAAY,EAAE,IAAI,sBAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;YACrD,YAAY,EAAE,IAAI,sBAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;SACtD,CAAC;KACH;IAED,OAAO;QACL,YAAY,EAAE,IAAI,sBAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;QACtD,YAAY,EAAE,IAAI,sBAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;KACvD,CAAC;AACJ,CAAC;AA5CD,4EA4CC"}

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

@@ -1,4 +1,6 @@
+import { Platform } from '@sonarwatch/portfolio-core';
 import { Fetcher } from '../../Fetcher';
 import { Job } from '../../Job';
+export declare const platforms: Platform[];
 export declare const jobs: Job[];
 export declare const fetchers: Fetcher[];

package/src/plugins/orca/index.js

@@ -3,9 +3,11 @@ 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;
+exports.fetchers = exports.jobs = exports.platforms = void 0;
 const lpTokensJob_1 = __importDefault(require("./lpTokensJob"));
 const whirlpoolsJob_1 = __importDefault(require("./whirlpoolsJob"));
+const constants_1 = require("./constants");
+exports.platforms = [constants_1.orcaPlatform];
 exports.jobs = [whirlpoolsJob_1.default, lpTokensJob_1.default];
 exports.fetchers = [];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/index.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAkC;AAGlC,oEAA2C;AAE9B,QAAA,IAAI,GAAU,CAAC,uBAAY,EAAE,qBAAK,CAAC,CAAC;AACpC,QAAA,QAAQ,GAAc,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/index.ts"],"names":[],"mappings":";;;;;;AACA,gEAAkC;AAGlC,oEAA2C;AAC3C,2CAA2C;AAE9B,QAAA,SAAS,GAAe,CAAC,wBAAY,CAAC,CAAC;AACvC,QAAA,IAAI,GAAU,CAAC,uBAAY,EAAE,qBAAK,CAAC,CAAC;AACpC,QAAA,QAAQ,GAAc,EAAE,CAAC"}

package/src/plugins/orders/clobs-solana/MarketJobExecutorGenerator.js

@@ -13,12 +13,12 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const web3_js_1 = require("@solana/web3.js");
 const clients_1 = require("../../../utils/clients");
 const solana_1 = require("../../../utils/solana");
-const filters_1 = require("./filters");
+const filters_1 = require("../../../utils/solana/filters");
 const networkId = portfolio_core_1.NetworkId.solana;
 function getMarketJobExecutor(clobVersion) {
     return (cache) => __awaiter(this, void 0, void 0, function* () {
         const client = (0, clients_1.getClientSolana)();
-        const marketsAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, clobVersion.struct, new web3_js_1.PublicKey(clobVersion.programId), (0, filters_1.dataSizeStructFilter)(clobVersion.struct));
+        const marketsAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, clobVersion.struct, new web3_js_1.PublicKey(clobVersion.programId), (0, filters_1.dataSizeFilter)(clobVersion.struct));
         yield addMarketsToCache(cache, clobVersion, marketsAccounts);
     });
 }

package/src/plugins/orders/clobs-solana/MarketJobExecutorGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"MarketJobExecutorGenerator.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/MarketJobExecutorGenerator.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAG5C,oDAAyD;AACzD,kDAAiE;AAEjE,uCAAiD;AAIjD,MAAM,SAAS,GAAG,0BAAS,CAAC,MAAM,CAAC;AAEnC,SAAwB,oBAAoB,CAC1C,WAAwB;IAExB,OAAO,CAAO,KAAY,EAAE,EAAE;QAC5B,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QACjC,MAAM,eAAe,GAAG,MAAM,IAAA,iCAAwB,EACpD,MAAM,EACN,WAAW,CAAC,MAAM,EAClB,IAAI,mBAAS,CAAC,WAAW,CAAC,SAAS,CAAC,EACpC,IAAA,8BAAoB,EAAC,WAAW,CAAC,MAAM,CAAC,CACzC,CAAC;QAEF,MAAM,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IAC/D,CAAC,CAAA,CAAC;AACJ,CAAC;AAdD,uCAcC;AAED,SAAe,iBAAiB,CAC9B,KAAY,EACZ,WAAwB,EACxB,eAAoC;;QAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,MAAM,aAAa,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,UAAU,GAAG,aAAa,CAC9B,aAAa,EACb,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CACjC,CAAC;YACF,IAAI,CAAC,UAAU;gBAAE,SAAS;YAE1B,MAAM,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE;gBACnE,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,SAAS;aACV,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAED,SAAS,aAAa,CACpB,OAA0B,EAC1B,SAAiB;IAEjB,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE;QAC1E,OAAO,SAAS,CAAC;IAEnB,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE;QACtC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE;QACrC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE;QACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,SAAS;KACV,CAAC;AACJ,CAAC"}
+{"version":3,"file":"MarketJobExecutorGenerator.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/MarketJobExecutorGenerator.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAG5C,oDAAyD;AACzD,kDAAiE;AAGjE,2DAA+D;AAE/D,MAAM,SAAS,GAAG,0BAAS,CAAC,MAAM,CAAC;AAEnC,SAAwB,oBAAoB,CAC1C,WAAwB;IAExB,OAAO,CAAO,KAAY,EAAE,EAAE;QAC5B,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QACjC,MAAM,eAAe,GAAG,MAAM,IAAA,iCAAwB,EACpD,MAAM,EACN,WAAW,CAAC,MAAM,EAClB,IAAI,mBAAS,CAAC,WAAW,CAAC,SAAS,CAAC,EACpC,IAAA,wBAAc,EAAC,WAAW,CAAC,MAAM,CAAC,CACnC,CAAC;QAEF,MAAM,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IAC/D,CAAC,CAAA,CAAC;AACJ,CAAC;AAdD,uCAcC;AAED,SAAe,iBAAiB,CAC9B,KAAY,EACZ,WAAwB,EACxB,eAAoC;;QAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,MAAM,aAAa,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,UAAU,GAAG,aAAa,CAC9B,aAAa,EACb,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CACjC,CAAC;YACF,IAAI,CAAC,UAAU;gBAAE,SAAS;YAE1B,MAAM,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE;gBACnE,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,SAAS;aACV,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAED,SAAS,aAAa,CACpB,OAA0B,EAC1B,SAAiB;IAEjB,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE;QAC1E,OAAO,SAAS,CAAC;IAEnB,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE;QACtC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE;QACrC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE;QACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,SAAS;KACV,CAAC;AACJ,CAAC"}

package/src/plugins/orders/clobs-solana/constants.d.ts

@@ -1,4 +1,7 @@
+import { Platform } from '@sonarwatch/portfolio-core';
 import { CLOBVersion } from './types';
+export declare const openbookPlatform: Platform;
+export declare const serumPlatform: Platform;
 export declare const clobVersions: {
     serumV1: CLOBVersion;
     serumV2: CLOBVersion;

package/src/plugins/orders/clobs-solana/constants.js

@@ -1,37 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clobVersions = void 0;
-const platforms_1 = require("../../../platforms");
+exports.clobVersions = exports.serumPlatform = exports.openbookPlatform = void 0;
 const structs_1 = require("./structs");
 const openOrders_1 = require("../../raydium/structs/openOrders");
+exports.openbookPlatform = {
+    id: 'openbook',
+    name: 'OpenBook',
+    image: 'https://alpha.sonar.watch/img/platforms/openbook.png',
+};
+exports.serumPlatform = {
+    id: 'serum',
+    name: 'Serum',
+    image: 'https://alpha.sonar.watch/img/platforms/serum.png',
+};
 exports.clobVersions = {
     serumV1: {
         name: 'Serum V1',
         programId: '4ckmDgGdxQoPDLUkDT3vHgSAkzA3QRdNq5ywwY4sUSJn',
         struct: structs_1.serumMarketV1Struct,
         orderStruct: openOrders_1.openOrdersV1Struct,
-        prefix: `${platforms_1.serumPlatform.id}-marketsV1`,
+        prefix: `${exports.serumPlatform.id}-marketsV1`,
     },
     serumV2: {
         name: 'Serum V2',
         programId: 'EUqojwWA2rd19FZrzeBncJsm38Jm1hEhE3zsmX3bRc2o',
         struct: structs_1.serumMarketV2Struct,
         orderStruct: structs_1.openOrdersV2Struct,
-        prefix: `${platforms_1.serumPlatform.id}-marketsV2`,
+        prefix: `${exports.serumPlatform.id}-marketsV2`,
     },
     serumV3: {
         name: 'Serum V3',
         programId: '9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin',
         struct: structs_1.serumMarketV3Struct,
         orderStruct: structs_1.openOrdersV2Struct,
-        prefix: `${platforms_1.serumPlatform.id}-marketsV3`,
+        prefix: `${exports.serumPlatform.id}-marketsV3`,
     },
     openbookV1: {
         name: 'OpenBook V1',
         programId: 'srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX',
         struct: structs_1.serumMarketV2Struct,
         orderStruct: structs_1.openOrdersV2Struct,
-        prefix: `${platforms_1.openbookPlatform.id}-markets`,
+        prefix: `${exports.openbookPlatform.id}-markets`,
     },
     // openbookV2: {
     //   programId: 'opnbkNkqux64GppQhwbyEVc3axhssFhVYuwar8rDHCu',

package/src/plugins/orders/clobs-solana/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/constants.ts"],"names":[],"mappings":";;;AAAA,kDAAqE;AACrE,uCAKmB;AAEnB,iEAAsE;AAEzD,QAAA,YAAY,GAAG;IAC1B,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,+BAAkB;QAC/B,MAAM,EAAE,GAAG,yBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,yBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,yBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,UAAU,EAAE;QACV,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,6CAA6C;QACxD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,4BAAgB,CAAC,EAAE,UAAU;KAC1B;IAChB,gBAAgB;IAChB,8DAA8D;IAC9D,oCAAoC;IACpC,qCAAqC;IACrC,mCAAmC;IACnC,wBAAwB;CACzB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/constants.ts"],"names":[],"mappings":";;;AACA,uCAKmB;AAEnB,iEAAsE;AAEzD,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,UAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,sDAAsD;CAC9D,CAAC;AACW,QAAA,aAAa,GAAa;IACrC,EAAE,EAAE,OAAO;IACX,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,mDAAmD;CAC3D,CAAC;AACW,QAAA,YAAY,GAAG;IAC1B,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,+BAAkB;QAC/B,MAAM,EAAE,GAAG,qBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,qBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,qBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,UAAU,EAAE;QACV,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,6CAA6C;QACxD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,wBAAgB,CAAC,EAAE,UAAU;KAC1B;IAChB,gBAAgB;IAChB,8DAA8D;IAC9D,oCAAoC;IACpC,qCAAqC;IACrC,mCAAmC;IACnC,wBAAwB;CACzB,CAAC"}

package/src/plugins/orders/clobs-solana/filters.d.ts

@@ -1,5 +1,4 @@
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 import { BeetStruct } from '@metaplex-foundation/beet';
-import { CLOBMarketAccount, CLOBOrderStruct } from './structs';
+import { CLOBOrderStruct } from './structs';
 export declare const serumOrdersFilter: (owner: string, struct: BeetStruct<CLOBOrderStruct>) => GetProgramAccountsFilter[];
-export declare const dataSizeStructFilter: (struct: BeetStruct<CLOBMarketAccount>) => GetProgramAccountsFilter[];

package/src/plugins/orders/clobs-solana/filters.js

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

package/src/plugins/orders/clobs-solana/filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/filters.ts"],"names":[],"mappings":";;;AAIO,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACb,MAAmC,EACP,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;IACD;QACE,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B;CACF,CAAC;AAbW,QAAA,iBAAiB,qBAa5B;AAEK,MAAM,oBAAoB,GAAG,CAClC,MAAqC,EACT,EAAE,CAAC;IAC/B;QACE,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B;CACF,CAAC;AANW,QAAA,oBAAoB,wBAM/B"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/filters.ts"],"names":[],"mappings":";;;AAIO,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACb,MAAmC,EACP,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;IACD;QACE,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B;CACF,CAAC;AAbW,QAAA,iBAAiB,qBAa5B"}

package/src/plugins/orders/clobs-solana/openbookFetcher.js

@@ -20,7 +20,6 @@ const solana_1 = require("../../../utils/solana");
 const openOrders_1 = require("../../raydium/structs/openOrders");
 const runInBatch_1 = __importDefault(require("../../../utils/misc/runInBatch"));
 const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
-const platforms_1 = require("../../../platforms");
 const constants_2 = require("./constants");
 const filters_1 = require("./filters");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
@@ -85,7 +84,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const openBookElement = {
         type: 'multiple',
         networkId: portfolio_core_1.NetworkId.solana,
-        platformId: platforms_1.openbookPlatform.id,
+        platformId: constants_2.openbookPlatform.id,
         value,
         label: 'Deposit',
         tags: ['Limit Orders'],
@@ -94,7 +93,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     return [openBookElement];
 });
 const fetcher = {
-    id: `${constants_1.platformId}-${platforms_1.openbookPlatform.id}`,
+    id: `${constants_1.pluginId}-${constants_2.openbookPlatform.id}`,
     networkId: portfolio_core_1.NetworkId.solana,
     executor,
 };