flash-sdk 11.4.4 → 11.4.7

package/dist/PerpetualsClient.d.ts

@@ -6,9 +6,6 @@ import { AddLiquidityAmountAndFee, InternalPrice, BorrowRateParams, ExitPriceAnd
 import { OraclePrice } from "./OraclePrice";
 import { CustodyAccount } from "./CustodyAccount";
 import { Perpetuals } from "./idl/perpetuals";
-import { PerpComposability } from "./idl/perp_composability";
-import { FbnftRewards } from "./idl/fbnft_rewards";
-import { RewardDistribution } from "./idl/reward_distribution";
 import { SendTransactionOpts } from "./utils/rpc";
 import { MarketConfig, PoolConfig, Token } from "./PoolConfig";
 import { MarketAccount } from "./MarketAccount";
@@ -22,12 +19,8 @@ export type PerpClientOptions = {
 export declare class PerpetualsClient {
     provider: AnchorProvider;
     program: Program<Perpetuals>;
-    programPerpComposability: Program<PerpComposability>;
-    programFbnftReward: Program<FbnftRewards>;
-    programRewardDistribution: Program<RewardDistribution>;
     admin: PublicKey;
     programId: PublicKey;
-    composabilityProgramId: PublicKey;
     multisig: {
         publicKey: PublicKey;
         bump: number;
@@ -48,10 +41,6 @@ export declare class PerpetualsClient {
         publicKey: PublicKey;
         bump: number;
     };
-    eventAuthorityRewardDistribution: {
-        publicKey: PublicKey;
-        bump: number;
-    };
     prioritizationFee: number;
     minimumBalanceForRentExemptAccountLamports: number;
     private postSendTxCallback?;

package/dist/PerpetualsClient.js

@@ -69,9 +69,6 @@ var PositionAccount_1 = require("./PositionAccount");
 var types_1 = require("./types");
 var OraclePrice_1 = require("./OraclePrice");
 var perpetuals_1 = require("./idl/perpetuals");
-var perp_composability_1 = require("./idl/perp_composability");
-var fbnft_rewards_1 = require("./idl/fbnft_rewards");
-var reward_distribution_1 = require("./idl/reward_distribution");
 var rpc_1 = require("./utils/rpc");
 var utils_1 = require("./utils");
 var constants_1 = require("./constants");
@@ -7125,12 +7122,12 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.moveProtocolFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_45;
+            var publicKey, rewardCustodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
-                        custodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                        rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
                         instructions = [];
                         additionalSigners = [];
                         _a.label = 1;
@@ -7143,15 +7140,15 @@ var PerpetualsClient = (function () {
                                 perpetuals: this.perpetuals.publicKey,
                                 tokenVault: poolConfig.tokenVault,
                                 pool: poolConfig.poolAddress,
-                                custody: custodyConfig.custodyAccount,
-                                custodyTokenAccount: custodyConfig.tokenAccount,
+                                rewardCustody: rewardCustodyConfig.custodyAccount,
+                                rewardCustodyTokenAccount: rewardCustodyConfig.tokenAccount,
                                 revenueTokenAccount: poolConfig.revenueTokenAccount,
                                 protocolVault: poolConfig.protocolVault,
                                 protocolTokenAccount: poolConfig.protocolTokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
-                                tokenMint: custodyConfig.mintKey,
+                                tokenMint: rewardCustodyConfig.mintKey,
                             })
                                 .instruction()];
                     case 2:
@@ -8164,17 +8161,12 @@ var PerpetualsClient = (function () {
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
         this.program = new anchor_1.Program(perpetuals_1.IDL, programId);
-        this.programPerpComposability = new anchor_1.Program(perp_composability_1.IDL, composabilityProgramId);
-        this.programFbnftReward = new anchor_1.Program(fbnft_rewards_1.IDL, fbNftRewardProgramId);
-        this.programRewardDistribution = new anchor_1.Program(reward_distribution_1.IDL, rewardDistributionProgramId);
         this.programId = programId;
-        this.composabilityProgramId = composabilityProgramId;
         this.admin = this.provider.wallet.publicKey;
         this.multisig = this.findProgramAddress("multisig");
         this.authority = this.findProgramAddress("transfer_authority");
         this.perpetuals = this.findProgramAddress("perpetuals");
         this.eventAuthority = this.findProgramAddress("__event_authority");
-        this.eventAuthorityRewardDistribution = this.findProgramAddressFromProgramId("__event_authority", null, this.programRewardDistribution.programId);
         this.minimumBalanceForRentExemptAccountLamports = 2039280;
         this.prioritizationFee = (opts === null || opts === void 0 ? void 0 : opts.prioritizationFee) || 0;
         this.useExtOracleAccount = useExtOracleAccount;

package/dist/PoolConfig.json

@@ -387,24 +387,6 @@
                     "targetMint": "A7bdiYdS5GjqGFtxf17ppRHtDKPkkRqbKtR27dxvQXaS",
                     "collateralMint": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
                 }
-            ],
-            "marketsDeprecated": [
-                {
-                    "marketId": 0,
-                    "marketAccount": "88zawd3Rw6tknWvgEm8QBgBuf5Y2GTeA18S788qUrSnM",
-                    "marketCorrelation": false,
-                    "pool": "KwhpybQPe9xuZFmAfcjLHj3ukownWex1ratyascAC1X",
-                    "targetCustody": "3j1xiP6GckKCzsTm6sni5iy6zrpZX5BWZGbKCq5buk4d",
-                    "collateralCustody": "9yANuRkTRxb9jjxnG1h3xcUz2kM8fJgDbdYJV4PfZ7dy",
-                    "side": "long",
-                    "maxLev": 100,
-                    "degenMinLev": 1,
-                    "degenMaxLev": 100,
-                    "targetCustodyId": 1,
-                    "collateralCustodyId": 0,
-                    "targetMint": "XAUfcdPHmEBnj78YnZ5YxqdwBmgbwoY5VfrRwETnKuQ",
-                    "collateralMint": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
-                }
             ]
         },
         {
@@ -661,22 +643,6 @@
                 }
             ],
             "markets": [
-                {
-                    "marketId": 0,
-                    "marketAccount": "88zawd3Rw6tknWvgEm8QBgBuf5Y2GTeA18S788qUrSnM",
-                    "marketCorrelation": false,
-                    "pool": "KwhpybQPe9xuZFmAfcjLHj3ukownWex1ratyascAC1X",
-                    "targetCustody": "3j1xiP6GckKCzsTm6sni5iy6zrpZX5BWZGbKCq5buk4d",
-                    "collateralCustody": "9yANuRkTRxb9jjxnG1h3xcUz2kM8fJgDbdYJV4PfZ7dy",
-                    "side": "long",
-                    "maxLev": 100,
-                    "degenMinLev": 1,
-                    "degenMaxLev": 100,
-                    "targetCustodyId": 1,
-                    "collateralCustodyId": 0,
-                    "targetMint": "XAUfcdPHmEBnj78YnZ5YxqdwBmgbwoY5VfrRwETnKuQ",
-                    "collateralMint": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
-                },
                 {
                     "marketId": 1,
                     "marketAccount": "G2rj5artQzevbsQtCJ1rkDt3Pd5b6ZYAf8e9AjZPipui",
@@ -820,6 +786,40 @@
                     "collateralCustodyId": 0,
                     "targetMint": "o1Lw5djE8o6wMbPXU7U8Us8a6DJhWJc9WrWWUc1LHAo",
                     "collateralMint": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+                },
+                {
+                    "marketId": 12,
+                    "marketAccount": "AKD5nCQRH2NvBbCD9eGhhu7w1auX1cG8x9XAUNrwQMm1",
+                    "marketCorrelation": true,
+                    "pool": "KwhpybQPe9xuZFmAfcjLHj3ukownWex1ratyascAC1X",
+                    "targetCustody": "3j1xiP6GckKCzsTm6sni5iy6zrpZX5BWZGbKCq5buk4d",
+                    "collateralCustody": "HymsKV4bGdSbf4AyaBqCrK1438jZu6ubCqcws516vRXx",
+                    "side": "long",
+                    "maxLev": 100,
+                    "degenMinLev": 1,
+                    "degenMaxLev": 100,
+                    "targetCustodyId": 1,
+                    "collateralCustodyId": 7,
+                    "targetMint": "XAUfcdPHmEBnj78YnZ5YxqdwBmgbwoY5VfrRwETnKuQ",
+                    "collateralMint": "AymATz4TCL9sWNEEV9Kvyz45CHVhDZ6kUgjTJPzLpU9P"
+                }
+            ],
+            "marketsDeprecated": [
+                {
+                    "marketId": 0,
+                    "marketAccount": "88zawd3Rw6tknWvgEm8QBgBuf5Y2GTeA18S788qUrSnM",
+                    "marketCorrelation": false,
+                    "pool": "KwhpybQPe9xuZFmAfcjLHj3ukownWex1ratyascAC1X",
+                    "targetCustody": "3j1xiP6GckKCzsTm6sni5iy6zrpZX5BWZGbKCq5buk4d",
+                    "collateralCustody": "9yANuRkTRxb9jjxnG1h3xcUz2kM8fJgDbdYJV4PfZ7dy",
+                    "side": "long",
+                    "maxLev": 100,
+                    "degenMinLev": 1,
+                    "degenMaxLev": 100,
+                    "targetCustodyId": 1,
+                    "collateralCustodyId": 0,
+                    "targetMint": "XAUfcdPHmEBnj78YnZ5YxqdwBmgbwoY5VfrRwETnKuQ",
+                    "collateralMint": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
                 }
             ]
         },
@@ -2957,6 +2957,19 @@
                     "pythTicker": "Commodities.WTIG6/USD",
                     "pythPriceId": "0x7e91242dfd2cea64715b26edaa3e51bafc712a56ac4228a77bd53b51fd66db52",
                     "isToken2022": false
+                },
+                {
+                    "symbol": "XAUt",
+                    "mintKey": "xaut1dB1uihYCwjReVgwZ4mBBJzwkXn4picqqmk4v2H",
+                    "decimals": 6,
+                    "usdPrecision": 4,
+                    "tokenPrecision": 4,
+                    "isStable": false,
+                    "isVirtual": false,
+                    "lazerId": 172,
+                    "pythTicker": "Crypto.XAUT/USD",
+                    "pythPriceId": "0x44465e17d2e9d390e70c999d5a11fda4f092847fcd2e3e5aa089d96c98a30e67",
+                    "isToken2022": false
                 }
             ],
             "custodies": [
@@ -3061,25 +3074,26 @@
                     "lazerId": 2691,
                     "pythTicker": "Commodities.WTIG6/USD",
                     "pythPriceId": "0x7e91242dfd2cea64715b26edaa3e51bafc712a56ac4228a77bd53b51fd66db52"
+                },
+                {
+                    "custodyId": 7,
+                    "custodyAccount": "8sriDinQT789N7AJrEtQ2Q1jvVm7jGHhkdw4zTLKZxGe",
+                    "tokenAccount": "DpnfaMR5kJhVyy5SGk6yB1JHXYuqJhsm53wdewd8gNd1",
+                    "symbol": "XAUt",
+                    "mintKey": "xaut1dB1uihYCwjReVgwZ4mBBJzwkXn4picqqmk4v2H",
+                    "decimals": 6,
+                    "usdPrecision": 4,
+                    "tokenPrecision": 4,
+                    "isStable": false,
+                    "isVirtual": false,
+                    "intOracleAddress": "6fCDXgCYMnY29RENXKE2yGxvtMVUCMU59kkmS212MjMc",
+                    "extOracleAddress": "2uPQGpm8X4ZkxMHxrAW1QuhXcse1AHEgPih6Xp9NuEWW",
+                    "lazerId": 172,
+                    "pythTicker": "Crypto.XAUT/USD",
+                    "pythPriceId": "0x44465e17d2e9d390e70c999d5a11fda4f092847fcd2e3e5aa089d96c98a30e67"
                 }
             ],
             "markets": [
-                {
-                    "marketId": 0,
-                    "marketAccount": "6VaKMhU9mtWUVXSj73VMj5RAXfLiE7mRn1myyWEwBC6S",
-                    "marketCorrelation": false,
-                    "pool": "Ar7yp9PJkRpvXasLB4NYdbDHnuvAZ1gDA8ALnkPKivbb",
-                    "targetCustody": "EXumu4qqjXYpv1RUzTGiVJAvjvL3BWzn592SSwxrtZwW",
-                    "collateralCustody": "4nkiPSMJb4hpLhpaXbebkYF73Ub5vjeked8mWkPafMBm",
-                    "side": "long",
-                    "maxLev": 100,
-                    "degenMinLev": 1,
-                    "degenMaxLev": 100,
-                    "targetCustodyId": 1,
-                    "collateralCustodyId": 0,
-                    "targetMint": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
-                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
-                },
                 {
                     "marketId": 1,
                     "marketAccount": "HH56JHJojhexo4eAE6dCC8XAKKoHiUzEg5fkFRmVGh2S",
@@ -3096,22 +3110,6 @@
                     "targetMint": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
                     "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
                 },
-                {
-                    "marketId": 2,
-                    "marketAccount": "F2ro3DdrYJB59JS18wekPKU8yKG5YKFejypPkEX7wYzK",
-                    "marketCorrelation": false,
-                    "pool": "Ar7yp9PJkRpvXasLB4NYdbDHnuvAZ1gDA8ALnkPKivbb",
-                    "targetCustody": "H9KvJwG7qB5hcuqdx5Ac3mVFiSdTsms92NLQnGC9eGkx",
-                    "collateralCustody": "4nkiPSMJb4hpLhpaXbebkYF73Ub5vjeked8mWkPafMBm",
-                    "side": "long",
-                    "maxLev": 100,
-                    "degenMinLev": 1,
-                    "degenMaxLev": 100,
-                    "targetCustodyId": 2,
-                    "collateralCustodyId": 0,
-                    "targetMint": "xagGMhSCG8WDsf3zFep6sGtvyY1D78roKCHTJtEWg4Z",
-                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
-                },
                 {
                     "marketId": 3,
                     "marketAccount": "GofqHEVEZDEEzLtsGzHszvQAjEuByXR2jK5d7Y94ioQ3",
@@ -3223,6 +3221,38 @@
                     "collateralCustodyId": 0,
                     "targetMint": "oi1DkCGa5CVm379ZuznLMevqjg7KGWnDDFB96JXAi7a",
                     "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                },
+                {
+                    "marketId": 12,
+                    "marketAccount": "HCHwtnbLgZPPkYqrbXF1oF688dxHW6cbhfU7yFLgfCpY",
+                    "marketCorrelation": true,
+                    "pool": "Ar7yp9PJkRpvXasLB4NYdbDHnuvAZ1gDA8ALnkPKivbb",
+                    "targetCustody": "EXumu4qqjXYpv1RUzTGiVJAvjvL3BWzn592SSwxrtZwW",
+                    "collateralCustody": "8sriDinQT789N7AJrEtQ2Q1jvVm7jGHhkdw4zTLKZxGe",
+                    "side": "long",
+                    "maxLev": 50,
+                    "degenMinLev": 1,
+                    "degenMaxLev": 50,
+                    "targetCustodyId": 1,
+                    "collateralCustodyId": 7,
+                    "targetMint": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
+                    "collateralMint": "xaut1dB1uihYCwjReVgwZ4mBBJzwkXn4picqqmk4v2H"
+                },
+                {
+                    "marketId": 13,
+                    "marketAccount": "6L3TrWrCSVq46N6zyTufVV6hpmMaLQgohkXntkf2fkzc",
+                    "marketCorrelation": false,
+                    "pool": "Ar7yp9PJkRpvXasLB4NYdbDHnuvAZ1gDA8ALnkPKivbb",
+                    "targetCustody": "H9KvJwG7qB5hcuqdx5Ac3mVFiSdTsms92NLQnGC9eGkx",
+                    "collateralCustody": "8sriDinQT789N7AJrEtQ2Q1jvVm7jGHhkdw4zTLKZxGe",
+                    "side": "long",
+                    "maxLev": 50,
+                    "degenMinLev": 1,
+                    "degenMaxLev": 50,
+                    "targetCustodyId": 2,
+                    "collateralCustodyId": 7,
+                    "targetMint": "xagGMhSCG8WDsf3zFep6sGtvyY1D78roKCHTJtEWg4Z",
+                    "collateralMint": "xaut1dB1uihYCwjReVgwZ4mBBJzwkXn4picqqmk4v2H"
                 }
             ]
         },