flash-sdk 10.10.5 → 10.100.1-alpha.0

package/dist/PoolAccount.d.ts

@@ -38,6 +38,9 @@ export declare class PoolAccount implements Pool {
     compoundingLpPrice: BN;
     lastUpdatedTimestamp: BN;
     padding2: BN[];
+    feesObligationUsd: BN;
+    rebateObligationUsd: BN;
+    thresholdUsd: BN;
     constructor(publicKey: PublicKey, parseData: Pool);
     static from(publicKey: PublicKey, parseData: Pool): PoolAccount;
     updatePoolData(parseData: Pool): void;

package/dist/PoolConfig.d.ts

@@ -54,6 +54,7 @@ export declare class PoolConfig {
     fbNftRewardProgramId: PublicKey;
     cluster: Cluster;
     poolName: string;
+    isDeprecated: boolean;
     poolAddress: PublicKey;
     stakedLpTokenMint: PublicKey;
     compoundingTokenMint: PublicKey;
@@ -67,6 +68,8 @@ export declare class PoolConfig {
     tokenMint: PublicKey;
     tokenVault: PublicKey;
     tokenVaultTokenAccount: PublicKey;
+    rebateVault: PublicKey;
+    rebateTokenAccount: PublicKey;
     revenueTokenAccount: PublicKey;
     protocolVault: PublicKey;
     protocolTokenAccount: PublicKey;
@@ -83,15 +86,18 @@ export declare class PoolConfig {
         rewardTokenAccount: PublicKey;
     };
     tokens: Token[];
+    tokensDeprecated: Token[];
     custodies: CustodyConfig[];
+    custodiesDeprecated: CustodyConfig[];
     markets: 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, revenueTokenAccount: PublicKey, protocolVault: PublicKey, protocolTokenAccount: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], pusherAddressLookupTableAddress: PublicKey, backupOracle: PublicKey, nftCollectionAddress: PublicKey, rewardDistributionProgram: {
+    marketsDeprecated: MarketConfig[];
+    constructor(programId: PublicKey, perpComposibilityProgramId: PublicKey, fbNftRewardProgramId: PublicKey, cluster: Cluster, poolName: string, isDeprecated: boolean, 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[], tokensDeprecated: Token[], custodies: CustodyConfig[], custodiesDeprecated: CustodyConfig[], markets: MarketConfig[], marketsDeprecated: MarketConfig[]);
     getAllTokenMints(): PublicKey[];
     getMarketConfigByPk(marketAccountPk: PublicKey): MarketConfig;
     getMarketConfig(targetCustody: PublicKey, collateralCustody: PublicKey, side: Side): MarketConfig | null;
@@ -99,6 +105,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,13 +19,14 @@ 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, revenueTokenAccount, protocolVault, protocolTokenAccount, multisig, addressLookupTableAddresses, pusherAddressLookupTableAddress, backupOracle, nftCollectionAddress, rewardDistributionProgram, tokens, custodies, markets) {
+    function PoolConfig(programId, perpComposibilityProgramId, fbNftRewardProgramId, cluster, poolName, isDeprecated, 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, tokensDeprecated, custodies, custodiesDeprecated, markets, marketsDeprecated) {
         var _this = this;
         this.programId = programId;
         this.perpComposibilityProgramId = perpComposibilityProgramId;
         this.fbNftRewardProgramId = fbNftRewardProgramId;
         this.cluster = cluster;
         this.poolName = poolName;
+        this.isDeprecated = isDeprecated;
         this.poolAddress = poolAddress;
         this.stakedLpTokenMint = stakedLpTokenMint;
         this.compoundingTokenMint = compoundingTokenMint;
@@ -39,6 +40,8 @@ var PoolConfig = (function () {
         this.tokenMint = tokenMint;
         this.tokenVault = tokenVault;
         this.tokenVaultTokenAccount = tokenVaultTokenAccount;
+        this.rebateVault = rebateVault;
+        this.rebateTokenAccount = rebateTokenAccount;
         this.revenueTokenAccount = revenueTokenAccount;
         this.protocolVault = protocolVault;
         this.protocolTokenAccount = protocolTokenAccount;
@@ -49,8 +52,11 @@ var PoolConfig = (function () {
         this.nftCollectionAddress = nftCollectionAddress;
         this.rewardDistributionProgram = rewardDistributionProgram;
         this.tokens = tokens;
+        this.tokensDeprecated = tokensDeprecated;
         this.custodies = custodies;
+        this.custodiesDeprecated = custodiesDeprecated;
         this.markets = markets;
+        this.marketsDeprecated = marketsDeprecated;
         this.getTokenFromSymbol = function (symbol) {
             return _this.tokens.find(function (f) { return f.symbol.toUpperCase() === symbol.toUpperCase(); });
         };
@@ -62,10 +68,15 @@ var PoolConfig = (function () {
         };
     }
     PoolConfig.prototype.getAllTokenMints = function () {
-        return Array.from(this.tokens.map(function (token) { return new web3_js_1.PublicKey(token.mintKey); }));
+        var tokenList = Array.from(this.tokens.map(function (token) { return new web3_js_1.PublicKey(token.mintKey); }));
+        var deprecatedTokenList = Array.from(this.tokensDeprecated.map(function (token) { return new web3_js_1.PublicKey(token.mintKey); }));
+        return tokenList.concat(deprecatedTokenList);
     };
     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;
@@ -73,6 +84,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;
@@ -106,6 +120,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;
     };
@@ -153,6 +174,20 @@ var PoolConfig = (function () {
         catch (error) {
             console.log("ERROR: buildPoolconfigFromJson  unable to load tokens ");
         }
+        var tokensDeprecated;
+        try {
+            if (!poolConfig['tokensDeprecated']) {
+                tokensDeprecated = [];
+            }
+            else {
+                tokensDeprecated = poolConfig['tokensDeprecated'].map(function (i) {
+                    return __assign(__assign({}, i), { mintKey: new web3_js_1.PublicKey(i.mintKey) });
+                });
+            }
+        }
+        catch (error) {
+            console.log("ERROR: buildPoolconfigFromJson  unable to load tokensDeprecated ");
+        }
         var custodies;
         try {
             custodies = poolConfig['custodies'].map(function (i, index) {
@@ -162,6 +197,20 @@ var PoolConfig = (function () {
         catch (error) {
             console.log("ERROR: buildPoolconfigFromJson  unable to load custodies ");
         }
+        var custodiesDeprecated;
+        try {
+            if (!poolConfig['custodiesDeprecated']) {
+                custodiesDeprecated = [];
+            }
+            else {
+                custodiesDeprecated = poolConfig['custodiesDeprecated'].map(function (i) {
+                    return __assign(__assign({}, i), { custodyId: i.custodyId, custodyAccount: new web3_js_1.PublicKey(i.custodyAccount), tokenAccount: new web3_js_1.PublicKey(i.tokenAccount), mintKey: new web3_js_1.PublicKey(i.mintKey), intOracleAccount: new web3_js_1.PublicKey(i.intOracleAddress), extOracleAccount: new web3_js_1.PublicKey(i.extOracleAddress), usdPrecision: i.usdPrecision, tokenPrecision: i.tokenPrecision });
+                });
+            }
+        }
+        catch (error) {
+            console.log("ERROR: buildPoolconfigFromJson  unable to load custodiesDeprecated ");
+        }
         var addressLookupTableAddresses;
         try {
             addressLookupTableAddresses = poolConfig['addressLookupTableAddresses'].map(function (i) {
@@ -187,13 +236,27 @@ var PoolConfig = (function () {
         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.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), {
+        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, poolConfig.isDeprecated, 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, tokensDeprecated, custodies, custodiesDeprecated, markets, marketsDeprecated);
     };
     PoolConfig.fromIdsByName = function (name, cluster) {
         var poolConfig = PoolConfig_json_1.default.pools.find(function (pool) { return pool['poolName'] === name && cluster === pool['cluster']; });