flash-sdk 15.0.0-alpha.0 → 15.0.1-alpha.0

package/dist/PerpetualsClient.d.ts

@@ -890,7 +890,7 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
-    setCustody: (poolName: string, tokenMint: PublicKey, depegAdjustment: boolean, inversePrice: boolean, oracle: OracleParams, pricingConfig: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[], rewardThreshold: BN, minReserveUsd: BN, limitPriceBufferBps: BN, token22: boolean) => Promise<{
+    setCustody: (poolName: string, tokenMint: PublicKey, isVirtual: boolean, depegAdjustment: boolean, inversePrice: boolean, oracle: OracleParams, pricingConfig: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[], rewardThreshold: BN, minReserveUsd: BN, limitPriceBufferBps: BN, token22: boolean) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
@@ -910,7 +910,11 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
-    refreshOrdersStatus: (orderAccounts: PublicKey[]) => Promise<{
+    migrateMarketPosition: (poolName: string, oldMarket: PublicKey, newMarket: PublicKey, oldCollateralCustody: PublicKey, newCollateralCustody: PublicKey, owner: PublicKey) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    migrateMarketOrder: (poolName: string, oldMarket: PublicKey, newMarket: PublicKey, oldCollateralCustody: PublicKey, newCollateralCustody: PublicKey, owner?: PublicKey) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;

package/dist/PerpetualsClient.js

@@ -8421,7 +8421,7 @@ var PerpetualsClient = (function () {
                         ], this.program.programId)[0];
                         return [4, this.program.methods
                                 .addMarket({
-                                side: side === "long" ? { long: {} } : { short: {} },
+                                side: (0, types_1.isVariant)(side, 'long') ? { long: {} } : { short: {} },
                                 correlation: correlation,
                                 maxPayoffBps: maxPayoffBps,
                                 permissions: permissions
@@ -8454,7 +8454,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.setCustody = function (poolName, tokenMint, depegAdjustment, inversePrice, oracle, pricingConfig, permissions, fees, borrowRate, ratios, rewardThreshold, minReserveUsd, limitPriceBufferBps, token22) { return __awaiter(_this, void 0, void 0, function () {
+        this.setCustody = function (poolName, tokenMint, isVirtual, depegAdjustment, inversePrice, oracle, pricingConfig, permissions, fees, borrowRate, ratios, rewardThreshold, minReserveUsd, limitPriceBufferBps, token22) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setCustodyConfigInstruction, err_72;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -8469,6 +8469,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .setCustodyConfig({
+                                isVirtual: isVirtual,
                                 depegAdjustment: depegAdjustment,
                                 inversePrice: inversePrice,
                                 oracle: oracle,
@@ -8485,8 +8486,11 @@ var PerpetualsClient = (function () {
                                 .accountsPartial({
                                 admin: this.admin,
                                 multisig: this.multisig.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
                                 pool: this.getPoolKey(poolName),
                                 custody: this.getCustodyKey(poolName, tokenMint),
+                                custodyOracleAccount: oracle.intOracleAccount,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                             })
                                 .instruction()];
                     case 2:
@@ -8662,50 +8666,131 @@ var PerpetualsClient = (function () {
                         console.log("perpClient refreshPositionsStatus error:: ", err_76);
                         throw err_76;
                     case 4: return [2, {
-                            instructions: instructions,
+                            instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
                         }];
                 }
             });
         }); };
-        this.refreshOrdersStatus = function (orderAccounts) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, remainingAccounts, refreshInstruction, err_77;
+        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;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        preInstructions = [];
                         instructions = [];
+                        postInstructions = [];
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        remainingAccounts = orderAccounts.map(function (pubkey) { return ({
-                            pubkey: pubkey,
-                            isSigner: false,
-                            isWritable: true,
-                        }); });
+                        _a.trys.push([1, 5, , 6]);
+                        oldPosition = this.findProgramAddress("position", [
+                            owner,
+                            oldMarket,
+                        ]).publicKey;
+                        newPosition = this.findProgramAddress("position", [
+                            owner,
+                            newMarket,
+                        ]).publicKey;
+                        return [4, this.program.account.custody.fetch(oldCollateralCustody)];
+                    case 2:
+                        oldCollateralCustodyAccount = _a.sent();
+                        return [4, this.program.account.custody.fetch(newCollateralCustody)];
+                    case 3:
+                        newCollateralCustodyAccount = _a.sent();
                         return [4, this.program.methods
-                                .refreshOrdersStatus({})
+                                .migrateMarketPosition({})
                                 .accountsPartial({
-                                admin: this.provider.wallet.publicKey,
-                                multisig: this.multisig.publicKey,
+                                feePayer: this.provider.wallet.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                oldPosition: oldPosition,
+                                oldMarket: oldMarket,
+                                oldCollateralOracleAccount: oldCollateralCustodyAccount.oracle.intOracleAccount,
+                                oldCollateralCustody: oldCollateralCustody,
+                                newPosition: newPosition,
+                                newMarket: newMarket,
+                                newCollateralCustody: newCollateralCustody,
+                                newCollateralOracleAccount: newCollateralCustodyAccount.oracle.intOracleAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                systemProgram: web3_js_1.SystemProgram.programId,
                             })
-                                .remainingAccounts(remainingAccounts)
                                 .instruction()];
-                    case 2:
-                        refreshInstruction = _a.sent();
-                        instructions.push(refreshInstruction);
-                        return [3, 4];
-                    case 3:
+                    case 4:
+                        migrateMarketPositionInstruction = _a.sent();
+                        instructions.push(migrateMarketPositionInstruction);
+                        return [3, 6];
+                    case 5:
                         err_77 = _a.sent();
-                        console.log("perpClient refreshOrdersStatus error:: ", err_77);
+                        console.log("perpClient migrateMarketPosition error:: ", err_77);
                         throw err_77;
-                    case 4: return [2, {
-                            instructions: instructions,
+                    case 6: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
                 }
             });
         }); };
+        this.migrateMarketOrder = function (poolName_1, oldMarket_1, newMarket_1, oldCollateralCustody_1, newCollateralCustody_1) {
+            var args_1 = [];
+            for (var _i = 5; _i < arguments.length; _i++) {
+                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;
+                if (owner === void 0) { owner = this.provider.wallet.publicKey; }
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            void poolName;
+                            void oldCollateralCustody;
+                            void newCollateralCustody;
+                            oldOrder = this.findProgramAddress("order", [
+                                owner,
+                                oldMarket,
+                            ]).publicKey;
+                            newOrder = this.findProgramAddress("order", [
+                                owner,
+                                newMarket,
+                            ]).publicKey;
+                            return [4, this.program.methods
+                                    .migrateMarketOrder({})
+                                    .accountsPartial({
+                                    feePayer: this.provider.wallet.publicKey,
+                                    oldOrder: oldOrder,
+                                    oldMarket: oldMarket,
+                                    newOrder: newOrder,
+                                    newMarket: newMarket,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    systemProgram: web3_js_1.SystemProgram.programId,
+                                })
+                                    .instruction()];
+                        case 2:
+                            migrateMarketOrderInstruction = _a.sent();
+                            instructions.push(migrateMarketOrderInstruction);
+                            return [3, 4];
+                        case 3:
+                            err_78 = _a.sent();
+                            console.log("perpClient migrateMarketOrder error:: ", err_78);
+                            throw err_78;
+                        case 4: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
         var idlWithAddress = __assign(__assign({}, perpetuals_json_1.default), { address: programId.toBase58() });

package/dist/PoolConfig.json

@@ -3754,7 +3754,7 @@
                     "usdPrecision": 4,
                     "tokenPrecision": 4,
                     "isStable": false,
-                    "isVirtual": false,
+                    "isVirtual": true,
                     "lazerId": 2382,
                     "pythTicker": "Crypto.MET/USD",
                     "pythPriceId": "0x0292e0f405bcd4a496d34e48307f6787349ad2bcd8505c3d3a9f77d81a67a682",
@@ -3891,7 +3891,7 @@
                     "usdPrecision": 4,
                     "tokenPrecision": 4,
                     "isStable": false,
-                    "isVirtual": false,
+                    "isVirtual": true,
                     "intOracleAddress": "792tp3W9dzvfofq65LgtoJdfCdb9cRoXm1pAT3nxNEbG",
                     "extOracleAddress": "BEMsCSQEGi2kwPA4mKnGjxnreijhMki7L4eeb96ypzF9",
                     "lazerId": 2382,