@deriverse/kit 1.0.30 → 1.0.38

package/dist/index.js

@@ -23,7 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Engine = exports.getPriceStep = void 0;
+exports.Engine = exports.getPerpPriceStep = exports.getSpotPriceStep = void 0;
 const kit_1 = require("@solana/kit");
 const system_1 = require("@solana-program/system");
 const bs58_1 = require("bs58");
@@ -48,7 +48,7 @@ const nullOrder = 0xFFFF;
  * @param price Current market price
  * @returns Price step
  */
-function getPriceStep(price) {
+function getSpotPriceStep(price) {
     if (price <= 0.00001) {
         return 0.000000001;
     }
@@ -161,7 +161,129 @@ function getPriceStep(price) {
         return 1000;
     }
 }
-exports.getPriceStep = getPriceStep;
+exports.getSpotPriceStep = getSpotPriceStep;
+/**
+ * Get price step between orderbook lines depending on curent price
+ * @param price Current market price
+ * @returns Price step
+ */
+function getPerpPriceStep(price) {
+    if (price <= 0.00005) {
+        return 0.000000001;
+    }
+    else if (price <= 0.0001) {
+        return 0.000000002;
+    }
+    else if (price <= 0.0002) {
+        return 0.000000005;
+    }
+    else if (price <= 0.0005) {
+        return 0.00000001;
+    }
+    else if (price <= 0.001) {
+        return 0.00000002;
+    }
+    else if (price <= 0.002) {
+        return 0.00000005;
+    }
+    else if (price <= 0.005) {
+        return 0.0000001;
+    }
+    else if (price <= 0.01) {
+        return 0.0000002;
+    }
+    else if (price <= 0.02) {
+        return 0.0000005;
+    }
+    else if (price <= 0.05) {
+        return 0.000001;
+    }
+    else if (price <= 0.1) {
+        return 0.000002;
+    }
+    else if (price <= 0.2) {
+        return 0.000005;
+    }
+    else if (price <= 0.5) {
+        return 0.00001;
+    }
+    else if (price <= 1) {
+        return 0.00002;
+    }
+    else if (price <= 2) {
+        return 0.00005;
+    }
+    else if (price <= 5) {
+        return 0.0001;
+    }
+    else if (price <= 10) {
+        return 0.0002;
+    }
+    else if (price <= 20) {
+        return 0.0005;
+    }
+    else if (price <= 50) {
+        return 0.001;
+    }
+    else if (price <= 100) {
+        return 0.002;
+    }
+    else if (price <= 200) {
+        return 0.005;
+    }
+    else if (price <= 500) {
+        return 0.01;
+    }
+    else if (price <= 1000) {
+        return 0.02;
+    }
+    else if (price <= 2000) {
+        return 0.05;
+    }
+    else if (price <= 5000) {
+        return 0.1;
+    }
+    else if (price <= 10000) {
+        return 0.2;
+    }
+    else if (price <= 20000) {
+        return 0.5;
+    }
+    else if (price <= 50000) {
+        return 1;
+    }
+    else if (price <= 100000) {
+        return 2;
+    }
+    else if (price <= 200000) {
+        return 5;
+    }
+    else if (price <= 500000) {
+        return 10;
+    }
+    else if (price <= 1000000) {
+        return 20;
+    }
+    else if (price <= 2000000) {
+        return 50;
+    }
+    else if (price <= 5000000) {
+        return 100;
+    }
+    else if (price <= 10000000) {
+        return 200;
+    }
+    else if (price <= 20000000) {
+        return 500;
+    }
+    else {
+        return 1000;
+    }
+}
+exports.getPerpPriceStep = getPerpPriceStep;
+function perpSeatReserve(activeUsers) {
+    return 250000 * activeUsers / (25000 - activeUsers);
+}
 function findAssociatedTokenAddress(owner, tokenProgramId, mint) {
     return __awaiter(this, void 0, void 0, function* () {
         const address = (yield (0, kit_1.getProgramDerivedAddress)({
@@ -388,6 +510,22 @@ class Engine {
                     }
                     break;
                 }
+                case logs_models_1.LogType.moveSpot: {
+                    if (buffer.length == logs_models_1.MoveSpotAvailFundsReportModel.LENGTH) {
+                        let report = logs_models_1.MoveSpotAvailFundsReportModel.fromBuffer(buffer);
+                        if (this.uiNumbers) {
+                            const instrInfo = this.instruments.get(report.instrId);
+                            if (instrInfo) {
+                                assetTokenDec = this.tokenDec(instrInfo.header.assetTokenId);
+                                crncyTokenDec = this.tokenDec(instrInfo.header.crncyTokenId);
+                                report.qty /= assetTokenDec;
+                                report.crncy /= crncyTokenDec;
+                            }
+                        }
+                        logs.push(report);
+                    }
+                    break;
+                }
                 case logs_models_1.LogType.earnings: {
                     if (buffer.length == logs_models_1.EarningsReportModel.LENGTH) {
                         let report = logs_models_1.EarningsReportModel.fromBuffer(buffer);
@@ -680,6 +818,7 @@ class Engine {
                 this.rootStateModel = structure_models_1.RootStateModel.fromBuffer(infos.value[0].data);
                 this.tokens = new Map();
                 this.instruments = new Map();
+                this.privateMode = (this.rootStateModel.mask & 1) != 0;
                 const tokenAccounts = yield this.findAccountsByTag(types_1.AccountType.TOKEN);
                 tokenAccounts.forEach((t) => {
                     let tokenStateModel = structure_models_1.TokenStateModel.fromBuffer(t.account.data);
@@ -883,16 +1022,6 @@ class Engine {
                     }),
                     role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag({
-                    assetTokenId: instrAccountHeaderModel.assetTokenId,
-                    crncyTokenId: instrAccountHeaderModel.crncyTokenId,
-                    tag: AccountType.SPOT_CLIENT_ACCOUNTS
-                  }),
-                  role: AccountRole.WRITABLE
-                },
-                */
             ];
         });
     }
@@ -991,16 +1120,6 @@ class Engine {
                     }),
                     role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag({
-                    assetTokenId: instrAccountHeaderModel.assetTokenId,
-                    crncyTokenId: instrAccountHeaderModel.crncyTokenId,
-                    tag: AccountType.PERP_CLIENT_ACCOUNTS
-                  }),
-                  role: AccountRole.WRITABLE
-                },
-                */
                 {
                     address: yield this.getInstrAccountByTag({
                         assetTokenId: instrAccountHeaderModel.assetTokenId,
@@ -1025,16 +1144,6 @@ class Engine {
                     }),
                     role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag({
-                    assetTokenId: instrAccountHeaderModel.assetTokenId,
-                    crncyTokenId: instrAccountHeaderModel.crncyTokenId,
-                    tag: AccountType.PERP_PRIORITY_TREE
-                  }),
-                  role: AccountRole.WRITABLE
-                },
-                */
             ];
         });
     }
@@ -1254,8 +1363,8 @@ class Engine {
             for (var i = 0; i < clientPrimaryAccountHeaderModel.assetsCount; ++i) {
                 const offset = structure_models_1.ClientPrimaryAccountHeaderModel.LENGTH + i * 16;
                 const assetInfo = primaryData.readUint32LE(offset);
-                const tag = assetInfo >> 24;
-                const id = assetInfo & 0xFFFFFF;
+                const tag = assetInfo >> 28;
+                const id = assetInfo & 0xFFFFFFF;
                 if (tag == 1) {
                     tokens.set(id, {
                         tokenId: id,
@@ -1727,8 +1836,8 @@ class Engine {
             header.dayCrncyTokens /= crncyTokenDec;
             header.prevDayAssetTokens /= assetTokenDec;
             header.prevDayCrncyTokens /= crncyTokenDec;
-            header.perpLastAssetTokens /= assetTokenDec;
-            header.perpLastCrncyTokens /= crncyTokenDec;
+            header.perpLastTradeAssetTokens /= assetTokenDec;
+            header.perpLastTradeCrncyTokens /= crncyTokenDec;
             header.perpDayAssetTokens /= assetTokenDec;
             header.perpDayCrncyTokens /= crncyTokenDec;
             header.fixingAssetTokens /= assetTokenDec;
@@ -1753,8 +1862,8 @@ class Engine {
             header.fixingPx /= dec;
             header.perpLastClose /= dec;
             header.perpLastPx /= dec;
-            //header.lastHourPx /= dec;
-            header.perpSpotPriceForWithdrowal /= dec;
+            header.perpLongSpotPriceForWithdrowal /= dec;
+            header.perpShortSpotPriceForWithdrowal /= dec;
             header.poolFees /= crncyTokenDec;
             let spotBids = [];
             let spotAsks = [];
@@ -1871,6 +1980,9 @@ class Engine {
                 { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
                 { address: tokenProgramId, role: kit_1.AccountRole.READONLY },
             ];
+            if (this.privateMode) {
+                keys.push({ address: yield this.getAccountByTag(types_1.AccountType.PRIVATE_CLIENTS), role: kit_1.AccountRole.WRITABLE });
+            }
             if (exists) {
                 if (args.tokenId == 0) {
                     keys.push({ address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.WRITABLE });
@@ -1886,11 +1998,6 @@ class Engine {
                 const slot = Number((yield this.rpc.getSlot().send())) - 1;
                 const lutAddress = yield getLookupTableAddress(this.signer, slot);
                 const clientCommunityAccount = yield this.findClientCommunityAccount();
-                /*
-                keys.push(
-                  { address: await this.findClientDrvAccount(), role: AccountRole.WRITABLE }
-                );
-                */
                 keys.push({ address: clientCommunityAccount, role: kit_1.AccountRole.WRITABLE });
                 keys.push({ address: lutAddress, role: kit_1.AccountRole.WRITABLE });
                 keys.push({ address: ADDRESS_LOOKUP_TABLE_PROGRAM_ID, role: kit_1.AccountRole.WRITABLE });
@@ -1945,7 +2052,6 @@ class Engine {
                 { address: ASSOCIATED_TOKEN_PROGRAM_ID, role: kit_1.AccountRole.WRITABLE },
             ];
             if (args.spot != undefined) {
-                //keys.push({ address: await this.findClientDrvAccount(), role: AccountRole.READONLY });
                 for (var i = 0; i < args.spot.length; ++i) {
                     const instr = this.instruments.get(args.spot[i].instrId);
                     if (instr.header.assetTokenId == args.tokenId || instr.header.crncyTokenId == args.tokenId) {
@@ -1962,8 +2068,8 @@ class Engine {
                 }
             }
             if (args.tokenId == 0) {
-                keys.push({ address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.READONLY });
-                keys.push({ address: yield this.clientCommunityAccount, role: kit_1.AccountRole.READONLY });
+                keys.push({ address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.WRITABLE });
+                keys.push({ address: yield this.clientCommunityAccount, role: kit_1.AccountRole.WRITABLE });
             }
             return {
                 accounts: keys,
@@ -1982,7 +2088,8 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            yield this.updateInstrData({ instrId: args.instrId });
+            let instr = this.instruments.get(args.instrId);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2001,10 +2108,12 @@ class Engine {
                 keys.push({ address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.WRITABLE });
                 keys.push({ address: this.clientCommunityAccount, role: kit_1.AccountRole.WRITABLE });
             }
+            const minPrice = (args.minPrice == undefined || args.minPrice == null) ? 0 : args.minPrice;
+            const maxPrice = (args.maxPrice == undefined || args.maxPrice == null) ? 0 : args.maxPrice;
             return {
                 accounts: keys,
                 programAddress: this.programId,
-                data: (0, instruction_models_1.spotLpData)(14, args.side, args.instrId, Math.round(args.amount * lpDec)),
+                data: (0, instruction_models_1.spotLpData)(14, args.side, args.instrId, Math.round(args.amount * lpDec), minPrice * 1000000000, maxPrice * 1000000000),
             };
         });
     }
@@ -2019,7 +2128,11 @@ class Engine {
                 throw new Error("Client account not found");
             }
             let instr = this.instruments.get(args.instrId);
-            let buf = (0, instruction_models_1.newSpotOrderData)(12, args.ioc == null || args.ioc == undefined ? 0 : args.ioc, args.orderType == null || args.orderType == undefined ? 0 : args.orderType, args.side, args.instrId, Math.round(args.price * 1000000000), Math.round(args.qty * this.tokenDec(instr.header.assetTokenId)));
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
+            let buf = (0, instruction_models_1.newSpotOrderData)(12, args.ioc == null || args.ioc == undefined ? 0 : args.ioc, args.orderType == null || args.orderType == undefined ? 0 : args.orderType, args.side, args.instrId, Math.round(args.price * 1000000000), Math.round(args.qty * this.tokenDec(instr.header.assetTokenId)), args.edgePrice == null || args.edgePrice == undefined ? 0 : args.edgePrice * 1000000000);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2053,6 +2166,10 @@ class Engine {
                 throw new Error("Client account not found");
             }
             let instr = this.instruments.get(args.instrId);
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let assetTokenDecFactor = this.tokenDec(instr.header.assetTokenId);
             let buf = (0, instruction_models_1.spotQuotesReplaceData)(34, args.instrId, Math.round(args.newBidPrice * 1000000000), Math.round(args.newBidQty * assetTokenDecFactor), args.bidOrderIdToCancel, Math.round(args.newAskPrice * 1000000000), Math.round(args.newAskQty * assetTokenDecFactor), args.askOrderIdToCancel);
             let keys = [
@@ -2088,6 +2205,10 @@ class Engine {
                 throw new Error("Client account not found");
             }
             let instr = this.instruments.get(args.instrId);
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             const drvs = instr.header.assetTokenId == 0;
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
@@ -2120,7 +2241,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             const drvs = instr.header.assetTokenId == 0;
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
@@ -2275,16 +2400,6 @@ class Engine {
                         tag: types_1.AccountType.PERP_CLIENT_INFOS5
                     }), role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag(
-                    {
-                      assetTokenId: instr.header.assetTokenId,
-                      crncyTokenId: instr.header.crncyTokenId,
-                      tag: AccountType.PERP_CLIENT_ACCOUNTS
-                    }), role: AccountRole.WRITABLE
-                },
-                */
                 {
                     address: yield this.getInstrAccountByTag({
                         assetTokenId: instr.header.assetTokenId,
@@ -2306,16 +2421,6 @@ class Engine {
                         tag: types_1.AccountType.PERP_REBALANCE_TIME_TREE
                     }), role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag(
-                    {
-                      assetTokenId: instr.header.assetTokenId,
-                      crncyTokenId: instr.header.crncyTokenId,
-                      tag: AccountType.PERP_PRIORITY_TREE
-                    }), role: AccountRole.WRITABLE
-                },
-                */
             ];
             const upgradeIx = {
                 accounts: keys,
@@ -2335,7 +2440,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2360,7 +2469,8 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            yield this.updateInstrData({ instrId: args.instrId });
+            let instr = this.instruments.get(args.instrId);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2368,10 +2478,14 @@ class Engine {
                 ...yield this.getPerpContext(instr.header),
                 { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
             ];
+            const splippage = (args.slippage == undefined || args.slippage == null) ? 0 : args.slippage;
+            const slippagePrice = (perpSeatReserve(instr.header.perpClientsCount + 1) -
+                perpSeatReserve(instr.header.perpClientsCount)) * (1 + splippage);
+            const crncyDec = this.tokenDec(instr.header.crncyTokenId);
             return {
                 accounts: keys,
                 programAddress: this.programId,
-                data: (0, instruction_models_1.buyMarketSeatData)(47, args.instrId, args.amount * this.tokenDec(instr.header.crncyTokenId)),
+                data: (0, instruction_models_1.buyMarketSeatData)(47, args.instrId, slippagePrice * crncyDec, args.amount * crncyDec),
             };
         });
     }
@@ -2380,7 +2494,8 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            yield this.updateInstrData({ instrId: args.instrId });
+            let instr = this.instruments.get(args.instrId);
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2389,10 +2504,14 @@ class Engine {
                 { address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.READONLY },
                 { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
             ];
+            const splippage = (args.slippage == undefined || args.slippage == null) ? 0 : args.slippage;
+            const slippagePrice = (perpSeatReserve(instr.header.perpClientsCount + 1) -
+                perpSeatReserve(instr.header.perpClientsCount)) / (1 + splippage);
+            const crncyDec = this.tokenDec(instr.header.crncyTokenId);
             return {
                 accounts: keys,
                 programAddress: this.programId,
-                data: (0, instruction_models_1.sellMarketSeatData)(48, args.instrId),
+                data: (0, instruction_models_1.sellMarketSeatData)(48, slippagePrice * crncyDec, args.instrId),
             };
         });
     }
@@ -2406,7 +2525,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2423,7 +2546,7 @@ class Engine {
             return {
                 accounts: keys,
                 programAddress: this.programId,
-                data: (0, instruction_models_1.newPerpOrderData)(19, args.ioc == null || args.ioc == undefined ? 0 : args.ioc, args.leverage == null || args.leverage == undefined ? 0 : args.leverage, args.orderType == null || args.orderType == undefined ? 0 : args.orderType, args.side, args.instrId, args.price * 1000000000, args.qty * this.tokenDec(instr.header.assetTokenId)),
+                data: (0, instruction_models_1.newPerpOrderData)(19, args.ioc == null || args.ioc == undefined ? 0 : args.ioc, args.leverage == null || args.leverage == undefined ? 0 : args.leverage, args.orderType == null || args.orderType == undefined ? 0 : args.orderType, args.side, args.instrId, args.price * 1000000000, args.qty * this.tokenDec(instr.header.assetTokenId), args.edgePrice == null || args.edgePrice == undefined ? 0 : args.edgePrice * 1000000000),
             };
         });
     }
@@ -2437,7 +2560,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let assetTokenDecFactor = this.tokenDec(instr.header.assetTokenId);
             let buf = (0, instruction_models_1.perpQuotesReplaceData)(42, args.instrId, Math.round(args.newBidPrice * 1000000000), Math.round(args.newBidQty * assetTokenDecFactor), args.bidOrderIdToCancel, Math.round(args.newAskPrice * 1000000000), Math.round(args.newAskQty * assetTokenDecFactor), args.askOrderIdToCancel);
             let keys = [
@@ -2470,7 +2597,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2496,7 +2627,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2512,32 +2647,6 @@ class Engine {
             };
         });
     }
-    /**
-     * Build instruction for perp forced close in particular instrument
-     * @param args Order data
-     * @returns Transaction instruction
-     */
-    perpForcedCloseInstruction(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.checkClient())) {
-                throw new Error("Client account not found");
-            }
-            const instr = this.instruments.get(args.instrId);
-            let keys = [
-                { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
-                { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
-                { address: args.clientPrimaryAccount, role: kit_1.AccountRole.WRITABLE },
-                ...yield this.getPerpContext(instr.header),
-                { address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY), role: kit_1.AccountRole.READONLY },
-                { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
-            ];
-            return {
-                accounts: keys,
-                programAddress: this.programId,
-                data: (0, instruction_models_1.perpForcedCloseData)(38, args.instrId),
-            };
-        });
-    }
     /**
      * Build instruction for new referral link
      * @returns Transaction instruction
@@ -2571,7 +2680,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2597,7 +2710,11 @@ class Engine {
             if (!(yield this.checkClient())) {
                 throw new Error("Client account not found");
             }
-            const instr = this.instruments.get(args.instrId);
+            let instr = this.instruments.get(args.instrId);
+            if (instr.header.perpMapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: args.instrId });
+                instr = this.instruments.get(args.instrId);
+            }
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
@@ -2732,16 +2849,6 @@ class Engine {
                         tag: types_1.AccountType.SPOT_CLIENT_INFOS2
                     }), role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag(
-                    {
-                      assetTokenId: assetTokenId,
-                      crncyTokenId: crncyTokenId,
-                      tag: AccountType.SPOT_CLIENT_ACCOUNTS
-                    }), role: AccountRole.WRITABLE
-                },
-                */
                 {
                     address: yield this.getInstrAccountByTag({
                         assetTokenId: assetTokenId,
@@ -2763,16 +2870,6 @@ class Engine {
                         tag: types_1.AccountType.SPOT_DAY_CANDLES
                     }), role: kit_1.AccountRole.WRITABLE
                 },
-                /*
-                {
-                  address: await this.getInstrAccountByTag(
-                    {
-                      assetTokenId: assetTokenId,
-                      crncyTokenId: crncyTokenId,
-                      tag: AccountType.INSTR_TRACE
-                    }), role: AccountRole.WRITABLE
-                },
-                */
             ];
             const newInstrIx = {
                 accounts: keys,
@@ -2782,5 +2879,65 @@ class Engine {
             return [createMapsAccountIx, newInstrIx];
         });
     }
+    /**
+     * Build instruction for durect swap
+     * @param args Order data
+     * @returns Transaction instruction
+     */
+    swapInstruction(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.checkClient())) {
+                throw new Error("Client account not found");
+            }
+            const assetTokenId = yield this.getTokenId(args.assetMint);
+            const crncyTokenId = yield this.getTokenId(args.crncyMint);
+            const assetTokenAccount = this.tokens.get(assetTokenId);
+            const crncyTokenAccount = this.tokens.get(crncyTokenId);
+            const assetTokenProgramId = (assetTokenAccount.mask & 0x80000000) == 0 ?
+                TOKEN_PROGRAM_ID : TOKEN_2022_PROGRAM_ID;
+            const crncyTokenProgramId = (crncyTokenAccount.mask & 0x80000000) == 0 ?
+                TOKEN_PROGRAM_ID : TOKEN_2022_PROGRAM_ID;
+            let instrId = yield this.getInstrId({
+                assetTokenId: assetTokenId,
+                crncyTokenId: crncyTokenId
+            });
+            const clientAssetTokenAccount = yield findAssociatedTokenAddress(this.signer, assetTokenProgramId, args.assetMint);
+            const clientCrncyTokenAccount = yield findAssociatedTokenAddress(this.signer, crncyTokenProgramId, args.crncyMint);
+            let instr = this.instruments.get(instrId);
+            if (instr.header.mapsAddress == undefined) {
+                yield this.updateInstrData({ instrId: instrId });
+                instr = this.instruments.get(instrId);
+            }
+            let buf = (0, instruction_models_1.swapData)(26, args.crncyInput ? 1 : 0, instrId, Math.round(args.limitPrice * 1000000000), Math.round(args.amount *
+                (args.crncyInput ?
+                    this.tokenDec(instr.header.crncyTokenId) :
+                    this.tokenDec(instr.header.assetTokenId))));
+            let keys = [
+                { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
+                { address: this.rootAccount, role: kit_1.AccountRole.READONLY },
+                ...yield this.getSpotContext(instr.header),
+                ...yield this.getSpotCandles(instr.header),
+                {
+                    address: yield this.getAccountByTag(types_1.AccountType.COMMUNITY),
+                    role: kit_1.AccountRole.READONLY
+                },
+                { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
+                { address: assetTokenProgramId, role: kit_1.AccountRole.READONLY },
+                { address: crncyTokenProgramId, role: kit_1.AccountRole.READONLY },
+                { address: assetTokenAccount.programAddress, role: kit_1.AccountRole.WRITABLE },
+                { address: crncyTokenAccount.programAddress, role: kit_1.AccountRole.WRITABLE },
+                { address: args.assetMint, role: kit_1.AccountRole.READONLY },
+                { address: args.crncyMint, role: kit_1.AccountRole.READONLY },
+                { address: yield this.getTokenAccount(args.assetMint), role: kit_1.AccountRole.READONLY },
+                { address: yield this.getTokenAccount(args.crncyMint), role: kit_1.AccountRole.READONLY },
+                { address: clientAssetTokenAccount, role: kit_1.AccountRole.WRITABLE },
+                { address: clientCrncyTokenAccount, role: kit_1.AccountRole.WRITABLE },
+                { address: this.drvsAuthority, role: kit_1.AccountRole.READONLY },
+            ];
+            return {
+                accounts: keys, programAddress: this.programId, data: buf
+            };
+        });
+    }
 }
 exports.Engine = Engine;