flash-sdk 1.0.134 → 2.0.0

package/dist/PoolAccount.d.ts

@@ -1,16 +1,26 @@
 /// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
-import { Pool, TokenRatios } from "./types";
+import { Pool, TokenRatios, StakeStats, Permissions } from "./types";
 import { PublicKey } from "@solana/web3.js";
 export declare class PoolAccount implements Pool {
     publicKey: PublicKey;
     name: string;
+    permissions: Permissions;
+    inceptionTime: BN;
+    flpMint: PublicKey;
+    oracleAuthority: PublicKey;
+    flpTokenAccount: PublicKey;
+    rewardCustody: PublicKey;
     custodies: PublicKey[];
     ratios: TokenRatios[];
+    markets: PublicKey[];
+    maxAumUsd: BN;
     aumUsd: BN;
+    totalStaked: StakeStats;
+    stakingFeeShareBps: BN;
     bump: number;
-    lpTokenBump: number;
-    inceptionTime: BN;
+    flpMintBump: number;
+    flpTokenAccountBump: number;
     constructor(publicKey: PublicKey, parseData: Pool);
     static from(publicKey: PublicKey, parseData: Pool): PoolAccount;
     updatePoolData(parseData: Pool): void;

package/dist/PoolConfig.d.ts

@@ -1,5 +1,7 @@
 import { Address } from '@coral-xyz/anchor';
 import { Cluster, PublicKey } from '@solana/web3.js';
+import poolConfigs from './PoolConfig.json';
+import { Side } from './types';
 export interface CustodyConfig {
     custodyId: number;
     custodyAccount: PublicKey;
@@ -11,6 +13,18 @@ export interface CustodyConfig {
     isVirtual: boolean;
     oracleAddress: PublicKey;
 }
+export interface MarketConfig {
+    marketId: number;
+    marketAccount: PublicKey;
+    pool: PublicKey;
+    targetCustody: PublicKey;
+    collateralCustody: PublicKey;
+    side: Side;
+    targetCustodyId: number;
+    collateralCustodyId: number;
+    targetMint: PublicKey;
+    collateralMint: PublicKey;
+}
 export type Token = {
     symbol: string;
     mintKey: PublicKey;
@@ -34,10 +48,19 @@ export declare class PoolConfig {
     multisig: PublicKey;
     addressLookupTableAddresses: PublicKey[];
     backupOracle: PublicKey;
+    nftCollectionAddress: PublicKey;
     tokens: Token[];
     custodies: CustodyConfig[];
-    constructor(programId: PublicKey, perpComposibilityProgramId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, lpDecimals: number, lpTokenSymbol: string, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], backupOracle: PublicKey, tokens: Token[], custodies: CustodyConfig[]);
+    markets: MarketConfig[];
+    constructor(programId: PublicKey, perpComposibilityProgramId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, lpDecimals: number, lpTokenSymbol: string, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], backupOracle: PublicKey, nftCollectionAddress: PublicKey, tokens: Token[], custodies: CustodyConfig[], markets: MarketConfig[]);
     getAllTokenMints(): PublicKey[];
+    getMarketConfigByPk(marketAccountPk: PublicKey): MarketConfig;
+    getMarketConfig(targetCustody: PublicKey, collateralCustody: PublicKey, side: Side): MarketConfig | null;
+    getMarketPk(targetCustody: PublicKey, collateralCustody: PublicKey, side: Side): PublicKey;
+    getPositionFromMarketPk(owner: PublicKey, marketAccount: PublicKey): PublicKey;
+    getPositionFromCustodyPk(owner: PublicKey, targetCustody: PublicKey, collateralCustody: PublicKey, side: Side): PublicKey;
+    doesMarketExist(pubkey: PublicKey): boolean;
+    getAllMarketPks(): PublicKey[];
     getNonStableTokens(): PublicKey[];
     getAllCustodies(): PublicKey[];
     getNonStableCustodies(): PublicKey[];
@@ -48,6 +71,7 @@ export declare class PoolConfig {
     getCustodyIdFromCustodyAccount(custodyAccountPk: Address): number;
     getCustodyAccountFromCustodyId(custodyId: number): PublicKey;
     static getTokensInPool(name: string, cluster: Cluster): Token[];
+    static buildPoolconfigFromJson(poolConfig: typeof poolConfigs['pools'][0]): PoolConfig;
     static fromIdsByName(name: string, cluster: Cluster): PoolConfig;
     static fromIdsByPk(poolPk: PublicKey, cluster: Cluster): PoolConfig;
 }

package/dist/PoolConfig.js

@@ -17,8 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PoolConfig = void 0;
 var web3_js_1 = require("@solana/web3.js");
 var PoolConfig_json_1 = __importDefault(require("./PoolConfig.json"));
+var types_1 = require("./types");
 var PoolConfig = (function () {
-    function PoolConfig(programId, perpComposibilityProgramId, cluster, poolName, poolAddress, lpTokenMint, lpDecimals, lpTokenSymbol, perpetuals, transferAuthority, multisig, addressLookupTableAddresses, backupOracle, tokens, custodies) {
+    function PoolConfig(programId, perpComposibilityProgramId, cluster, poolName, poolAddress, lpTokenMint, lpDecimals, lpTokenSymbol, perpetuals, transferAuthority, multisig, addressLookupTableAddresses, backupOracle, nftCollectionAddress, tokens, custodies, markets) {
         var _this = this;
         this.programId = programId;
         this.perpComposibilityProgramId = perpComposibilityProgramId;
@@ -33,8 +34,10 @@ var PoolConfig = (function () {
         this.multisig = multisig;
         this.addressLookupTableAddresses = addressLookupTableAddresses;
         this.backupOracle = backupOracle;
+        this.nftCollectionAddress = nftCollectionAddress;
         this.tokens = tokens;
         this.custodies = custodies;
+        this.markets = markets;
         this.getTokenFromSymbol = function (symbol) {
             return _this.tokens.find(function (f) { return f.symbol.toUpperCase() === symbol.toUpperCase(); });
         };
@@ -48,6 +51,47 @@ var PoolConfig = (function () {
     PoolConfig.prototype.getAllTokenMints = function () {
         return Array.from(this.tokens.map(function (token) { return new web3_js_1.PublicKey(token.mintKey); }));
     };
+    PoolConfig.prototype.getMarketConfigByPk = function (marketAccountPk) {
+        var market = this.markets.find(function (f) { return f.marketAccount.equals(marketAccountPk); });
+        if (!market)
+            throw new Error("No such market ".concat(marketAccountPk.toBase58(), " exists."));
+        return market;
+    };
+    PoolConfig.prototype.getMarketConfig = function (targetCustody, collateralCustody, side) {
+        var marketAccountPk = this.getMarketPk(targetCustody, collateralCustody, side);
+        var market = this.markets.find(function (f) { return f.marketAccount.equals(marketAccountPk); });
+        if (!market)
+            return null;
+        return market;
+    };
+    PoolConfig.prototype.getMarketPk = function (targetCustody, collateralCustody, side) {
+        return web3_js_1.PublicKey.findProgramAddressSync([
+            Buffer.from('market'),
+            targetCustody.toBuffer(),
+            collateralCustody.toBuffer(),
+            Buffer.from([(0, types_1.isVariant)(side, 'long') ? 1 : 2])
+        ], this.programId)[0];
+    };
+    PoolConfig.prototype.getPositionFromMarketPk = function (owner, marketAccount) {
+        return web3_js_1.PublicKey.findProgramAddressSync([
+            Buffer.from("position"),
+            owner.toBuffer(),
+            marketAccount.toBuffer(),
+        ], this.programId)[0];
+    };
+    PoolConfig.prototype.getPositionFromCustodyPk = function (owner, targetCustody, collateralCustody, side) {
+        return web3_js_1.PublicKey.findProgramAddressSync([
+            Buffer.from("position"),
+            owner.toBuffer(),
+            this.getMarketPk(targetCustody, collateralCustody, side).toBuffer(),
+        ], this.programId)[0];
+    };
+    PoolConfig.prototype.doesMarketExist = function (pubkey) {
+        return;
+    };
+    PoolConfig.prototype.getAllMarketPks = function () {
+        return this.markets.map(function (m) { return m.marketAccount; });
+    };
     PoolConfig.prototype.getNonStableTokens = function () {
         return Array.from(this.tokens
             .filter(function (token) { return !token.isStable; })
@@ -79,10 +123,7 @@ var PoolConfig = (function () {
         });
         return tokens;
     };
-    PoolConfig.fromIdsByName = function (name, cluster) {
-        var poolConfig = PoolConfig_json_1.default.pools.find(function (pool) { return pool['poolName'] === name && cluster === pool['cluster']; });
-        if (!poolConfig)
-            throw new Error("No pool config ".concat(name, " found in Ids!"));
+    PoolConfig.buildPoolconfigFromJson = function (poolConfig) {
         var tokens = poolConfig['tokens'].map(function (i) {
             return __assign(__assign({}, i), { mintKey: new web3_js_1.PublicKey(i.mintKey) });
         });
@@ -93,22 +134,24 @@ var PoolConfig = (function () {
         var addressLookupTableAddresses = poolConfig['addressLookupTableAddresses'].map(function (i) {
             return new web3_js_1.PublicKey(i);
         });
-        return new PoolConfig(new web3_js_1.PublicKey(poolConfig.programId), new web3_js_1.PublicKey(poolConfig.perpComposibilityProgramId), poolConfig.cluster, poolConfig.poolName, new web3_js_1.PublicKey(poolConfig.poolAddress), new web3_js_1.PublicKey(poolConfig.lpTokenMint), poolConfig.lpDecimals, poolConfig.lpTokenSymbol, new web3_js_1.PublicKey(poolConfig.perpetuals), new web3_js_1.PublicKey(poolConfig.transferAuthority), new web3_js_1.PublicKey(poolConfig.multisig), addressLookupTableAddresses, new web3_js_1.PublicKey(poolConfig.backupOracle), tokens, custodies);
+        var markets = poolConfig['markets'].map(function (i) {
+            return __assign(__assign({}, i), { marketAccount: new web3_js_1.PublicKey(i.marketAccount), pool: new web3_js_1.PublicKey(i.pool), targetCustody: new web3_js_1.PublicKey(i.targetCustody), collateralCustody: new web3_js_1.PublicKey(i.collateralCustody), side: i.side === 'long' ? types_1.Side.Long : types_1.Side.Short, targetMint: new web3_js_1.PublicKey(i.targetMint), collateralMint: new web3_js_1.PublicKey(i.collateralMint) });
+        });
+        return new PoolConfig(new web3_js_1.PublicKey(poolConfig.programId), new web3_js_1.PublicKey(poolConfig.perpComposibilityProgramId), poolConfig.cluster, poolConfig.poolName, new web3_js_1.PublicKey(poolConfig.poolAddress), new web3_js_1.PublicKey(poolConfig.lpTokenMint), poolConfig.lpDecimals, poolConfig.lpTokenSymbol, new web3_js_1.PublicKey(poolConfig.perpetuals), new web3_js_1.PublicKey(poolConfig.transferAuthority), new web3_js_1.PublicKey(poolConfig.multisig), addressLookupTableAddresses, new web3_js_1.PublicKey(poolConfig.backupOracle), new web3_js_1.PublicKey(poolConfig.nftCollectionAddress), tokens, custodies, markets);
+    };
+    PoolConfig.fromIdsByName = function (name, cluster) {
+        var poolConfig = PoolConfig_json_1.default.pools.find(function (pool) { return pool['poolName'] === name && cluster === pool['cluster']; });
+        if (!poolConfig) {
+            throw new Error("No pool with ".concat(name, " found!"));
+        }
+        return PoolConfig.buildPoolconfigFromJson(poolConfig);
     };
     PoolConfig.fromIdsByPk = function (poolPk, cluster) {
         var poolConfig = PoolConfig_json_1.default.pools.find(function (pool) { return pool['poolAddress'] === poolPk.toString() && cluster === pool['cluster']; });
-        if (!poolConfig)
-            throw new Error("No pool config ".concat(poolPk.toString(), " found in Ids!"));
-        var tokens = poolConfig['tokens'].map(function (i) {
-            return __assign(__assign({}, i), { mintKey: new web3_js_1.PublicKey(i.mintKey) });
-        });
-        var custodies = poolConfig['custodies'].map(function (i) {
-            return __assign(__assign({}, i), { custodyAccount: new web3_js_1.PublicKey(i.custodyAccount), tokenAccount: new web3_js_1.PublicKey(i.tokenAccount), mintKey: new web3_js_1.PublicKey(i.mintKey), oracleAddress: new web3_js_1.PublicKey(i.oracleAddress) });
-        });
-        var addressLookupTableAddresses = poolConfig['addressLookupTableAddresses'].map(function (i) {
-            return new web3_js_1.PublicKey(i);
-        });
-        return new PoolConfig(new web3_js_1.PublicKey(poolConfig.programId), new web3_js_1.PublicKey(poolConfig.perpComposibilityProgramId), poolConfig.cluster, poolConfig.poolName, new web3_js_1.PublicKey(poolConfig.poolAddress), new web3_js_1.PublicKey(poolConfig.lpTokenMint), poolConfig.lpDecimals, poolConfig.lpTokenSymbol, new web3_js_1.PublicKey(poolConfig.perpetuals), new web3_js_1.PublicKey(poolConfig.transferAuthority), new web3_js_1.PublicKey(poolConfig.multisig), addressLookupTableAddresses, new web3_js_1.PublicKey(poolConfig.backupOracle), tokens, custodies);
+        if (!poolConfig) {
+            throw new Error("No pool with ".concat(poolPk.toString(), " found!"));
+        }
+        return PoolConfig.buildPoolconfigFromJson(poolConfig);
     };
     return PoolConfig;
 }());