@kamino-finance/kliquidity-sdk 7.0.1 → 7.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Kamino.d.ts.map +1 -1
- package/dist/Kamino.js +26 -28
- package/dist/Kamino.js.map +1 -1
- package/dist/services/MeteoraService.d.ts +3 -2
- package/dist/services/MeteoraService.d.ts.map +1 -1
- package/dist/services/MeteoraService.js +6 -3
- package/dist/services/MeteoraService.js.map +1 -1
- package/dist/services/OrcaService.d.ts +3 -4
- package/dist/services/OrcaService.d.ts.map +1 -1
- package/dist/services/OrcaService.js +6 -8
- package/dist/services/OrcaService.js.map +1 -1
- package/dist/services/RaydiumService.d.ts +3 -3
- package/dist/services/RaydiumService.d.ts.map +1 -1
- package/dist/services/RaydiumService.js +7 -4
- package/dist/services/RaydiumService.js.map +1 -1
- package/package.json +1 -1
- package/src/Kamino.ts +44 -31
- package/src/services/MeteoraService.ts +7 -3
- package/src/services/OrcaService.ts +8 -14
- package/src/services/RaydiumService.ts +8 -5
|
@@ -10,8 +10,9 @@ export interface MeteoraPool {
|
|
|
10
10
|
}
|
|
11
11
|
export declare class MeteoraService {
|
|
12
12
|
private readonly _connection;
|
|
13
|
-
private readonly
|
|
14
|
-
constructor(connection: Connection,
|
|
13
|
+
private readonly _meteoraProgramId;
|
|
14
|
+
constructor(connection: Connection, meteoraProgramId?: PublicKey);
|
|
15
|
+
getMeteoraProgramId(): PublicKey;
|
|
15
16
|
getPool(poolAddress: PublicKey): Promise<LbPair | null>;
|
|
16
17
|
getPosition(position: PublicKey): Promise<PositionV2 | null>;
|
|
17
18
|
getMeteoraPools(): Promise<MeteoraPool[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeteoraService.d.ts","sourceRoot":"","sources":["../../src/services/MeteoraService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,eAAe,EAIf,qBAAqB,EAEtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"MeteoraService.d.ts","sourceRoot":"","sources":["../../src/services/MeteoraService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,eAAe,EAIf,qBAAqB,EAEtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAY;gBAElC,UAAU,EAAE,UAAU,EAAE,gBAAgB,GAAE,SAA8B;IAKpF,mBAAmB,IAAI,SAAS;IAI1B,OAAO,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIvD,WAAW,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAI5D,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAiBzC,4BAA4B,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6DnF,+BAA+B,CACnC,OAAO,EAAE,SAAS,EAClB,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAiC3B,wBAAwB,CAC5B,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,eAAe,CAAC;IAmDrB,kBAAkB,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC;IAqCnE,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAQhE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD"}
|
|
@@ -13,10 +13,13 @@ const programId_1 = require("../meteora_client/programId");
|
|
|
13
13
|
const meteora_1 = require("../utils/meteora");
|
|
14
14
|
class MeteoraService {
|
|
15
15
|
_connection;
|
|
16
|
-
|
|
17
|
-
constructor(connection,
|
|
16
|
+
_meteoraProgramId;
|
|
17
|
+
constructor(connection, meteoraProgramId = programId_1.METEORA_PROGRAM_ID) {
|
|
18
18
|
this._connection = connection;
|
|
19
|
-
this.
|
|
19
|
+
this._meteoraProgramId = meteoraProgramId;
|
|
20
|
+
}
|
|
21
|
+
getMeteoraProgramId() {
|
|
22
|
+
return this._meteoraProgramId;
|
|
20
23
|
}
|
|
21
24
|
async getPool(poolAddress) {
|
|
22
25
|
return await accounts_1.LbPair.fetch(this._connection, poolAddress);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeteoraService.js","sourceRoot":"","sources":["../../src/services/MeteoraService.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"MeteoraService.js","sourceRoot":"","sources":["../../src/services/MeteoraService.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,11 @@ import { CollateralInfo } from '../kamino-client/types';
|
|
|
10
10
|
import { KaminoPrices } from '../models';
|
|
11
11
|
export declare class OrcaService {
|
|
12
12
|
private readonly _connection;
|
|
13
|
-
private readonly
|
|
13
|
+
private readonly _whirilpoolProgramId;
|
|
14
14
|
private readonly _orcaNetwork;
|
|
15
15
|
private readonly _orcaApiUrl;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
constructor(connection: Connection, cluster: SolanaCluster, globalConfig: PublicKey, kaminoProgramId?: PublicKey);
|
|
16
|
+
constructor(connection: Connection, cluster: SolanaCluster, whirlpoolProgramId?: PublicKey);
|
|
17
|
+
getWhirlpoolProgramId(): PublicKey;
|
|
19
18
|
getOrcaWhirlpools(): Promise<OrcaWhirlpoolsResponse>;
|
|
20
19
|
/**
|
|
21
20
|
* Get token prices for a strategy - for use with orca sdk
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrcaService.d.ts","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAML,QAAQ,EACT,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"OrcaService.d.ts","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAML,QAAQ,EACT,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAY;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,kBAAkB,GAAE,SAAgC;IAOhH,qBAAqB,IAAI,SAAS;IAI5B,iBAAiB;IAIvB;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,mBAAmB;IAsBrB,OAAO,CAAC,WAAW,EAAE,SAAS;IAQ9B,8BAA8B,CAClC,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,OAAO,CAAC,eAAe,CAAC;IAkErB,iCAAiC,CACrC,IAAI,EAAE,SAAS,EACf,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAqD3B,0BAA0B,CAC9B,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,OAAO,CAAC,eAAe,CAAC;IAqErB,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE;IAkClE,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAYhE"}
|
|
@@ -11,21 +11,19 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
11
11
|
const whirlpools_client_1 = require("../whirlpools-client");
|
|
12
12
|
const utils_1 = require("../utils");
|
|
13
13
|
const programId_1 = require("../whirlpools-client/programId");
|
|
14
|
-
const programId_2 = require("../kamino-client/programId");
|
|
15
14
|
class OrcaService {
|
|
16
15
|
_connection;
|
|
17
|
-
|
|
16
|
+
_whirilpoolProgramId;
|
|
18
17
|
_orcaNetwork;
|
|
19
18
|
_orcaApiUrl;
|
|
20
|
-
|
|
21
|
-
_kaminoProgramId;
|
|
22
|
-
constructor(connection, cluster, globalConfig, kaminoProgramId = programId_2.PROGRAM_ID) {
|
|
19
|
+
constructor(connection, cluster, whirlpoolProgramId = programId_1.WHIRLPOOL_PROGRAM_ID) {
|
|
23
20
|
this._connection = connection;
|
|
24
|
-
this.
|
|
25
|
-
this._globalConfig = globalConfig;
|
|
21
|
+
this._whirilpoolProgramId = whirlpoolProgramId;
|
|
26
22
|
this._orcaNetwork = cluster === 'mainnet-beta' ? whirlpool_sdk_1.OrcaNetwork.MAINNET : whirlpool_sdk_1.OrcaNetwork.DEVNET;
|
|
27
23
|
this._orcaApiUrl = `https://api.${cluster === 'mainnet-beta' ? 'mainnet' : 'devnet'}.orca.so`;
|
|
28
|
-
|
|
24
|
+
}
|
|
25
|
+
getWhirlpoolProgramId() {
|
|
26
|
+
return this._whirilpoolProgramId;
|
|
29
27
|
}
|
|
30
28
|
async getOrcaWhirlpools() {
|
|
31
29
|
return (await axios_1.default.get(`${this._orcaApiUrl}/v1/whirlpool/list`)).data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrcaService.js","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"OrcaService.js","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Connection, PublicKey } from '@solana/web3.js';
|
|
2
|
-
import { SolanaCluster } from '@hubbleprotocol/hubble-config';
|
|
3
2
|
import { Pool, RaydiumPoolsResponse } from './RaydiumPoolsResponse';
|
|
4
3
|
import Decimal from 'decimal.js';
|
|
5
4
|
import { WhirlpoolAprApy } from './WhirlpoolAprApy';
|
|
@@ -7,8 +6,9 @@ import { WhirlpoolStrategy } from '../kamino-client/accounts';
|
|
|
7
6
|
import { GenericPoolInfo, LiquidityDistribution } from '../utils';
|
|
8
7
|
export declare class RaydiumService {
|
|
9
8
|
private readonly _connection;
|
|
10
|
-
private readonly
|
|
11
|
-
constructor(connection: Connection,
|
|
9
|
+
private readonly _raydiumProgramId;
|
|
10
|
+
constructor(connection: Connection, raydiumProgramId?: PublicKey);
|
|
11
|
+
getRaydiumProgramId(): PublicKey;
|
|
12
12
|
getRaydiumWhirlpools(): Promise<RaydiumPoolsResponse>;
|
|
13
13
|
getRaydiumPoolLiquidityDistribution(pool: PublicKey, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
|
|
14
14
|
getStrategyWhirlpoolPoolAprApy: (strategy: WhirlpoolStrategy, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumService.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"RaydiumService.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAEL,IAAI,EACJ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAMlB,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAY;gBAElC,UAAU,EAAE,UAAU,EAAE,gBAAgB,GAAE,SAA8B;IAKpF,mBAAmB,IAAI,SAAS;IAI1B,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAIrD,mCAAmC,CACvC,IAAI,EAAE,SAAS,EACf,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAuDjC,8BAA8B,aAAoB,iBAAiB,UAAU,IAAI,EAAE,KAAG,OAAO,CAAC,eAAe,CAAC,CA8E5G;IAEF,wBAAwB,eACV,SAAS,cACT,OAAO,cACP,OAAO,UACX,IAAI,EAAE,KACb,OAAO,CAAC,eAAe,CAAC,CAwFzB;IAEI,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAmCnF,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAWhE"}
|
|
@@ -15,10 +15,13 @@ const programId_1 = require("../raydium_client/programId");
|
|
|
15
15
|
const raydium_1 = require("../utils/raydium");
|
|
16
16
|
class RaydiumService {
|
|
17
17
|
_connection;
|
|
18
|
-
|
|
19
|
-
constructor(connection,
|
|
18
|
+
_raydiumProgramId;
|
|
19
|
+
constructor(connection, raydiumProgramId = programId_1.PROGRAM_ID) {
|
|
20
|
+
this._raydiumProgramId = raydiumProgramId;
|
|
20
21
|
this._connection = connection;
|
|
21
|
-
|
|
22
|
+
}
|
|
23
|
+
getRaydiumProgramId() {
|
|
24
|
+
return this._raydiumProgramId;
|
|
22
25
|
}
|
|
23
26
|
async getRaydiumWhirlpools() {
|
|
24
27
|
return (await axios_1.default.get(`https://api.kamino.finance/v2/raydium/ammPools`)).data;
|
|
@@ -205,7 +208,7 @@ class RaydiumService {
|
|
|
205
208
|
return poolInfo;
|
|
206
209
|
}
|
|
207
210
|
async getPositionsCountByPool(pool) {
|
|
208
|
-
const positions = await this._connection.getProgramAccounts(
|
|
211
|
+
const positions = await this._connection.getProgramAccounts(this._raydiumProgramId, {
|
|
209
212
|
commitment: 'confirmed',
|
|
210
213
|
filters: [
|
|
211
214
|
{ dataSize: raydium_sdk_1.PositionInfoLayout.span },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumService.js","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAwD;
|
|
1
|
+
{"version":3,"file":"RaydiumService.js","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Kamino.ts
CHANGED
|
@@ -64,7 +64,7 @@ import {
|
|
|
64
64
|
TotalStrategyVaultTokens,
|
|
65
65
|
TreasuryFeeVault,
|
|
66
66
|
} from './models';
|
|
67
|
-
import {
|
|
67
|
+
import { setWhirlpoolsProgramId } from './whirlpools-client/programId';
|
|
68
68
|
import { OraclePrices, Scope } from '@kamino-finance/scope-sdk';
|
|
69
69
|
import {
|
|
70
70
|
batchFetch,
|
|
@@ -179,7 +179,7 @@ import {
|
|
|
179
179
|
StrategyStatusKind,
|
|
180
180
|
} from './kamino-client/types';
|
|
181
181
|
import { AmmConfig, PersonalPositionState, PoolState } from './raydium_client';
|
|
182
|
-
import {
|
|
182
|
+
import { setRaydiumProgramId } from './raydium_client/programId';
|
|
183
183
|
import {
|
|
184
184
|
getPdaProtocolPositionAddress,
|
|
185
185
|
i32ToBytes,
|
|
@@ -330,7 +330,7 @@ import {
|
|
|
330
330
|
} from './rebalance_methods/autodriftRebalance';
|
|
331
331
|
import { KaminoPrices, OraclePricesAndCollateralInfos } from './models';
|
|
332
332
|
import { getRemoveLiquidityQuote } from './whirlpools-client/shim/remove-liquidity';
|
|
333
|
-
import {
|
|
333
|
+
import { setMeteoraProgramId } from './meteora_client/programId';
|
|
334
334
|
import { computeMeteoraFee, MeteoraPool, MeteoraService } from './services/MeteoraService';
|
|
335
335
|
import {
|
|
336
336
|
binIdToBinArrayIndex,
|
|
@@ -401,19 +401,17 @@ export class Kamino {
|
|
|
401
401
|
setWhirlpoolsProgramId(whirlpoolProgramId);
|
|
402
402
|
}
|
|
403
403
|
|
|
404
|
-
if (
|
|
405
|
-
|
|
406
|
-
setRaydiumProgramId(raydiumProgramId);
|
|
407
|
-
}
|
|
404
|
+
if (raydiumProgramId) {
|
|
405
|
+
setRaydiumProgramId(raydiumProgramId);
|
|
408
406
|
}
|
|
409
407
|
|
|
410
408
|
if (meteoraProgramId) {
|
|
411
409
|
setMeteoraProgramId(meteoraProgramId);
|
|
412
410
|
}
|
|
413
411
|
|
|
414
|
-
this._orcaService = new OrcaService(connection, cluster,
|
|
415
|
-
this._raydiumService = new RaydiumService(connection,
|
|
416
|
-
this._meteoraService = new MeteoraService(connection,
|
|
412
|
+
this._orcaService = new OrcaService(connection, cluster, whirlpoolProgramId);
|
|
413
|
+
this._raydiumService = new RaydiumService(connection, raydiumProgramId);
|
|
414
|
+
this._meteoraService = new MeteoraService(connection, meteoraProgramId);
|
|
417
415
|
}
|
|
418
416
|
|
|
419
417
|
getConnection = () => this._connection;
|
|
@@ -2551,7 +2549,10 @@ export class Kamino {
|
|
|
2551
2549
|
}
|
|
2552
2550
|
|
|
2553
2551
|
if (dex.toNumber() == dexToNumber('METEORA')) {
|
|
2554
|
-
const [key, _] = PublicKey.findProgramAddressSync(
|
|
2552
|
+
const [key, _] = PublicKey.findProgramAddressSync(
|
|
2553
|
+
[Buffer.from('__event_authority')],
|
|
2554
|
+
this._meteoraService.getMeteoraProgramId()
|
|
2555
|
+
);
|
|
2555
2556
|
return key;
|
|
2556
2557
|
}
|
|
2557
2558
|
throw new Error('Invalid dex');
|
|
@@ -4111,7 +4112,7 @@ export class Kamino {
|
|
|
4111
4112
|
strategyState.tokenBMint
|
|
4112
4113
|
);
|
|
4113
4114
|
|
|
4114
|
-
let programId =
|
|
4115
|
+
let programId = this._orcaService.getWhirlpoolProgramId();
|
|
4115
4116
|
|
|
4116
4117
|
let poolRewardVault0 = PublicKey.default;
|
|
4117
4118
|
let poolRewardVault1 = PublicKey.default;
|
|
@@ -4132,7 +4133,7 @@ export class Kamino {
|
|
|
4132
4133
|
rewardMint1 = whirlpool.rewardInfos[1].mint;
|
|
4133
4134
|
rewardMint2 = whirlpool.rewardInfos[2].mint;
|
|
4134
4135
|
} else if (strategyState.strategyDex.toNumber() == dexToNumber('RAYDIUM')) {
|
|
4135
|
-
programId =
|
|
4136
|
+
programId = this._raydiumService.getRaydiumProgramId();
|
|
4136
4137
|
|
|
4137
4138
|
const poolState = await PoolState.fetch(this._connection, strategyState.pool);
|
|
4138
4139
|
if (!poolState) {
|
|
@@ -4145,7 +4146,7 @@ export class Kamino {
|
|
|
4145
4146
|
rewardMint1 = poolState.rewardInfos[1].tokenMint;
|
|
4146
4147
|
rewardMint2 = poolState.rewardInfos[2].tokenMint;
|
|
4147
4148
|
} else if (strategyState.strategyDex.toNumber() == dexToNumber('METEORA')) {
|
|
4148
|
-
programId =
|
|
4149
|
+
programId = this._meteoraService.getMeteoraProgramId();
|
|
4149
4150
|
|
|
4150
4151
|
const poolState = await LbPair.fetch(this._connection, strategyState.pool);
|
|
4151
4152
|
if (!poolState) {
|
|
@@ -4215,7 +4216,7 @@ export class Kamino {
|
|
|
4215
4216
|
if (strategyState.strategyDex.toNumber() == dexToNumber('RAYDIUM')) {
|
|
4216
4217
|
const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = PublicKey.findProgramAddressSync(
|
|
4217
4218
|
[Buffer.from('pool_tick_array_bitmap_extension'), strategyState.pool.toBuffer()],
|
|
4218
|
-
|
|
4219
|
+
this._raydiumService.getRaydiumProgramId()
|
|
4219
4220
|
);
|
|
4220
4221
|
|
|
4221
4222
|
ixn.keys.push({ pubkey: poolTickArrayBitmap, isSigner: false, isWritable: true });
|
|
@@ -4231,7 +4232,7 @@ export class Kamino {
|
|
|
4231
4232
|
getMetadataProgramAddressesOrca = (positionMint: PublicKey): MetadataProgramAddressesOrca => {
|
|
4232
4233
|
const [position, positionBump] = PublicKey.findProgramAddressSync(
|
|
4233
4234
|
[Buffer.from('position'), positionMint.toBuffer()],
|
|
4234
|
-
|
|
4235
|
+
this._orcaService.getWhirlpoolProgramId()
|
|
4235
4236
|
);
|
|
4236
4237
|
|
|
4237
4238
|
const [positionMetadata, positionMetadataBump] = PublicKey.findProgramAddressSync(
|
|
@@ -4254,7 +4255,7 @@ export class Kamino {
|
|
|
4254
4255
|
tickUpperIndex: number
|
|
4255
4256
|
): MetadataProgramAddressesRaydium => {
|
|
4256
4257
|
const { publicKey: protocolPosition, nonce: protocolPositionBump } = getPdaProtocolPositionAddress(
|
|
4257
|
-
|
|
4258
|
+
this._raydiumService.getRaydiumProgramId(),
|
|
4258
4259
|
pool,
|
|
4259
4260
|
tickLowerIndex,
|
|
4260
4261
|
tickUpperIndex
|
|
@@ -4262,7 +4263,7 @@ export class Kamino {
|
|
|
4262
4263
|
|
|
4263
4264
|
const [position, positionBump] = PublicKey.findProgramAddressSync(
|
|
4264
4265
|
[Buffer.from('position'), positionMint.toBuffer()],
|
|
4265
|
-
|
|
4266
|
+
this._raydiumService.getRaydiumProgramId()
|
|
4266
4267
|
);
|
|
4267
4268
|
|
|
4268
4269
|
const [positionMetadata, positionMetadataBump] = PublicKey.findProgramAddressSync(
|
|
@@ -4291,11 +4292,11 @@ export class Kamino {
|
|
|
4291
4292
|
|
|
4292
4293
|
const [lowerTickPubkey, lowerTickBump] = PublicKey.findProgramAddressSync(
|
|
4293
4294
|
[Buffer.from('tick_array'), whirlpool.toBuffer(), Buffer.from(startTickIndex.toString())],
|
|
4294
|
-
|
|
4295
|
+
this._orcaService.getWhirlpoolProgramId()
|
|
4295
4296
|
);
|
|
4296
4297
|
const [upperTickPubkey, upperTickBump] = PublicKey.findProgramAddressSync(
|
|
4297
4298
|
[Buffer.from('tick_array'), whirlpool.toBuffer(), Buffer.from(endTickIndex.toString())],
|
|
4298
|
-
|
|
4299
|
+
this._orcaService.getWhirlpoolProgramId()
|
|
4299
4300
|
);
|
|
4300
4301
|
return {
|
|
4301
4302
|
lowerTick: lowerTickPubkey,
|
|
@@ -4316,11 +4317,11 @@ export class Kamino {
|
|
|
4316
4317
|
|
|
4317
4318
|
const [lowerTickPubkey, lowerTickBump] = PublicKey.findProgramAddressSync(
|
|
4318
4319
|
[Buffer.from('tick_array'), pool.toBuffer(), i32ToBytes(startTickIndex)],
|
|
4319
|
-
|
|
4320
|
+
this._raydiumService.getRaydiumProgramId()
|
|
4320
4321
|
);
|
|
4321
4322
|
const [upperTickPubkey, upperTickBump] = PublicKey.findProgramAddressSync(
|
|
4322
4323
|
[Buffer.from('tick_array'), pool.toBuffer(), i32ToBytes(endTickIndex)],
|
|
4323
|
-
|
|
4324
|
+
this._raydiumService.getRaydiumProgramId()
|
|
4324
4325
|
);
|
|
4325
4326
|
return {
|
|
4326
4327
|
lowerTick: lowerTickPubkey,
|
|
@@ -4385,7 +4386,7 @@ export class Kamino {
|
|
|
4385
4386
|
pool: PublicKey,
|
|
4386
4387
|
tickLowerIndex: number
|
|
4387
4388
|
): LowerAndUpperTickPubkeys => {
|
|
4388
|
-
const meteoraProgramId =
|
|
4389
|
+
const meteoraProgramId = this._meteoraService.getMeteoraProgramId();
|
|
4389
4390
|
|
|
4390
4391
|
const lowerBinArrayIndex = binIdToBinArrayIndex(new BN(tickLowerIndex));
|
|
4391
4392
|
const [lowerTick, lowerTickBump] = deriveBinArray(pool, lowerBinArrayIndex, meteoraProgramId);
|
|
@@ -4599,7 +4600,7 @@ export class Kamino {
|
|
|
4599
4600
|
tokenProgram: TOKEN_PROGRAM_ID,
|
|
4600
4601
|
tokenProgram2022: TOKEN_2022_PROGRAM_ID,
|
|
4601
4602
|
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
4602
|
-
poolProgram:
|
|
4603
|
+
poolProgram: this._orcaService.getWhirlpoolProgramId(),
|
|
4603
4604
|
oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
|
|
4604
4605
|
oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
|
|
4605
4606
|
oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
|
|
@@ -4729,7 +4730,7 @@ export class Kamino {
|
|
|
4729
4730
|
tokenProgram: TOKEN_PROGRAM_ID,
|
|
4730
4731
|
tokenProgram2022: TOKEN_2022_PROGRAM_ID,
|
|
4731
4732
|
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
4732
|
-
poolProgram:
|
|
4733
|
+
poolProgram: this._raydiumService.getRaydiumProgramId(),
|
|
4733
4734
|
oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
|
|
4734
4735
|
oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
|
|
4735
4736
|
oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
|
|
@@ -4754,7 +4755,7 @@ export class Kamino {
|
|
|
4754
4755
|
};
|
|
4755
4756
|
const [poolTickArrayBitmap, _poolTickArrayBitmapBump] = PublicKey.findProgramAddressSync(
|
|
4756
4757
|
[Buffer.from('pool_tick_array_bitmap_extension'), pool.toBuffer()],
|
|
4757
|
-
|
|
4758
|
+
this._raydiumService.getRaydiumProgramId()
|
|
4758
4759
|
);
|
|
4759
4760
|
|
|
4760
4761
|
const ix = openLiquidityPosition(args, accounts);
|
|
@@ -4869,7 +4870,7 @@ export class Kamino {
|
|
|
4869
4870
|
tokenProgram: TOKEN_PROGRAM_ID,
|
|
4870
4871
|
tokenProgram2022: TOKEN_2022_PROGRAM_ID,
|
|
4871
4872
|
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
|
|
4872
|
-
poolProgram:
|
|
4873
|
+
poolProgram: this._orcaService.getWhirlpoolProgramId(),
|
|
4873
4874
|
oldPositionOrBaseVaultAuthority: isRebalancing ? oldPositionOrBaseVaultAuthority : baseVaultAuthority,
|
|
4874
4875
|
oldPositionMintOrBaseVaultAuthority: isRebalancing ? oldPositionMintOrBaseVaultAuthority : positionMint,
|
|
4875
4876
|
oldPositionTokenAccountOrBaseVaultAuthority: isRebalancing
|
|
@@ -6881,7 +6882,7 @@ export class Kamino {
|
|
|
6881
6882
|
return [new Decimal(0), new Decimal(0)];
|
|
6882
6883
|
}
|
|
6883
6884
|
// Given A in ATA, calc how much A and B
|
|
6884
|
-
const accessor = new OrcaDAL(whirlpoolConfig,
|
|
6885
|
+
const accessor = new OrcaDAL(whirlpoolConfig, this._orcaService.getWhirlpoolProgramId(), this._connection);
|
|
6885
6886
|
const orcaPosition = new OrcaPosition(accessor);
|
|
6886
6887
|
const defaultSlippagePercentage = Percentage.fromFraction(1, 1000); // 0.1%
|
|
6887
6888
|
|
|
@@ -7018,7 +7019,11 @@ export class Kamino {
|
|
|
7018
7019
|
return [tokenAAmount, tokenBAmount];
|
|
7019
7020
|
} else {
|
|
7020
7021
|
const binArrayIndex = binIdToBinArrayIndex(new BN(poolState.activeId));
|
|
7021
|
-
const [binArrayPk] = deriveBinArray(
|
|
7022
|
+
const [binArrayPk] = deriveBinArray(
|
|
7023
|
+
strategyState.pool,
|
|
7024
|
+
binArrayIndex,
|
|
7025
|
+
this._meteoraService.getMeteoraProgramId()
|
|
7026
|
+
);
|
|
7022
7027
|
const binArray = await BinArray.fetch(this._connection, binArrayPk);
|
|
7023
7028
|
if (!binArray) {
|
|
7024
7029
|
throw new Error(`bin array ${binArrayPk.toString()} is not found`);
|
|
@@ -7567,7 +7572,11 @@ export class Kamino {
|
|
|
7567
7572
|
const tickIndex = getNextValidTickIndex(priceToTickIndex(price, decimalsA, decimalsB), whilrpoolState.tickSpacing);
|
|
7568
7573
|
const startTickIndex = getStartTickIndex(tickIndex, whilrpoolState.tickSpacing);
|
|
7569
7574
|
|
|
7570
|
-
const [startTickIndexPk, _startTickIndexBump] = getTickArray(
|
|
7575
|
+
const [startTickIndexPk, _startTickIndexBump] = getTickArray(
|
|
7576
|
+
this._orcaService.getWhirlpoolProgramId(),
|
|
7577
|
+
poolAddress,
|
|
7578
|
+
startTickIndex
|
|
7579
|
+
);
|
|
7571
7580
|
const tick = await TickArray.fetch(this._connection, startTickIndexPk);
|
|
7572
7581
|
// initialize tick if it doesn't exist
|
|
7573
7582
|
if (!tick) {
|
|
@@ -7603,7 +7612,11 @@ export class Kamino {
|
|
|
7603
7612
|
const binArray = getBinIdFromPriceWithDecimals(price, poolState.binStep, true, decimalsA, decimalsB);
|
|
7604
7613
|
const binArrayIndex = binIdToBinArrayIndex(new BN(binArray));
|
|
7605
7614
|
|
|
7606
|
-
const [startTickIndexPk, _startTickIndexBump] = deriveBinArray(
|
|
7615
|
+
const [startTickIndexPk, _startTickIndexBump] = deriveBinArray(
|
|
7616
|
+
poolAddress,
|
|
7617
|
+
binArrayIndex,
|
|
7618
|
+
this._meteoraService.getMeteoraProgramId()
|
|
7619
|
+
);
|
|
7607
7620
|
const tick = await TickArray.fetch(this._connection, startTickIndexPk);
|
|
7608
7621
|
// initialize tick if it doesn't exist
|
|
7609
7622
|
if (!tick) {
|
|
@@ -22,11 +22,15 @@ export interface MeteoraPool {
|
|
|
22
22
|
|
|
23
23
|
export class MeteoraService {
|
|
24
24
|
private readonly _connection: Connection;
|
|
25
|
-
private readonly
|
|
25
|
+
private readonly _meteoraProgramId: PublicKey;
|
|
26
26
|
|
|
27
|
-
constructor(connection: Connection,
|
|
27
|
+
constructor(connection: Connection, meteoraProgramId: PublicKey = METEORA_PROGRAM_ID) {
|
|
28
28
|
this._connection = connection;
|
|
29
|
-
this.
|
|
29
|
+
this._meteoraProgramId = meteoraProgramId;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
getMeteoraProgramId(): PublicKey {
|
|
33
|
+
return this._meteoraProgramId;
|
|
30
34
|
}
|
|
31
35
|
|
|
32
36
|
async getPool(poolAddress: PublicKey): Promise<LbPair | null> {
|
|
@@ -25,28 +25,22 @@ import {
|
|
|
25
25
|
import { WHIRLPOOL_PROGRAM_ID } from '../whirlpools-client/programId';
|
|
26
26
|
import { CollateralInfo } from '../kamino-client/types';
|
|
27
27
|
import { KaminoPrices } from '../models';
|
|
28
|
-
import { PROGRAM_ID } from '../kamino-client/programId';
|
|
29
28
|
|
|
30
29
|
export class OrcaService {
|
|
31
30
|
private readonly _connection: Connection;
|
|
32
|
-
private readonly
|
|
31
|
+
private readonly _whirilpoolProgramId: PublicKey;
|
|
33
32
|
private readonly _orcaNetwork: OrcaNetwork;
|
|
34
33
|
private readonly _orcaApiUrl: string;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
constructor(
|
|
39
|
-
connection: Connection,
|
|
40
|
-
cluster: SolanaCluster,
|
|
41
|
-
globalConfig: PublicKey,
|
|
42
|
-
kaminoProgramId: PublicKey = PROGRAM_ID
|
|
43
|
-
) {
|
|
34
|
+
|
|
35
|
+
constructor(connection: Connection, cluster: SolanaCluster, whirlpoolProgramId: PublicKey = WHIRLPOOL_PROGRAM_ID) {
|
|
44
36
|
this._connection = connection;
|
|
45
|
-
this.
|
|
46
|
-
this._globalConfig = globalConfig;
|
|
37
|
+
this._whirilpoolProgramId = whirlpoolProgramId;
|
|
47
38
|
this._orcaNetwork = cluster === 'mainnet-beta' ? OrcaNetwork.MAINNET : OrcaNetwork.DEVNET;
|
|
48
39
|
this._orcaApiUrl = `https://api.${cluster === 'mainnet-beta' ? 'mainnet' : 'devnet'}.orca.so`;
|
|
49
|
-
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
getWhirlpoolProgramId(): PublicKey {
|
|
43
|
+
return this._whirilpoolProgramId;
|
|
50
44
|
}
|
|
51
45
|
|
|
52
46
|
async getOrcaWhirlpools() {
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Connection, PublicKey } from '@solana/web3.js';
|
|
2
|
-
import { SolanaCluster } from '@hubbleprotocol/hubble-config';
|
|
3
2
|
import {
|
|
4
3
|
LiquidityDistribution as RaydiumLiquidityDistribuion,
|
|
5
4
|
Pool,
|
|
@@ -25,11 +24,15 @@ import { priceToTickIndexWithRounding } from '../utils/raydium';
|
|
|
25
24
|
|
|
26
25
|
export class RaydiumService {
|
|
27
26
|
private readonly _connection: Connection;
|
|
28
|
-
private readonly
|
|
27
|
+
private readonly _raydiumProgramId: PublicKey;
|
|
29
28
|
|
|
30
|
-
constructor(connection: Connection,
|
|
29
|
+
constructor(connection: Connection, raydiumProgramId: PublicKey = RAYDIUM_PROGRAM_ID) {
|
|
30
|
+
this._raydiumProgramId = raydiumProgramId;
|
|
31
31
|
this._connection = connection;
|
|
32
|
-
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
getRaydiumProgramId(): PublicKey {
|
|
35
|
+
return this._raydiumProgramId;
|
|
33
36
|
}
|
|
34
37
|
|
|
35
38
|
async getRaydiumWhirlpools(): Promise<RaydiumPoolsResponse> {
|
|
@@ -307,7 +310,7 @@ export class RaydiumService {
|
|
|
307
310
|
}
|
|
308
311
|
|
|
309
312
|
async getPositionsCountByPool(pool: PublicKey): Promise<number> {
|
|
310
|
-
const positions = await this._connection.getProgramAccounts(
|
|
313
|
+
const positions = await this._connection.getProgramAccounts(this._raydiumProgramId, {
|
|
311
314
|
commitment: 'confirmed',
|
|
312
315
|
filters: [
|
|
313
316
|
{ dataSize: PositionInfoLayout.span },
|