flash-sdk 12.0.0 → 12.0.1

package/dist/PoolAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { Pool, TokenRatios, StakeStats, CompoundingStats, Permissions } from "./types";
 import { PublicKey } from "@solana/web3.js";

package/dist/PoolConfig.d.ts

@@ -87,13 +87,14 @@ export declare class PoolConfig {
     tokens: Token[];
     custodies: CustodyConfig[];
     markets: MarketConfig[];
+    marketsDeprecated: MarketConfig[];
     constructor(programId: PublicKey, perpComposibilityProgramId: PublicKey, fbNftRewardProgramId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, stakedLpTokenMint: PublicKey, compoundingTokenMint: PublicKey, stakedLpVault: PublicKey, compoundingLpVault: PublicKey, lpDecimals: number, compoundingLpTokenSymbol: string, stakedLpTokenSymbol: string, perpetuals: PublicKey, transferAuthority: PublicKey, tokenMint: PublicKey, tokenVault: PublicKey, tokenVaultTokenAccount: PublicKey, rebateVault: PublicKey, rebateTokenAccount: PublicKey, revenueTokenAccount: PublicKey, protocolVault: PublicKey, protocolTokenAccount: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], pusherAddressLookupTableAddress: PublicKey, backupOracle: PublicKey, nftCollectionAddress: PublicKey, rewardDistributionProgram: {
         programId: PublicKey;
         transferAuthority: PublicKey;
         rewardVault: PublicKey;
         rewardMint: PublicKey;
         rewardTokenAccount: PublicKey;
-    }, tokens: Token[], custodies: CustodyConfig[], markets: MarketConfig[]);
+    }, tokens: Token[], custodies: CustodyConfig[], markets: MarketConfig[], marketsDeprecated: MarketConfig[]);
     getAllTokenMints(): PublicKey[];
     getMarketConfigByPk(marketAccountPk: PublicKey): MarketConfig;
     getMarketConfig(targetCustody: PublicKey, collateralCustody: PublicKey, side: Side): MarketConfig | null;
@@ -101,6 +102,7 @@ export declare class PoolConfig {
     getPositionFromMarketPk(owner: PublicKey, marketAccount: PublicKey): PublicKey;
     getOrderFromMarketPk(owner: PublicKey, marketAccount: PublicKey): PublicKey;
     getPositionFromCustodyPk(owner: PublicKey, targetCustody: PublicKey, collateralCustody: PublicKey, side: Side): PublicKey;
+    getOrderFromCustodyPk(owner: PublicKey, targetCustody: PublicKey, collateralCustody: PublicKey, side: Side): PublicKey;
     doesMarketExist(pubkey: PublicKey): boolean;
     getAllMarketPks(): PublicKey[];
     getNonStableTokens(): PublicKey[];

package/dist/PoolConfig.js

@@ -19,7 +19,7 @@ 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, fbNftRewardProgramId, cluster, poolName, poolAddress, stakedLpTokenMint, compoundingTokenMint, stakedLpVault, compoundingLpVault, lpDecimals, compoundingLpTokenSymbol, stakedLpTokenSymbol, perpetuals, transferAuthority, tokenMint, tokenVault, tokenVaultTokenAccount, rebateVault, rebateTokenAccount, revenueTokenAccount, protocolVault, protocolTokenAccount, multisig, addressLookupTableAddresses, pusherAddressLookupTableAddress, backupOracle, nftCollectionAddress, rewardDistributionProgram, tokens, custodies, markets) {
+    function PoolConfig(programId, perpComposibilityProgramId, fbNftRewardProgramId, cluster, poolName, poolAddress, stakedLpTokenMint, compoundingTokenMint, stakedLpVault, compoundingLpVault, lpDecimals, compoundingLpTokenSymbol, stakedLpTokenSymbol, perpetuals, transferAuthority, tokenMint, tokenVault, tokenVaultTokenAccount, rebateVault, rebateTokenAccount, revenueTokenAccount, protocolVault, protocolTokenAccount, multisig, addressLookupTableAddresses, pusherAddressLookupTableAddress, backupOracle, nftCollectionAddress, rewardDistributionProgram, tokens, custodies, markets, marketsDeprecated) {
         var _this = this;
         this.programId = programId;
         this.perpComposibilityProgramId = perpComposibilityProgramId;
@@ -53,6 +53,7 @@ var PoolConfig = (function () {
         this.tokens = tokens;
         this.custodies = custodies;
         this.markets = markets;
+        this.marketsDeprecated = marketsDeprecated;
         this.getTokenFromSymbol = function (symbol) {
             return _this.tokens.find(function (f) { return f.symbol.toUpperCase() === symbol.toUpperCase(); });
         };
@@ -68,6 +69,9 @@ var PoolConfig = (function () {
     };
     PoolConfig.prototype.getMarketConfigByPk = function (marketAccountPk) {
         var market = this.markets.find(function (f) { return f.marketAccount.equals(marketAccountPk); });
+        if (!market) {
+            market = this.marketsDeprecated.find(function (f) { return f.marketAccount.equals(marketAccountPk); });
+        }
         if (!market)
             throw new Error("No such market ".concat(marketAccountPk.toBase58(), " exists."));
         return market;
@@ -75,6 +79,9 @@ var PoolConfig = (function () {
     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) {
+            market = this.marketsDeprecated.find(function (f) { return f.marketAccount.equals(marketAccountPk); });
+        }
         if (!market)
             return null;
         return market;
@@ -108,6 +115,13 @@ var PoolConfig = (function () {
             this.getMarketPk(targetCustody, collateralCustody, side).toBuffer(),
         ], this.programId)[0];
     };
+    PoolConfig.prototype.getOrderFromCustodyPk = function (owner, targetCustody, collateralCustody, side) {
+        return web3_js_1.PublicKey.findProgramAddressSync([
+            Buffer.from("order"),
+            owner.toBuffer(),
+            this.getMarketPk(targetCustody, collateralCustody, side).toBuffer(),
+        ], this.programId)[0];
+    };
     PoolConfig.prototype.doesMarketExist = function (pubkey) {
         return;
     };
@@ -189,13 +203,27 @@ var PoolConfig = (function () {
         catch (error) {
             console.log("ERROR: buildPoolconfigFromJson  unable to load markets ");
         }
+        var marketsDeprecated;
+        try {
+            if (!poolConfig['marketsDeprecated']) {
+                marketsDeprecated = [];
+            }
+            else {
+                marketsDeprecated = poolConfig['marketsDeprecated'].map(function (i) {
+                    return __assign(__assign({}, i), { marketAccount: new web3_js_1.PublicKey(i.marketAccount), marketCorrelation: i.marketCorrelation, 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, maxLev: i.maxLev, degenMinLev: i.degenMinLev, degenMaxLev: i.degenMaxLev, targetMint: new web3_js_1.PublicKey(i.targetMint), collateralMint: new web3_js_1.PublicKey(i.collateralMint) });
+                });
+            }
+        }
+        catch (error) {
+            console.log("ERROR: buildPoolconfigFromJson  unable to load markets ");
+        }
         return new PoolConfig(new web3_js_1.PublicKey(poolConfig.programId), new web3_js_1.PublicKey(poolConfig.perpComposibilityProgramId), new web3_js_1.PublicKey(poolConfig.fbNftRewardProgramId), poolConfig.cluster, poolConfig.poolName, new web3_js_1.PublicKey(poolConfig.poolAddress), new web3_js_1.PublicKey(poolConfig.stakedLpTokenMint), new web3_js_1.PublicKey(poolConfig.compoundingTokenMint), new web3_js_1.PublicKey(poolConfig.stakedLpVault), new web3_js_1.PublicKey(poolConfig.compoundingLpVault), poolConfig.lpDecimals, poolConfig.compoundingLpTokenSymbol, poolConfig.stakedLpTokenSymbol, new web3_js_1.PublicKey(poolConfig.perpetuals), new web3_js_1.PublicKey(poolConfig.transferAuthority), new web3_js_1.PublicKey(poolConfig.tokenMint), new web3_js_1.PublicKey(poolConfig.tokenVault), new web3_js_1.PublicKey(poolConfig.tokenVaultTokenAccount), new web3_js_1.PublicKey(poolConfig.rebateVault), new web3_js_1.PublicKey(poolConfig.rebateTokenAccount), new web3_js_1.PublicKey(poolConfig.revenueTokenAccount), new web3_js_1.PublicKey(poolConfig.protocolVault), new web3_js_1.PublicKey(poolConfig.protocolTokenAccount), new web3_js_1.PublicKey(poolConfig.multisig), addressLookupTableAddresses, pusherAddressLookupTableAddress, new web3_js_1.PublicKey(poolConfig.backupOracle), new web3_js_1.PublicKey(poolConfig.nftCollectionAddress), {
             programId: new web3_js_1.PublicKey(poolConfig.rewardDistributionProgram.programId),
             rewardMint: new web3_js_1.PublicKey(poolConfig.rewardDistributionProgram.rewardMint),
             rewardTokenAccount: new web3_js_1.PublicKey(poolConfig.rewardDistributionProgram.rewardTokenAccount),
             rewardVault: new web3_js_1.PublicKey(poolConfig.rewardDistributionProgram.rewardVault),
             transferAuthority: new web3_js_1.PublicKey(poolConfig.rewardDistributionProgram.transferAuthority),
-        }, tokens, custodies, markets);
+        }, tokens, custodies, markets, marketsDeprecated);
     };
     PoolConfig.fromIdsByName = function (name, cluster) {
         var poolConfig = PoolConfig_json_1.default.pools.find(function (pool) { return pool['poolName'] === name && cluster === pool['cluster']; });