flash-sdk 15.1.1 → 15.1.3

package/dist/PerpetualsClient.d.ts

@@ -778,7 +778,7 @@ export declare class PerpetualsClient {
     setAdminSigners: (admins: PublicKey[], minSignatures: number) => Promise<void>;
     addPool: (name: string, maxAumUsd: BN, permissions: Permissions, metadataSymbol: string, metadataTitle: string, metadataUri: string, stakingFeeShareBps: BN, vpVolumeFactor: number, stakingFeeBoostBps: BN[], minLpPriceUsd: BN, maxLpPriceUsd: BN, thresholdUsd: BN) => Promise<void>;
     removePool: (name: string) => Promise<void>;
-    addCustody: (poolName: string, tokenMint: PublicKey, isToken222: boolean, isStable: boolean, isVirtual: boolean, oracle: OracleParams, pricing: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[], depegAdjustment: boolean, rewardThreshold: BN, minReserveUsd: BN, limitPriceBufferBps: BN, inversePrice: boolean) => Promise<void>;
+    addCustody: (poolName: string, tokenMint: PublicKey, isToken22: boolean, isStable: boolean, isVirtual: boolean, oracle: OracleParams, pricing: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[], depegAdjustment: boolean, rewardThreshold: BN, minReserveUsd: BN, limitPriceBufferBps: BN, inversePrice: boolean) => Promise<void>;
     editCustody: (poolName: string, tokenMint: PublicKey, isStable: boolean, oracle: OracleParams, pricing: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[]) => Promise<void>;
     removeCustody: (poolName: string, tokenMint: PublicKey, ratios: TokenRatios[], poolConfig: PoolConfig) => Promise<void>;
     protocolWithdrawFees: (rewardSymbol: string, poolConfig: PoolConfig) => Promise<{
@@ -910,6 +910,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    refreshOrdersStatus: (orderAccounts: PublicKey[]) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     migrateMarketPosition: (poolName: string, oldMarket: PublicKey, newMarket: PublicKey, oldCollateralCustody: PublicKey, newCollateralCustody: PublicKey, owner: PublicKey) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];

package/dist/PerpetualsClient.js

@@ -7028,7 +7028,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCustody = function (poolName, tokenMint, isToken222, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment, rewardThreshold, minReserveUsd, limitPriceBufferBps, inversePrice) { return __awaiter(_this, void 0, void 0, function () {
+        this.addCustody = function (poolName, tokenMint, isToken22, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment, rewardThreshold, minReserveUsd, limitPriceBufferBps, inversePrice) { return __awaiter(_this, void 0, void 0, function () {
             var trx_id, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -7040,7 +7040,7 @@ var PerpetualsClient = (function () {
                                 depegAdjustment: depegAdjustment,
                                 isVirtual: isVirtual,
                                 inversePrice: inversePrice,
-                                token22: isToken222,
+                                token22: isToken22,
                                 oracle: oracle,
                                 pricing: pricing,
                                 permissions: permissions,
@@ -8672,8 +8672,46 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.refreshOrdersStatus = function (orderAccounts) { return __awaiter(_this, void 0, void 0, function () {
+            var instructions, additionalSigners, remainingAccounts, refreshInstruction, err_77;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        instructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        remainingAccounts = orderAccounts.map(function (pubkey) { return ({
+                            pubkey: pubkey,
+                            isSigner: false,
+                            isWritable: true,
+                        }); });
+                        return [4, this.program.methods
+                                .refreshOrdersStatus({})
+                                .accountsPartial({
+                                admin: this.provider.wallet.publicKey,
+                                multisig: this.multisig.publicKey,
+                            })
+                                .remainingAccounts(remainingAccounts)
+                                .instruction()];
+                    case 2:
+                        refreshInstruction = _a.sent();
+                        instructions.push(refreshInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_77 = _a.sent();
+                        console.log("perpClient refreshOrdersStatus error:: ", err_77);
+                        throw err_77;
+                    case 4: return [2, {
+                            instructions: __spreadArray([], instructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         this.migrateMarketPosition = function (poolName, oldMarket, newMarket, oldCollateralCustody, newCollateralCustody, owner) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, oldPosition, newPosition, oldCollateralCustodyAccount, newCollateralCustodyAccount, migrateMarketPositionInstruction, err_77;
+            var preInstructions, instructions, postInstructions, additionalSigners, oldPosition, newPosition, oldCollateralCustodyAccount, newCollateralCustodyAccount, migrateMarketPositionInstruction, err_78;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8723,9 +8761,9 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateMarketPositionInstruction);
                         return [3, 6];
                     case 5:
-                        err_77 = _a.sent();
-                        console.log("perpClient migrateMarketPosition error:: ", err_77);
-                        throw err_77;
+                        err_78 = _a.sent();
+                        console.log("perpClient migrateMarketPosition error:: ", err_78);
+                        throw err_78;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8739,7 +8777,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 5] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([poolName_1, oldMarket_1, newMarket_1, oldCollateralCustody_1, newCollateralCustody_1], args_1, true), void 0, function (poolName, oldMarket, newMarket, oldCollateralCustody, newCollateralCustody, owner) {
-                var preInstructions, instructions, postInstructions, additionalSigners, oldOrder, newOrder, migrateMarketOrderInstruction, err_78;
+                var preInstructions, instructions, postInstructions, additionalSigners, oldOrder, newOrder, migrateMarketOrderInstruction, err_79;
                 if (owner === void 0) { owner = this.provider.wallet.publicKey; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -8780,9 +8818,9 @@ var PerpetualsClient = (function () {
                             instructions.push(migrateMarketOrderInstruction);
                             return [3, 4];
                         case 3:
-                            err_78 = _a.sent();
-                            console.log("perpClient migrateMarketOrder error:: ", err_78);
-                            throw err_78;
+                            err_79 = _a.sent();
+                            console.log("perpClient migrateMarketOrder error:: ", err_79);
+                            throw err_79;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -8792,7 +8830,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.forceSettlePosition = function (market, owner, receivingAccount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, marketAccount, targetCustody_1, collateralCustody_1, targetCustodyConfig, collateralCustodyConfig, positionAccount, orderAccount, remainingAccounts, orderAccountInfo, forceSettlePositionIx, err_79;
+            var instructions, additionalSigners, marketAccount, targetCustody_1, collateralCustody_1, targetCustodyConfig, collateralCustodyConfig, positionAccount, orderAccount, remainingAccounts, orderAccountInfo, forceSettlePositionIx, err_80;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8856,9 +8894,9 @@ var PerpetualsClient = (function () {
                         instructions.push(forceSettlePositionIx);
                         return [3, 6];
                     case 5:
-                        err_79 = _a.sent();
-                        console.log("perpClient forceSettlePosition error:: ", err_79);
-                        throw err_79;
+                        err_80 = _a.sent();
+                        console.log("perpClient forceSettlePosition error:: ", err_80);
+                        throw err_80;
                     case 6: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -8867,18 +8905,18 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.forceSettleOrder = function (market, owner, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, marketAccount, targetCustody, orderKey, orderAccount, uidToCustodyConfig, _i, _a, custodyConfig, custody, activeLimitOrders, uniqueUids, _b, uniqueUids_1, uid, reserveCustodyConfig, isToken2022, receivingAccount, forceSettleOrderIx, reserveCustodyConfig, isToken2022, receivingAccount, forceSettleOrderIx, err_80;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var instructions, additionalSigners, marketAccount, targetCustody, orderKey, orderAccount, uidToCustodyConfig, _i, _a, custodyConfig, custody, _b, activeLimitOrders, uniqueUids, _c, uniqueUids_1, uid, reserveCustodyConfig, isToken2022, receivingAccount, forceSettleOrderIx, reserveCustodyConfig, isToken2022, receivingAccount, forceSettleOrderIx, err_81;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         instructions = [];
                         additionalSigners = [];
-                        _c.label = 1;
+                        _d.label = 1;
                     case 1:
-                        _c.trys.push([1, 14, , 15]);
+                        _d.trys.push([1, 16, , 17]);
                         return [4, this.program.account.market.fetch(market)];
                     case 2:
-                        marketAccount = _c.sent();
+                        marketAccount = _d.sent();
                         targetCustody = marketAccount.targetCustody;
                         orderKey = this.findProgramAddress("order", [
                             owner,
@@ -8886,32 +8924,38 @@ var PerpetualsClient = (function () {
                         ]).publicKey;
                         return [4, this.program.account.order.fetch(orderKey)];
                     case 3:
-                        orderAccount = _c.sent();
+                        orderAccount = _d.sent();
                         uidToCustodyConfig = new Map();
                         _i = 0, _a = poolConfig.custodies;
-                        _c.label = 4;
+                        _d.label = 4;
                     case 4:
-                        if (!(_i < _a.length)) return [3, 7];
+                        if (!(_i < _a.length)) return [3, 9];
                         custodyConfig = _a[_i];
-                        return [4, this.program.account.custody.fetch(custodyConfig.custodyAccount)];
+                        _d.label = 5;
                     case 5:
-                        custody = _c.sent();
-                        uidToCustodyConfig.set(custody.uid, custodyConfig);
-                        _c.label = 6;
+                        _d.trys.push([5, 7, , 8]);
+                        return [4, this.program.account.custody.fetch(custodyConfig.custodyAccount)];
                     case 6:
+                        custody = _d.sent();
+                        uidToCustodyConfig.set(custody.uid, custodyConfig);
+                        return [3, 8];
+                    case 7:
+                        _b = _d.sent();
+                        return [3, 8];
+                    case 8:
                         _i++;
                         return [3, 4];
-                    case 7:
+                    case 9:
                         activeLimitOrders = orderAccount.limitOrders.slice(0, orderAccount.activeOrders);
                         uniqueUids = Array.from(new Set(activeLimitOrders.map(function (o) { return o.reserveCustodyUid; })));
-                        _b = 0, uniqueUids_1 = uniqueUids;
-                        _c.label = 8;
-                    case 8:
-                        if (!(_b < uniqueUids_1.length)) return [3, 11];
-                        uid = uniqueUids_1[_b];
+                        _c = 0, uniqueUids_1 = uniqueUids;
+                        _d.label = 10;
+                    case 10:
+                        if (!(_c < uniqueUids_1.length)) return [3, 13];
+                        uid = uniqueUids_1[_c];
                         reserveCustodyConfig = uidToCustodyConfig.get(uid);
                         if (!reserveCustodyConfig)
-                            return [3, 10];
+                            return [3, 12];
                         isToken2022 = poolConfig.getTokenFromMintPk(reserveCustodyConfig.mintKey).isToken2022;
                         receivingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(reserveCustodyConfig.mintKey, owner, true, isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                         return [4, this.program.methods
@@ -8935,15 +8979,15 @@ var PerpetualsClient = (function () {
                                 reserveMint: reserveCustodyConfig.mintKey,
                             })
                                 .instruction()];
-                    case 9:
-                        forceSettleOrderIx = _c.sent();
-                        instructions.push(forceSettleOrderIx);
-                        _c.label = 10;
-                    case 10:
-                        _b++;
-                        return [3, 8];
                     case 11:
-                        if (!(uniqueUids.length === 0 && (orderAccount.openTp > 0 || orderAccount.openSl > 0))) return [3, 13];
+                        forceSettleOrderIx = _d.sent();
+                        instructions.push(forceSettleOrderIx);
+                        _d.label = 12;
+                    case 12:
+                        _c++;
+                        return [3, 10];
+                    case 13:
+                        if (!(uniqueUids.length === 0 && (orderAccount.openTp > 0 || orderAccount.openSl > 0))) return [3, 15];
                         reserveCustodyConfig = poolConfig.custodies[0];
                         isToken2022 = poolConfig.getTokenFromMintPk(reserveCustodyConfig.mintKey).isToken2022;
                         receivingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(reserveCustodyConfig.mintKey, owner, true, isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
@@ -8968,16 +9012,16 @@ var PerpetualsClient = (function () {
                                 reserveMint: reserveCustodyConfig.mintKey,
                             })
                                 .instruction()];
-                    case 12:
-                        forceSettleOrderIx = _c.sent();
-                        instructions.push(forceSettleOrderIx);
-                        _c.label = 13;
-                    case 13: return [3, 15];
                     case 14:
-                        err_80 = _c.sent();
-                        console.log("perpClient forceSettleOrder error:: ", err_80);
-                        throw err_80;
-                    case 15: return [2, {
+                        forceSettleOrderIx = _d.sent();
+                        instructions.push(forceSettleOrderIx);
+                        _d.label = 15;
+                    case 15: return [3, 17];
+                    case 16:
+                        err_81 = _d.sent();
+                        console.log("perpClient forceSettleOrder error:: ", err_81);
+                        throw err_81;
+                    case 17: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
                         }];

package/dist/PoolConfig.json

@@ -564,9 +564,9 @@
                     "tokenPrecision": 4,
                     "isStable": false,
                     "isVirtual": true,
-                    "lazerId": 2692,
-                    "pythTicker": "Commodities.WTIH6/USD",
-                    "pythPriceId": "0x0058c6f03fd28b18083d00fcdc3baaed2f11edef8b981f6b74130b85be474b17",
+                    "lazerId": 2693,
+                    "pythTicker": "Commodities.WTIJ6/USD",
+                    "pythPriceId": "0x6a60b0d1ea6809b47dbe599f24a71c8bda335aa5c77e503e7260cde5ba2f4694",
                     "isToken2022": false
                 },
                 {
@@ -707,10 +707,10 @@
                     "isStable": false,
                     "isVirtual": true,
                     "intOracleAddress": "5qLQ3BT7JCf4fUxoAH1xZwHCca9fZuuTWTgTsNxLNcoZ",
-                    "extOracleAddress": "Gf9Cg2NS2xfsxLXixjsfAsQkeH1UxN2WVA7dRzKoacYk",
-                    "lazerId": 2692,
-                    "pythTicker": "Commodities.WTIH6/USD",
-                    "pythPriceId": "0x0058c6f03fd28b18083d00fcdc3baaed2f11edef8b981f6b74130b85be474b17"
+                    "extOracleAddress": "5cuRJhJacGmNJWXqFMWebJReaCktd4Huj2eY7VxF2Rkr",
+                    "lazerId": 2693,
+                    "pythTicker": "Commodities.WTIJ6/USD",
+                    "pythPriceId": "0x6a60b0d1ea6809b47dbe599f24a71c8bda335aa5c77e503e7260cde5ba2f4694"
                 },
                 {
                     "custodyId": 7,
@@ -3189,9 +3189,9 @@
                     "tokenPrecision": 4,
                     "isStable": false,
                     "isVirtual": true,
-                    "lazerId": 2692,
-                    "pythTicker": "Commodities.WTIH6/USD",
-                    "pythPriceId": "0x0058c6f03fd28b18083d00fcdc3baaed2f11edef8b981f6b74130b85be474b17",
+                    "lazerId": 2693,
+                    "pythTicker": "Commodities.WTIJ6/USD",
+                    "pythPriceId": "0x6a60b0d1ea6809b47dbe599f24a71c8bda335aa5c77e503e7260cde5ba2f4694",
                     "isToken2022": false
                 },
                 {
@@ -3332,10 +3332,10 @@
                     "isStable": false,
                     "isVirtual": true,
                     "intOracleAddress": "BeqYMCytDcEJrpikXhz8ZLaBb9ACGDVvmp9ekwbgBgma",
-                    "extOracleAddress": "Gf9Cg2NS2xfsxLXixjsfAsQkeH1UxN2WVA7dRzKoacYk",
-                    "lazerId": 2692,
-                    "pythTicker": "Commodities.WTIH6/USD",
-                    "pythPriceId": "0x0058c6f03fd28b18083d00fcdc3baaed2f11edef8b981f6b74130b85be474b17"
+                    "extOracleAddress": "5cuRJhJacGmNJWXqFMWebJReaCktd4Huj2eY7VxF2Rkr",
+                    "lazerId": 2693,
+                    "pythTicker": "Commodities.WTIJ6/USD",
+                    "pythPriceId": "0x6a60b0d1ea6809b47dbe599f24a71c8bda335aa5c77e503e7260cde5ba2f4694"
                 },
                 {
                     "custodyId": 7,